From b839c2a9ff7c290bd16402812228ad46b17ca799 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Mon, 22 Aug 2022 15:00:50 +0200 Subject: [PATCH 01/37] Companion for #11981 --- node/overseer/src/lib.rs | 2 +- runtime/common/src/assigned_slots.rs | 2 +- runtime/common/src/auctions.rs | 2 +- runtime/common/src/claims.rs | 2 +- runtime/common/src/crowdloan/mod.rs | 2 +- runtime/common/src/paras_registrar.rs | 2 +- runtime/common/src/purchase.rs | 2 +- runtime/common/src/slots/mod.rs | 2 +- runtime/parachains/src/disputes.rs | 2 +- runtime/parachains/src/hrmp.rs | 2 +- runtime/parachains/src/inclusion/mod.rs | 2 +- runtime/parachains/src/paras/mod.rs | 2 +- runtime/parachains/src/ump.rs | 2 +- runtime/rococo/src/validator_manager.rs | 2 +- runtime/test-runtime/src/lib.rs | 2 +- xcm/pallet-xcm/src/lib.rs | 2 +- xcm/pallet-xcm/src/mock.rs | 2 +- xcm/xcm-simulator/example/src/parachain.rs | 2 +- xcm/xcm-simulator/fuzzer/src/parachain.rs | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 21160bddaecb..16f7de9998bc 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -265,7 +265,7 @@ impl From> for BlockInfo { /// An event from outside the overseer scope, such /// as the substrate framework or user interaction. -pub enum Event { +pub enum PalletEvent { /// A new block was imported. BlockImported(BlockInfo), /// A block was finalized with i.e. babe or another consensus algorithm. diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs index bac642cde589..cc51ebdcfcea 100644 --- a/runtime/common/src/assigned_slots.rs +++ b/runtime/common/src/assigned_slots.rs @@ -152,7 +152,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// A para was assigned a permanent parachain slot PermanentSlotAssigned(ParaId), /// A para was assigned a temporary parachain slot diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index b937a26d5671..f5d814ea50c1 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -125,7 +125,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// An auction started. Provides its index and the block number where it will begin to /// close and the first lease period of the quadruplet that is auctioned. AuctionStarted { diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index e2731f9336cc..35655a5d7582 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -182,7 +182,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// Someone claimed some DOTs. Claimed { who: T::AccountId, ethereum_address: EthereumAddress, amount: BalanceOf }, } diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index 4b2c29f5398d..2b67064cd0ae 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -253,7 +253,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// Create a new crowdloaning campaign. Created { para_id: ParaId }, /// Contributed to a crowd sale. diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 7631914b9992..e9d11eea52dc 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -126,7 +126,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { Registered { para_id: ParaId, manager: T::AccountId }, Deregistered { para_id: ParaId }, Reserved { para_id: ParaId, who: T::AccountId }, diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 3900f6edb318..ad4d3a2809ea 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -131,7 +131,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// A [new] account was created. AccountCreated { who: T::AccountId }, /// Someone's account validity was updated. diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index 76054ac989f9..cbd447912047 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -120,7 +120,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// A new `[lease_period]` is beginning. NewLeasePeriod { lease_period: LeasePeriodOf }, /// A para has won the right to a continuous set of lease periods as a parachain. diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index aec60a4eb0f7..90f201812279 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -468,7 +468,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// A dispute has been initiated. \[candidate hash, dispute location\] DisputeInitiated(CandidateHash, DisputeLocation), /// A dispute has concluded for or against a candidate. diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs index d18c2b3fc497..2cd4957dba88 100644 --- a/runtime/parachains/src/hrmp.rs +++ b/runtime/parachains/src/hrmp.rs @@ -258,7 +258,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// Open HRMP channel requested. /// `[sender, recipient, proposed_max_capacity, proposed_max_message_size]` OpenChannelRequested(ParaId, ParaId, u32, u32), diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index c936b54eecfc..0f7e62a1f552 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -205,7 +205,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// A candidate was backed. `[candidate, head_data]` CandidateBacked(CandidateReceipt, HeadData, CoreIndex, GroupIndex), /// A candidate was included. `[candidate, head_data]` diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs index 3c5b82479395..5bf26bf9192f 100644 --- a/runtime/parachains/src/paras/mod.rs +++ b/runtime/parachains/src/paras/mod.rs @@ -486,7 +486,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// Current code has been updated for a Para. `para_id` CurrentCodeUpdated(ParaId), /// Current head has been updated for a Para. `para_id` diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 7d40a99e9885..46005486b0a6 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -238,7 +238,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// Upward message is invalid XCM. /// \[ id \] InvalidFormat(MessageId), diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs index 2fd60b682ea5..19e9c0ac6018 100644 --- a/runtime/rococo/src/validator_manager.rs +++ b/runtime/rococo/src/validator_manager.rs @@ -45,7 +45,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// New validators were added to the set. ValidatorsRegistered(Vec), /// Validators were removed from the set. diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index d18a2c9bb95c..1afcae14d087 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -597,7 +597,7 @@ pub mod pallet_test_notifier { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { QueryPrepared(QueryId), NotifyQueryPrepared(QueryId), ResponseReceived(MultiLocation, QueryId, Response), diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index c237fc702a4a..61ff8680f01d 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -124,7 +124,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { /// Execution of an XCM message was attempted. /// /// \[ outcome \] diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 5627acd31a3c..c395673afe0a 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -59,7 +59,7 @@ pub mod pallet_test_notifier { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { QueryPrepared(QueryId), NotifyQueryPrepared(QueryId), ResponseReceived(MultiLocation, QueryId, Response), diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index 614d50e4fc6e..c1c7d70467ba 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -187,7 +187,7 @@ pub mod mock_msg_queue { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { // XCMP /// Some XCM was executed OK. Success(Option), diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index 3326875206b2..6241509eb5f7 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -187,7 +187,7 @@ pub mod mock_msg_queue { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum Event { + pub enum PalletEvent { // XCMP /// Some XCM was executed OK. Success(Option), From 8b5cf180435722253b1ac3ae8b08a34d533d3d4a Mon Sep 17 00:00:00 2001 From: Szegoo Date: Mon, 22 Aug 2022 16:01:43 +0200 Subject: [PATCH 02/37] more renaming --- node/overseer/src/lib.rs | 24 +++--- runtime/common/src/assigned_slots.rs | 18 ++--- runtime/common/src/auctions.rs | 30 +++---- runtime/common/src/claims.rs | 12 +-- runtime/common/src/crowdloan/mod.rs | 56 ++++++------- runtime/common/src/impls.rs | 12 +-- runtime/common/src/integration_tests.rs | 24 +++--- runtime/common/src/paras_registrar.rs | 28 +++---- runtime/common/src/purchase.rs | 24 +++--- runtime/common/src/slots/mod.rs | 18 ++--- runtime/kusama/src/governance/old.rs | 10 +-- runtime/kusama/src/lib.rs | 74 ++++++++--------- runtime/kusama/src/xcm_config.rs | 4 +- runtime/parachains/src/disputes.rs | 12 +-- runtime/parachains/src/disputes/tests.rs | 2 +- runtime/parachains/src/hrmp.rs | 10 +-- runtime/parachains/src/hrmp/benchmarking.rs | 10 +-- runtime/parachains/src/hrmp/tests.rs | 8 +- runtime/parachains/src/inclusion/mod.rs | 8 +- runtime/parachains/src/mock.rs | 14 ++-- runtime/parachains/src/paras/benchmarking.rs | 14 ++-- runtime/parachains/src/paras/mod.rs | 18 ++--- runtime/parachains/src/paras/tests.rs | 8 +- runtime/parachains/src/runtime_api_impl/v2.rs | 4 +- runtime/parachains/src/ump.rs | 16 ++-- runtime/parachains/src/ump/benchmarking.rs | 10 +-- runtime/parachains/src/ump/tests.rs | 4 +- runtime/polkadot/src/lib.rs | 80 +++++++++---------- runtime/polkadot/src/xcm_config.rs | 4 +- runtime/rococo/src/lib.rs | 54 ++++++------- runtime/rococo/src/validator_manager.rs | 6 +- runtime/rococo/src/xcm_config.rs | 4 +- runtime/test-runtime/src/lib.rs | 44 +++++----- runtime/westend/src/lib.rs | 64 +++++++-------- runtime/westend/src/xcm_config.rs | 4 +- .../src/fungible/mock.rs | 8 +- xcm/pallet-xcm-benchmarks/src/generic/mock.rs | 4 +- xcm/pallet-xcm/src/lib.rs | 48 +++++------ xcm/pallet-xcm/src/mock.rs | 22 ++--- xcm/pallet-xcm/src/tests.rs | 28 +++---- xcm/xcm-builder/tests/mock/mod.rs | 12 +-- xcm/xcm-builder/tests/scenarios.rs | 2 +- xcm/xcm-executor/integration-tests/src/lib.rs | 12 +-- xcm/xcm-simulator/example/src/lib.rs | 6 +- xcm/xcm-simulator/example/src/parachain.rs | 24 +++--- xcm/xcm-simulator/example/src/relay_chain.rs | 14 ++-- xcm/xcm-simulator/fuzzer/src/parachain.rs | 24 +++--- xcm/xcm-simulator/fuzzer/src/relay_chain.rs | 14 ++-- 48 files changed, 475 insertions(+), 475 deletions(-) diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 16f7de9998bc..54a8755d93e6 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -185,12 +185,12 @@ impl Handle { /// Inform the `Overseer` that that some block was imported. pub async fn block_imported(&mut self, block: BlockInfo) { - self.send_and_log_error(Event::BlockImported(block)).await + self.send_and_log_error(PalletEvent::BlockImported(block)).await } /// Send some message to one of the `Subsystem`s. pub async fn send_msg(&mut self, msg: impl Into, origin: &'static str) { - self.send_and_log_error(Event::MsgToSubsystem { msg: msg.into(), origin }).await + self.send_and_log_error(PalletEvent::MsgToSubsystem { msg: msg.into(), origin }).await } /// Send a message not providing an origin. @@ -201,7 +201,7 @@ impl Handle { /// Inform the `Overseer` that some block was finalized. pub async fn block_finalized(&mut self, block: BlockInfo) { - self.send_and_log_error(Event::BlockFinalized(block)).await + self.send_and_log_error(PalletEvent::BlockFinalized(block)).await } /// Wait for a block with the given hash to be in the active-leaves set. @@ -215,7 +215,7 @@ impl Handle { hash: Hash, response_channel: oneshot::Sender>, ) { - self.send_and_log_error(Event::ExternalRequest(ExternalRequest::WaitForActivation { + self.send_and_log_error(PalletEvent::ExternalRequest(ExternalRequest::WaitForActivation { hash, response_channel, })) @@ -224,11 +224,11 @@ impl Handle { /// Tell `Overseer` to shutdown. pub async fn stop(&mut self) { - self.send_and_log_error(Event::Stop).await; + self.send_and_log_error(PalletEvent::Stop).await; } /// Most basic operation, to stop a server. - async fn send_and_log_error(&mut self, event: Event) { + async fn send_and_log_error(&mut self, event: PalletEvent) { if self.0.send(event).await.is_err() { gum::info!(target: LOG_TARGET, "Failed to send an event to Overseer"); } @@ -442,7 +442,7 @@ pub async fn forward_events>(client: Arc

, mut hand /// ``` #[orchestra( gen=AllMessages, - event=Event, + event=PalletEvent, signal=OverseerSignal, error=SubsystemError, message_capacity=2048, @@ -724,21 +724,21 @@ where select! { msg = self.events_rx.select_next_some() => { match msg { - Event::MsgToSubsystem { msg, origin } => { + PalletEvent::MsgToSubsystem { msg, origin } => { self.route_message(msg.into(), origin).await?; self.metrics.on_message_relayed(); } - Event::Stop => { + PalletEvent::Stop => { self.stop().await; return Ok(()); } - Event::BlockImported(block) => { + PalletEvent::BlockImported(block) => { self.block_imported(block).await?; } - Event::BlockFinalized(block) => { + PalletEvent::BlockFinalized(block) => { self.block_finalized(block).await?; } - Event::ExternalRequest(request) => { + PalletEvent::ExternalRequest(request) => { self.handle_external_request(request); } } diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs index cc51ebdcfcea..590ceb116a97 100644 --- a/runtime/common/src/assigned_slots.rs +++ b/runtime/common/src/assigned_slots.rs @@ -84,8 +84,8 @@ pub mod pallet { #[pallet::config] #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config + slots::Config { - /// The overarching event type. - type Event: From> + IsType<::Event>; + /// The overarching PalletEvent type. + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Origin for assigning slots. type AssignSlotOrigin: EnsureOrigin<::Origin>; @@ -250,7 +250,7 @@ pub mod pallet { ); >::mutate(|count| count.saturating_inc()); - Self::deposit_event(Event::::PermanentSlotAssigned(id)); + Self::deposit_event(PalletEvent::::PermanentSlotAssigned(id)); Ok(()) } @@ -334,7 +334,7 @@ pub mod pallet { TemporarySlots::::insert(id, temp_slot); >::mutate(|count| count.saturating_inc()); - Self::deposit_event(Event::::TemporarySlotAssigned(id)); + Self::deposit_event(PalletEvent::::TemporarySlotAssigned(id)); Ok(()) } @@ -601,7 +601,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type PalletEvent = PalletEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -621,7 +621,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type PalletEvent = PalletEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -640,7 +640,7 @@ mod tests { } impl parachains_paras::Config for Test { - type Event = Event; + type PalletEvent = PalletEvent; type WeightInfo = parachains_paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -655,7 +655,7 @@ mod tests { } impl slots::Config for Test { - type Event = Event; + type PalletEvent = PalletEvent; type Currency = Balances; type Registrar = TestRegistrar; type LeasePeriod = LeasePeriod; @@ -673,7 +673,7 @@ mod tests { } impl assigned_slots::Config for Test { - type Event = Event; + type PalletEvent = PalletEvent; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index f5d814ea50c1..da04159dc0f2 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -91,7 +91,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The type representing the leasing system. type Leaser: Leaser< @@ -402,7 +402,7 @@ impl Pallet { let ending = frame_system::Pallet::::block_number().saturating_add(duration); AuctionInfo::::put((lease_period_index, ending)); - Self::deposit_event(Event::::AuctionStarted { + Self::deposit_event(PalletEvent::::AuctionStarted { auction_index: n, lease_period: lease_period_index, ending, @@ -481,7 +481,7 @@ impl Pallet { // ...and record the amount reserved. ReservedAmounts::::insert(&bidder_para, reserve_required); - Self::deposit_event(Event::::Reserved { + Self::deposit_event(PalletEvent::::Reserved { bidder: bidder.clone(), extra_reserved: additional, total_amount: reserve_required, @@ -504,14 +504,14 @@ impl Pallet { // It really should be reserved; there's not much we can do here on fail. let err_amt = CurrencyOf::::unreserve(&who, amount); debug_assert!(err_amt.is_zero()); - Self::deposit_event(Event::::Unreserved { bidder: who, amount }); + Self::deposit_event(PalletEvent::::Unreserved { bidder: who, amount }); } } } // Update the range winner. Winning::::insert(offset, ¤t_winning); - Self::deposit_event(Event::::BidAccepted { + Self::deposit_event(PalletEvent::::BidAccepted { bidder, para_id: para, amount, @@ -548,7 +548,7 @@ impl Pallet { T::SampleLength::get().max(One::one()); let auction_counter = AuctionCounter::::get(); - Self::deposit_event(Event::::WinningOffset { + Self::deposit_event(PalletEvent::::WinningOffset { auction_index: auction_counter, block_number: offset, }); @@ -602,7 +602,7 @@ impl Pallet { // The leaser attempted to get a second lease on the same para ID, possibly griefing us. Let's // keep the amount reserved and let governance sort it out. if CurrencyOf::::reserve(&leaser, amount).is_ok() { - Self::deposit_event(Event::::ReserveConfiscated { + Self::deposit_event(PalletEvent::::ReserveConfiscated { para_id: para, leaser, amount, @@ -613,7 +613,7 @@ impl Pallet { } } - Self::deposit_event(Event::::AuctionClosed { + Self::deposit_event(PalletEvent::::AuctionClosed { auction_index: AuctionCounter::::get(), }); } @@ -718,7 +718,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type PalletEvent = PalletEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -739,7 +739,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; type DustRemoval = (); - type Event = Event; + type PalletEvent = PalletEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -867,7 +867,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type PalletEvent = PalletEvent; type Leaser = TestLeaser; type Registrar = TestRegistrar; type EndingPeriod = EndingPeriod; @@ -1729,9 +1729,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1786,7 +1786,7 @@ mod benchmarking { let origin = T::InitiateOrigin::successful_origin(); }: _(origin, duration, lease_period_index) verify { - assert_last_event::(Event::::AuctionStarted { + assert_last_event::(PalletEvent::::AuctionStarted { auction_index: AuctionCounter::::get(), lease_period: LeasePeriodOf::::max_value(), ending: T::BlockNumber::max_value(), @@ -1884,7 +1884,7 @@ mod benchmarking { Auctions::::on_initialize(duration + now + T::EndingPeriod::get()); } verify { let auction_index = AuctionCounter::::get(); - assert_last_event::(Event::::AuctionClosed { auction_index }.into()); + assert_last_event::(PalletEvent::::AuctionClosed { auction_index }.into()); assert!(Winning::::iter().count().is_zero()); } diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index 35655a5d7582..c4bd8184c005 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -172,7 +172,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type VestingSchedule: VestingSchedule; #[pallet::constant] type Prefix: Get<&'static [u8]>; @@ -581,7 +581,7 @@ impl Pallet { Signing::::remove(&signer); // Let's deposit an event to let the outside world know this happened. - Self::deposit_event(Event::::Claimed { + Self::deposit_event(PalletEvent::::Claimed { who: dest, ethereum_address: signer, amount: balance_due, @@ -760,7 +760,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -779,7 +779,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -794,7 +794,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -810,7 +810,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureSignedBy; diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index 2b67064cd0ae..f255ccb52ca4 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -189,7 +189,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")` #[pallet::constant] @@ -351,7 +351,7 @@ pub mod pallet { fund.raised, ); - Self::deposit_event(Event::::HandleBidResult { para_id, result }); + Self::deposit_event(PalletEvent::::HandleBidResult { para_id, result }); } T::WeightInfo::on_initialize(new_raise_len) } else { @@ -437,7 +437,7 @@ pub mod pallet { // Add a lock to the para so that the configuration cannot be changed. T::Registrar::apply_lock(index); - Self::deposit_event(Event::::Created { para_id: index }); + Self::deposit_event(PalletEvent::::Created { para_id: index }); Ok(()) } @@ -494,7 +494,7 @@ pub mod pallet { Funds::::insert(index, &fund); - Self::deposit_event(Event::::Withdrew { who, fund_index: index, amount: balance }); + Self::deposit_event(PalletEvent::::Withdrew { who, fund_index: index, amount: balance }); Ok(()) } @@ -536,11 +536,11 @@ pub mod pallet { Funds::::insert(index, &fund); if all_refunded { - Self::deposit_event(Event::::AllRefunded { para_id: index }); + Self::deposit_event(PalletEvent::::AllRefunded { para_id: index }); // Refund for unused refund count. Ok(Some(T::WeightInfo::refund(refund_count)).into()) } else { - Self::deposit_event(Event::::PartiallyRefunded { para_id: index }); + Self::deposit_event(PalletEvent::::PartiallyRefunded { para_id: index }); // No weight to refund since we did not finish the loop. Ok(().into()) } @@ -567,7 +567,7 @@ pub mod pallet { CurrencyOf::::unreserve(&fund.depositor, fund.deposit); Funds::::remove(index); - Self::deposit_event(Event::::Dissolved { para_id: index }); + Self::deposit_event(PalletEvent::::Dissolved { para_id: index }); Ok(()) } @@ -604,7 +604,7 @@ pub mod pallet { }, ); - Self::deposit_event(Event::::Edited { para_id: index }); + Self::deposit_event(PalletEvent::::Edited { para_id: index }); Ok(()) } @@ -622,7 +622,7 @@ pub mod pallet { ensure!(balance > Zero::zero(), Error::::NoContributions); Self::contribution_put(fund.fund_index, &who, &balance, &memo); - Self::deposit_event(Event::::MemoUpdated { who, para_id: index, memo }); + Self::deposit_event(PalletEvent::::MemoUpdated { who, para_id: index, memo }); Ok(()) } @@ -636,7 +636,7 @@ pub mod pallet { ensure!(!fund.raised.is_zero(), Error::::NoContributions); ensure!(!NewRaise::::get().contains(&index), Error::::AlreadyInNewRaise); NewRaise::::append(index); - Self::deposit_event(Event::::AddedToNewRaise { para_id: index }); + Self::deposit_event(PalletEvent::::AddedToNewRaise { para_id: index }); Ok(()) } @@ -811,7 +811,7 @@ impl Pallet { Funds::::insert(index, &fund); - Self::deposit_event(Event::::Contributed { who, fund_index: index, amount: value }); + Self::deposit_event(PalletEvent::::Contributed { who, fund_index: index, amount: value }); Ok(()) } } @@ -901,7 +901,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -920,7 +920,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -1072,7 +1072,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; type PalletId = CrowdloanPalletId; @@ -1129,8 +1129,8 @@ mod tests { } } - fn last_event() -> Event { - System::events().pop().expect("Event expected").event + fn last_event() -> PalletEvent { + System::events().pop().expect("PalletEvent expected").event } #[test] @@ -1651,7 +1651,7 @@ mod tests { assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); assert_eq!( last_event(), - super::Event::::PartiallyRefunded { para_id: para }.into() + super::PalletEvent::::PartiallyRefunded { para_id: para }.into() ); // Funds still left over @@ -1659,7 +1659,7 @@ mod tests { // Call again assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); - assert_eq!(last_event(), super::Event::::AllRefunded { para_id: para }.into()); + assert_eq!(last_event(), super::PalletEvent::::AllRefunded { para_id: para }.into()); // Funds are returned assert_eq!(Balances::free_balance(account_id), 0); @@ -1906,9 +1906,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1987,7 +1987,7 @@ mod benchmarking { }: _(RawOrigin::Signed(caller), para_id, cap, first_period, last_period, end, Some(verifier)) verify { - assert_last_event::(Event::::Created { para_id }.into()) + assert_last_event::(PalletEvent::::Created { para_id }.into()) } // Contribute has two arms: PreEnding and Ending, but both are equal complexity. @@ -2008,7 +2008,7 @@ mod benchmarking { verify { // NewRaise is appended to, so we don't need to fill it up for worst case scenario. assert!(!NewRaise::::get().is_empty()); - assert_last_event::(Event::::Contributed { who: caller, fund_index, amount: contribution }.into()); + assert_last_event::(PalletEvent::::Contributed { who: caller, fund_index, amount: contribution }.into()); } withdraw { @@ -2021,7 +2021,7 @@ mod benchmarking { frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); }: _(RawOrigin::Signed(caller), contributor.clone(), fund_index) verify { - assert_last_event::(Event::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); + assert_last_event::(PalletEvent::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); } // Worst case: Refund removes `RemoveKeysLimit` keys, and is fully refunded. @@ -2041,7 +2041,7 @@ mod benchmarking { frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); }: _(RawOrigin::Signed(caller), fund_index) verify { - assert_last_event::(Event::::AllRefunded { para_id: fund_index }.into()); + assert_last_event::(PalletEvent::::AllRefunded { para_id: fund_index }.into()); } dissolve { @@ -2052,7 +2052,7 @@ mod benchmarking { frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); }: _(RawOrigin::Signed(caller.clone()), fund_index) verify { - assert_last_event::(Event::::Dissolved { para_id: fund_index }.into()); + assert_last_event::(PalletEvent::::Dissolved { para_id: fund_index }.into()); } edit { @@ -2081,7 +2081,7 @@ mod benchmarking { // Doesn't matter what we edit to, so use the same values. }: _(RawOrigin::Root, para_id, cap, first_period, last_period, end, Some(verifier)) verify { - assert_last_event::(Event::::Edited { para_id }.into()) + assert_last_event::(PalletEvent::::Edited { para_id }.into()) } add_memo { @@ -2111,7 +2111,7 @@ mod benchmarking { }: _(RawOrigin::Signed(caller), fund_index) verify { assert!(!NewRaise::::get().is_empty()); - assert_last_event::(Event::::AddedToNewRaise { para_id: fund_index }.into()) + assert_last_event::(PalletEvent::::AddedToNewRaise { para_id: fund_index }.into()) } // Worst case scenario: N funds are all in the `NewRaise` list, we are @@ -2150,7 +2150,7 @@ mod benchmarking { Crowdloan::::on_initialize(end_block); } verify { assert_eq!(EndingsCount::::get(), old_endings_count + 1); - assert_last_event::(Event::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); + assert_last_event::(PalletEvent::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); } impl_benchmark_test_suite!( diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index bce847c82a83..2f8348ad5622 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -80,10 +80,10 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event}, } ); @@ -113,7 +113,7 @@ mod tests { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockLength = BlockLength; type BlockWeights = BlockWeights; @@ -131,7 +131,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = (); type AccountStore = System; @@ -150,7 +150,7 @@ mod tests { type Currency = pallet_balances::Pallet; type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = (); type ProposalBond = (); type ProposalBondMinimum = (); diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs index 76dc1f4c55b0..89fbe2409643 100644 --- a/runtime/common/src/integration_tests.rs +++ b/runtime/common/src/integration_tests.rs @@ -120,7 +120,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -178,7 +178,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -200,7 +200,7 @@ parameter_types! { } impl paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -212,7 +212,7 @@ parameter_types! { } impl paras_registrar::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSwap = (Crowdloan, Slots); type ParaDeposit = ParaDeposit; type DataDepositPerByte = DataDepositPerByte; @@ -227,7 +227,7 @@ parameter_types! { } impl auctions::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -243,7 +243,7 @@ parameter_types! { } impl slots::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -261,7 +261,7 @@ parameter_types! { } impl crowdloan::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -342,11 +342,11 @@ fn run_to_session(n: u32) { run_to_block(block_number); } -fn last_event() -> Event { - System::events().pop().expect("Event expected").event +fn last_event() -> PalletEvent { + System::events().pop().expect("PalletEvent expected").event } -fn contains_event(event: Event) -> bool { +fn contains_event(event: PalletEvent) -> bool { System::events().iter().any(|x| x.event == event) } @@ -432,7 +432,7 @@ fn basic_end_to_end_works() { // Auction ends at block 110 + offset run_to_block(109 + offset); assert!(contains_event( - crowdloan::Event::::HandleBidResult { + crowdloan::PalletEvent::::HandleBidResult { para_id: ParaId::from(para_2), result: Ok(()) } @@ -441,7 +441,7 @@ fn basic_end_to_end_works() { run_to_block(110 + offset); assert_eq!( last_event(), - auctions::Event::::AuctionClosed { auction_index: 1 }.into() + auctions::PalletEvent::::AuctionClosed { auction_index: 1 }.into() ); // Paras should have won slots diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index e9d11eea52dc..07e752b496d1 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -96,7 +96,7 @@ pub mod pallet { #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The aggregated origin type must support the `parachains` origin. We require that we can /// infallibly convert between this origin and the system origin, but in reality, they're the @@ -492,7 +492,7 @@ impl Pallet { let info = ParaInfo { manager: who.clone(), deposit, locked: false }; Paras::::insert(id, info); - Self::deposit_event(Event::::Reserved { para_id: id, who }); + Self::deposit_event(PalletEvent::::Reserved { para_id: id, who }); Ok(()) } @@ -530,7 +530,7 @@ impl Pallet { // We check above that para has no lifecycle, so this should not fail. let res = runtime_parachains::schedule_para_initialize::(id, genesis); debug_assert!(res.is_ok()); - Self::deposit_event(Event::::Registered { para_id: id, manager: who }); + Self::deposit_event(PalletEvent::::Registered { para_id: id, manager: who }); Ok(()) } @@ -549,7 +549,7 @@ impl Pallet { } PendingSwap::::remove(id); - Self::deposit_event(Event::::Deregistered { para_id: id }); + Self::deposit_event(PalletEvent::::Deregistered { para_id: id }); Ok(()) } @@ -657,7 +657,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type BlockWeights = BlockWeights; @@ -680,7 +680,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u128; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = (); @@ -698,7 +698,7 @@ mod tests { } impl paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -715,7 +715,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = MockSwap; @@ -1226,9 +1226,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1268,7 +1268,7 @@ mod benchmarking { T::Currency::make_free_balance_be(&caller, BalanceOf::::max_value()); }: _(RawOrigin::Signed(caller.clone())) verify { - assert_last_event::(Event::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); + assert_last_event::(PalletEvent::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); assert!(Paras::::get(LOWEST_PUBLIC_ID).is_some()); assert_eq!(paras::Pallet::::lifecycle(LOWEST_PUBLIC_ID), None); } @@ -1282,7 +1282,7 @@ mod benchmarking { assert_ok!(Registrar::::reserve(RawOrigin::Signed(caller.clone()).into())); }: _(RawOrigin::Signed(caller.clone()), para, genesis_head, validation_code) verify { - assert_last_event::(Event::::Registered{ para_id: para, manager: caller }.into()); + assert_last_event::(PalletEvent::::Registered{ para_id: para, manager: caller }.into()); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); next_scheduled_session::(); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); @@ -1296,7 +1296,7 @@ mod benchmarking { let validation_code = Registrar::::worst_validation_code(); }: _(RawOrigin::Root, manager.clone(), deposit, para, genesis_head, validation_code) verify { - assert_last_event::(Event::::Registered { para_id: para, manager }.into()); + assert_last_event::(PalletEvent::::Registered { para_id: para, manager }.into()); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); next_scheduled_session::(); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); @@ -1308,7 +1308,7 @@ mod benchmarking { let caller: T::AccountId = whitelisted_caller(); }: _(RawOrigin::Signed(caller), para) verify { - assert_last_event::(Event::::Deregistered { para_id: para }.into()); + assert_last_event::(PalletEvent::::Deregistered { para_id: para }.into()); } swap { diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index ad4d3a2809ea..5e36cc44f851 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -98,7 +98,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Balances Pallet type Currency: Currency; @@ -222,7 +222,7 @@ pub mod pallet { vat: Permill::zero(), }; Accounts::::insert(&who, status); - Self::deposit_event(Event::::AccountCreated { who }); + Self::deposit_event(PalletEvent::::AccountCreated { who }); Ok(()) } @@ -251,7 +251,7 @@ pub mod pallet { Ok(()) }, )?; - Self::deposit_event(Event::::ValidityUpdated { who, validity }); + Self::deposit_event(PalletEvent::::ValidityUpdated { who, validity }); Ok(()) } @@ -283,7 +283,7 @@ pub mod pallet { Ok(()) }, )?; - Self::deposit_event(Event::::BalanceUpdated { + Self::deposit_event(PalletEvent::::BalanceUpdated { who, free: free_balance, locked: locked_balance, @@ -350,7 +350,7 @@ pub mod pallet { // Setting the user account to `Completed` ends the purchase process for this user. status.validity = AccountValidity::Completed; - Self::deposit_event(Event::::PaymentComplete { + Self::deposit_event(PalletEvent::::PaymentComplete { who: who.clone(), free: status.free_balance, locked: status.locked_balance, @@ -371,7 +371,7 @@ pub mod pallet { T::ConfigurationOrigin::ensure_origin(origin)?; // Possibly this is worse than having the caller account be the payment account? PaymentAccount::::put(who.clone()); - Self::deposit_event(Event::::PaymentAccountSet { who }); + Self::deposit_event(PalletEvent::::PaymentAccountSet { who }); Ok(()) } @@ -387,7 +387,7 @@ pub mod pallet { ); // Possibly this is worse than having the caller account be the payment account? Statement::::set(statement); - Self::deposit_event(Event::::StatementUpdated); + Self::deposit_event(PalletEvent::::StatementUpdated); Ok(()) } @@ -406,7 +406,7 @@ pub mod pallet { ); // Possibly this is worse than having the caller account be the payment account? UnlockBlock::::set(unlock_block); - Self::deposit_event(Event::::UnlockBlockUpdated { block_number: unlock_block }); + Self::deposit_event(PalletEvent::::UnlockBlockUpdated { block_number: unlock_block }); Ok(()) } } @@ -519,7 +519,7 @@ mod tests { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -538,7 +538,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -553,7 +553,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -574,7 +574,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type VestingSchedule = Vesting; type ValidityOrigin = frame_system::EnsureSignedBy; diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index cbd447912047..847308b176ba 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -74,7 +74,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The currency type used for bidding. type Currency: ReservableCurrency; @@ -227,7 +227,7 @@ impl Pallet { /// We need to on-board and off-board parachains as needed. We should also handle reducing/ /// returning deposits. fn manage_lease_period_start(lease_period_index: LeasePeriodOf) -> Weight { - Self::deposit_event(Event::::NewLeasePeriod { lease_period: lease_period_index }); + Self::deposit_event(PalletEvent::::NewLeasePeriod { lease_period: lease_period_index }); let old_parachains = T::Registrar::parachains(); @@ -407,7 +407,7 @@ impl Leaser for Pallet { let _ = T::Registrar::make_parachain(para); } - Self::deposit_event(Event::::Leased { + Self::deposit_event(PalletEvent::::Leased { para_id: para, leaser: leaser.clone(), period_begin, @@ -538,7 +538,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -558,7 +558,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -575,7 +575,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = TestRegistrar; type LeasePeriod = LeasePeriod; @@ -988,9 +988,9 @@ mod benchmarking { use crate::slots::Pallet as Slots; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1027,7 +1027,7 @@ mod benchmarking { let origin = T::ForceOrigin::successful_origin(); }: _(origin, para, leaser.clone(), amount, period_begin, period_count) verify { - assert_last_event::(Event::::Leased { + assert_last_event::(PalletEvent::::Leased { para_id: para, leaser, period_begin, period_count, diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs index a87ddf6ec1fc..b36380b4b3fd 100644 --- a/runtime/kusama/src/governance/old.rs +++ b/runtime/kusama/src/governance/old.rs @@ -33,7 +33,7 @@ parameter_types! { impl pallet_democracy::Config for Runtime { type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -94,7 +94,7 @@ pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -121,7 +121,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ChangeMembers = Council; type InitializeMembers = Council; @@ -150,7 +150,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -159,7 +159,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 12b9554c5cff..5e2fa13025cf 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -175,7 +175,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -225,7 +225,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; @@ -246,7 +246,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -302,7 +302,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -315,7 +315,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -332,7 +332,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -378,7 +378,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -468,7 +468,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EstimateCallFee = TransactionPayment; type UnsignedPhase = UnsignedPhase; @@ -511,7 +511,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -607,7 +607,7 @@ impl pallet_staking::Config for Runtime { type ElectionProvider = ElectionProviderMultiPhase; type GenesisElectionProvider = onchain::UnboundedExecution; type RewardRemainder = Treasury; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = Treasury; type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -656,7 +656,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -691,7 +691,7 @@ impl pallet_bounties::Config for Runtime { type BountyValueMinimum = BountyValueMinimum; type ChildBountyManager = ChildBounties; type DataDepositPerByte = DataDepositPerByte; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } @@ -702,7 +702,7 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; @@ -715,12 +715,12 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_tips::WeightInfo; } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -737,7 +737,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -749,7 +749,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type KeyOwnerProof = @@ -838,7 +838,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = @@ -857,7 +857,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BasicDeposit = BasicDeposit; type FieldDeposit = FieldDeposit; @@ -872,7 +872,7 @@ impl pallet_identity::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -887,7 +887,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -904,7 +904,7 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type Call = Call; type Currency = Balances; @@ -927,7 +927,7 @@ parameter_types! { } impl pallet_society::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Randomness = pallet_babe::RandomnessFromOneEpochAgo; type CandidateDeposit = CandidateDeposit; @@ -950,7 +950,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -1094,7 +1094,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -1121,7 +1121,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -1131,7 +1131,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -1142,7 +1142,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -1153,7 +1153,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -1172,7 +1172,7 @@ impl parachains_initializer::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -1183,7 +1183,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -1198,7 +1198,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1217,7 +1217,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1242,7 +1242,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1264,7 +1264,7 @@ parameter_types! { } impl pallet_gilt::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; type AdminOrigin = MoreThanHalfCouncil; @@ -1287,7 +1287,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; type Currency = Balances; type CurrencyBalance = Balance; @@ -1621,7 +1621,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 5bf45cfc89c4..4051ba466723 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configurations for the Kusama runtime. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, + parachains_origin, AccountId, Balances, Call, CouncilCollective, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; @@ -169,7 +169,7 @@ pub type LocalOriginToLocation = ( SignedToAccountId32, ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; // We only allow the council to send messages. This is basically safe to enable for everyone // (safe the possibility of someone spamming the parachain if they're willing to pay the KSM to // send from the Relay-chain), but it's useless until we bring in XCM v3 which will make diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index 90f201812279..20e6fca4ad9e 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -410,7 +410,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config + session_info::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type RewardValidators: RewardValidators; type PunishValidators: PunishValidators; @@ -804,7 +804,7 @@ impl Pallet { if dispute.concluded_at.is_none() && dispute.start + config.dispute_conclusion_by_time_out_period < now { - Self::deposit_event(Event::DisputeTimedOut(candidate_hash)); + Self::deposit_event(PalletEvent::DisputeTimedOut(candidate_hash)); dispute.concluded_at = Some(now); >::insert(session_index, candidate_hash, &dispute); @@ -1195,7 +1195,7 @@ impl Pallet { if fresh { let is_local = >::contains_key(&session, &candidate_hash); - Self::deposit_event(Event::DisputeInitiated( + Self::deposit_event(PalletEvent::DisputeInitiated( candidate_hash, if is_local { DisputeLocation::Local } else { DisputeLocation::Remote }, )); @@ -1203,7 +1203,7 @@ impl Pallet { { if summary.new_flags.contains(DisputeStateFlags::FOR_SUPERMAJORITY) { - Self::deposit_event(Event::DisputeConcluded(candidate_hash, DisputeResult::Valid)); + Self::deposit_event(PalletEvent::DisputeConcluded(candidate_hash, DisputeResult::Valid)); } // It is possible, although unexpected, for a dispute to conclude twice. @@ -1211,7 +1211,7 @@ impl Pallet { // A dispute cannot conclude more than once in each direction. if summary.new_flags.contains(DisputeStateFlags::AGAINST_SUPERMAJORITY) { - Self::deposit_event(Event::DisputeConcluded( + Self::deposit_event(PalletEvent::DisputeConcluded( candidate_hash, DisputeResult::Invalid, )); @@ -1304,7 +1304,7 @@ impl Pallet { // If we want to revert to block X in the current chain, we need to revert // block X+1. let revert = revert_to + One::one(); - Self::deposit_event(Event::Revert(revert)); + Self::deposit_event(PalletEvent::Revert(revert)); frame_system::Pallet::::deposit_log( ConsensusLog::Revert(revert.saturated_into()).into(), ); diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs index 2897ced22ed0..937f45546a51 100644 --- a/runtime/parachains/src/disputes/tests.rs +++ b/runtime/parachains/src/disputes/tests.rs @@ -1341,7 +1341,7 @@ fn test_revert_and_freeze() { assert_eq!(Frozen::::get(), Some(0)); assert_eq!(System::digest().logs[0], ConsensusLog::Revert(1).into()); - System::assert_has_event(Event::Revert(1).into()); + System::assert_has_event(PalletEvent::Revert(1).into()); }) } diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs index 2cd4957dba88..c6609e8bdd34 100644 --- a/runtime/parachains/src/hrmp.rs +++ b/runtime/parachains/src/hrmp.rs @@ -239,7 +239,7 @@ pub mod pallet { frame_system::Config + configuration::Config + paras::Config + dmp::Config { /// The outer event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Origin: From + From<::Origin> @@ -472,7 +472,7 @@ pub mod pallet { proposed_max_capacity, proposed_max_message_size, )?; - Self::deposit_event(Event::OpenChannelRequested( + Self::deposit_event(PalletEvent::OpenChannelRequested( origin, recipient, proposed_max_capacity, @@ -488,7 +488,7 @@ pub mod pallet { pub fn hrmp_accept_open_channel(origin: OriginFor, sender: ParaId) -> DispatchResult { let origin = ensure_parachain(::Origin::from(origin))?; Self::accept_open_channel(origin, sender)?; - Self::deposit_event(Event::OpenChannelAccepted(sender, origin)); + Self::deposit_event(PalletEvent::OpenChannelAccepted(sender, origin)); Ok(()) } @@ -503,7 +503,7 @@ pub mod pallet { ) -> DispatchResult { let origin = ensure_parachain(::Origin::from(origin))?; Self::close_channel(origin, channel_id.clone())?; - Self::deposit_event(Event::ChannelClosed(origin, channel_id)); + Self::deposit_event(PalletEvent::ChannelClosed(origin, channel_id)); Ok(()) } @@ -574,7 +574,7 @@ pub mod pallet { Error::::WrongWitness ); Self::cancel_open_request(origin, channel_id.clone())?; - Self::deposit_event(Event::OpenChannelCanceled(origin, channel_id)); + Self::deposit_event(PalletEvent::OpenChannelCanceled(origin, channel_id)); Ok(()) } } diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs index 3486e990fe57..95206e90b1ff 100644 --- a/runtime/parachains/src/hrmp/benchmarking.rs +++ b/runtime/parachains/src/hrmp/benchmarking.rs @@ -39,9 +39,9 @@ fn register_parachain_with_balance(id: ParaId, balance: BalanceOf) T::Currency::make_free_balance_be(&id.into_account_truncating(), balance); } -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -156,7 +156,7 @@ frame_benchmarking::benchmarks! { }: _(sender_origin, recipient_id, capacity, message_size) verify { assert_last_event::( - Event::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() + PalletEvent::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() ); } @@ -165,7 +165,7 @@ frame_benchmarking::benchmarks! { establish_para_connection::(1, 2, ParachainSetupStep::Requested); }: _(recipient_origin, sender) verify { - assert_last_event::(Event::::OpenChannelAccepted(sender, recipient).into()); + assert_last_event::(PalletEvent::::OpenChannelAccepted(sender, recipient).into()); } hrmp_close_channel { @@ -174,7 +174,7 @@ frame_benchmarking::benchmarks! { let channel_id = HrmpChannelId { sender, recipient }; }: _(sender_origin, channel_id.clone()) verify { - assert_last_event::(Event::::ChannelClosed(sender, channel_id).into()); + assert_last_event::(PalletEvent::::ChannelClosed(sender, channel_id).into()); } // NOTE: a single parachain should have the maximum number of allowed ingress and egress diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs index 463c5eb39385..cc532748e756 100644 --- a/runtime/parachains/src/hrmp/tests.rs +++ b/runtime/parachains/src/hrmp/tests.rs @@ -16,7 +16,7 @@ use super::*; use crate::mock::{ - new_test_ext, Configuration, Event as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, + new_test_ext, Configuration, PalletEvent as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, System, Test, }; use frame_support::{assert_noop, assert_ok, traits::Currency as _}; @@ -173,14 +173,14 @@ fn open_channel_works() { Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap(); Hrmp::assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| record.event == - MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8)))); + MockEvent::Hrmp(PalletEvent::OpenChannelRequested(para_a, para_b, 2, 8)))); Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap(); Hrmp::assert_storage_consistency_exhaustive(); assert!(System::events() .iter() .any(|record| record.event == - MockEvent::Hrmp(Event::OpenChannelAccepted(para_a, para_b)))); + MockEvent::Hrmp(PalletEvent::OpenChannelAccepted(para_a, para_b)))); // Advance to a block 6, but without session change. That means that the channel has // not been created yet. @@ -223,7 +223,7 @@ fn close_channel_works() { assert!(!channel_exists(para_a, para_b)); Hrmp::assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| record.event == - MockEvent::Hrmp(Event::ChannelClosed(para_b, channel_id.clone())))); + MockEvent::Hrmp(PalletEvent::ChannelClosed(para_b, channel_id.clone())))); }); } diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index 0f7e62a1f552..32563a646fbf 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -198,7 +198,7 @@ pub mod pallet { + hrmp::Config + configuration::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type DisputesHandler: disputes::DisputesHandler; type RewardValidators: RewardValidators; } @@ -655,7 +655,7 @@ impl Pallet { let availability_votes: BitVec = bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()]; - Self::deposit_event(Event::::CandidateBacked( + Self::deposit_event(PalletEvent::::CandidateBacked( candidate.candidate.to_plain(), candidate.candidate.commitments.head_data.clone(), core, @@ -778,7 +778,7 @@ impl Pallet { commitments.horizontal_messages, ); - Self::deposit_event(Event::::CandidateIncluded( + Self::deposit_event(PalletEvent::::CandidateIncluded( plain, commitments.head_data.clone(), core_index, @@ -823,7 +823,7 @@ impl Pallet { commitments_hash: commitments.hash(), }; - Self::deposit_event(Event::::CandidateTimedOut( + Self::deposit_event(PalletEvent::::CandidateTimedOut( candidate, commitments.head_data, pending.core, diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 064b9918ff5f..d3085081507e 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -101,7 +101,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -123,7 +123,7 @@ impl pallet_balances::Config for Test { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -213,7 +213,7 @@ impl frame_support::traits::EstimateNextSessionRotation for TestNextSession } impl crate::paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = crate::paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = TestNextSessionRotation; @@ -226,7 +226,7 @@ parameter_types! { } impl crate::ump::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = TestUmpSink; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -234,14 +234,14 @@ impl crate::ump::Config for Test { } impl crate::hrmp::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = pallet_balances::Pallet; type WeightInfo = crate::hrmp::TestWeightInfo; } impl crate::disputes::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = Self; type PunishValidators = Self; type WeightInfo = crate::disputes::TestWeightInfo; @@ -292,7 +292,7 @@ impl crate::disputes::PunishValidators for Test { impl crate::scheduler::Config for Test {} impl crate::inclusion::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = Disputes; type RewardValidators = TestRewardValidators; } diff --git a/runtime/parachains/src/paras/benchmarking.rs b/runtime/parachains/src/paras/benchmarking.rs index 9d31453638a7..154d6dcfba80 100644 --- a/runtime/parachains/src/paras/benchmarking.rs +++ b/runtime/parachains/src/paras/benchmarking.rs @@ -31,9 +31,9 @@ use self::pvf_check::{VoteCause, VoteOutcome}; // shouldn't exceed this number. const SAMPLE_SIZE: u32 = 1024; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -89,7 +89,7 @@ benchmarks! { generate_disordered_pruning::(); }: _(RawOrigin::Root, para_id, new_code) verify { - assert_last_event::(Event::CurrentCodeUpdated(para_id).into()); + assert_last_event::(PalletEvent::CurrentCodeUpdated(para_id).into()); } force_set_current_head { let s in 1 .. MAX_HEAD_DATA_SIZE; @@ -97,7 +97,7 @@ benchmarks! { let para_id = ParaId::from(1000); }: _(RawOrigin::Root, para_id, new_head) verify { - assert_last_event::(Event::CurrentHeadUpdated(para_id).into()); + assert_last_event::(PalletEvent::CurrentHeadUpdated(para_id).into()); } force_schedule_code_upgrade { let c in 1 .. MAX_CODE_SIZE; @@ -107,7 +107,7 @@ benchmarks! { generate_disordered_upgrades::(); }: _(RawOrigin::Root, para_id, new_code, block) verify { - assert_last_event::(Event::CodeUpgradeScheduled(para_id).into()); + assert_last_event::(PalletEvent::CodeUpgradeScheduled(para_id).into()); } force_note_new_head { let s in 1 .. MAX_HEAD_DATA_SIZE; @@ -123,7 +123,7 @@ benchmarks! { Pallet::::schedule_code_upgrade(para_id, ValidationCode(vec![0]), expired, &config); }: _(RawOrigin::Root, para_id, new_head) verify { - assert_last_event::(Event::NewHeadNoted(para_id).into()); + assert_last_event::(PalletEvent::NewHeadNoted(para_id).into()); } force_queue_action { let para_id = ParaId::from(1000); @@ -131,7 +131,7 @@ benchmarks! { }: _(RawOrigin::Root, para_id) verify { let next_session = crate::shared::Pallet::::session_index().saturating_add(One::one()); - assert_last_event::(Event::ActionQueued(para_id, next_session).into()); + assert_last_event::(PalletEvent::ActionQueued(para_id, next_session).into()); } add_trusted_validation_code { diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs index 5bf26bf9192f..0075171b4659 100644 --- a/runtime/parachains/src/paras/mod.rs +++ b/runtime/parachains/src/paras/mod.rs @@ -473,7 +473,7 @@ pub mod pallet { + shared::Config + frame_system::offchain::SendTransactionTypes> { - type Event: From + IsType<::Event>; + type RuntimeEvent: From + IsType<::RuntimeEvent>; #[pallet::constant] type UnsignedPriority: Get; @@ -740,7 +740,7 @@ pub mod pallet { ¶ ); } - Self::deposit_event(Event::CurrentCodeUpdated(para)); + Self::deposit_event(PalletEvent::CurrentCodeUpdated(para)); Ok(()) } @@ -753,7 +753,7 @@ pub mod pallet { ) -> DispatchResult { ensure_root(origin)?; ::Heads::insert(¶, new_head); - Self::deposit_event(Event::CurrentHeadUpdated(para)); + Self::deposit_event(PalletEvent::CurrentHeadUpdated(para)); Ok(()) } @@ -768,7 +768,7 @@ pub mod pallet { ensure_root(origin)?; let config = configuration::Pallet::::config(); Self::schedule_code_upgrade(para, new_code, relay_parent_number, &config); - Self::deposit_event(Event::CodeUpgradeScheduled(para)); + Self::deposit_event(PalletEvent::CodeUpgradeScheduled(para)); Ok(()) } @@ -782,7 +782,7 @@ pub mod pallet { ensure_root(origin)?; let now = frame_system::Pallet::::block_number(); Self::note_new_head(para, new_head, now); - Self::deposit_event(Event::NewHeadNoted(para)); + Self::deposit_event(PalletEvent::NewHeadNoted(para)); Ok(()) } @@ -798,7 +798,7 @@ pub mod pallet { v.insert(i, para); } }); - Self::deposit_event(Event::ActionQueued(para, next_session)); + Self::deposit_event(PalletEvent::ActionQueued(para, next_session)); Ok(()) } @@ -1375,7 +1375,7 @@ impl Pallet { let mut weight = 0; for cause in causes { weight += T::DbWeight::get().reads_writes(3, 2); - Self::deposit_event(Event::PvfCheckAccepted(*code_hash, cause.para_id())); + Self::deposit_event(PalletEvent::PvfCheckAccepted(*code_hash, cause.para_id())); match cause { PvfCheckCause::Onboarding(id) => { @@ -1465,7 +1465,7 @@ impl Pallet { weight += Self::decrease_code_ref(code_hash); weight += T::DbWeight::get().reads_writes(3, 2); - Self::deposit_event(Event::PvfCheckRejected(*code_hash, cause.para_id())); + Self::deposit_event(PalletEvent::PvfCheckRejected(*code_hash, cause.para_id())); match cause { PvfCheckCause::Onboarding(id) => { @@ -1749,7 +1749,7 @@ impl Pallet { let mut weight = 0; weight += T::DbWeight::get().reads_writes(3, 2); - Self::deposit_event(Event::PvfCheckStarted(code_hash, cause.para_id())); + Self::deposit_event(PalletEvent::PvfCheckStarted(code_hash, cause.para_id())); weight += T::DbWeight::get().reads(1); match PvfActiveVoteMap::::get(&code_hash) { diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs index 960132d5f804..1f60a4313297 100644 --- a/runtime/parachains/src/paras/tests.rs +++ b/runtime/parachains/src/paras/tests.rs @@ -113,7 +113,7 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { /// An utility for checking that certain events were deposited. struct EventValidator { events: - Vec::Event, primitives::v2::Hash>>, + Vec::PalletEvent, primitives::v2::Hash>>, } impl EventValidator { @@ -124,7 +124,7 @@ impl EventValidator { fn started(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { self.events.push(frame_system::EventRecord { phase: frame_system::Phase::Initialization, - event: Event::PvfCheckStarted(code.hash(), id).into(), + event: PalletEvent::PvfCheckStarted(code.hash(), id).into(), topics: vec![], }); self @@ -133,7 +133,7 @@ impl EventValidator { fn rejected(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { self.events.push(frame_system::EventRecord { phase: frame_system::Phase::Initialization, - event: Event::PvfCheckRejected(code.hash(), id).into(), + event: PalletEvent::PvfCheckRejected(code.hash(), id).into(), topics: vec![], }); self @@ -142,7 +142,7 @@ impl EventValidator { fn accepted(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { self.events.push(frame_system::EventRecord { phase: frame_system::Phase::Initialization, - event: Event::PvfCheckAccepted(code.hash(), id).into(), + event: PalletEvent::PvfCheckAccepted(code.hash(), id).into(), topics: vec![], }); self diff --git a/runtime/parachains/src/runtime_api_impl/v2.rs b/runtime/parachains/src/runtime_api_impl/v2.rs index 20ee41636d81..e13506de62a0 100644 --- a/runtime/parachains/src/runtime_api_impl/v2.rs +++ b/runtime/parachains/src/runtime_api_impl/v2.rs @@ -323,9 +323,9 @@ pub fn candidate_pending_availability( pub fn candidate_events(extract_event: F) -> Vec> where T: initializer::Config, - F: Fn(::Event) -> Option>, + F: Fn(::RuntimeEvent) -> Option>, { - use inclusion::Event as RawEvent; + use inclusion::PalletEvent as RawEvent; >::read_events_no_consensus() .into_iter() diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 46005486b0a6..916d18a183c8 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -122,11 +122,11 @@ impl, C: Config> UmpSink for XcmSi }); match maybe_msg_and_weight { Err(_) => { - Pallet::::deposit_event(Event::InvalidFormat(id)); + Pallet::::deposit_event(PalletEvent::InvalidFormat(id)); Ok(0) }, Ok((Err(()), weight_used)) => { - Pallet::::deposit_event(Event::UnsupportedVersion(id)); + Pallet::::deposit_event(PalletEvent::UnsupportedVersion(id)); Ok(weight_used) }, Ok((Ok(xcm_message), weight_used)) => { @@ -136,7 +136,7 @@ impl, C: Config> UmpSink for XcmSi Outcome::Error(XcmError::WeightLimitReached(required)) => Err((id, required)), outcome => { let outcome_weight = outcome.weight_used(); - Pallet::::deposit_event(Event::ExecutedUpward(id, outcome)); + Pallet::::deposit_event(PalletEvent::ExecutedUpward(id, outcome)); Ok(weight_used.saturating_add(outcome_weight)) }, } @@ -216,7 +216,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config { /// The aggregate event. - type Event: From + IsType<::Event>; + type RuntimeEvent: From + IsType<::RuntimeEvent>; /// A place where all received upward messages are funneled. type UmpSink: UmpSink; @@ -358,7 +358,7 @@ pub mod pallet { let used = T::UmpSink::process_upward_message(sender, &data[..], weight_limit) .map_err(|_| Error::::WeightOverLimit)?; Overweight::::remove(index); - Self::deposit_event(Event::OverweightServiced(index, used)); + Self::deposit_event(PalletEvent::OverweightServiced(index, used)); Ok(Some(used.saturating_add(::WeightInfo::service_overweight())).into()) } } @@ -495,7 +495,7 @@ impl Pallet { // NOTE: The actual computation is not accounted for. It should be benchmarked. weight += T::DbWeight::get().reads_writes(3, 3); - Self::deposit_event(Event::UpwardMessagesReceived(para, extra_count, extra_size)); + Self::deposit_event(PalletEvent::UpwardMessagesReceived(para, extra_count, extra_size)); } weight @@ -544,13 +544,13 @@ impl Pallet { thus `upward_message` cannot be `None`; qed", ); let index = Self::stash_overweight(dispatchee, upward_message); - Self::deposit_event(Event::OverweightEnqueued( + Self::deposit_event(PalletEvent::OverweightEnqueued( dispatchee, id, index, required, )); } else { // we process messages in order and don't drop them if we run out of weight, // so need to break here without calling `consume_front`. - Self::deposit_event(Event::WeightExhausted(id, max_weight, required)); + Self::deposit_event(PalletEvent::WeightExhausted(id, max_weight, required)); break } }, diff --git a/runtime/parachains/src/ump/benchmarking.rs b/runtime/parachains/src/ump/benchmarking.rs index 2c132324d44a..8c441069096b 100644 --- a/runtime/parachains/src/ump/benchmarking.rs +++ b/runtime/parachains/src/ump/benchmarking.rs @@ -18,9 +18,9 @@ use super::{Pallet as Ump, *}; use frame_system::RawOrigin; use xcm::prelude::*; -fn assert_last_event_type(generic_event: ::Event) { +fn assert_last_event_type(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::PalletEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event)); @@ -35,7 +35,7 @@ fn queue_upward_msg( let msgs = vec![msg]; Ump::::check_upward_messages(host_conf, para, &msgs).unwrap(); let _ = Ump::::receive_upward_messages(para, msgs); - assert_last_event_type::(Event::UpwardMessagesReceived(para, 1, len).into()); + assert_last_event_type::(PalletEvent::UpwardMessagesReceived(para, 1, len).into()); } // Create a message with at least `size` bytes encoded length @@ -124,11 +124,11 @@ frame_benchmarking::benchmarks! { queue_upward_msg::(&host_conf, para, msg.clone()); Ump::::process_pending_upward_messages(); assert_last_event_type::( - Event::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() + PalletEvent::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() ); }: _(RawOrigin::Root, 0, Weight::MAX) verify { - assert_last_event_type::(Event::OverweightServiced(0, 0).into()); + assert_last_event_type::(PalletEvent::OverweightServiced(0, 0).into()); } } diff --git a/runtime/parachains/src/ump/tests.rs b/runtime/parachains/src/ump/tests.rs index b4e758b4b88c..698b91206179 100644 --- a/runtime/parachains/src/ump/tests.rs +++ b/runtime/parachains/src/ump/tests.rs @@ -326,7 +326,7 @@ fn overweight_queue_works() { queue_upward_msg(para_a, a_msg_3.clone()); Ump::process_pending_upward_messages(); assert_last_event( - Event::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), + PalletEvent::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), ); // Now verify that if we wanted to service this overweight message with less than enough @@ -338,7 +338,7 @@ fn overweight_queue_works() { // ... and if we try to service it with just enough weight it will succeed as well. assert_ok!(Ump::service_overweight(Origin::root(), 0, 500)); - assert_last_event(Event::OverweightServiced(0, 500).into()); + assert_last_event(PalletEvent::OverweightServiced(0, 500).into()); // ... and if we try to service a message with index that doesn't exist it will error // out. diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 9489df9f403c..f9df916f2ac6 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -214,7 +214,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -264,7 +264,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; @@ -285,7 +285,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = pallet_preimage::weights::SubstrateWeight; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -341,7 +341,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -354,7 +354,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -371,7 +371,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -413,7 +413,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -505,7 +505,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; @@ -548,7 +548,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -596,7 +596,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type RewardRemainder = Treasury; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = Treasury; type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -629,7 +629,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BasicDeposit = BasicDeposit; type FieldDeposit = FieldDeposit; @@ -657,7 +657,7 @@ parameter_types! { impl pallet_democracy::Config for Runtime { type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -728,7 +728,7 @@ pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -755,7 +755,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = PhragmenElectionPalletId; type Currency = Balances; type ChangeMembers = Council; @@ -784,7 +784,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -793,7 +793,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; @@ -834,7 +834,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -860,7 +860,7 @@ parameter_types! { } impl pallet_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; type BountyUpdatePeriod = BountyUpdatePeriod; @@ -880,14 +880,14 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type Tippers = PhragmenElection; @@ -898,7 +898,7 @@ impl pallet_tips::Config for Runtime { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -915,7 +915,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -927,7 +927,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type KeyOwnerProof = @@ -1022,7 +1022,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; /// At least 3/4 of the council must agree to a claim move before it can happen. @@ -1036,7 +1036,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -1045,7 +1045,7 @@ impl pallet_vesting::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -1060,7 +1060,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -1225,7 +1225,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -1252,7 +1252,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -1262,7 +1262,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -1273,7 +1273,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -1284,7 +1284,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -1303,7 +1303,7 @@ impl parachains_initializer::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -1317,7 +1317,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -1338,7 +1338,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1360,7 +1360,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1385,7 +1385,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1402,7 +1402,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; type RewardCounter = FixedU128; @@ -1740,7 +1740,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -2047,7 +2047,7 @@ sp_api::impl_runtime_apis! { hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), // Execution Phase hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), - // Event Count + // PalletEvent Count hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), // System Events hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index a7ea36445bd8..fe62046eed6e 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configuration for Polkadot. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, + parachains_origin, AccountId, Balances, Call, CouncilCollective, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -175,7 +175,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; // Only allow the council to send messages. type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index d745e109be4d..7bbd30fa9137 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -267,7 +267,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -353,7 +353,7 @@ impl pallet_session::historical::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -372,7 +372,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -392,7 +392,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -415,7 +415,7 @@ parameter_types! { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = (); } @@ -442,7 +442,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -459,7 +459,7 @@ impl sp_runtime::traits::Convert> for ValidatorIdOf } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = ValidatorIdOf; type ShouldEndSession = Babe; @@ -512,7 +512,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -521,7 +521,7 @@ parameter_types! { } impl pallet_grandpa::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type KeyOwnerProofSystem = Historical; @@ -571,7 +571,7 @@ impl runtime_parachains::inclusion::RewardValidators for RewardValidators { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = RewardValidators; } @@ -581,7 +581,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -596,7 +596,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -607,7 +607,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -636,7 +636,7 @@ parameter_types! { } impl assigned_slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; @@ -652,7 +652,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -723,7 +723,7 @@ parameter_types! { } impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -738,7 +738,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -757,7 +757,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -769,17 +769,17 @@ impl crowdloan::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; } impl validator_manager::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PrivilegedOrigin = EnsureRoot; } impl pallet_utility::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -845,7 +845,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -868,7 +868,7 @@ parameter_types! { impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = MotionDuration; type MaxProposals = MaxProposals; type DefaultVote = pallet_collective::PrimeDefaultVote; @@ -877,7 +877,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRoot; type RemoveOrigin = EnsureRoot; type SwapOrigin = EnsureRoot; @@ -898,7 +898,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -1055,7 +1055,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -1359,7 +1359,7 @@ sp_api::impl_runtime_apis! { hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), // Execution Phase hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), - // Event Count + // PalletEvent Count hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), // System Events hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs index 19e9c0ac6018..0a868f8152ec 100644 --- a/runtime/rococo/src/validator_manager.rs +++ b/runtime/rococo/src/validator_manager.rs @@ -37,7 +37,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_session::Config { /// The overreaching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Privileged origin that can add or remove validators. type PrivilegedOrigin: EnsureOrigin<::Origin>; @@ -75,7 +75,7 @@ pub mod pallet { validators.clone().into_iter().for_each(|v| ValidatorsToAdd::::append(v)); - Self::deposit_event(Event::ValidatorsRegistered(validators)); + Self::deposit_event(PalletEvent::ValidatorsRegistered(validators)); Ok(()) } @@ -91,7 +91,7 @@ pub mod pallet { validators.clone().into_iter().for_each(|v| ValidatorsToRetire::::append(v)); - Self::deposit_event(Event::ValidatorsDeregistered(validators)); + Self::deposit_event(PalletEvent::ValidatorsDeregistered(validators)); Ok(()) } } diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 1512ef9e6ccd..367595dd60d1 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configuration for Rococo. use super::{ - parachains_origin, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, WeightToFee, + parachains_origin, AccountId, Balances, Call, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -151,7 +151,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 1afcae14d087..780fa67bd04d 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -145,7 +145,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = Indices; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -206,7 +206,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -219,7 +219,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -236,7 +236,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -282,7 +282,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -337,7 +337,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = frame_support::traits::U128CurrencyToVote; type RewardRemainder = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = (); type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -362,7 +362,7 @@ impl pallet_staking::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type KeyOwnerProofSystem = (); @@ -427,7 +427,7 @@ impl frame_system::offchain::SigningTypes for Runtime { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -446,7 +446,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureRoot; @@ -458,7 +458,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -467,7 +467,7 @@ impl pallet_vesting::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; } @@ -478,13 +478,13 @@ impl parachains_configuration::Config for Runtime { impl parachains_shared::Config for Runtime {} impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = RewardValidatorsWithEraPoints; } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = parachains_disputes::TestWeightInfo; @@ -509,7 +509,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = parachains_paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -522,7 +522,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = (); type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -540,7 +540,7 @@ pub type LocalOriginToLocation = xcm_builder::SignedToAccountId32; type LocationInverter = xcm_config::InvertNothing; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -557,7 +557,7 @@ impl pallet_xcm::Config for Runtime { } impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = parachains_hrmp::TestWeightInfo; @@ -570,7 +570,7 @@ impl paras_sudo_wrapper::Config for Runtime {} impl parachains_origin::Config for Runtime {} impl pallet_test_notifier::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Call = Call; } @@ -589,7 +589,7 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + pallet_xcm::Config { - type Event: IsType<::Event> + From>; + type RuntimeEvent: IsType<::RuntimeEvent> + From>; type Origin: IsType<::Origin> + Into::Origin>>; type Call: IsType<::Call> + From>; @@ -621,7 +621,7 @@ pub mod pallet_test_notifier { Junction::AccountId32 { network: Any, id }.into(), 100u32.into(), ); - Self::deposit_event(Event::::QueryPrepared(qid)); + Self::deposit_event(PalletEvent::::QueryPrepared(qid)); Ok(()) } @@ -638,7 +638,7 @@ pub mod pallet_test_notifier { ::Call::from(call), 100u32.into(), ); - Self::deposit_event(Event::::NotifyQueryPrepared(qid)); + Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); Ok(()) } @@ -649,7 +649,7 @@ pub mod pallet_test_notifier { response: Response, ) -> DispatchResult { let responder = ensure_response(::Origin::from(origin))?; - Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); + Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); Ok(()) } } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 788aede78092..bec0be82d1f4 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -155,7 +155,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -177,7 +177,7 @@ parameter_types! { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; @@ -198,7 +198,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -253,7 +253,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -266,7 +266,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -283,7 +283,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -329,7 +329,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -416,7 +416,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; @@ -456,7 +456,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -494,7 +494,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type RewardRemainder = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = (); type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -521,7 +521,7 @@ parameter_types! { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -540,7 +540,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -552,7 +552,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type KeyOwnerProofSystem = Historical; @@ -647,7 +647,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Slashed = (); type BasicDeposit = BasicDeposit; @@ -662,7 +662,7 @@ impl pallet_identity::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -677,7 +677,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -694,7 +694,7 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type Call = Call; type Currency = Balances; @@ -709,7 +709,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -718,7 +718,7 @@ impl pallet_vesting::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; } @@ -841,7 +841,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -868,7 +868,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -878,7 +878,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -889,7 +889,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -900,7 +900,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -929,7 +929,7 @@ parameter_types! { } impl assigned_slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; @@ -940,7 +940,7 @@ impl assigned_slots::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -952,7 +952,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -966,7 +966,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -985,7 +985,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1005,7 +1005,7 @@ parameter_types! { } impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1021,7 +1021,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; type Currency = Balances; type CurrencyBalance = Balance; @@ -1324,7 +1324,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index 867bdb2cacf3..3fdea021c605 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configurations for Westend. use super::{ - parachains_origin, weights, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, + parachains_origin, weights, AccountId, Balances, Call, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -131,7 +131,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs index 3f7e4f8f26e0..39e91f184d07 100644 --- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs @@ -38,8 +38,8 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, XcmBalancesBenchmark: xcm_balances_benchmark::{Pallet}, } ); @@ -63,7 +63,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -86,7 +86,7 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = [u8; 8]; type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs index 7782ba1d90ea..c660b960945e 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs @@ -43,7 +43,7 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, XcmGenericBenchmarks: generic::{Pallet}, } ); @@ -68,7 +68,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index 61ff8680f01d..fa2f3dea2564 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -71,7 +71,7 @@ pub mod pallet { /// The module configuration trait. pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Required origin for sending XCM messages. If successful, it resolves to `MultiLocation` /// which exists as an interior location within this chain's XCM context. @@ -461,7 +461,7 @@ pub mod pallet { SendError::CannotReachDestination(..) => Error::::Unreachable, _ => Error::::SendFailure, })?; - Self::deposit_event(Event::Sent(origin_location, dest, message)); + Self::deposit_event(PalletEvent::Sent(origin_location, dest, message)); Ok(()) } @@ -579,7 +579,7 @@ pub mod pallet { max_weight, ); let result = Ok(Some(outcome.weight_used().saturating_add(100_000_000)).into()); - Self::deposit_event(Event::Attempted(outcome)); + Self::deposit_event(PalletEvent::Attempted(outcome)); result } @@ -602,7 +602,7 @@ pub mod pallet { LatestVersionedMultiLocation(&location), xcm_version, ); - Self::deposit_event(Event::SupportedVersionChanged(location, xcm_version)); + Self::deposit_event(PalletEvent::SupportedVersionChanged(location, xcm_version)); Ok(()) } @@ -818,7 +818,7 @@ pub mod pallet { T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; let outcome = T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); - Self::deposit_event(Event::Attempted(outcome)); + Self::deposit_event(PalletEvent::Attempted(outcome)); Ok(()) } @@ -876,7 +876,7 @@ pub mod pallet { T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; let outcome = T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); - Self::deposit_event(Event::Attempted(outcome)); + Self::deposit_event(PalletEvent::Attempted(outcome)); Ok(()) } @@ -954,11 +954,11 @@ pub mod pallet { Ok(()) => { let value = (query_id, max_weight, xcm_version); VersionNotifyTargets::::insert(XCM_VERSION, key, value); - Event::VersionChangeNotified(new_key, xcm_version) + PalletEvent::VersionChangeNotified(new_key, xcm_version) }, Err(e) => { VersionNotifyTargets::::remove(XCM_VERSION, key); - Event::NotifyTargetSendFail(new_key, query_id, e.into()) + PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()) }, }; Self::deposit_event(event); @@ -977,7 +977,7 @@ pub mod pallet { let new_key = match MultiLocation::try_from(old_key.clone()) { Ok(k) => k, Err(()) => { - Self::deposit_event(Event::NotifyTargetMigrationFail( + Self::deposit_event(PalletEvent::NotifyTargetMigrationFail( old_key, value.0, )); weight_used.saturating_accrue(todo_vnt_migrate_fail_weight); @@ -1004,9 +1004,9 @@ pub mod pallet { versioned_key, (query_id, max_weight, xcm_version), ); - Event::VersionChangeNotified(new_key, xcm_version) + PalletEvent::VersionChangeNotified(new_key, xcm_version) }, - Err(e) => Event::NotifyTargetSendFail(new_key, query_id, e.into()), + Err(e) => PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()), }; Self::deposit_event(event); weight_used.saturating_accrue(todo_vnt_notify_migrate_weight); @@ -1182,7 +1182,7 @@ pub mod pallet { if let Some(QueryStatus::Ready { response, at }) = Queries::::get(query_id) { let response = response.try_into().ok()?; Queries::::remove(query_id); - Self::deposit_event(Event::ResponseTaken(query_id)); + Self::deposit_event(PalletEvent::ResponseTaken(query_id)); Some((response, at)) } else { None @@ -1277,7 +1277,7 @@ pub mod pallet { let versioned = VersionedMultiAssets::from(MultiAssets::from(assets)); let hash = BlakeTwo256::hash_of(&(&origin, &versioned)); AssetTraps::::mutate(hash, |n| *n += 1); - Self::deposit_event(Event::AssetsTrapped(hash, origin.clone(), versioned)); + Self::deposit_event(PalletEvent::AssetsTrapped(hash, origin.clone(), versioned)); // TODO #3735: Put the real weight in there. 0 } @@ -1334,7 +1334,7 @@ pub mod pallet { let origin: MultiLocation = match expected_origin.try_into() { Ok(o) if &o == origin => o, Ok(o) => { - Self::deposit_event(Event::InvalidResponder( + Self::deposit_event(PalletEvent::InvalidResponder( origin.clone(), query_id, Some(o), @@ -1342,7 +1342,7 @@ pub mod pallet { return 0 }, _ => { - Self::deposit_event(Event::InvalidResponder( + Self::deposit_event(PalletEvent::InvalidResponder( origin.clone(), query_id, None, @@ -1367,14 +1367,14 @@ pub mod pallet { LatestVersionedMultiLocation(&origin), v, ); - Self::deposit_event(Event::SupportedVersionChanged(origin, v)); + Self::deposit_event(PalletEvent::SupportedVersionChanged(origin, v)); 0 }, (response, Some(QueryStatus::Pending { responder, maybe_notify, .. })) => { let responder = match MultiLocation::try_from(responder) { Ok(r) => r, Err(_) => { - Self::deposit_event(Event::InvalidResponderVersion( + Self::deposit_event(PalletEvent::InvalidResponderVersion( origin.clone(), query_id, )); @@ -1382,7 +1382,7 @@ pub mod pallet { }, }; if origin != &responder { - Self::deposit_event(Event::InvalidResponder( + Self::deposit_event(PalletEvent::InvalidResponder( origin.clone(), query_id, Some(responder), @@ -1401,7 +1401,7 @@ pub mod pallet { Queries::::remove(query_id); let weight = call.get_dispatch_info().weight; if weight > max_weight { - let e = Event::NotifyOverweight( + let e = PalletEvent::NotifyOverweight( query_id, pallet_index, call_index, @@ -1414,12 +1414,12 @@ pub mod pallet { let dispatch_origin = Origin::Response(origin.clone()).into(); match call.dispatch(dispatch_origin) { Ok(post_info) => { - let e = Event::Notified(query_id, pallet_index, call_index); + let e = PalletEvent::Notified(query_id, pallet_index, call_index); Self::deposit_event(e); post_info.actual_weight }, Err(error_and_info) => { - let e = Event::NotifyDispatchError( + let e = PalletEvent::NotifyDispatchError( query_id, pallet_index, call_index, @@ -1433,13 +1433,13 @@ pub mod pallet { .unwrap_or(weight) } else { let e = - Event::NotifyDecodeFailed(query_id, pallet_index, call_index); + PalletEvent::NotifyDecodeFailed(query_id, pallet_index, call_index); Self::deposit_event(e); 0 } }, None => { - let e = Event::ResponseReady(query_id, response.clone()); + let e = PalletEvent::ResponseReady(query_id, response.clone()); Self::deposit_event(e); let at = frame_system::Pallet::::current_block_number(); let response = response.into(); @@ -1449,7 +1449,7 @@ pub mod pallet { } }, _ => { - Self::deposit_event(Event::UnexpectedResponse(origin.clone(), query_id)); + Self::deposit_event(PalletEvent::UnexpectedResponse(origin.clone(), query_id)); return 0 }, } diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index c395673afe0a..5c2f58f2184e 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -51,7 +51,7 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + crate::Config { - type Event: IsType<::Event> + From>; + type RuntimeEvent: IsType<::RuntimeEvent> + From>; type Origin: IsType<::Origin> + Into::Origin>>; type Call: IsType<::Call> + From>; @@ -83,7 +83,7 @@ pub mod pallet_test_notifier { Junction::AccountId32 { network: Any, id }.into(), 100u32.into(), ); - Self::deposit_event(Event::::QueryPrepared(qid)); + Self::deposit_event(PalletEvent::::QueryPrepared(qid)); Ok(()) } @@ -100,7 +100,7 @@ pub mod pallet_test_notifier { ::Call::from(call), 100u32.into(), ); - Self::deposit_event(Event::::NotifyQueryPrepared(qid)); + Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); Ok(()) } @@ -111,7 +111,7 @@ pub mod pallet_test_notifier { response: Response, ) -> DispatchResult { let responder = ensure_response(::Origin::from(origin))?; - Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); + Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); Ok(()) } } @@ -180,7 +180,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -206,7 +206,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -274,7 +274,7 @@ parameter_types! { } impl pallet_xcm::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = (TestSendXcmErrX8, TestSendXcm); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -293,16 +293,16 @@ impl pallet_xcm::Config for Test { impl origin::Config for Test {} impl pallet_test_notifier::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Call = Call; } -pub(crate) fn last_event() -> Event { - System::events().pop().expect("Event expected").event +pub(crate) fn last_event() -> PalletEvent { + System::events().pop().expect("PalletEvent expected").event } -pub(crate) fn last_events(n: usize) -> Vec { +pub(crate) fn last_events(n: usize) -> Vec { System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect() } diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs index 8ede7f11ae22..c22496cba4e5 100644 --- a/xcm/pallet-xcm/src/tests.rs +++ b/xcm/pallet-xcm/src/tests.rs @@ -84,12 +84,12 @@ fn report_outcome_notify_works() { assert_eq!( last_events(2), vec![ - Event::TestNotifier(pallet_test_notifier::Event::ResponseReceived( + PalletEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived( Parachain(PARA_ID).into(), 0, Response::ExecutionResult(None), )), - Event::XcmPallet(crate::Event::Notified(0, 4, 2)), + PalletEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)), ] ); assert_eq!(crate::Queries::::iter().collect::>(), vec![]); @@ -139,7 +139,7 @@ fn report_outcome_works() { assert_eq!(r, Outcome::Complete(1_000)); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::ResponseReady(0, Response::ExecutionResult(None),)) + PalletEvent::XcmPallet(crate::PalletEvent::ResponseReady(0, Response::ExecutionResult(None),)) ); let response = Some((Response::ExecutionResult(None), 1)); @@ -180,7 +180,7 @@ fn send_works() { ); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Sent(sender, RelayLocation::get(), message)) + PalletEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message)) ); }); } @@ -252,7 +252,7 @@ fn teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -296,7 +296,7 @@ fn limmited_teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -338,7 +338,7 @@ fn unlimmited_teleport_assets_works() { ); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -386,7 +386,7 @@ fn reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -435,7 +435,7 @@ fn limited_reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -482,7 +482,7 @@ fn unlimited_reserve_transfer_assets_works() { ); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -515,7 +515,7 @@ fn execute_withdraw_to_deposit_works() { assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -551,8 +551,8 @@ fn trapped_assets_can_be_claimed() { assert_eq!( last_events(2), vec![ - Event::XcmPallet(crate::Event::AssetsTrapped(hash.clone(), source, vma)), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete( + PalletEvent::XcmPallet(crate::PalletEvent::AssetsTrapped(hash.clone(), source, vma)), + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( 5 * BaseXcmWeight::get() ))) ] @@ -590,7 +590,7 @@ fn trapped_assets_can_be_claimed() { )); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Incomplete( + PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete( BaseXcmWeight::get(), XcmError::UnknownClaim ))) diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs index 9599efcd7f29..7a074c031980 100644 --- a/xcm/xcm-builder/tests/mock/mod.rs +++ b/xcm/xcm-builder/tests/mock/mod.rs @@ -71,7 +71,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -97,7 +97,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -180,7 +180,7 @@ impl xcm_executor::Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LocationInverter = LocationInverter; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = TestSendXcm; @@ -208,10 +208,10 @@ construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, } ); diff --git a/xcm/xcm-builder/tests/scenarios.rs b/xcm/xcm-builder/tests/scenarios.rs index d826e652c5d6..50842f899290 100644 --- a/xcm/xcm-builder/tests/scenarios.rs +++ b/xcm/xcm-builder/tests/scenarios.rs @@ -89,7 +89,7 @@ fn transfer_asset_works() { weight, ); System::assert_last_event( - pallet_balances::Event::Transfer { from: ALICE, to: bob.clone(), amount }.into(), + pallet_balances::PalletEvent::Transfer { from: ALICE, to: bob.clone(), amount }.into(), ); assert_eq!(r, Outcome::Complete(weight)); assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - amount); diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index a6673aca7a92..c271e43552a6 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -66,7 +66,7 @@ fn basic_buy_fees_message_executes() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(Outcome::Complete( + polkadot_test_runtime::PalletEvent::Xcm(pallet_xcm::PalletEvent::Attempted(Outcome::Complete( _ ))), ))); @@ -75,9 +75,9 @@ fn basic_buy_fees_message_executes() { #[test] fn query_response_fires() { - use pallet_test_notifier::Event::*; + use pallet_test_notifier::PalletEvent::*; use pallet_xcm::QueryStatus; - use polkadot_test_runtime::Event::TestNotifier; + use polkadot_test_runtime::PalletEvent::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() @@ -146,7 +146,7 @@ fn query_response_fires() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::ResponseReady( + polkadot_test_runtime::PalletEvent::Xcm(pallet_xcm::PalletEvent::ResponseReady( q, Response::ExecutionResult(None), )) if q == query_id, @@ -163,8 +163,8 @@ fn query_response_fires() { #[test] fn query_response_elicits_handler() { - use pallet_test_notifier::Event::*; - use polkadot_test_runtime::Event::TestNotifier; + use pallet_test_notifier::PalletEvent::*; + use polkadot_test_runtime::PalletEvent::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index 741732cc797a..6d812eb2ba95 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -138,7 +138,7 @@ mod tests { use parachain::{Event, System}; assert!(System::events() .iter() - .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); + .any(|r| matches!(r.event, PalletEvent::System(frame_system::PalletEvent::Remarked { .. })))); }); } @@ -165,7 +165,7 @@ mod tests { use relay_chain::{Event, System}; assert!(System::events() .iter() - .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); + .any(|r| matches!(r.event, PalletEvent::System(frame_system::PalletEvent::Remarked { .. })))); }); } @@ -193,7 +193,7 @@ mod tests { use parachain::{Event, System}; assert!(System::events() .iter() - .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); + .any(|r| matches!(r.event, PalletEvent::System(frame_system::PalletEvent::Remarked { .. })))); }); } diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index c1c7d70467ba..f22357c7aff3 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -87,7 +87,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -156,7 +156,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type XcmExecutor: ExecuteXcm; } @@ -223,14 +223,14 @@ pub mod mock_msg_queue { Ok(xcm) => { let location = (1, Parachain(sender.into())); match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { - Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), - Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), + Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), + Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), // As far as the caller is concerned, this was dispatched without error, so // we just report the weight used. - Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), + Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), } }, - Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), + Err(()) => (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), }; Self::deposit_event(event); result @@ -271,15 +271,15 @@ pub mod mock_msg_queue { VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); match maybe_msg { Err(_) => { - Self::deposit_event(Event::InvalidFormat(id)); + Self::deposit_event(PalletEvent::InvalidFormat(id)); }, Ok(Err(())) => { - Self::deposit_event(Event::UnsupportedVersion(id)); + Self::deposit_event(PalletEvent::UnsupportedVersion(id)); }, Ok(Ok(x)) => { let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); >::append(x); - Self::deposit_event(Event::ExecutedDownward(id, outcome)); + Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); }, } } @@ -289,14 +289,14 @@ pub mod mock_msg_queue { } impl mock_msg_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs index a648ba96ba70..e1b2f8b0eda2 100644 --- a/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/xcm/xcm-simulator/example/src/relay_chain.rs @@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -78,7 +78,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -144,7 +144,7 @@ impl Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -166,7 +166,7 @@ parameter_types! { } impl ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -184,10 +184,10 @@ construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, ParasUmp: ump::{Pallet, Call, Storage, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, } ); diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index 6241509eb5f7..e98584d77d93 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -87,7 +87,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -156,7 +156,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type XcmExecutor: ExecuteXcm; } @@ -223,14 +223,14 @@ pub mod mock_msg_queue { Ok(xcm) => { let location = MultiLocation::new(1, X1(Parachain(sender.into()))); match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { - Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), - Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), + Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), + Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), // As far as the caller is concerned, this was dispatched without error, so // we just report the weight used. - Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), + Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), } }, - Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), + Err(()) => (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), }; Self::deposit_event(event); result @@ -271,15 +271,15 @@ pub mod mock_msg_queue { VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); match maybe_msg { Err(_) => { - Self::deposit_event(Event::InvalidFormat(id)); + Self::deposit_event(PalletEvent::InvalidFormat(id)); }, Ok(Err(())) => { - Self::deposit_event(Event::UnsupportedVersion(id)); + Self::deposit_event(PalletEvent::UnsupportedVersion(id)); }, Ok(Ok(x)) => { let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); >::append(x); - Self::deposit_event(Event::ExecutedDownward(id, outcome)); + Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); }, } } @@ -289,14 +289,14 @@ pub mod mock_msg_queue { } impl mock_msg_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index a648ba96ba70..e1b2f8b0eda2 100644 --- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -78,7 +78,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -144,7 +144,7 @@ impl Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -166,7 +166,7 @@ parameter_types! { } impl ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -184,10 +184,10 @@ construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, ParasUmp: ump::{Pallet, Call, Storage, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, } ); From aa3d405ff211804c9bc29a3ca1844cda918e6023 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Mon, 22 Aug 2022 16:58:19 +0200 Subject: [PATCH 03/37] fmt --- node/overseer/src/lib.rs | 3 ++- runtime/common/src/assigned_slots.rs | 3 ++- runtime/common/src/auctions.rs | 3 ++- runtime/common/src/claims.rs | 3 ++- runtime/common/src/crowdloan/mod.rs | 20 ++++++++++++++---- runtime/common/src/paras_registrar.rs | 3 ++- runtime/common/src/purchase.rs | 7 +++++-- runtime/common/src/slots/mod.rs | 3 ++- runtime/kusama/src/xcm_config.rs | 4 ++-- runtime/parachains/src/disputes.rs | 8 +++++-- runtime/parachains/src/hrmp.rs | 3 ++- runtime/parachains/src/hrmp/tests.rs | 10 ++++----- runtime/parachains/src/inclusion/mod.rs | 3 ++- runtime/parachains/src/paras/tests.rs | 8 +++++-- runtime/parachains/src/ump.rs | 4 +++- runtime/polkadot/src/xcm_config.rs | 4 ++-- runtime/rococo/src/validator_manager.rs | 3 ++- runtime/rococo/src/xcm_config.rs | 4 ++-- runtime/test-runtime/src/lib.rs | 3 ++- runtime/westend/src/xcm_config.rs | 2 +- xcm/pallet-xcm/src/lib.rs | 19 ++++++++++++----- xcm/pallet-xcm/src/mock.rs | 3 ++- xcm/pallet-xcm/src/tests.rs | 11 ++++++++-- xcm/xcm-executor/integration-tests/src/lib.rs | 6 +++--- xcm/xcm-simulator/example/src/lib.rs | 21 +++++++++++-------- xcm/xcm-simulator/example/src/parachain.rs | 6 ++++-- xcm/xcm-simulator/fuzzer/src/parachain.rs | 6 ++++-- 27 files changed, 115 insertions(+), 58 deletions(-) diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 54a8755d93e6..dd5177c6a380 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -190,7 +190,8 @@ impl Handle { /// Send some message to one of the `Subsystem`s. pub async fn send_msg(&mut self, msg: impl Into, origin: &'static str) { - self.send_and_log_error(PalletEvent::MsgToSubsystem { msg: msg.into(), origin }).await + self.send_and_log_error(PalletEvent::MsgToSubsystem { msg: msg.into(), origin }) + .await } /// Send a message not providing an origin. diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs index 590ceb116a97..b5d8d7e9449b 100644 --- a/runtime/common/src/assigned_slots.rs +++ b/runtime/common/src/assigned_slots.rs @@ -85,7 +85,8 @@ pub mod pallet { #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config + slots::Config { /// The overarching PalletEvent type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// Origin for assigning slots. type AssignSlotOrigin: EnsureOrigin<::Origin>; diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index da04159dc0f2..ff4304d56428 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -91,7 +91,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// The type representing the leasing system. type Leaser: Leaser< diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index c4bd8184c005..315786308088 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -172,7 +172,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; type VestingSchedule: VestingSchedule; #[pallet::constant] type Prefix: Get<&'static [u8]>; diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index f255ccb52ca4..f4e9938dd5f5 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -189,7 +189,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")` #[pallet::constant] @@ -494,7 +495,11 @@ pub mod pallet { Funds::::insert(index, &fund); - Self::deposit_event(PalletEvent::::Withdrew { who, fund_index: index, amount: balance }); + Self::deposit_event(PalletEvent::::Withdrew { + who, + fund_index: index, + amount: balance, + }); Ok(()) } @@ -811,7 +816,11 @@ impl Pallet { Funds::::insert(index, &fund); - Self::deposit_event(PalletEvent::::Contributed { who, fund_index: index, amount: value }); + Self::deposit_event(PalletEvent::::Contributed { + who, + fund_index: index, + amount: value, + }); Ok(()) } } @@ -1659,7 +1668,10 @@ mod tests { // Call again assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); - assert_eq!(last_event(), super::PalletEvent::::AllRefunded { para_id: para }.into()); + assert_eq!( + last_event(), + super::PalletEvent::::AllRefunded { para_id: para }.into() + ); // Funds are returned assert_eq!(Balances::free_balance(account_id), 0); diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 07e752b496d1..f2adeb6fc4a3 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -96,7 +96,8 @@ pub mod pallet { #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config { /// The overarching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// The aggregated origin type must support the `parachains` origin. We require that we can /// infallibly convert between this origin and the system origin, but in reality, they're the diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 5e36cc44f851..c8cee4046331 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -98,7 +98,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// Balances Pallet type Currency: Currency; @@ -406,7 +407,9 @@ pub mod pallet { ); // Possibly this is worse than having the caller account be the payment account? UnlockBlock::::set(unlock_block); - Self::deposit_event(PalletEvent::::UnlockBlockUpdated { block_number: unlock_block }); + Self::deposit_event(PalletEvent::::UnlockBlockUpdated { + block_number: unlock_block, + }); Ok(()) } } diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index 847308b176ba..81e557bceec3 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -74,7 +74,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// The currency type used for bidding. type Currency: ReservableCurrency; diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 4051ba466723..05c892d16bdc 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configurations for the Kusama runtime. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, RuntimeEvent, Origin, ParaId, - Runtime, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, + RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; use runtime_common::{xcm_sender, ToAuthor}; diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index 20e6fca4ad9e..f9cdfe920101 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -410,7 +410,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config + session_info::Config { - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; type RewardValidators: RewardValidators; type PunishValidators: PunishValidators; @@ -1203,7 +1204,10 @@ impl Pallet { { if summary.new_flags.contains(DisputeStateFlags::FOR_SUPERMAJORITY) { - Self::deposit_event(PalletEvent::DisputeConcluded(candidate_hash, DisputeResult::Valid)); + Self::deposit_event(PalletEvent::DisputeConcluded( + candidate_hash, + DisputeResult::Valid, + )); } // It is possible, although unexpected, for a dispute to conclude twice. diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs index c6609e8bdd34..d8fa87015a8a 100644 --- a/runtime/parachains/src/hrmp.rs +++ b/runtime/parachains/src/hrmp.rs @@ -239,7 +239,8 @@ pub mod pallet { frame_system::Config + configuration::Config + paras::Config + dmp::Config { /// The outer event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; type Origin: From + From<::Origin> diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs index cc532748e756..e4f86875a507 100644 --- a/runtime/parachains/src/hrmp/tests.rs +++ b/runtime/parachains/src/hrmp/tests.rs @@ -16,8 +16,8 @@ use super::*; use crate::mock::{ - new_test_ext, Configuration, PalletEvent as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, - System, Test, + new_test_ext, Configuration, Hrmp, MockGenesisConfig, PalletEvent as MockEvent, Paras, + ParasShared, System, Test, }; use frame_support::{assert_noop, assert_ok, traits::Currency as _}; use primitives::v2::BlockNumber; @@ -177,10 +177,8 @@ fn open_channel_works() { Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap(); Hrmp::assert_storage_consistency_exhaustive(); - assert!(System::events() - .iter() - .any(|record| record.event == - MockEvent::Hrmp(PalletEvent::OpenChannelAccepted(para_a, para_b)))); + assert!(System::events().iter().any(|record| record.event == + MockEvent::Hrmp(PalletEvent::OpenChannelAccepted(para_a, para_b)))); // Advance to a block 6, but without session change. That means that the channel has // not been created yet. diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index 32563a646fbf..39ef43be1655 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -198,7 +198,8 @@ pub mod pallet { + hrmp::Config + configuration::Config { - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; type DisputesHandler: disputes::DisputesHandler; type RewardValidators: RewardValidators; } diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs index 1f60a4313297..2f0fbf82a393 100644 --- a/runtime/parachains/src/paras/tests.rs +++ b/runtime/parachains/src/paras/tests.rs @@ -112,8 +112,12 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { /// An utility for checking that certain events were deposited. struct EventValidator { - events: - Vec::PalletEvent, primitives::v2::Hash>>, + events: Vec< + frame_system::EventRecord< + ::PalletEvent, + primitives::v2::Hash, + >, + >, } impl EventValidator { diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 916d18a183c8..71b05d534209 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -550,7 +550,9 @@ impl Pallet { } else { // we process messages in order and don't drop them if we run out of weight, // so need to break here without calling `consume_front`. - Self::deposit_event(PalletEvent::WeightExhausted(id, max_weight, required)); + Self::deposit_event(PalletEvent::WeightExhausted( + id, max_weight, required, + )); break } }, diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index fe62046eed6e..36b6d07b86ba 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Polkadot. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, RuntimeEvent, Origin, ParaId, - Runtime, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, + RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{ match_types, parameter_types, diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs index 0a868f8152ec..d0522522fb62 100644 --- a/runtime/rococo/src/validator_manager.rs +++ b/runtime/rococo/src/validator_manager.rs @@ -37,7 +37,8 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_session::Config { /// The overreaching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// Privileged origin that can add or remove validators. type PrivilegedOrigin: EnsureOrigin<::Origin>; diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 367595dd60d1..4a111d9a40a5 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Rococo. use super::{ - parachains_origin, AccountId, Balances, Call, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, - XcmPallet, + parachains_origin, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, + WeightToFee, XcmPallet, }; use frame_support::{ parameter_types, diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 780fa67bd04d..a703b68cf9c2 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -589,7 +589,8 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + pallet_xcm::Config { - type RuntimeEvent: IsType<::RuntimeEvent> + From>; + type RuntimeEvent: IsType<::RuntimeEvent> + + From>; type Origin: IsType<::Origin> + Into::Origin>>; type Call: IsType<::Call> + From>; diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index 3fdea021c605..c282dc2dcca0 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configurations for Westend. use super::{ - parachains_origin, weights, AccountId, Balances, Call, RuntimeEvent, Origin, ParaId, Runtime, + parachains_origin, weights, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{ diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index fa2f3dea2564..b286b41b384a 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -71,7 +71,8 @@ pub mod pallet { /// The module configuration trait. pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; /// Required origin for sending XCM messages. If successful, it resolves to `MultiLocation` /// which exists as an interior location within this chain's XCM context. @@ -1006,7 +1007,8 @@ pub mod pallet { ); PalletEvent::VersionChangeNotified(new_key, xcm_version) }, - Err(e) => PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()), + Err(e) => + PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()), }; Self::deposit_event(event); weight_used.saturating_accrue(todo_vnt_notify_migrate_weight); @@ -1414,7 +1416,11 @@ pub mod pallet { let dispatch_origin = Origin::Response(origin.clone()).into(); match call.dispatch(dispatch_origin) { Ok(post_info) => { - let e = PalletEvent::Notified(query_id, pallet_index, call_index); + let e = PalletEvent::Notified( + query_id, + pallet_index, + call_index, + ); Self::deposit_event(e); post_info.actual_weight }, @@ -1432,8 +1438,11 @@ pub mod pallet { } .unwrap_or(weight) } else { - let e = - PalletEvent::NotifyDecodeFailed(query_id, pallet_index, call_index); + let e = PalletEvent::NotifyDecodeFailed( + query_id, + pallet_index, + call_index, + ); Self::deposit_event(e); 0 } diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 5c2f58f2184e..83a7b8fdb2ce 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -51,7 +51,8 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + crate::Config { - type RuntimeEvent: IsType<::RuntimeEvent> + From>; + type RuntimeEvent: IsType<::RuntimeEvent> + + From>; type Origin: IsType<::Origin> + Into::Origin>>; type Call: IsType<::Call> + From>; diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs index c22496cba4e5..9528352b0b5c 100644 --- a/xcm/pallet-xcm/src/tests.rs +++ b/xcm/pallet-xcm/src/tests.rs @@ -139,7 +139,10 @@ fn report_outcome_works() { assert_eq!(r, Outcome::Complete(1_000)); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::ResponseReady(0, Response::ExecutionResult(None),)) + PalletEvent::XcmPallet(crate::PalletEvent::ResponseReady( + 0, + Response::ExecutionResult(None), + )) ); let response = Some((Response::ExecutionResult(None), 1)); @@ -551,7 +554,11 @@ fn trapped_assets_can_be_claimed() { assert_eq!( last_events(2), vec![ - PalletEvent::XcmPallet(crate::PalletEvent::AssetsTrapped(hash.clone(), source, vma)), + PalletEvent::XcmPallet(crate::PalletEvent::AssetsTrapped( + hash.clone(), + source, + vma + )), PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( 5 * BaseXcmWeight::get() ))) diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index c271e43552a6..e089f9247804 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -66,9 +66,9 @@ fn basic_buy_fees_message_executes() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::PalletEvent::Xcm(pallet_xcm::PalletEvent::Attempted(Outcome::Complete( - _ - ))), + polkadot_test_runtime::PalletEvent::Xcm(pallet_xcm::PalletEvent::Attempted( + Outcome::Complete(_) + )), ))); }); } diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index 6d812eb2ba95..61993f44b403 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -136,9 +136,10 @@ mod tests { ParaA::execute_with(|| { use parachain::{Event, System}; - assert!(System::events() - .iter() - .any(|r| matches!(r.event, PalletEvent::System(frame_system::PalletEvent::Remarked { .. })))); + assert!(System::events().iter().any(|r| matches!( + r.event, + PalletEvent::System(frame_system::PalletEvent::Remarked { .. }) + ))); }); } @@ -163,9 +164,10 @@ mod tests { Relay::execute_with(|| { use relay_chain::{Event, System}; - assert!(System::events() - .iter() - .any(|r| matches!(r.event, PalletEvent::System(frame_system::PalletEvent::Remarked { .. })))); + assert!(System::events().iter().any(|r| matches!( + r.event, + PalletEvent::System(frame_system::PalletEvent::Remarked { .. }) + ))); }); } @@ -191,9 +193,10 @@ mod tests { ParaB::execute_with(|| { use parachain::{Event, System}; - assert!(System::events() - .iter() - .any(|r| matches!(r.event, PalletEvent::System(frame_system::PalletEvent::Remarked { .. })))); + assert!(System::events().iter().any(|r| matches!( + r.event, + PalletEvent::System(frame_system::PalletEvent::Remarked { .. }) + ))); }); } diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index f22357c7aff3..984387e29e71 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -156,7 +156,8 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; type XcmExecutor: ExecuteXcm; } @@ -230,7 +231,8 @@ pub mod mock_msg_queue { Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), } }, - Err(()) => (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), + Err(()) => + (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), }; Self::deposit_event(event); result diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index e98584d77d93..b4c5abf14c77 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -156,7 +156,8 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeEvent: From> + + IsType<::RuntimeEvent>; type XcmExecutor: ExecuteXcm; } @@ -230,7 +231,8 @@ pub mod mock_msg_queue { Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), } }, - Err(()) => (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), + Err(()) => + (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), }; Self::deposit_event(event); result From 5103db1d05366c842f75565b7a42fc482bab9792 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Mon, 22 Aug 2022 18:09:17 +0200 Subject: [PATCH 04/37] fixes --- runtime/common/src/auctions.rs | 2 +- runtime/common/src/crowdloan/mod.rs | 2 +- runtime/common/src/paras_registrar.rs | 2 +- runtime/common/src/slots/mod.rs | 2 +- runtime/parachains/src/hrmp/benchmarking.rs | 2 +- runtime/parachains/src/hrmp/tests.rs | 4 ++-- runtime/parachains/src/mock.rs | 4 ++-- runtime/parachains/src/paras/benchmarking.rs | 2 +- runtime/parachains/src/paras/tests.rs | 2 +- runtime/parachains/src/ump/benchmarking.rs | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index ff4304d56428..7971eafc04dc 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -1732,7 +1732,7 @@ mod benchmarking { fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index f4e9938dd5f5..5366eb93cd15 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -1920,7 +1920,7 @@ mod benchmarking { fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index f2adeb6fc4a3..183c307da316 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -1229,7 +1229,7 @@ mod benchmarking { fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index 81e557bceec3..2a52c8631cdb 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -991,7 +991,7 @@ mod benchmarking { fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs index 95206e90b1ff..321b9213561c 100644 --- a/runtime/parachains/src/hrmp/benchmarking.rs +++ b/runtime/parachains/src/hrmp/benchmarking.rs @@ -41,7 +41,7 @@ fn register_parachain_with_balance(id: ParaId, balance: BalanceOf) fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs index e4f86875a507..18355ad73f7f 100644 --- a/runtime/parachains/src/hrmp/tests.rs +++ b/runtime/parachains/src/hrmp/tests.rs @@ -16,8 +16,8 @@ use super::*; use crate::mock::{ - new_test_ext, Configuration, Hrmp, MockGenesisConfig, PalletEvent as MockEvent, Paras, - ParasShared, System, Test, + new_test_ext, Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared, + RuntimeEvent as MockEvent, System, Test, }; use frame_support::{assert_noop, assert_ok, traits::Currency as _}; use primitives::v2::BlockNumber; diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index d3085081507e..cbb7e01dd314 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -455,9 +455,9 @@ pub struct MockGenesisConfig { pub paras: crate::paras::GenesisConfig, } -pub fn assert_last_event(generic_event: Event) { +pub fn assert_last_event(generic_event: RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/paras/benchmarking.rs b/runtime/parachains/src/paras/benchmarking.rs index 154d6dcfba80..283cc3d35b0a 100644 --- a/runtime/parachains/src/paras/benchmarking.rs +++ b/runtime/parachains/src/paras/benchmarking.rs @@ -33,7 +33,7 @@ const SAMPLE_SIZE: u32 = 1024; fn assert_last_event(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs index 2f0fbf82a393..32e0004049d9 100644 --- a/runtime/parachains/src/paras/tests.rs +++ b/runtime/parachains/src/paras/tests.rs @@ -114,7 +114,7 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { struct EventValidator { events: Vec< frame_system::EventRecord< - ::PalletEvent, + ::RuntimeEvent, primitives::v2::Hash, >, >, diff --git a/runtime/parachains/src/ump/benchmarking.rs b/runtime/parachains/src/ump/benchmarking.rs index 8c441069096b..513e16cb6fbf 100644 --- a/runtime/parachains/src/ump/benchmarking.rs +++ b/runtime/parachains/src/ump/benchmarking.rs @@ -20,7 +20,7 @@ use xcm::prelude::*; fn assert_last_event_type(generic_event: ::PalletEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::PalletEvent = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event)); From 6e57d6f7893c0575c371f954ae271248bfe63c68 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Mon, 22 Aug 2022 19:07:12 +0200 Subject: [PATCH 05/37] add generic type --- runtime/common/src/impls.rs | 6 +++--- xcm/pallet-xcm-benchmarks/src/fungible/mock.rs | 4 ++-- xcm/pallet-xcm-benchmarks/src/generic/mock.rs | 2 +- xcm/xcm-builder/tests/mock/mod.rs | 6 +++--- xcm/xcm-simulator/example/src/relay_chain.rs | 6 +++--- xcm/xcm-simulator/fuzzer/src/relay_chain.rs | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 2f8348ad5622..c528f1915116 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -80,10 +80,10 @@ mod tests { NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event}, } ); diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs index 39e91f184d07..3f5b4d9e662b 100644 --- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs @@ -38,8 +38,8 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, XcmBalancesBenchmark: xcm_balances_benchmark::{Pallet}, } ); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs index c660b960945e..7fec7a5e041b 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs @@ -43,7 +43,7 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Config, Storage, Event}, XcmGenericBenchmarks: generic::{Pallet}, } ); diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs index 7a074c031980..1eb51b7b24c5 100644 --- a/xcm/xcm-builder/tests/mock/mod.rs +++ b/xcm/xcm-builder/tests/mock/mod.rs @@ -208,10 +208,10 @@ construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, } ); diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs index e1b2f8b0eda2..e9e6fe7608e6 100644 --- a/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/xcm/xcm-simulator/example/src/relay_chain.rs @@ -184,10 +184,10 @@ construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, ParasUmp: ump::{Pallet, Call, Storage, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, } ); diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index e1b2f8b0eda2..e9e6fe7608e6 100644 --- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -184,10 +184,10 @@ construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, ParasOrigin: origin::{Pallet, Origin}, ParasUmp: ump::{Pallet, Call, Storage, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, + XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, } ); From f314d546ae509cfb85ee4607d2912fd6819eb308 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sat, 16 Jul 2022 15:34:38 +0300 Subject: [PATCH 06/37] Companion for #11831 --- xcm/pallet-xcm/src/mock.rs | 6 +++--- xcm/pallet-xcm/src/tests.rs | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 83a7b8fdb2ce..3bd9bf395e39 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -299,11 +299,11 @@ impl pallet_test_notifier::Config for Test { type Call = Call; } -pub(crate) fn last_event() -> PalletEvent { - System::events().pop().expect("PalletEvent expected").event +pub(crate) fn last_event() -> RuntimeEvent { + System::events().pop().expect("RuntimeEvent expected").event } -pub(crate) fn last_events(n: usize) -> Vec { +pub(crate) fn last_events(n: usize) -> Vec { System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect() } diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs index 9528352b0b5c..7aa2a8f9ed22 100644 --- a/xcm/pallet-xcm/src/tests.rs +++ b/xcm/pallet-xcm/src/tests.rs @@ -84,12 +84,12 @@ fn report_outcome_notify_works() { assert_eq!( last_events(2), vec![ - PalletEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived( + RuntimeEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived( Parachain(PARA_ID).into(), 0, Response::ExecutionResult(None), )), - PalletEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)), + RuntimeEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)), ] ); assert_eq!(crate::Queries::::iter().collect::>(), vec![]); @@ -139,7 +139,7 @@ fn report_outcome_works() { assert_eq!(r, Outcome::Complete(1_000)); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::ResponseReady( + RuntimeEvent::XcmPallet(crate::PalletEvent::ResponseReady( 0, Response::ExecutionResult(None), )) @@ -183,7 +183,7 @@ fn send_works() { ); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message)) + RuntimeEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message)) ); }); } @@ -255,7 +255,7 @@ fn teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -299,7 +299,7 @@ fn limmited_teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -341,7 +341,7 @@ fn unlimmited_teleport_assets_works() { ); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -389,7 +389,7 @@ fn reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -438,7 +438,7 @@ fn limited_reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -485,7 +485,7 @@ fn unlimited_reserve_transfer_assets_works() { ); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -518,7 +518,7 @@ fn execute_withdraw_to_deposit_works() { assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) ); }); } @@ -554,12 +554,12 @@ fn trapped_assets_can_be_claimed() { assert_eq!( last_events(2), vec![ - PalletEvent::XcmPallet(crate::PalletEvent::AssetsTrapped( + RuntimeEvent::XcmPallet(crate::PalletEvent::AssetsTrapped( hash.clone(), source, vma )), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( 5 * BaseXcmWeight::get() ))) ] @@ -597,7 +597,7 @@ fn trapped_assets_can_be_claimed() { )); assert_eq!( last_event(), - PalletEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete( + RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete( BaseXcmWeight::get(), XcmError::UnknownClaim ))) From 418dc9e573702c95a7e0c622924eebfb0542410a Mon Sep 17 00:00:00 2001 From: Szegoo Date: Tue, 23 Aug 2022 09:00:24 +0200 Subject: [PATCH 07/37] fix --- xcm/xcm-executor/integration-tests/src/lib.rs | 8 ++++---- xcm/xcm-simulator/example/src/lib.rs | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index e089f9247804..a470e5bfd52f 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -66,7 +66,7 @@ fn basic_buy_fees_message_executes() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::PalletEvent::Xcm(pallet_xcm::PalletEvent::Attempted( + polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::Attempted( Outcome::Complete(_) )), ))); @@ -77,7 +77,7 @@ fn basic_buy_fees_message_executes() { fn query_response_fires() { use pallet_test_notifier::PalletEvent::*; use pallet_xcm::QueryStatus; - use polkadot_test_runtime::PalletEvent::TestNotifier; + use polkadot_test_runtime::RuntimeEvent::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() @@ -146,7 +146,7 @@ fn query_response_fires() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::PalletEvent::Xcm(pallet_xcm::PalletEvent::ResponseReady( + polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::ResponseReady( q, Response::ExecutionResult(None), )) if q == query_id, @@ -164,7 +164,7 @@ fn query_response_fires() { #[test] fn query_response_elicits_handler() { use pallet_test_notifier::PalletEvent::*; - use polkadot_test_runtime::PalletEvent::TestNotifier; + use polkadot_test_runtime::RuntimeEvent::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index 61993f44b403..1fb659b082f2 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -135,10 +135,10 @@ mod tests { }); ParaA::execute_with(|| { - use parachain::{Event, System}; + use parachain::{RuntimeEvent, System}; assert!(System::events().iter().any(|r| matches!( r.event, - PalletEvent::System(frame_system::PalletEvent::Remarked { .. }) + RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) ))); }); } @@ -163,10 +163,10 @@ mod tests { }); Relay::execute_with(|| { - use relay_chain::{Event, System}; + use relay_chain::{RuntimeEvent, System}; assert!(System::events().iter().any(|r| matches!( r.event, - PalletEvent::System(frame_system::PalletEvent::Remarked { .. }) + RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) ))); }); } @@ -192,10 +192,10 @@ mod tests { }); ParaB::execute_with(|| { - use parachain::{Event, System}; + use parachain::{RuntimeEvent, System}; assert!(System::events().iter().any(|r| matches!( r.event, - PalletEvent::System(frame_system::PalletEvent::Remarked { .. }) + RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) ))); }); } From 0cac7305ca04bfb50c6a9eb4cfcdc27d3e732590 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 25 Aug 2022 09:43:56 +0200 Subject: [PATCH 08/37] revert changes --- .github/workflows/auto-label-prs.yml | 4 +- .github/workflows/release-10_candidate.yml | 4 +- Cargo.lock | 349 +- node/network/bridge/src/network.rs | 9 +- node/overseer/src/lib.rs | 27 +- rename-outer-enum.diff | 6043 +++++++++++++++++ runtime/common/src/assigned_slots.rs | 21 +- runtime/common/src/auctions.rs | 33 +- runtime/common/src/claims.rs | 15 +- runtime/common/src/crowdloan/mod.rs | 70 +- runtime/common/src/impls.rs | 6 +- runtime/common/src/integration_tests.rs | 24 +- runtime/common/src/paras_registrar.rs | 31 +- runtime/common/src/purchase.rs | 29 +- runtime/common/src/slots/mod.rs | 21 +- runtime/kusama/src/governance/old.rs | 10 +- runtime/kusama/src/lib.rs | 74 +- runtime/kusama/src/xcm_config.rs | 6 +- runtime/parachains/src/disputes.rs | 18 +- runtime/parachains/src/disputes/tests.rs | 2 +- runtime/parachains/src/hrmp.rs | 13 +- runtime/parachains/src/hrmp/benchmarking.rs | 10 +- runtime/parachains/src/hrmp/tests.rs | 14 +- runtime/parachains/src/inclusion/mod.rs | 11 +- runtime/parachains/src/mock.rs | 18 +- runtime/parachains/src/paras/benchmarking.rs | 14 +- runtime/parachains/src/paras/mod.rs | 20 +- runtime/parachains/src/paras/tests.rs | 14 +- runtime/parachains/src/runtime_api_impl/v2.rs | 4 +- runtime/parachains/src/ump.rs | 20 +- runtime/parachains/src/ump/benchmarking.rs | 10 +- runtime/parachains/src/ump/tests.rs | 4 +- runtime/polkadot/src/lib.rs | 80 +- runtime/polkadot/src/xcm_config.rs | 6 +- runtime/rococo/src/lib.rs | 54 +- runtime/rococo/src/validator_manager.rs | 9 +- runtime/rococo/src/xcm_config.rs | 6 +- runtime/test-runtime/src/lib.rs | 47 +- runtime/westend/src/lib.rs | 64 +- runtime/westend/src/xcm_config.rs | 4 +- scripts/ci/run_benches_for_runtime.sh | 8 +- .../src/fungible/mock.rs | 4 +- xcm/pallet-xcm-benchmarks/src/generic/mock.rs | 2 +- xcm/pallet-xcm/src/lib.rs | 61 +- xcm/pallet-xcm/src/mock.rs | 25 +- xcm/pallet-xcm/src/tests.rs | 35 +- xcm/xcm-builder/tests/mock/mod.rs | 6 +- xcm/xcm-builder/tests/scenarios.rs | 2 +- xcm/xcm-executor/integration-tests/src/lib.rs | 16 +- xcm/xcm-simulator/example/src/lib.rs | 27 +- xcm/xcm-simulator/example/src/parachain.rs | 28 +- xcm/xcm-simulator/example/src/relay_chain.rs | 8 +- xcm/xcm-simulator/fuzzer/src/parachain.rs | 28 +- xcm/xcm-simulator/fuzzer/src/relay_chain.rs | 8 +- 54 files changed, 6727 insertions(+), 749 deletions(-) create mode 100644 rename-outer-enum.diff diff --git a/.github/workflows/auto-label-prs.yml b/.github/workflows/auto-label-prs.yml index 50539b80b98b..f0b8e9b343e2 100644 --- a/.github/workflows/auto-label-prs.yml +++ b/.github/workflows/auto-label-prs.yml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Label drafts - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 + uses: andymckay/labeler@master if: github.event.pull_request.draft == true with: add-labels: 'A3-inprogress' remove-labels: 'A0-pleasereview' - name: Label PRs - uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 + uses: andymckay/labeler@master if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial') with: add-labels: 'A0-pleasereview' diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml index acffa6842d49..51a82bc4f593 100644 --- a/.github/workflows/release-10_candidate.yml +++ b/.github/workflows/release-10_candidate.yml @@ -34,7 +34,7 @@ jobs: echo "::set-output name=first_rc::true" fi - name: Apply new tag - uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2 + uses: tvdias/github-tagger@v0.0.2 with: # We can't use the normal GITHUB_TOKEN for the following reason: # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token @@ -42,7 +42,7 @@ jobs: repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}" tag: ${{ steps.compute_tag.outputs.new_tag }} - id: create-issue - uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0 + uses: JasonEtco/create-an-issue@v2 # Only create the issue if it's the first release candidate if: steps.compute_tag.outputs.first_rc == 'true' env: diff --git a/Cargo.lock b/Cargo.lock index 13743f95a975..0f65ff847ee5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -423,7 +423,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "beefy-primitives", @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "beefy-primitives", "sp-api", @@ -488,7 +488,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -1974,7 +1974,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", ] @@ -1992,7 +1992,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -2015,7 +2015,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "Inflector", "chrono", @@ -2066,7 +2066,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2077,7 +2077,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -2121,7 +2121,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "bitflags", "frame-metadata", @@ -2152,7 +2152,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2176,7 +2176,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro2", "quote", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2209,7 +2209,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -2220,7 +2220,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "log", @@ -2237,7 +2237,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -2252,7 +2252,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "sp-api", @@ -2261,7 +2261,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "sp-api", @@ -2443,7 +2443,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "chrono", "frame-election-provider-support", @@ -4816,7 +4816,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -4830,7 +4830,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -4846,7 +4846,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -4861,7 +4861,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -4885,7 +4885,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4905,7 +4905,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4924,7 +4924,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -4939,7 +4939,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "beefy-primitives", "frame-support", @@ -4955,7 +4955,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4978,7 +4978,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -4996,7 +4996,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5015,7 +5015,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5032,7 +5032,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5048,7 +5048,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5071,7 +5071,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5084,7 +5084,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5102,7 +5102,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5117,7 +5117,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5140,7 +5140,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5156,7 +5156,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5176,7 +5176,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5193,7 +5193,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5210,7 +5210,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5228,7 +5228,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5243,7 +5243,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5258,7 +5258,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -5275,7 +5275,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "sp-api", @@ -5304,7 +5304,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -5321,7 +5321,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5344,7 +5344,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5360,7 +5360,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5375,7 +5375,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5390,7 +5390,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5406,7 +5406,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -5427,7 +5427,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5443,7 +5443,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -5457,7 +5457,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5480,7 +5480,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5491,7 +5491,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "sp-arithmetic", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -5514,7 +5514,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5532,7 +5532,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5551,7 +5551,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-support", "frame-system", @@ -5567,7 +5567,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5582,7 +5582,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5593,7 +5593,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5610,7 +5610,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -5626,7 +5626,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-benchmarking", "frame-support", @@ -8100,7 +8100,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8442,7 +8442,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "sp-core", @@ -8453,7 +8453,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "futures-timer", @@ -8465,6 +8465,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "sc-client-api", + "sc-network", "sc-network-common", "sp-api", "sp-authority-discovery", @@ -8479,7 +8480,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "futures-timer", @@ -8502,7 +8503,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8518,13 +8519,13 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", "parity-scale-codec", "sc-chain-spec-derive", - "sc-network-common", + "sc-network", "sc-telemetry", "serde", "serde_json", @@ -8535,7 +8536,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8546,7 +8547,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "chrono", "clap", @@ -8585,7 +8586,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "fnv", "futures", @@ -8613,7 +8614,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "hash-db", "kvdb", @@ -8638,7 +8639,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "futures", @@ -8662,7 +8663,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "fork-tree", @@ -8704,7 +8705,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "jsonrpsee", @@ -8726,7 +8727,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8739,7 +8740,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "futures", @@ -8764,7 +8765,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "lazy_static", "lru 0.7.8", @@ -8791,7 +8792,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "environmental", "parity-scale-codec", @@ -8807,7 +8808,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "parity-scale-codec", @@ -8822,7 +8823,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8842,7 +8843,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ahash", "async-trait", @@ -8883,7 +8884,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "finality-grandpa", "futures", @@ -8904,7 +8905,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ansi_term", "futures", @@ -8921,7 +8922,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "hex", @@ -8936,7 +8937,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "asynchronous-codec", @@ -8985,7 +8986,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "bitflags", @@ -8996,7 +8997,6 @@ dependencies = [ "prost-build", "sc-consensus", "sc-peerset", - "serde", "smallvec", "sp-consensus", "sp-finality-grandpa", @@ -9007,7 +9007,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ahash", "futures", @@ -9015,8 +9015,8 @@ dependencies = [ "libp2p", "log", "lru 0.7.8", + "sc-network", "sc-network-common", - "sc-peerset", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -9025,7 +9025,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "hex", @@ -9046,7 +9046,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "fork-tree", "futures", @@ -9074,7 +9074,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "bytes", "fnv", @@ -9083,15 +9083,14 @@ dependencies = [ "hex", "hyper", "hyper-rustls", - "libp2p", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", + "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-api", "sp-core", @@ -9104,7 +9103,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "libp2p", @@ -9117,7 +9116,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9126,7 +9125,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "hash-db", @@ -9156,7 +9155,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "jsonrpsee", @@ -9179,7 +9178,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "jsonrpsee", @@ -9192,7 +9191,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "directories", @@ -9259,7 +9258,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "parity-scale-codec", @@ -9273,7 +9272,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9292,7 +9291,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "libc", @@ -9311,7 +9310,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "chrono", "futures", @@ -9329,7 +9328,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ansi_term", "atty", @@ -9360,7 +9359,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9371,7 +9370,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "futures-timer", @@ -9397,7 +9396,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "log", @@ -9410,7 +9409,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "futures-timer", @@ -9895,7 +9894,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "hash-db", "log", @@ -9913,7 +9912,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "blake2", "proc-macro-crate", @@ -9925,7 +9924,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -9938,7 +9937,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "integer-sqrt", "num-traits", @@ -9953,7 +9952,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -9966,7 +9965,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "parity-scale-codec", @@ -9978,7 +9977,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "sp-api", @@ -9990,7 +9989,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "log", @@ -10008,7 +10007,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "futures", @@ -10027,7 +10026,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "merlin", @@ -10050,7 +10049,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -10064,7 +10063,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -10077,7 +10076,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "base58", "bitflags", @@ -10123,7 +10122,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "blake2", "byteorder", @@ -10137,7 +10136,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro2", "quote", @@ -10148,7 +10147,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -10157,7 +10156,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro2", "quote", @@ -10167,7 +10166,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "environmental", "parity-scale-codec", @@ -10178,7 +10177,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "finality-grandpa", "log", @@ -10196,7 +10195,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10210,7 +10209,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "bytes", "futures", @@ -10236,7 +10235,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "lazy_static", "sp-core", @@ -10247,7 +10246,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "futures", @@ -10264,7 +10263,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "thiserror", "zstd", @@ -10273,7 +10272,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "parity-scale-codec", @@ -10288,7 +10287,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -10302,7 +10301,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "sp-api", "sp-core", @@ -10312,7 +10311,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "backtrace", "lazy_static", @@ -10322,7 +10321,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "rustc-hash", "serde", @@ -10332,7 +10331,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "either", "hash256-std-hasher", @@ -10354,7 +10353,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10372,7 +10371,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "Inflector", "proc-macro-crate", @@ -10384,7 +10383,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "parity-scale-codec", @@ -10398,7 +10397,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -10412,7 +10411,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "scale-info", @@ -10423,7 +10422,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "hash-db", "log", @@ -10445,12 +10444,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10463,7 +10462,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "log", "sp-core", @@ -10476,7 +10475,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "futures-timer", @@ -10492,7 +10491,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "sp-std", @@ -10504,7 +10503,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "sp-api", "sp-runtime", @@ -10513,7 +10512,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "log", @@ -10529,7 +10528,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ahash", "hash-db", @@ -10552,7 +10551,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10569,7 +10568,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10580,7 +10579,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "impl-trait-for-tuples", "log", @@ -10754,7 +10753,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "platforms", ] @@ -10762,7 +10761,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10783,7 +10782,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures-util", "hyper", @@ -10796,7 +10795,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "jsonrpsee", "log", @@ -10817,7 +10816,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "async-trait", "futures", @@ -10843,7 +10842,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10853,7 +10852,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10864,7 +10863,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "ansi_term", "build-helper", @@ -11578,7 +11577,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" +source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" dependencies = [ "clap", "jsonrpsee", diff --git a/node/network/bridge/src/network.rs b/node/network/bridge/src/network.rs index e80094588e33..00a950f35c54 100644 --- a/node/network/bridge/src/network.rs +++ b/node/network/bridge/src/network.rs @@ -22,12 +22,11 @@ use futures::{prelude::*, stream::BoxStream}; use parity_scale_codec::Encode; use sc_network::{ - multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, NetworkService, OutboundFailure, - RequestFailure, + config::parse_addr, multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, + NetworkService, OutboundFailure, RequestFailure, }; -use sc_network_common::{ - config::parse_addr, - service::{NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest}, +use sc_network_common::service::{ + NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest, }; use polkadot_node_network_protocol::{ diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index dd5177c6a380..21160bddaecb 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -185,13 +185,12 @@ impl Handle { /// Inform the `Overseer` that that some block was imported. pub async fn block_imported(&mut self, block: BlockInfo) { - self.send_and_log_error(PalletEvent::BlockImported(block)).await + self.send_and_log_error(Event::BlockImported(block)).await } /// Send some message to one of the `Subsystem`s. pub async fn send_msg(&mut self, msg: impl Into, origin: &'static str) { - self.send_and_log_error(PalletEvent::MsgToSubsystem { msg: msg.into(), origin }) - .await + self.send_and_log_error(Event::MsgToSubsystem { msg: msg.into(), origin }).await } /// Send a message not providing an origin. @@ -202,7 +201,7 @@ impl Handle { /// Inform the `Overseer` that some block was finalized. pub async fn block_finalized(&mut self, block: BlockInfo) { - self.send_and_log_error(PalletEvent::BlockFinalized(block)).await + self.send_and_log_error(Event::BlockFinalized(block)).await } /// Wait for a block with the given hash to be in the active-leaves set. @@ -216,7 +215,7 @@ impl Handle { hash: Hash, response_channel: oneshot::Sender>, ) { - self.send_and_log_error(PalletEvent::ExternalRequest(ExternalRequest::WaitForActivation { + self.send_and_log_error(Event::ExternalRequest(ExternalRequest::WaitForActivation { hash, response_channel, })) @@ -225,11 +224,11 @@ impl Handle { /// Tell `Overseer` to shutdown. pub async fn stop(&mut self) { - self.send_and_log_error(PalletEvent::Stop).await; + self.send_and_log_error(Event::Stop).await; } /// Most basic operation, to stop a server. - async fn send_and_log_error(&mut self, event: PalletEvent) { + async fn send_and_log_error(&mut self, event: Event) { if self.0.send(event).await.is_err() { gum::info!(target: LOG_TARGET, "Failed to send an event to Overseer"); } @@ -266,7 +265,7 @@ impl From> for BlockInfo { /// An event from outside the overseer scope, such /// as the substrate framework or user interaction. -pub enum PalletEvent { +pub enum Event { /// A new block was imported. BlockImported(BlockInfo), /// A block was finalized with i.e. babe or another consensus algorithm. @@ -443,7 +442,7 @@ pub async fn forward_events>(client: Arc

, mut hand /// ``` #[orchestra( gen=AllMessages, - event=PalletEvent, + event=Event, signal=OverseerSignal, error=SubsystemError, message_capacity=2048, @@ -725,21 +724,21 @@ where select! { msg = self.events_rx.select_next_some() => { match msg { - PalletEvent::MsgToSubsystem { msg, origin } => { + Event::MsgToSubsystem { msg, origin } => { self.route_message(msg.into(), origin).await?; self.metrics.on_message_relayed(); } - PalletEvent::Stop => { + Event::Stop => { self.stop().await; return Ok(()); } - PalletEvent::BlockImported(block) => { + Event::BlockImported(block) => { self.block_imported(block).await?; } - PalletEvent::BlockFinalized(block) => { + Event::BlockFinalized(block) => { self.block_finalized(block).await?; } - PalletEvent::ExternalRequest(request) => { + Event::ExternalRequest(request) => { self.handle_external_request(request); } } diff --git a/rename-outer-enum.diff b/rename-outer-enum.diff new file mode 100644 index 000000000000..355709a6394d --- /dev/null +++ b/rename-outer-enum.diff @@ -0,0 +1,6043 @@ +diff --git a/.github/workflows/auto-label-prs.yml b/.github/workflows/auto-label-prs.yml +index f0b8e9b343e..50539b80b98 100644 +--- a/.github/workflows/auto-label-prs.yml ++++ b/.github/workflows/auto-label-prs.yml +@@ -8,13 +8,13 @@ jobs: + runs-on: ubuntu-latest + steps: + - name: Label drafts +- uses: andymckay/labeler@master ++ uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 + if: github.event.pull_request.draft == true + with: + add-labels: 'A3-inprogress' + remove-labels: 'A0-pleasereview' + - name: Label PRs +- uses: andymckay/labeler@master ++ uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 + if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial') + with: + add-labels: 'A0-pleasereview' +diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml +index 51a82bc4f59..acffa6842d4 100644 +--- a/.github/workflows/release-10_candidate.yml ++++ b/.github/workflows/release-10_candidate.yml +@@ -34,7 +34,7 @@ jobs: + echo "::set-output name=first_rc::true" + fi + - name: Apply new tag +- uses: tvdias/github-tagger@v0.0.2 ++ uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2 + with: + # We can't use the normal GITHUB_TOKEN for the following reason: + # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token +@@ -42,7 +42,7 @@ jobs: + repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}" + tag: ${{ steps.compute_tag.outputs.new_tag }} + - id: create-issue +- uses: JasonEtco/create-an-issue@v2 ++ uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0 + # Only create the issue if it's the first release candidate + if: steps.compute_tag.outputs.first_rc == 'true' + env: +diff --git a/Cargo.lock b/Cargo.lock +index 0f65ff847ee..13743f95a97 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -423,7 +423,7 @@ dependencies = [ + [[package]] + name = "beefy-gadget" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "beefy-primitives", +@@ -459,7 +459,7 @@ dependencies = [ + [[package]] + name = "beefy-gadget-rpc" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "beefy-gadget", + "beefy-primitives", +@@ -479,7 +479,7 @@ dependencies = [ + [[package]] + name = "beefy-merkle-tree" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "beefy-primitives", + "sp-api", +@@ -488,7 +488,7 @@ dependencies = [ + [[package]] + name = "beefy-primitives" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -1974,7 +1974,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] + name = "fork-tree" + version = "3.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + ] +@@ -1992,7 +1992,7 @@ dependencies = [ + [[package]] + name = "frame-benchmarking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -2015,7 +2015,7 @@ dependencies = [ + [[package]] + name = "frame-benchmarking-cli" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "Inflector", + "chrono", +@@ -2066,7 +2066,7 @@ dependencies = [ + [[package]] + name = "frame-election-provider-solution-type" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -2077,7 +2077,7 @@ dependencies = [ + [[package]] + name = "frame-election-provider-support" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-election-provider-solution-type", + "frame-support", +@@ -2093,7 +2093,7 @@ dependencies = [ + [[package]] + name = "frame-executive" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -2121,7 +2121,7 @@ dependencies = [ + [[package]] + name = "frame-support" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "bitflags", + "frame-metadata", +@@ -2152,7 +2152,7 @@ dependencies = [ + [[package]] + name = "frame-support-procedural" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "Inflector", + "frame-support-procedural-tools", +@@ -2164,7 +2164,7 @@ dependencies = [ + [[package]] + name = "frame-support-procedural-tools" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support-procedural-tools-derive", + "proc-macro-crate", +@@ -2176,7 +2176,7 @@ dependencies = [ + [[package]] + name = "frame-support-procedural-tools-derive" + version = "3.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro2", + "quote", +@@ -2186,7 +2186,7 @@ dependencies = [ + [[package]] + name = "frame-support-test" + version = "3.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-support-test-pallet", +@@ -2209,7 +2209,7 @@ dependencies = [ + [[package]] + name = "frame-support-test-pallet" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -2220,7 +2220,7 @@ dependencies = [ + [[package]] + name = "frame-system" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "log", +@@ -2237,7 +2237,7 @@ dependencies = [ + [[package]] + name = "frame-system-benchmarking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -2252,7 +2252,7 @@ dependencies = [ + [[package]] + name = "frame-system-rpc-runtime-api" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "sp-api", +@@ -2261,7 +2261,7 @@ dependencies = [ + [[package]] + name = "frame-try-runtime" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "sp-api", +@@ -2443,7 +2443,7 @@ dependencies = [ + [[package]] + name = "generate-bags" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "chrono", + "frame-election-provider-support", +@@ -4816,7 +4816,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" + [[package]] + name = "pallet-assets" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -4830,7 +4830,7 @@ dependencies = [ + [[package]] + name = "pallet-authority-discovery" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -4846,7 +4846,7 @@ dependencies = [ + [[package]] + name = "pallet-authorship" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -4861,7 +4861,7 @@ dependencies = [ + [[package]] + name = "pallet-babe" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -4885,7 +4885,7 @@ dependencies = [ + [[package]] + name = "pallet-bags-list" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", +@@ -4905,7 +4905,7 @@ dependencies = [ + [[package]] + name = "pallet-bags-list-remote-tests" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-election-provider-support", + "frame-support", +@@ -4924,7 +4924,7 @@ dependencies = [ + [[package]] + name = "pallet-balances" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -4939,7 +4939,7 @@ dependencies = [ + [[package]] + name = "pallet-beefy" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "beefy-primitives", + "frame-support", +@@ -4955,7 +4955,7 @@ dependencies = [ + [[package]] + name = "pallet-beefy-mmr" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "beefy-merkle-tree", + "beefy-primitives", +@@ -4978,7 +4978,7 @@ dependencies = [ + [[package]] + name = "pallet-bounties" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -4996,7 +4996,7 @@ dependencies = [ + [[package]] + name = "pallet-child-bounties" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5015,7 +5015,7 @@ dependencies = [ + [[package]] + name = "pallet-collective" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5032,7 +5032,7 @@ dependencies = [ + [[package]] + name = "pallet-democracy" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5048,7 +5048,7 @@ dependencies = [ + [[package]] + name = "pallet-election-provider-multi-phase" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", +@@ -5071,7 +5071,7 @@ dependencies = [ + [[package]] + name = "pallet-election-provider-support-benchmarking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", +@@ -5084,7 +5084,7 @@ dependencies = [ + [[package]] + name = "pallet-elections-phragmen" + version = "5.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5102,7 +5102,7 @@ dependencies = [ + [[package]] + name = "pallet-gilt" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5117,7 +5117,7 @@ dependencies = [ + [[package]] + name = "pallet-grandpa" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5140,7 +5140,7 @@ dependencies = [ + [[package]] + name = "pallet-identity" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "enumflags2", + "frame-benchmarking", +@@ -5156,7 +5156,7 @@ dependencies = [ + [[package]] + name = "pallet-im-online" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5176,7 +5176,7 @@ dependencies = [ + [[package]] + name = "pallet-indices" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5193,7 +5193,7 @@ dependencies = [ + [[package]] + name = "pallet-membership" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5210,7 +5210,7 @@ dependencies = [ + [[package]] + name = "pallet-mmr" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ckb-merkle-mountain-range", + "frame-benchmarking", +@@ -5228,7 +5228,7 @@ dependencies = [ + [[package]] + name = "pallet-mmr-rpc" + version = "3.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "jsonrpsee", + "parity-scale-codec", +@@ -5243,7 +5243,7 @@ dependencies = [ + [[package]] + name = "pallet-multisig" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5258,7 +5258,7 @@ dependencies = [ + [[package]] + name = "pallet-nomination-pools" + version = "1.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -5275,7 +5275,7 @@ dependencies = [ + [[package]] + name = "pallet-nomination-pools-benchmarking" + version = "1.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", +@@ -5294,7 +5294,7 @@ dependencies = [ + [[package]] + name = "pallet-nomination-pools-runtime-api" + version = "1.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "sp-api", +@@ -5304,7 +5304,7 @@ dependencies = [ + [[package]] + name = "pallet-offences" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -5321,7 +5321,7 @@ dependencies = [ + [[package]] + name = "pallet-offences-benchmarking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", +@@ -5344,7 +5344,7 @@ dependencies = [ + [[package]] + name = "pallet-preimage" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5360,7 +5360,7 @@ dependencies = [ + [[package]] + name = "pallet-proxy" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5375,7 +5375,7 @@ dependencies = [ + [[package]] + name = "pallet-recovery" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5390,7 +5390,7 @@ dependencies = [ + [[package]] + name = "pallet-scheduler" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5406,7 +5406,7 @@ dependencies = [ + [[package]] + name = "pallet-session" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -5427,7 +5427,7 @@ dependencies = [ + [[package]] + name = "pallet-session-benchmarking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5443,7 +5443,7 @@ dependencies = [ + [[package]] + name = "pallet-society" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -5457,7 +5457,7 @@ dependencies = [ + [[package]] + name = "pallet-staking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", +@@ -5480,7 +5480,7 @@ dependencies = [ + [[package]] + name = "pallet-staking-reward-curve" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -5491,7 +5491,7 @@ dependencies = [ + [[package]] + name = "pallet-staking-reward-fn" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "sp-arithmetic", +@@ -5500,7 +5500,7 @@ dependencies = [ + [[package]] + name = "pallet-sudo" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -5514,7 +5514,7 @@ dependencies = [ + [[package]] + name = "pallet-timestamp" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5532,7 +5532,7 @@ dependencies = [ + [[package]] + name = "pallet-tips" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5551,7 +5551,7 @@ dependencies = [ + [[package]] + name = "pallet-transaction-payment" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-support", + "frame-system", +@@ -5567,7 +5567,7 @@ dependencies = [ + [[package]] + name = "pallet-transaction-payment-rpc" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "jsonrpsee", + "pallet-transaction-payment-rpc-runtime-api", +@@ -5582,7 +5582,7 @@ dependencies = [ + [[package]] + name = "pallet-transaction-payment-rpc-runtime-api" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "pallet-transaction-payment", + "parity-scale-codec", +@@ -5593,7 +5593,7 @@ dependencies = [ + [[package]] + name = "pallet-treasury" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5610,7 +5610,7 @@ dependencies = [ + [[package]] + name = "pallet-utility" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -5626,7 +5626,7 @@ dependencies = [ + [[package]] + name = "pallet-vesting" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-benchmarking", + "frame-support", +@@ -8100,7 +8100,7 @@ dependencies = [ + [[package]] + name = "remote-externalities" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "env_logger 0.9.0", + "jsonrpsee", +@@ -8442,7 +8442,7 @@ dependencies = [ + [[package]] + name = "sc-allocator" + version = "4.1.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "sp-core", +@@ -8453,7 +8453,7 @@ dependencies = [ + [[package]] + name = "sc-authority-discovery" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "futures-timer", +@@ -8465,7 +8465,6 @@ dependencies = [ + "prost-build", + "rand 0.7.3", + "sc-client-api", +- "sc-network", + "sc-network-common", + "sp-api", + "sp-authority-discovery", +@@ -8480,7 +8479,7 @@ dependencies = [ + [[package]] + name = "sc-basic-authorship" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "futures-timer", +@@ -8503,7 +8502,7 @@ dependencies = [ + [[package]] + name = "sc-block-builder" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "sc-client-api", +@@ -8519,13 +8518,13 @@ dependencies = [ + [[package]] + name = "sc-chain-spec" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "impl-trait-for-tuples", + "memmap2 0.5.0", + "parity-scale-codec", + "sc-chain-spec-derive", +- "sc-network", ++ "sc-network-common", + "sc-telemetry", + "serde", + "serde_json", +@@ -8536,7 +8535,7 @@ dependencies = [ + [[package]] + name = "sc-chain-spec-derive" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -8547,7 +8546,7 @@ dependencies = [ + [[package]] + name = "sc-cli" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "chrono", + "clap", +@@ -8586,7 +8585,7 @@ dependencies = [ + [[package]] + name = "sc-client-api" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "fnv", + "futures", +@@ -8614,7 +8613,7 @@ dependencies = [ + [[package]] + name = "sc-client-db" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "hash-db", + "kvdb", +@@ -8639,7 +8638,7 @@ dependencies = [ + [[package]] + name = "sc-consensus" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "futures", +@@ -8663,7 +8662,7 @@ dependencies = [ + [[package]] + name = "sc-consensus-babe" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "fork-tree", +@@ -8705,7 +8704,7 @@ dependencies = [ + [[package]] + name = "sc-consensus-babe-rpc" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "jsonrpsee", +@@ -8727,7 +8726,7 @@ dependencies = [ + [[package]] + name = "sc-consensus-epochs" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "fork-tree", + "parity-scale-codec", +@@ -8740,7 +8739,7 @@ dependencies = [ + [[package]] + name = "sc-consensus-slots" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "futures", +@@ -8765,7 +8764,7 @@ dependencies = [ + [[package]] + name = "sc-executor" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "lazy_static", + "lru 0.7.8", +@@ -8792,7 +8791,7 @@ dependencies = [ + [[package]] + name = "sc-executor-common" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "environmental", + "parity-scale-codec", +@@ -8808,7 +8807,7 @@ dependencies = [ + [[package]] + name = "sc-executor-wasmi" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "parity-scale-codec", +@@ -8823,7 +8822,7 @@ dependencies = [ + [[package]] + name = "sc-executor-wasmtime" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "cfg-if 1.0.0", + "libc", +@@ -8843,7 +8842,7 @@ dependencies = [ + [[package]] + name = "sc-finality-grandpa" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ahash", + "async-trait", +@@ -8884,7 +8883,7 @@ dependencies = [ + [[package]] + name = "sc-finality-grandpa-rpc" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "finality-grandpa", + "futures", +@@ -8905,7 +8904,7 @@ dependencies = [ + [[package]] + name = "sc-informant" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ansi_term", + "futures", +@@ -8922,7 +8921,7 @@ dependencies = [ + [[package]] + name = "sc-keystore" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "hex", +@@ -8937,7 +8936,7 @@ dependencies = [ + [[package]] + name = "sc-network" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "asynchronous-codec", +@@ -8986,7 +8985,7 @@ dependencies = [ + [[package]] + name = "sc-network-common" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "bitflags", +@@ -8997,6 +8996,7 @@ dependencies = [ + "prost-build", + "sc-consensus", + "sc-peerset", ++ "serde", + "smallvec", + "sp-consensus", + "sp-finality-grandpa", +@@ -9007,7 +9007,7 @@ dependencies = [ + [[package]] + name = "sc-network-gossip" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ahash", + "futures", +@@ -9015,8 +9015,8 @@ dependencies = [ + "libp2p", + "log", + "lru 0.7.8", +- "sc-network", + "sc-network-common", ++ "sc-peerset", + "sp-runtime", + "substrate-prometheus-endpoint", + "tracing", +@@ -9025,7 +9025,7 @@ dependencies = [ + [[package]] + name = "sc-network-light" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "hex", +@@ -9046,7 +9046,7 @@ dependencies = [ + [[package]] + name = "sc-network-sync" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "fork-tree", + "futures", +@@ -9074,7 +9074,7 @@ dependencies = [ + [[package]] + name = "sc-offchain" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "bytes", + "fnv", +@@ -9083,14 +9083,15 @@ dependencies = [ + "hex", + "hyper", + "hyper-rustls", ++ "libp2p", + "num_cpus", + "once_cell", + "parity-scale-codec", + "parking_lot 0.12.0", + "rand 0.7.3", + "sc-client-api", +- "sc-network", + "sc-network-common", ++ "sc-peerset", + "sc-utils", + "sp-api", + "sp-core", +@@ -9103,7 +9104,7 @@ dependencies = [ + [[package]] + name = "sc-peerset" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "libp2p", +@@ -9116,7 +9117,7 @@ dependencies = [ + [[package]] + name = "sc-proposer-metrics" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "substrate-prometheus-endpoint", +@@ -9125,7 +9126,7 @@ dependencies = [ + [[package]] + name = "sc-rpc" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "hash-db", +@@ -9155,7 +9156,7 @@ dependencies = [ + [[package]] + name = "sc-rpc-api" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "jsonrpsee", +@@ -9178,7 +9179,7 @@ dependencies = [ + [[package]] + name = "sc-rpc-server" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "jsonrpsee", +@@ -9191,7 +9192,7 @@ dependencies = [ + [[package]] + name = "sc-service" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "directories", +@@ -9258,7 +9259,7 @@ dependencies = [ + [[package]] + name = "sc-state-db" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "parity-scale-codec", +@@ -9272,7 +9273,7 @@ dependencies = [ + [[package]] + name = "sc-sync-state-rpc" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "jsonrpsee", + "parity-scale-codec", +@@ -9291,7 +9292,7 @@ dependencies = [ + [[package]] + name = "sc-sysinfo" + version = "6.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "libc", +@@ -9310,7 +9311,7 @@ dependencies = [ + [[package]] + name = "sc-telemetry" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "chrono", + "futures", +@@ -9328,7 +9329,7 @@ dependencies = [ + [[package]] + name = "sc-tracing" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ansi_term", + "atty", +@@ -9359,7 +9360,7 @@ dependencies = [ + [[package]] + name = "sc-tracing-proc-macro" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -9370,7 +9371,7 @@ dependencies = [ + [[package]] + name = "sc-transaction-pool" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "futures-timer", +@@ -9396,7 +9397,7 @@ dependencies = [ + [[package]] + name = "sc-transaction-pool-api" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "log", +@@ -9409,7 +9410,7 @@ dependencies = [ + [[package]] + name = "sc-utils" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "futures-timer", +@@ -9894,7 +9895,7 @@ dependencies = [ + [[package]] + name = "sp-api" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "hash-db", + "log", +@@ -9912,7 +9913,7 @@ dependencies = [ + [[package]] + name = "sp-api-proc-macro" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "blake2", + "proc-macro-crate", +@@ -9924,7 +9925,7 @@ dependencies = [ + [[package]] + name = "sp-application-crypto" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -9937,7 +9938,7 @@ dependencies = [ + [[package]] + name = "sp-arithmetic" + version = "5.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "integer-sqrt", + "num-traits", +@@ -9952,7 +9953,7 @@ dependencies = [ + [[package]] + name = "sp-authority-discovery" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -9965,7 +9966,7 @@ dependencies = [ + [[package]] + name = "sp-authorship" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "parity-scale-codec", +@@ -9977,7 +9978,7 @@ dependencies = [ + [[package]] + name = "sp-block-builder" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "sp-api", +@@ -9989,7 +9990,7 @@ dependencies = [ + [[package]] + name = "sp-blockchain" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "log", +@@ -10007,7 +10008,7 @@ dependencies = [ + [[package]] + name = "sp-consensus" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "futures", +@@ -10026,7 +10027,7 @@ dependencies = [ + [[package]] + name = "sp-consensus-babe" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "merlin", +@@ -10049,7 +10050,7 @@ dependencies = [ + [[package]] + name = "sp-consensus-slots" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -10063,7 +10064,7 @@ dependencies = [ + [[package]] + name = "sp-consensus-vrf" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -10076,7 +10077,7 @@ dependencies = [ + [[package]] + name = "sp-core" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "base58", + "bitflags", +@@ -10122,7 +10123,7 @@ dependencies = [ + [[package]] + name = "sp-core-hashing" + version = "4.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "blake2", + "byteorder", +@@ -10136,7 +10137,7 @@ dependencies = [ + [[package]] + name = "sp-core-hashing-proc-macro" + version = "5.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro2", + "quote", +@@ -10147,7 +10148,7 @@ dependencies = [ + [[package]] + name = "sp-database" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "kvdb", + "parking_lot 0.12.0", +@@ -10156,7 +10157,7 @@ dependencies = [ + [[package]] + name = "sp-debug-derive" + version = "4.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro2", + "quote", +@@ -10166,7 +10167,7 @@ dependencies = [ + [[package]] + name = "sp-externalities" + version = "0.12.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "environmental", + "parity-scale-codec", +@@ -10177,7 +10178,7 @@ dependencies = [ + [[package]] + name = "sp-finality-grandpa" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "finality-grandpa", + "log", +@@ -10195,7 +10196,7 @@ dependencies = [ + [[package]] + name = "sp-inherents" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "impl-trait-for-tuples", +@@ -10209,7 +10210,7 @@ dependencies = [ + [[package]] + name = "sp-io" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "bytes", + "futures", +@@ -10235,7 +10236,7 @@ dependencies = [ + [[package]] + name = "sp-keyring" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "lazy_static", + "sp-core", +@@ -10246,7 +10247,7 @@ dependencies = [ + [[package]] + name = "sp-keystore" + version = "0.12.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "futures", +@@ -10263,7 +10264,7 @@ dependencies = [ + [[package]] + name = "sp-maybe-compressed-blob" + version = "4.1.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "thiserror", + "zstd", +@@ -10272,7 +10273,7 @@ dependencies = [ + [[package]] + name = "sp-mmr-primitives" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "parity-scale-codec", +@@ -10287,7 +10288,7 @@ dependencies = [ + [[package]] + name = "sp-npos-elections" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -10301,7 +10302,7 @@ dependencies = [ + [[package]] + name = "sp-offchain" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "sp-api", + "sp-core", +@@ -10311,7 +10312,7 @@ dependencies = [ + [[package]] + name = "sp-panic-handler" + version = "4.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "backtrace", + "lazy_static", +@@ -10321,7 +10322,7 @@ dependencies = [ + [[package]] + name = "sp-rpc" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "rustc-hash", + "serde", +@@ -10331,7 +10332,7 @@ dependencies = [ + [[package]] + name = "sp-runtime" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "either", + "hash256-std-hasher", +@@ -10353,7 +10354,7 @@ dependencies = [ + [[package]] + name = "sp-runtime-interface" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "bytes", + "impl-trait-for-tuples", +@@ -10371,7 +10372,7 @@ dependencies = [ + [[package]] + name = "sp-runtime-interface-proc-macro" + version = "5.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "Inflector", + "proc-macro-crate", +@@ -10383,7 +10384,7 @@ dependencies = [ + [[package]] + name = "sp-sandbox" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "parity-scale-codec", +@@ -10397,7 +10398,7 @@ dependencies = [ + [[package]] + name = "sp-session" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -10411,7 +10412,7 @@ dependencies = [ + [[package]] + name = "sp-staking" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "scale-info", +@@ -10422,7 +10423,7 @@ dependencies = [ + [[package]] + name = "sp-state-machine" + version = "0.12.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "hash-db", + "log", +@@ -10444,12 +10445,12 @@ dependencies = [ + [[package]] + name = "sp-std" + version = "4.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + + [[package]] + name = "sp-storage" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "impl-serde", + "parity-scale-codec", +@@ -10462,7 +10463,7 @@ dependencies = [ + [[package]] + name = "sp-tasks" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "log", + "sp-core", +@@ -10475,7 +10476,7 @@ dependencies = [ + [[package]] + name = "sp-timestamp" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "futures-timer", +@@ -10491,7 +10492,7 @@ dependencies = [ + [[package]] + name = "sp-tracing" + version = "5.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "sp-std", +@@ -10503,7 +10504,7 @@ dependencies = [ + [[package]] + name = "sp-transaction-pool" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "sp-api", + "sp-runtime", +@@ -10512,7 +10513,7 @@ dependencies = [ + [[package]] + name = "sp-transaction-storage-proof" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "log", +@@ -10528,7 +10529,7 @@ dependencies = [ + [[package]] + name = "sp-trie" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ahash", + "hash-db", +@@ -10551,7 +10552,7 @@ dependencies = [ + [[package]] + name = "sp-version" + version = "5.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "impl-serde", + "parity-scale-codec", +@@ -10568,7 +10569,7 @@ dependencies = [ + [[package]] + name = "sp-version-proc-macro" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "parity-scale-codec", + "proc-macro2", +@@ -10579,7 +10580,7 @@ dependencies = [ + [[package]] + name = "sp-wasm-interface" + version = "6.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "impl-trait-for-tuples", + "log", +@@ -10753,7 +10754,7 @@ dependencies = [ + [[package]] + name = "substrate-build-script-utils" + version = "3.0.0" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "platforms", + ] +@@ -10761,7 +10762,7 @@ dependencies = [ + [[package]] + name = "substrate-frame-rpc-system" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "frame-system-rpc-runtime-api", + "futures", +@@ -10782,7 +10783,7 @@ dependencies = [ + [[package]] + name = "substrate-prometheus-endpoint" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures-util", + "hyper", +@@ -10795,7 +10796,7 @@ dependencies = [ + [[package]] + name = "substrate-state-trie-migration-rpc" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "jsonrpsee", + "log", +@@ -10816,7 +10817,7 @@ dependencies = [ + [[package]] + name = "substrate-test-client" + version = "2.0.1" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "async-trait", + "futures", +@@ -10842,7 +10843,7 @@ dependencies = [ + [[package]] + name = "substrate-test-utils" + version = "4.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "futures", + "substrate-test-utils-derive", +@@ -10852,7 +10853,7 @@ dependencies = [ + [[package]] + name = "substrate-test-utils-derive" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -10863,7 +10864,7 @@ dependencies = [ + [[package]] + name = "substrate-wasm-builder" + version = "5.0.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "ansi_term", + "build-helper", +@@ -11577,7 +11578,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + [[package]] + name = "try-runtime-cli" + version = "0.10.0-dev" +-source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" ++source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" + dependencies = [ + "clap", + "jsonrpsee", +diff --git a/node/network/bridge/src/network.rs b/node/network/bridge/src/network.rs +index 00a950f35c5..e80094588e3 100644 +--- a/node/network/bridge/src/network.rs ++++ b/node/network/bridge/src/network.rs +@@ -22,11 +22,12 @@ use futures::{prelude::*, stream::BoxStream}; + use parity_scale_codec::Encode; + + use sc_network::{ +- config::parse_addr, multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, +- NetworkService, OutboundFailure, RequestFailure, ++ multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, NetworkService, OutboundFailure, ++ RequestFailure, + }; +-use sc_network_common::service::{ +- NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest, ++use sc_network_common::{ ++ config::parse_addr, ++ service::{NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest}, + }; + + use polkadot_node_network_protocol::{ +diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs +index 21160bddaec..dd5177c6a38 100644 +--- a/node/overseer/src/lib.rs ++++ b/node/overseer/src/lib.rs +@@ -185,12 +185,13 @@ impl Handle { + + /// Inform the `Overseer` that that some block was imported. + pub async fn block_imported(&mut self, block: BlockInfo) { +- self.send_and_log_error(Event::BlockImported(block)).await ++ self.send_and_log_error(PalletEvent::BlockImported(block)).await + } + + /// Send some message to one of the `Subsystem`s. + pub async fn send_msg(&mut self, msg: impl Into, origin: &'static str) { +- self.send_and_log_error(Event::MsgToSubsystem { msg: msg.into(), origin }).await ++ self.send_and_log_error(PalletEvent::MsgToSubsystem { msg: msg.into(), origin }) ++ .await + } + + /// Send a message not providing an origin. +@@ -201,7 +202,7 @@ impl Handle { + + /// Inform the `Overseer` that some block was finalized. + pub async fn block_finalized(&mut self, block: BlockInfo) { +- self.send_and_log_error(Event::BlockFinalized(block)).await ++ self.send_and_log_error(PalletEvent::BlockFinalized(block)).await + } + + /// Wait for a block with the given hash to be in the active-leaves set. +@@ -215,7 +216,7 @@ impl Handle { + hash: Hash, + response_channel: oneshot::Sender>, + ) { +- self.send_and_log_error(Event::ExternalRequest(ExternalRequest::WaitForActivation { ++ self.send_and_log_error(PalletEvent::ExternalRequest(ExternalRequest::WaitForActivation { + hash, + response_channel, + })) +@@ -224,11 +225,11 @@ impl Handle { + + /// Tell `Overseer` to shutdown. + pub async fn stop(&mut self) { +- self.send_and_log_error(Event::Stop).await; ++ self.send_and_log_error(PalletEvent::Stop).await; + } + + /// Most basic operation, to stop a server. +- async fn send_and_log_error(&mut self, event: Event) { ++ async fn send_and_log_error(&mut self, event: PalletEvent) { + if self.0.send(event).await.is_err() { + gum::info!(target: LOG_TARGET, "Failed to send an event to Overseer"); + } +@@ -265,7 +266,7 @@ impl From> for BlockInfo { + + /// An event from outside the overseer scope, such + /// as the substrate framework or user interaction. +-pub enum Event { ++pub enum PalletEvent { + /// A new block was imported. + BlockImported(BlockInfo), + /// A block was finalized with i.e. babe or another consensus algorithm. +@@ -442,7 +443,7 @@ pub async fn forward_events>(client: Arc

, mut hand + /// ``` + #[orchestra( + gen=AllMessages, +- event=Event, ++ event=PalletEvent, + signal=OverseerSignal, + error=SubsystemError, + message_capacity=2048, +@@ -724,21 +725,21 @@ where + select! { + msg = self.events_rx.select_next_some() => { + match msg { +- Event::MsgToSubsystem { msg, origin } => { ++ PalletEvent::MsgToSubsystem { msg, origin } => { + self.route_message(msg.into(), origin).await?; + self.metrics.on_message_relayed(); + } +- Event::Stop => { ++ PalletEvent::Stop => { + self.stop().await; + return Ok(()); + } +- Event::BlockImported(block) => { ++ PalletEvent::BlockImported(block) => { + self.block_imported(block).await?; + } +- Event::BlockFinalized(block) => { ++ PalletEvent::BlockFinalized(block) => { + self.block_finalized(block).await?; + } +- Event::ExternalRequest(request) => { ++ PalletEvent::ExternalRequest(request) => { + self.handle_external_request(request); + } + } +diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs +index bac642cde58..b5d8d7e9449 100644 +--- a/runtime/common/src/assigned_slots.rs ++++ b/runtime/common/src/assigned_slots.rs +@@ -84,8 +84,9 @@ pub mod pallet { + #[pallet::config] + #[pallet::disable_frame_system_supertrait_check] + pub trait Config: configuration::Config + paras::Config + slots::Config { +- /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ /// The overarching PalletEvent type. ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// Origin for assigning slots. + type AssignSlotOrigin: EnsureOrigin<::Origin>; +@@ -152,7 +153,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// A para was assigned a permanent parachain slot + PermanentSlotAssigned(ParaId), + /// A para was assigned a temporary parachain slot +@@ -250,7 +251,7 @@ pub mod pallet { + ); + >::mutate(|count| count.saturating_inc()); + +- Self::deposit_event(Event::::PermanentSlotAssigned(id)); ++ Self::deposit_event(PalletEvent::::PermanentSlotAssigned(id)); + Ok(()) + } + +@@ -334,7 +335,7 @@ pub mod pallet { + TemporarySlots::::insert(id, temp_slot); + >::mutate(|count| count.saturating_inc()); + +- Self::deposit_event(Event::::TemporarySlotAssigned(id)); ++ Self::deposit_event(PalletEvent::::TemporarySlotAssigned(id)); + + Ok(()) + } +@@ -601,7 +602,7 @@ mod tests { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type PalletEvent = PalletEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = (); + type Version = (); +@@ -621,7 +622,7 @@ mod tests { + + impl pallet_balances::Config for Test { + type Balance = u64; +- type Event = Event; ++ type PalletEvent = PalletEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -640,7 +641,7 @@ mod tests { + } + + impl parachains_paras::Config for Test { +- type Event = Event; ++ type PalletEvent = PalletEvent; + type WeightInfo = parachains_paras::TestWeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = crate::mock::TestNextSessionRotation; +@@ -655,7 +656,7 @@ mod tests { + } + + impl slots::Config for Test { +- type Event = Event; ++ type PalletEvent = PalletEvent; + type Currency = Balances; + type Registrar = TestRegistrar; + type LeasePeriod = LeasePeriod; +@@ -673,7 +674,7 @@ mod tests { + } + + impl assigned_slots::Config for Test { +- type Event = Event; ++ type PalletEvent = PalletEvent; + type AssignSlotOrigin = EnsureRoot; + type Leaser = Slots; + type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; +diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs +index b937a26d567..7971eafc04d 100644 +--- a/runtime/common/src/auctions.rs ++++ b/runtime/common/src/auctions.rs +@@ -91,7 +91,8 @@ pub mod pallet { + #[pallet::config] + pub trait Config: frame_system::Config { + /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// The type representing the leasing system. + type Leaser: Leaser< +@@ -125,7 +126,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// An auction started. Provides its index and the block number where it will begin to + /// close and the first lease period of the quadruplet that is auctioned. + AuctionStarted { +@@ -402,7 +403,7 @@ impl Pallet { + let ending = frame_system::Pallet::::block_number().saturating_add(duration); + AuctionInfo::::put((lease_period_index, ending)); + +- Self::deposit_event(Event::::AuctionStarted { ++ Self::deposit_event(PalletEvent::::AuctionStarted { + auction_index: n, + lease_period: lease_period_index, + ending, +@@ -481,7 +482,7 @@ impl Pallet { + // ...and record the amount reserved. + ReservedAmounts::::insert(&bidder_para, reserve_required); + +- Self::deposit_event(Event::::Reserved { ++ Self::deposit_event(PalletEvent::::Reserved { + bidder: bidder.clone(), + extra_reserved: additional, + total_amount: reserve_required, +@@ -504,14 +505,14 @@ impl Pallet { + // It really should be reserved; there's not much we can do here on fail. + let err_amt = CurrencyOf::::unreserve(&who, amount); + debug_assert!(err_amt.is_zero()); +- Self::deposit_event(Event::::Unreserved { bidder: who, amount }); ++ Self::deposit_event(PalletEvent::::Unreserved { bidder: who, amount }); + } + } + } + + // Update the range winner. + Winning::::insert(offset, ¤t_winning); +- Self::deposit_event(Event::::BidAccepted { ++ Self::deposit_event(PalletEvent::::BidAccepted { + bidder, + para_id: para, + amount, +@@ -548,7 +549,7 @@ impl Pallet { + T::SampleLength::get().max(One::one()); + + let auction_counter = AuctionCounter::::get(); +- Self::deposit_event(Event::::WinningOffset { ++ Self::deposit_event(PalletEvent::::WinningOffset { + auction_index: auction_counter, + block_number: offset, + }); +@@ -602,7 +603,7 @@ impl Pallet { + // The leaser attempted to get a second lease on the same para ID, possibly griefing us. Let's + // keep the amount reserved and let governance sort it out. + if CurrencyOf::::reserve(&leaser, amount).is_ok() { +- Self::deposit_event(Event::::ReserveConfiscated { ++ Self::deposit_event(PalletEvent::::ReserveConfiscated { + para_id: para, + leaser, + amount, +@@ -613,7 +614,7 @@ impl Pallet { + } + } + +- Self::deposit_event(Event::::AuctionClosed { ++ Self::deposit_event(PalletEvent::::AuctionClosed { + auction_index: AuctionCounter::::get(), + }); + } +@@ -718,7 +719,7 @@ mod tests { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type PalletEvent = PalletEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -739,7 +740,7 @@ mod tests { + impl pallet_balances::Config for Test { + type Balance = u64; + type DustRemoval = (); +- type Event = Event; ++ type PalletEvent = PalletEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type WeightInfo = (); +@@ -867,7 +868,7 @@ mod tests { + } + + impl Config for Test { +- type Event = Event; ++ type PalletEvent = PalletEvent; + type Leaser = TestLeaser; + type Registrar = TestRegistrar; + type EndingPeriod = EndingPeriod; +@@ -1729,9 +1730,9 @@ mod benchmarking { + + use frame_benchmarking::{account, benchmarks, whitelisted_caller}; + +- fn assert_last_event(generic_event: ::Event) { ++ fn assert_last_event(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +@@ -1786,7 +1787,7 @@ mod benchmarking { + let origin = T::InitiateOrigin::successful_origin(); + }: _(origin, duration, lease_period_index) + verify { +- assert_last_event::(Event::::AuctionStarted { ++ assert_last_event::(PalletEvent::::AuctionStarted { + auction_index: AuctionCounter::::get(), + lease_period: LeasePeriodOf::::max_value(), + ending: T::BlockNumber::max_value(), +@@ -1884,7 +1885,7 @@ mod benchmarking { + Auctions::::on_initialize(duration + now + T::EndingPeriod::get()); + } verify { + let auction_index = AuctionCounter::::get(); +- assert_last_event::(Event::::AuctionClosed { auction_index }.into()); ++ assert_last_event::(PalletEvent::::AuctionClosed { auction_index }.into()); + assert!(Winning::::iter().count().is_zero()); + } + +diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs +index e2731f9336c..31578630808 100644 +--- a/runtime/common/src/claims.rs ++++ b/runtime/common/src/claims.rs +@@ -172,7 +172,8 @@ pub mod pallet { + #[pallet::config] + pub trait Config: frame_system::Config { + /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + type VestingSchedule: VestingSchedule; + #[pallet::constant] + type Prefix: Get<&'static [u8]>; +@@ -182,7 +183,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// Someone claimed some DOTs. + Claimed { who: T::AccountId, ethereum_address: EthereumAddress, amount: BalanceOf }, + } +@@ -581,7 +582,7 @@ impl Pallet { + Signing::::remove(&signer); + + // Let's deposit an event to let the outside world know this happened. +- Self::deposit_event(Event::::Claimed { ++ Self::deposit_event(PalletEvent::::Claimed { + who: dest, + ethereum_address: signer, + amount: balance_due, +@@ -760,7 +761,7 @@ mod tests { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -779,7 +780,7 @@ mod tests { + + impl pallet_balances::Config for Test { + type Balance = u64; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -794,7 +795,7 @@ mod tests { + } + + impl pallet_vesting::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BlockNumberToBalance = Identity; + type MinVestedTransfer = MinVestedTransfer; +@@ -810,7 +811,7 @@ mod tests { + } + + impl Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type VestingSchedule = Vesting; + type Prefix = Prefix; + type MoveClaimOrigin = frame_system::EnsureSignedBy; +diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs +index 4b2c29f5398..5366eb93cd1 100644 +--- a/runtime/common/src/crowdloan/mod.rs ++++ b/runtime/common/src/crowdloan/mod.rs +@@ -189,7 +189,8 @@ pub mod pallet { + + #[pallet::config] + pub trait Config: frame_system::Config { +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")` + #[pallet::constant] +@@ -253,7 +254,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// Create a new crowdloaning campaign. + Created { para_id: ParaId }, + /// Contributed to a crowd sale. +@@ -351,7 +352,7 @@ pub mod pallet { + fund.raised, + ); + +- Self::deposit_event(Event::::HandleBidResult { para_id, result }); ++ Self::deposit_event(PalletEvent::::HandleBidResult { para_id, result }); + } + T::WeightInfo::on_initialize(new_raise_len) + } else { +@@ -437,7 +438,7 @@ pub mod pallet { + // Add a lock to the para so that the configuration cannot be changed. + T::Registrar::apply_lock(index); + +- Self::deposit_event(Event::::Created { para_id: index }); ++ Self::deposit_event(PalletEvent::::Created { para_id: index }); + Ok(()) + } + +@@ -494,7 +495,11 @@ pub mod pallet { + + Funds::::insert(index, &fund); + +- Self::deposit_event(Event::::Withdrew { who, fund_index: index, amount: balance }); ++ Self::deposit_event(PalletEvent::::Withdrew { ++ who, ++ fund_index: index, ++ amount: balance, ++ }); + Ok(()) + } + +@@ -536,11 +541,11 @@ pub mod pallet { + Funds::::insert(index, &fund); + + if all_refunded { +- Self::deposit_event(Event::::AllRefunded { para_id: index }); ++ Self::deposit_event(PalletEvent::::AllRefunded { para_id: index }); + // Refund for unused refund count. + Ok(Some(T::WeightInfo::refund(refund_count)).into()) + } else { +- Self::deposit_event(Event::::PartiallyRefunded { para_id: index }); ++ Self::deposit_event(PalletEvent::::PartiallyRefunded { para_id: index }); + // No weight to refund since we did not finish the loop. + Ok(().into()) + } +@@ -567,7 +572,7 @@ pub mod pallet { + + CurrencyOf::::unreserve(&fund.depositor, fund.deposit); + Funds::::remove(index); +- Self::deposit_event(Event::::Dissolved { para_id: index }); ++ Self::deposit_event(PalletEvent::::Dissolved { para_id: index }); + Ok(()) + } + +@@ -604,7 +609,7 @@ pub mod pallet { + }, + ); + +- Self::deposit_event(Event::::Edited { para_id: index }); ++ Self::deposit_event(PalletEvent::::Edited { para_id: index }); + Ok(()) + } + +@@ -622,7 +627,7 @@ pub mod pallet { + ensure!(balance > Zero::zero(), Error::::NoContributions); + + Self::contribution_put(fund.fund_index, &who, &balance, &memo); +- Self::deposit_event(Event::::MemoUpdated { who, para_id: index, memo }); ++ Self::deposit_event(PalletEvent::::MemoUpdated { who, para_id: index, memo }); + Ok(()) + } + +@@ -636,7 +641,7 @@ pub mod pallet { + ensure!(!fund.raised.is_zero(), Error::::NoContributions); + ensure!(!NewRaise::::get().contains(&index), Error::::AlreadyInNewRaise); + NewRaise::::append(index); +- Self::deposit_event(Event::::AddedToNewRaise { para_id: index }); ++ Self::deposit_event(PalletEvent::::AddedToNewRaise { para_id: index }); + Ok(()) + } + +@@ -811,7 +816,11 @@ impl Pallet { + + Funds::::insert(index, &fund); + +- Self::deposit_event(Event::::Contributed { who, fund_index: index, amount: value }); ++ Self::deposit_event(PalletEvent::::Contributed { ++ who, ++ fund_index: index, ++ amount: value, ++ }); + Ok(()) + } + } +@@ -901,7 +910,7 @@ mod tests { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -920,7 +929,7 @@ mod tests { + + impl pallet_balances::Config for Test { + type Balance = u64; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -1072,7 +1081,7 @@ mod tests { + } + + impl Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SubmissionDeposit = SubmissionDeposit; + type MinContribution = MinContribution; + type PalletId = CrowdloanPalletId; +@@ -1129,8 +1138,8 @@ mod tests { + } + } + +- fn last_event() -> Event { +- System::events().pop().expect("Event expected").event ++ fn last_event() -> PalletEvent { ++ System::events().pop().expect("PalletEvent expected").event + } + + #[test] +@@ -1651,7 +1660,7 @@ mod tests { + assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); + assert_eq!( + last_event(), +- super::Event::::PartiallyRefunded { para_id: para }.into() ++ super::PalletEvent::::PartiallyRefunded { para_id: para }.into() + ); + + // Funds still left over +@@ -1659,7 +1668,10 @@ mod tests { + + // Call again + assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); +- assert_eq!(last_event(), super::Event::::AllRefunded { para_id: para }.into()); ++ assert_eq!( ++ last_event(), ++ super::PalletEvent::::AllRefunded { para_id: para }.into() ++ ); + + // Funds are returned + assert_eq!(Balances::free_balance(account_id), 0); +@@ -1906,9 +1918,9 @@ mod benchmarking { + + use frame_benchmarking::{account, benchmarks, whitelisted_caller}; + +- fn assert_last_event(generic_event: ::Event) { ++ fn assert_last_event(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +@@ -1987,7 +1999,7 @@ mod benchmarking { + + }: _(RawOrigin::Signed(caller), para_id, cap, first_period, last_period, end, Some(verifier)) + verify { +- assert_last_event::(Event::::Created { para_id }.into()) ++ assert_last_event::(PalletEvent::::Created { para_id }.into()) + } + + // Contribute has two arms: PreEnding and Ending, but both are equal complexity. +@@ -2008,7 +2020,7 @@ mod benchmarking { + verify { + // NewRaise is appended to, so we don't need to fill it up for worst case scenario. + assert!(!NewRaise::::get().is_empty()); +- assert_last_event::(Event::::Contributed { who: caller, fund_index, amount: contribution }.into()); ++ assert_last_event::(PalletEvent::::Contributed { who: caller, fund_index, amount: contribution }.into()); + } + + withdraw { +@@ -2021,7 +2033,7 @@ mod benchmarking { + frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); + }: _(RawOrigin::Signed(caller), contributor.clone(), fund_index) + verify { +- assert_last_event::(Event::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); ++ assert_last_event::(PalletEvent::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); + } + + // Worst case: Refund removes `RemoveKeysLimit` keys, and is fully refunded. +@@ -2041,7 +2053,7 @@ mod benchmarking { + frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); + }: _(RawOrigin::Signed(caller), fund_index) + verify { +- assert_last_event::(Event::::AllRefunded { para_id: fund_index }.into()); ++ assert_last_event::(PalletEvent::::AllRefunded { para_id: fund_index }.into()); + } + + dissolve { +@@ -2052,7 +2064,7 @@ mod benchmarking { + frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); + }: _(RawOrigin::Signed(caller.clone()), fund_index) + verify { +- assert_last_event::(Event::::Dissolved { para_id: fund_index }.into()); ++ assert_last_event::(PalletEvent::::Dissolved { para_id: fund_index }.into()); + } + + edit { +@@ -2081,7 +2093,7 @@ mod benchmarking { + // Doesn't matter what we edit to, so use the same values. + }: _(RawOrigin::Root, para_id, cap, first_period, last_period, end, Some(verifier)) + verify { +- assert_last_event::(Event::::Edited { para_id }.into()) ++ assert_last_event::(PalletEvent::::Edited { para_id }.into()) + } + + add_memo { +@@ -2111,7 +2123,7 @@ mod benchmarking { + }: _(RawOrigin::Signed(caller), fund_index) + verify { + assert!(!NewRaise::::get().is_empty()); +- assert_last_event::(Event::::AddedToNewRaise { para_id: fund_index }.into()) ++ assert_last_event::(PalletEvent::::AddedToNewRaise { para_id: fund_index }.into()) + } + + // Worst case scenario: N funds are all in the `NewRaise` list, we are +@@ -2150,7 +2162,7 @@ mod benchmarking { + Crowdloan::::on_initialize(end_block); + } verify { + assert_eq!(EndingsCount::::get(), old_endings_count + 1); +- assert_last_event::(Event::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); ++ assert_last_event::(PalletEvent::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); + } + + impl_benchmark_test_suite!( +diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs +index bce847c82a8..c528f191511 100644 +--- a/runtime/common/src/impls.rs ++++ b/runtime/common/src/impls.rs +@@ -113,7 +113,7 @@ mod tests { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockLength = BlockLength; + type BlockWeights = BlockWeights; +@@ -131,7 +131,7 @@ mod tests { + + impl pallet_balances::Config for Test { + type Balance = u64; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = (); + type AccountStore = System; +@@ -150,7 +150,7 @@ mod tests { + type Currency = pallet_balances::Pallet; + type ApproveOrigin = frame_system::EnsureRoot; + type RejectOrigin = frame_system::EnsureRoot; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnSlash = (); + type ProposalBond = (); + type ProposalBondMinimum = (); +diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs +index 76dc1f4c55b..89fbe240964 100644 +--- a/runtime/common/src/integration_tests.rs ++++ b/runtime/common/src/integration_tests.rs +@@ -120,7 +120,7 @@ impl frame_system::Config for Test { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -178,7 +178,7 @@ parameter_types! { + impl pallet_balances::Config for Test { + type MaxLocks = (); + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -200,7 +200,7 @@ parameter_types! { + } + + impl paras::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = paras::TestWeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = crate::mock::TestNextSessionRotation; +@@ -212,7 +212,7 @@ parameter_types! { + } + + impl paras_registrar::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnSwap = (Crowdloan, Slots); + type ParaDeposit = ParaDeposit; + type DataDepositPerByte = DataDepositPerByte; +@@ -227,7 +227,7 @@ parameter_types! { + } + + impl auctions::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Leaser = Slots; + type Registrar = Registrar; + type EndingPeriod = EndingPeriod; +@@ -243,7 +243,7 @@ parameter_types! { + } + + impl slots::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Registrar = Registrar; + type LeasePeriod = LeasePeriod; +@@ -261,7 +261,7 @@ parameter_types! { + } + + impl crowdloan::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PalletId = CrowdloanId; + type SubmissionDeposit = SubmissionDeposit; + type MinContribution = MinContribution; +@@ -342,11 +342,11 @@ fn run_to_session(n: u32) { + run_to_block(block_number); + } + +-fn last_event() -> Event { +- System::events().pop().expect("Event expected").event ++fn last_event() -> PalletEvent { ++ System::events().pop().expect("PalletEvent expected").event + } + +-fn contains_event(event: Event) -> bool { ++fn contains_event(event: PalletEvent) -> bool { + System::events().iter().any(|x| x.event == event) + } + +@@ -432,7 +432,7 @@ fn basic_end_to_end_works() { + // Auction ends at block 110 + offset + run_to_block(109 + offset); + assert!(contains_event( +- crowdloan::Event::::HandleBidResult { ++ crowdloan::PalletEvent::::HandleBidResult { + para_id: ParaId::from(para_2), + result: Ok(()) + } +@@ -441,7 +441,7 @@ fn basic_end_to_end_works() { + run_to_block(110 + offset); + assert_eq!( + last_event(), +- auctions::Event::::AuctionClosed { auction_index: 1 }.into() ++ auctions::PalletEvent::::AuctionClosed { auction_index: 1 }.into() + ); + + // Paras should have won slots +diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs +index 7631914b999..183c307da31 100644 +--- a/runtime/common/src/paras_registrar.rs ++++ b/runtime/common/src/paras_registrar.rs +@@ -96,7 +96,8 @@ pub mod pallet { + #[pallet::disable_frame_system_supertrait_check] + pub trait Config: configuration::Config + paras::Config { + /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// The aggregated origin type must support the `parachains` origin. We require that we can + /// infallibly convert between this origin and the system origin, but in reality, they're the +@@ -126,7 +127,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + Registered { para_id: ParaId, manager: T::AccountId }, + Deregistered { para_id: ParaId }, + Reserved { para_id: ParaId, who: T::AccountId }, +@@ -492,7 +493,7 @@ impl Pallet { + let info = ParaInfo { manager: who.clone(), deposit, locked: false }; + + Paras::::insert(id, info); +- Self::deposit_event(Event::::Reserved { para_id: id, who }); ++ Self::deposit_event(PalletEvent::::Reserved { para_id: id, who }); + Ok(()) + } + +@@ -530,7 +531,7 @@ impl Pallet { + // We check above that para has no lifecycle, so this should not fail. + let res = runtime_parachains::schedule_para_initialize::(id, genesis); + debug_assert!(res.is_ok()); +- Self::deposit_event(Event::::Registered { para_id: id, manager: who }); ++ Self::deposit_event(PalletEvent::::Registered { para_id: id, manager: who }); + Ok(()) + } + +@@ -549,7 +550,7 @@ impl Pallet { + } + + PendingSwap::::remove(id); +- Self::deposit_event(Event::::Deregistered { para_id: id }); ++ Self::deposit_event(PalletEvent::::Deregistered { para_id: id }); + Ok(()) + } + +@@ -657,7 +658,7 @@ mod tests { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = (); + type BlockWeights = BlockWeights; +@@ -680,7 +681,7 @@ mod tests { + impl pallet_balances::Config for Test { + type Balance = u128; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = (); +@@ -698,7 +699,7 @@ mod tests { + } + + impl paras::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = paras::TestWeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = crate::mock::TestNextSessionRotation; +@@ -715,7 +716,7 @@ mod tests { + } + + impl Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type OnSwap = MockSwap; +@@ -1226,9 +1227,9 @@ mod benchmarking { + + use frame_benchmarking::{account, benchmarks, whitelisted_caller}; + +- fn assert_last_event(generic_event: ::Event) { ++ fn assert_last_event(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +@@ -1268,7 +1269,7 @@ mod benchmarking { + T::Currency::make_free_balance_be(&caller, BalanceOf::::max_value()); + }: _(RawOrigin::Signed(caller.clone())) + verify { +- assert_last_event::(Event::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); ++ assert_last_event::(PalletEvent::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); + assert!(Paras::::get(LOWEST_PUBLIC_ID).is_some()); + assert_eq!(paras::Pallet::::lifecycle(LOWEST_PUBLIC_ID), None); + } +@@ -1282,7 +1283,7 @@ mod benchmarking { + assert_ok!(Registrar::::reserve(RawOrigin::Signed(caller.clone()).into())); + }: _(RawOrigin::Signed(caller.clone()), para, genesis_head, validation_code) + verify { +- assert_last_event::(Event::::Registered{ para_id: para, manager: caller }.into()); ++ assert_last_event::(PalletEvent::::Registered{ para_id: para, manager: caller }.into()); + assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); + next_scheduled_session::(); + assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); +@@ -1296,7 +1297,7 @@ mod benchmarking { + let validation_code = Registrar::::worst_validation_code(); + }: _(RawOrigin::Root, manager.clone(), deposit, para, genesis_head, validation_code) + verify { +- assert_last_event::(Event::::Registered { para_id: para, manager }.into()); ++ assert_last_event::(PalletEvent::::Registered { para_id: para, manager }.into()); + assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); + next_scheduled_session::(); + assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); +@@ -1308,7 +1309,7 @@ mod benchmarking { + let caller: T::AccountId = whitelisted_caller(); + }: _(RawOrigin::Signed(caller), para) + verify { +- assert_last_event::(Event::::Deregistered { para_id: para }.into()); ++ assert_last_event::(PalletEvent::::Deregistered { para_id: para }.into()); + } + + swap { +diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs +index 3900f6edb31..c8cee404633 100644 +--- a/runtime/common/src/purchase.rs ++++ b/runtime/common/src/purchase.rs +@@ -98,7 +98,8 @@ pub mod pallet { + #[pallet::config] + pub trait Config: frame_system::Config { + /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// Balances Pallet + type Currency: Currency; +@@ -131,7 +132,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// A [new] account was created. + AccountCreated { who: T::AccountId }, + /// Someone's account validity was updated. +@@ -222,7 +223,7 @@ pub mod pallet { + vat: Permill::zero(), + }; + Accounts::::insert(&who, status); +- Self::deposit_event(Event::::AccountCreated { who }); ++ Self::deposit_event(PalletEvent::::AccountCreated { who }); + Ok(()) + } + +@@ -251,7 +252,7 @@ pub mod pallet { + Ok(()) + }, + )?; +- Self::deposit_event(Event::::ValidityUpdated { who, validity }); ++ Self::deposit_event(PalletEvent::::ValidityUpdated { who, validity }); + Ok(()) + } + +@@ -283,7 +284,7 @@ pub mod pallet { + Ok(()) + }, + )?; +- Self::deposit_event(Event::::BalanceUpdated { ++ Self::deposit_event(PalletEvent::::BalanceUpdated { + who, + free: free_balance, + locked: locked_balance, +@@ -350,7 +351,7 @@ pub mod pallet { + + // Setting the user account to `Completed` ends the purchase process for this user. + status.validity = AccountValidity::Completed; +- Self::deposit_event(Event::::PaymentComplete { ++ Self::deposit_event(PalletEvent::::PaymentComplete { + who: who.clone(), + free: status.free_balance, + locked: status.locked_balance, +@@ -371,7 +372,7 @@ pub mod pallet { + T::ConfigurationOrigin::ensure_origin(origin)?; + // Possibly this is worse than having the caller account be the payment account? + PaymentAccount::::put(who.clone()); +- Self::deposit_event(Event::::PaymentAccountSet { who }); ++ Self::deposit_event(PalletEvent::::PaymentAccountSet { who }); + Ok(()) + } + +@@ -387,7 +388,7 @@ pub mod pallet { + ); + // Possibly this is worse than having the caller account be the payment account? + Statement::::set(statement); +- Self::deposit_event(Event::::StatementUpdated); ++ Self::deposit_event(PalletEvent::::StatementUpdated); + Ok(()) + } + +@@ -406,7 +407,9 @@ pub mod pallet { + ); + // Possibly this is worse than having the caller account be the payment account? + UnlockBlock::::set(unlock_block); +- Self::deposit_event(Event::::UnlockBlockUpdated { block_number: unlock_block }); ++ Self::deposit_event(PalletEvent::::UnlockBlockUpdated { ++ block_number: unlock_block, ++ }); + Ok(()) + } + } +@@ -519,7 +522,7 @@ mod tests { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -538,7 +541,7 @@ mod tests { + + impl pallet_balances::Config for Test { + type Balance = u64; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -553,7 +556,7 @@ mod tests { + } + + impl pallet_vesting::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BlockNumberToBalance = Identity; + type MinVestedTransfer = MinVestedTransfer; +@@ -574,7 +577,7 @@ mod tests { + } + + impl Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type VestingSchedule = Vesting; + type ValidityOrigin = frame_system::EnsureSignedBy; +diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs +index 76054ac989f..2a52c8631cd 100644 +--- a/runtime/common/src/slots/mod.rs ++++ b/runtime/common/src/slots/mod.rs +@@ -74,7 +74,8 @@ pub mod pallet { + #[pallet::config] + pub trait Config: frame_system::Config { + /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// The currency type used for bidding. + type Currency: ReservableCurrency; +@@ -120,7 +121,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// A new `[lease_period]` is beginning. + NewLeasePeriod { lease_period: LeasePeriodOf }, + /// A para has won the right to a continuous set of lease periods as a parachain. +@@ -227,7 +228,7 @@ impl Pallet { + /// We need to on-board and off-board parachains as needed. We should also handle reducing/ + /// returning deposits. + fn manage_lease_period_start(lease_period_index: LeasePeriodOf) -> Weight { +- Self::deposit_event(Event::::NewLeasePeriod { lease_period: lease_period_index }); ++ Self::deposit_event(PalletEvent::::NewLeasePeriod { lease_period: lease_period_index }); + + let old_parachains = T::Registrar::parachains(); + +@@ -407,7 +408,7 @@ impl Leaser for Pallet { + let _ = T::Registrar::make_parachain(para); + } + +- Self::deposit_event(Event::::Leased { ++ Self::deposit_event(PalletEvent::::Leased { + para_id: para, + leaser: leaser.clone(), + period_begin, +@@ -538,7 +539,7 @@ mod tests { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = (); + type Version = (); +@@ -558,7 +559,7 @@ mod tests { + + impl pallet_balances::Config for Test { + type Balance = u64; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -575,7 +576,7 @@ mod tests { + } + + impl Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Registrar = TestRegistrar; + type LeasePeriod = LeasePeriod; +@@ -988,9 +989,9 @@ mod benchmarking { + + use crate::slots::Pallet as Slots; + +- fn assert_last_event(generic_event: ::Event) { ++ fn assert_last_event(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +@@ -1027,7 +1028,7 @@ mod benchmarking { + let origin = T::ForceOrigin::successful_origin(); + }: _(origin, para, leaser.clone(), amount, period_begin, period_count) + verify { +- assert_last_event::(Event::::Leased { ++ assert_last_event::(PalletEvent::::Leased { + para_id: para, + leaser, period_begin, + period_count, +diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs +index a87ddf6ec1f..b36380b4b3f 100644 +--- a/runtime/kusama/src/governance/old.rs ++++ b/runtime/kusama/src/governance/old.rs +@@ -33,7 +33,7 @@ parameter_types! { + + impl pallet_democracy::Config for Runtime { + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type EnactmentPeriod = EnactmentPeriod; + type VoteLockingPeriod = EnactmentPeriod; +@@ -94,7 +94,7 @@ pub type CouncilCollective = pallet_collective::Instance1; + impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MotionDuration = CouncilMotionDuration; + type MaxProposals = CouncilMaxProposals; + type MaxMembers = CouncilMaxMembers; +@@ -121,7 +121,7 @@ parameter_types! { + const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); + + impl pallet_elections_phragmen::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type ChangeMembers = Council; + type InitializeMembers = Council; +@@ -150,7 +150,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; + impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MotionDuration = TechnicalMotionDuration; + type MaxProposals = TechnicalMaxProposals; + type MaxMembers = TechnicalMaxMembers; +@@ -159,7 +159,7 @@ impl pallet_collective::Config for Runtime { + } + + impl pallet_membership::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type AddOrigin = MoreThanHalfCouncil; + type RemoveOrigin = MoreThanHalfCouncil; + type SwapOrigin = MoreThanHalfCouncil; +diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs +index 12b9554c5cf..5e2fa13025c 100644 +--- a/runtime/kusama/src/lib.rs ++++ b/runtime/kusama/src/lib.rs +@@ -175,7 +175,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = AccountIdLookup; + type Header = generic::Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = RocksDbWeight; + type Version = Version; +@@ -225,7 +225,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { + } + + impl pallet_scheduler::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type PalletsOrigin = OriginCaller; + type Call = Call; +@@ -246,7 +246,7 @@ parameter_types! { + + impl pallet_preimage::Config for Runtime { + type WeightInfo = weights::pallet_preimage::WeightInfo; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type MaxSize = PreimageMaxSize; +@@ -302,7 +302,7 @@ impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_indices::WeightInfo; + } + +@@ -315,7 +315,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = MaxLocks; +@@ -332,7 +332,7 @@ parameter_types! { + } + + impl pallet_transaction_payment::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = WeightToFee; +@@ -378,7 +378,7 @@ impl_opaque_keys! { + } + + impl pallet_session::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorId = AccountId; + type ValidatorIdOf = pallet_staking::StashOf; + type ShouldEndSession = Babe; +@@ -468,7 +468,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { + } + + impl pallet_election_provider_multi_phase::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type EstimateCallFee = TransactionPayment; + type UnsignedPhase = UnsignedPhase; +@@ -511,7 +511,7 @@ parameter_types! { + } + + impl pallet_bags_list::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ScoreProvider = Staking; + type WeightInfo = weights::pallet_bags_list::WeightInfo; + type BagThresholds = BagThresholds; +@@ -607,7 +607,7 @@ impl pallet_staking::Config for Runtime { + type ElectionProvider = ElectionProviderMultiPhase; + type GenesisElectionProvider = onchain::UnboundedExecution; + type RewardRemainder = Treasury; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Slash = Treasury; + type Reward = (); + type SessionsPerEra = SessionsPerEra; +@@ -656,7 +656,7 @@ impl pallet_treasury::Config for Runtime { + type Currency = Balances; + type ApproveOrigin = ApproveOrigin; + type RejectOrigin = MoreThanHalfCouncil; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnSlash = Treasury; + type ProposalBond = ProposalBond; + type ProposalBondMinimum = ProposalBondMinimum; +@@ -691,7 +691,7 @@ impl pallet_bounties::Config for Runtime { + type BountyValueMinimum = BountyValueMinimum; + type ChildBountyManager = ChildBounties; + type DataDepositPerByte = DataDepositPerByte; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MaximumReasonLength = MaximumReasonLength; + type WeightInfo = weights::pallet_bounties::WeightInfo; + } +@@ -702,7 +702,7 @@ parameter_types! { + } + + impl pallet_child_bounties::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MaxActiveChildBountyCount = MaxActiveChildBountyCount; + type ChildBountyValueMinimum = ChildBountyValueMinimum; + type WeightInfo = weights::pallet_child_bounties::WeightInfo; +@@ -715,12 +715,12 @@ impl pallet_tips::Config for Runtime { + type TipCountdown = TipCountdown; + type TipFindersFee = TipFindersFee; + type TipReportDepositBase = TipReportDepositBase; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_tips::WeightInfo; + } + + impl pallet_offences::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type IdentificationTuple = pallet_session::historical::IdentificationTuple; + type OnOffenceHandler = Staking; + } +@@ -737,7 +737,7 @@ parameter_types! { + + impl pallet_im_online::Config for Runtime { + type AuthorityId = ImOnlineId; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorSet = Historical; + type NextSessionRotation = Babe; + type ReportUnresponsiveness = Offences; +@@ -749,7 +749,7 @@ impl pallet_im_online::Config for Runtime { + } + + impl pallet_grandpa::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + + type KeyOwnerProof = +@@ -838,7 +838,7 @@ parameter_types! { + } + + impl claims::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type VestingSchedule = Vesting; + type Prefix = Prefix; + type MoveClaimOrigin = +@@ -857,7 +857,7 @@ parameter_types! { + } + + impl pallet_identity::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BasicDeposit = BasicDeposit; + type FieldDeposit = FieldDeposit; +@@ -872,7 +872,7 @@ impl pallet_identity::Config for Runtime { + } + + impl pallet_utility::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type PalletsOrigin = OriginCaller; + type WeightInfo = weights::pallet_utility::WeightInfo; +@@ -887,7 +887,7 @@ parameter_types! { + } + + impl pallet_multisig::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type DepositBase = DepositBase; +@@ -904,7 +904,7 @@ parameter_types! { + } + + impl pallet_recovery::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); + type Call = Call; + type Currency = Balances; +@@ -927,7 +927,7 @@ parameter_types! { + } + + impl pallet_society::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Randomness = pallet_babe::RandomnessFromOneEpochAgo; + type CandidateDeposit = CandidateDeposit; +@@ -950,7 +950,7 @@ parameter_types! { + } + + impl pallet_vesting::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BlockNumberToBalance = ConvertInto; + type MinVestedTransfer = MinVestedTransfer; +@@ -1094,7 +1094,7 @@ impl InstanceFilter for ProxyType { + } + + impl pallet_proxy::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type ProxyType = ProxyType; +@@ -1121,7 +1121,7 @@ impl parachains_session_info::Config for Runtime { + } + + impl parachains_inclusion::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DisputesHandler = ParasDisputes; + type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; + } +@@ -1131,7 +1131,7 @@ parameter_types! { + } + + impl parachains_paras::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::runtime_parachains_paras::WeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = Babe; +@@ -1142,7 +1142,7 @@ parameter_types! { + } + + impl parachains_ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = + crate::parachains_ump::XcmSink, Runtime>; + type FirstMessageFactorPercent = FirstMessageFactorPercent; +@@ -1153,7 +1153,7 @@ impl parachains_ump::Config for Runtime { + impl parachains_dmp::Config for Runtime {} + + impl parachains_hrmp::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; +@@ -1172,7 +1172,7 @@ impl parachains_initializer::Config for Runtime { + } + + impl parachains_disputes::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type RewardValidators = (); + type PunishValidators = (); + type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; +@@ -1183,7 +1183,7 @@ parameter_types! { + } + + impl paras_registrar::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type OnSwap = (Crowdloan, Slots); +@@ -1198,7 +1198,7 @@ parameter_types! { + } + + impl slots::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Registrar = Registrar; + type LeasePeriod = LeasePeriod; +@@ -1217,7 +1217,7 @@ parameter_types! { + } + + impl crowdloan::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PalletId = CrowdloanId; + type SubmissionDeposit = SubmissionDeposit; + type MinContribution = MinContribution; +@@ -1242,7 +1242,7 @@ type AuctionInitiate = EitherOfDiverse< + >; + + impl auctions::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Leaser = Slots; + type Registrar = Registrar; + type EndingPeriod = EndingPeriod; +@@ -1264,7 +1264,7 @@ parameter_types! { + } + + impl pallet_gilt::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type CurrencyBalance = Balance; + type AdminOrigin = MoreThanHalfCouncil; +@@ -1287,7 +1287,7 @@ parameter_types! { + } + + impl pallet_nomination_pools::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_nomination_pools::WeightInfo; + type Currency = Balances; + type CurrencyBalance = Balance; +@@ -1621,7 +1621,7 @@ sp_api::impl_runtime_apis! { + fn candidate_events() -> Vec> { + parachains_runtime_api_impl::candidate_events::(|ev| { + match ev { +- Event::ParaInclusion(ev) => { ++ RuntimeEvent::ParaInclusion(ev) => { + Some(ev) + } + _ => None, +diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs +index 5bf45cfc89c..05c892d16bd 100644 +--- a/runtime/kusama/src/xcm_config.rs ++++ b/runtime/kusama/src/xcm_config.rs +@@ -17,8 +17,8 @@ + //! XCM configurations for the Kusama runtime. + + use super::{ +- parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, +- Runtime, WeightToFee, XcmPallet, ++ parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, ++ RuntimeEvent, WeightToFee, XcmPallet, + }; + use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; + use runtime_common::{xcm_sender, ToAuthor}; +@@ -169,7 +169,7 @@ pub type LocalOriginToLocation = ( + SignedToAccountId32, + ); + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + // We only allow the council to send messages. This is basically safe to enable for everyone + // (safe the possibility of someone spamming the parachain if they're willing to pay the KSM to + // send from the Relay-chain), but it's useless until we bring in XCM v3 which will make +diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs +index aec60a4eb0f..f9cdfe92010 100644 +--- a/runtime/parachains/src/disputes.rs ++++ b/runtime/parachains/src/disputes.rs +@@ -410,7 +410,8 @@ pub mod pallet { + + #[pallet::config] + pub trait Config: frame_system::Config + configuration::Config + session_info::Config { +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + type RewardValidators: RewardValidators; + type PunishValidators: PunishValidators; + +@@ -468,7 +469,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// A dispute has been initiated. \[candidate hash, dispute location\] + DisputeInitiated(CandidateHash, DisputeLocation), + /// A dispute has concluded for or against a candidate. +@@ -804,7 +805,7 @@ impl Pallet { + if dispute.concluded_at.is_none() && + dispute.start + config.dispute_conclusion_by_time_out_period < now + { +- Self::deposit_event(Event::DisputeTimedOut(candidate_hash)); ++ Self::deposit_event(PalletEvent::DisputeTimedOut(candidate_hash)); + + dispute.concluded_at = Some(now); + >::insert(session_index, candidate_hash, &dispute); +@@ -1195,7 +1196,7 @@ impl Pallet { + if fresh { + let is_local = >::contains_key(&session, &candidate_hash); + +- Self::deposit_event(Event::DisputeInitiated( ++ Self::deposit_event(PalletEvent::DisputeInitiated( + candidate_hash, + if is_local { DisputeLocation::Local } else { DisputeLocation::Remote }, + )); +@@ -1203,7 +1204,10 @@ impl Pallet { + + { + if summary.new_flags.contains(DisputeStateFlags::FOR_SUPERMAJORITY) { +- Self::deposit_event(Event::DisputeConcluded(candidate_hash, DisputeResult::Valid)); ++ Self::deposit_event(PalletEvent::DisputeConcluded( ++ candidate_hash, ++ DisputeResult::Valid, ++ )); + } + + // It is possible, although unexpected, for a dispute to conclude twice. +@@ -1211,7 +1215,7 @@ impl Pallet { + // A dispute cannot conclude more than once in each direction. + + if summary.new_flags.contains(DisputeStateFlags::AGAINST_SUPERMAJORITY) { +- Self::deposit_event(Event::DisputeConcluded( ++ Self::deposit_event(PalletEvent::DisputeConcluded( + candidate_hash, + DisputeResult::Invalid, + )); +@@ -1304,7 +1308,7 @@ impl Pallet { + // If we want to revert to block X in the current chain, we need to revert + // block X+1. + let revert = revert_to + One::one(); +- Self::deposit_event(Event::Revert(revert)); ++ Self::deposit_event(PalletEvent::Revert(revert)); + frame_system::Pallet::::deposit_log( + ConsensusLog::Revert(revert.saturated_into()).into(), + ); +diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs +index 2897ced22ed..937f45546a5 100644 +--- a/runtime/parachains/src/disputes/tests.rs ++++ b/runtime/parachains/src/disputes/tests.rs +@@ -1341,7 +1341,7 @@ fn test_revert_and_freeze() { + + assert_eq!(Frozen::::get(), Some(0)); + assert_eq!(System::digest().logs[0], ConsensusLog::Revert(1).into()); +- System::assert_has_event(Event::Revert(1).into()); ++ System::assert_has_event(PalletEvent::Revert(1).into()); + }) + } + +diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs +index d18c2b3fc49..d8fa87015a8 100644 +--- a/runtime/parachains/src/hrmp.rs ++++ b/runtime/parachains/src/hrmp.rs +@@ -239,7 +239,8 @@ pub mod pallet { + frame_system::Config + configuration::Config + paras::Config + dmp::Config + { + /// The outer event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + type Origin: From + + From<::Origin> +@@ -258,7 +259,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// Open HRMP channel requested. + /// `[sender, recipient, proposed_max_capacity, proposed_max_message_size]` + OpenChannelRequested(ParaId, ParaId, u32, u32), +@@ -472,7 +473,7 @@ pub mod pallet { + proposed_max_capacity, + proposed_max_message_size, + )?; +- Self::deposit_event(Event::OpenChannelRequested( ++ Self::deposit_event(PalletEvent::OpenChannelRequested( + origin, + recipient, + proposed_max_capacity, +@@ -488,7 +489,7 @@ pub mod pallet { + pub fn hrmp_accept_open_channel(origin: OriginFor, sender: ParaId) -> DispatchResult { + let origin = ensure_parachain(::Origin::from(origin))?; + Self::accept_open_channel(origin, sender)?; +- Self::deposit_event(Event::OpenChannelAccepted(sender, origin)); ++ Self::deposit_event(PalletEvent::OpenChannelAccepted(sender, origin)); + Ok(()) + } + +@@ -503,7 +504,7 @@ pub mod pallet { + ) -> DispatchResult { + let origin = ensure_parachain(::Origin::from(origin))?; + Self::close_channel(origin, channel_id.clone())?; +- Self::deposit_event(Event::ChannelClosed(origin, channel_id)); ++ Self::deposit_event(PalletEvent::ChannelClosed(origin, channel_id)); + Ok(()) + } + +@@ -574,7 +575,7 @@ pub mod pallet { + Error::::WrongWitness + ); + Self::cancel_open_request(origin, channel_id.clone())?; +- Self::deposit_event(Event::OpenChannelCanceled(origin, channel_id)); ++ Self::deposit_event(PalletEvent::OpenChannelCanceled(origin, channel_id)); + Ok(()) + } + } +diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs +index 3486e990fe5..321b9213561 100644 +--- a/runtime/parachains/src/hrmp/benchmarking.rs ++++ b/runtime/parachains/src/hrmp/benchmarking.rs +@@ -39,9 +39,9 @@ fn register_parachain_with_balance(id: ParaId, balance: BalanceOf) + T::Currency::make_free_balance_be(&id.into_account_truncating(), balance); + } + +-fn assert_last_event(generic_event: ::Event) { ++fn assert_last_event(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +@@ -156,7 +156,7 @@ frame_benchmarking::benchmarks! { + }: _(sender_origin, recipient_id, capacity, message_size) + verify { + assert_last_event::( +- Event::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() ++ PalletEvent::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() + ); + } + +@@ -165,7 +165,7 @@ frame_benchmarking::benchmarks! { + establish_para_connection::(1, 2, ParachainSetupStep::Requested); + }: _(recipient_origin, sender) + verify { +- assert_last_event::(Event::::OpenChannelAccepted(sender, recipient).into()); ++ assert_last_event::(PalletEvent::::OpenChannelAccepted(sender, recipient).into()); + } + + hrmp_close_channel { +@@ -174,7 +174,7 @@ frame_benchmarking::benchmarks! { + let channel_id = HrmpChannelId { sender, recipient }; + }: _(sender_origin, channel_id.clone()) + verify { +- assert_last_event::(Event::::ChannelClosed(sender, channel_id).into()); ++ assert_last_event::(PalletEvent::::ChannelClosed(sender, channel_id).into()); + } + + // NOTE: a single parachain should have the maximum number of allowed ingress and egress +diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs +index 463c5eb3938..18355ad73f7 100644 +--- a/runtime/parachains/src/hrmp/tests.rs ++++ b/runtime/parachains/src/hrmp/tests.rs +@@ -16,8 +16,8 @@ + + use super::*; + use crate::mock::{ +- new_test_ext, Configuration, Event as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, +- System, Test, ++ new_test_ext, Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared, ++ RuntimeEvent as MockEvent, System, Test, + }; + use frame_support::{assert_noop, assert_ok, traits::Currency as _}; + use primitives::v2::BlockNumber; +@@ -173,14 +173,12 @@ fn open_channel_works() { + Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap(); + Hrmp::assert_storage_consistency_exhaustive(); + assert!(System::events().iter().any(|record| record.event == +- MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8)))); ++ MockEvent::Hrmp(PalletEvent::OpenChannelRequested(para_a, para_b, 2, 8)))); + + Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap(); + Hrmp::assert_storage_consistency_exhaustive(); +- assert!(System::events() +- .iter() +- .any(|record| record.event == +- MockEvent::Hrmp(Event::OpenChannelAccepted(para_a, para_b)))); ++ assert!(System::events().iter().any(|record| record.event == ++ MockEvent::Hrmp(PalletEvent::OpenChannelAccepted(para_a, para_b)))); + + // Advance to a block 6, but without session change. That means that the channel has + // not been created yet. +@@ -223,7 +221,7 @@ fn close_channel_works() { + assert!(!channel_exists(para_a, para_b)); + Hrmp::assert_storage_consistency_exhaustive(); + assert!(System::events().iter().any(|record| record.event == +- MockEvent::Hrmp(Event::ChannelClosed(para_b, channel_id.clone())))); ++ MockEvent::Hrmp(PalletEvent::ChannelClosed(para_b, channel_id.clone())))); + }); + } + +diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs +index c936b54eecf..39ef43be165 100644 +--- a/runtime/parachains/src/inclusion/mod.rs ++++ b/runtime/parachains/src/inclusion/mod.rs +@@ -198,14 +198,15 @@ pub mod pallet { + + hrmp::Config + + configuration::Config + { +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + type DisputesHandler: disputes::DisputesHandler; + type RewardValidators: RewardValidators; + } + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// A candidate was backed. `[candidate, head_data]` + CandidateBacked(CandidateReceipt, HeadData, CoreIndex, GroupIndex), + /// A candidate was included. `[candidate, head_data]` +@@ -655,7 +656,7 @@ impl Pallet { + let availability_votes: BitVec = + bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()]; + +- Self::deposit_event(Event::::CandidateBacked( ++ Self::deposit_event(PalletEvent::::CandidateBacked( + candidate.candidate.to_plain(), + candidate.candidate.commitments.head_data.clone(), + core, +@@ -778,7 +779,7 @@ impl Pallet { + commitments.horizontal_messages, + ); + +- Self::deposit_event(Event::::CandidateIncluded( ++ Self::deposit_event(PalletEvent::::CandidateIncluded( + plain, + commitments.head_data.clone(), + core_index, +@@ -823,7 +824,7 @@ impl Pallet { + commitments_hash: commitments.hash(), + }; + +- Self::deposit_event(Event::::CandidateTimedOut( ++ Self::deposit_event(PalletEvent::::CandidateTimedOut( + candidate, + commitments.head_data, + pending.core, +diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs +index 064b9918ff5..cbb7e01dd31 100644 +--- a/runtime/parachains/src/mock.rs ++++ b/runtime/parachains/src/mock.rs +@@ -101,7 +101,7 @@ impl frame_system::Config for Test { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -123,7 +123,7 @@ impl pallet_balances::Config for Test { + type MaxReserves = (); + type ReserveIdentifier = [u8; 8]; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -213,7 +213,7 @@ impl frame_support::traits::EstimateNextSessionRotation for TestNextSession + } + + impl crate::paras::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = crate::paras::TestWeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = TestNextSessionRotation; +@@ -226,7 +226,7 @@ parameter_types! { + } + + impl crate::ump::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = TestUmpSink; + type FirstMessageFactorPercent = FirstMessageFactorPercent; + type ExecuteOverweightOrigin = frame_system::EnsureRoot; +@@ -234,14 +234,14 @@ impl crate::ump::Config for Test { + } + + impl crate::hrmp::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = pallet_balances::Pallet; + type WeightInfo = crate::hrmp::TestWeightInfo; + } + + impl crate::disputes::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type RewardValidators = Self; + type PunishValidators = Self; + type WeightInfo = crate::disputes::TestWeightInfo; +@@ -292,7 +292,7 @@ impl crate::disputes::PunishValidators for Test { + impl crate::scheduler::Config for Test {} + + impl crate::inclusion::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DisputesHandler = Disputes; + type RewardValidators = TestRewardValidators; + } +@@ -455,9 +455,9 @@ pub struct MockGenesisConfig { + pub paras: crate::paras::GenesisConfig, + } + +-pub fn assert_last_event(generic_event: Event) { ++pub fn assert_last_event(generic_event: RuntimeEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +diff --git a/runtime/parachains/src/paras/benchmarking.rs b/runtime/parachains/src/paras/benchmarking.rs +index 9d31453638a..283cc3d35b0 100644 +--- a/runtime/parachains/src/paras/benchmarking.rs ++++ b/runtime/parachains/src/paras/benchmarking.rs +@@ -31,9 +31,9 @@ use self::pvf_check::{VoteCause, VoteOutcome}; + // shouldn't exceed this number. + const SAMPLE_SIZE: u32 = 1024; + +-fn assert_last_event(generic_event: ::Event) { ++fn assert_last_event(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(event, &system_event); +@@ -89,7 +89,7 @@ benchmarks! { + generate_disordered_pruning::(); + }: _(RawOrigin::Root, para_id, new_code) + verify { +- assert_last_event::(Event::CurrentCodeUpdated(para_id).into()); ++ assert_last_event::(PalletEvent::CurrentCodeUpdated(para_id).into()); + } + force_set_current_head { + let s in 1 .. MAX_HEAD_DATA_SIZE; +@@ -97,7 +97,7 @@ benchmarks! { + let para_id = ParaId::from(1000); + }: _(RawOrigin::Root, para_id, new_head) + verify { +- assert_last_event::(Event::CurrentHeadUpdated(para_id).into()); ++ assert_last_event::(PalletEvent::CurrentHeadUpdated(para_id).into()); + } + force_schedule_code_upgrade { + let c in 1 .. MAX_CODE_SIZE; +@@ -107,7 +107,7 @@ benchmarks! { + generate_disordered_upgrades::(); + }: _(RawOrigin::Root, para_id, new_code, block) + verify { +- assert_last_event::(Event::CodeUpgradeScheduled(para_id).into()); ++ assert_last_event::(PalletEvent::CodeUpgradeScheduled(para_id).into()); + } + force_note_new_head { + let s in 1 .. MAX_HEAD_DATA_SIZE; +@@ -123,7 +123,7 @@ benchmarks! { + Pallet::::schedule_code_upgrade(para_id, ValidationCode(vec![0]), expired, &config); + }: _(RawOrigin::Root, para_id, new_head) + verify { +- assert_last_event::(Event::NewHeadNoted(para_id).into()); ++ assert_last_event::(PalletEvent::NewHeadNoted(para_id).into()); + } + force_queue_action { + let para_id = ParaId::from(1000); +@@ -131,7 +131,7 @@ benchmarks! { + }: _(RawOrigin::Root, para_id) + verify { + let next_session = crate::shared::Pallet::::session_index().saturating_add(One::one()); +- assert_last_event::(Event::ActionQueued(para_id, next_session).into()); ++ assert_last_event::(PalletEvent::ActionQueued(para_id, next_session).into()); + } + + add_trusted_validation_code { +diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs +index 3c5b8247939..0075171b465 100644 +--- a/runtime/parachains/src/paras/mod.rs ++++ b/runtime/parachains/src/paras/mod.rs +@@ -473,7 +473,7 @@ pub mod pallet { + + shared::Config + + frame_system::offchain::SendTransactionTypes> + { +- type Event: From + IsType<::Event>; ++ type RuntimeEvent: From + IsType<::RuntimeEvent>; + + #[pallet::constant] + type UnsignedPriority: Get; +@@ -486,7 +486,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// Current code has been updated for a Para. `para_id` + CurrentCodeUpdated(ParaId), + /// Current head has been updated for a Para. `para_id` +@@ -740,7 +740,7 @@ pub mod pallet { + ¶ + ); + } +- Self::deposit_event(Event::CurrentCodeUpdated(para)); ++ Self::deposit_event(PalletEvent::CurrentCodeUpdated(para)); + Ok(()) + } + +@@ -753,7 +753,7 @@ pub mod pallet { + ) -> DispatchResult { + ensure_root(origin)?; + ::Heads::insert(¶, new_head); +- Self::deposit_event(Event::CurrentHeadUpdated(para)); ++ Self::deposit_event(PalletEvent::CurrentHeadUpdated(para)); + Ok(()) + } + +@@ -768,7 +768,7 @@ pub mod pallet { + ensure_root(origin)?; + let config = configuration::Pallet::::config(); + Self::schedule_code_upgrade(para, new_code, relay_parent_number, &config); +- Self::deposit_event(Event::CodeUpgradeScheduled(para)); ++ Self::deposit_event(PalletEvent::CodeUpgradeScheduled(para)); + Ok(()) + } + +@@ -782,7 +782,7 @@ pub mod pallet { + ensure_root(origin)?; + let now = frame_system::Pallet::::block_number(); + Self::note_new_head(para, new_head, now); +- Self::deposit_event(Event::NewHeadNoted(para)); ++ Self::deposit_event(PalletEvent::NewHeadNoted(para)); + Ok(()) + } + +@@ -798,7 +798,7 @@ pub mod pallet { + v.insert(i, para); + } + }); +- Self::deposit_event(Event::ActionQueued(para, next_session)); ++ Self::deposit_event(PalletEvent::ActionQueued(para, next_session)); + Ok(()) + } + +@@ -1375,7 +1375,7 @@ impl Pallet { + let mut weight = 0; + for cause in causes { + weight += T::DbWeight::get().reads_writes(3, 2); +- Self::deposit_event(Event::PvfCheckAccepted(*code_hash, cause.para_id())); ++ Self::deposit_event(PalletEvent::PvfCheckAccepted(*code_hash, cause.para_id())); + + match cause { + PvfCheckCause::Onboarding(id) => { +@@ -1465,7 +1465,7 @@ impl Pallet { + weight += Self::decrease_code_ref(code_hash); + + weight += T::DbWeight::get().reads_writes(3, 2); +- Self::deposit_event(Event::PvfCheckRejected(*code_hash, cause.para_id())); ++ Self::deposit_event(PalletEvent::PvfCheckRejected(*code_hash, cause.para_id())); + + match cause { + PvfCheckCause::Onboarding(id) => { +@@ -1749,7 +1749,7 @@ impl Pallet { + let mut weight = 0; + + weight += T::DbWeight::get().reads_writes(3, 2); +- Self::deposit_event(Event::PvfCheckStarted(code_hash, cause.para_id())); ++ Self::deposit_event(PalletEvent::PvfCheckStarted(code_hash, cause.para_id())); + + weight += T::DbWeight::get().reads(1); + match PvfActiveVoteMap::::get(&code_hash) { +diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs +index 960132d5f80..32e0004049d 100644 +--- a/runtime/parachains/src/paras/tests.rs ++++ b/runtime/parachains/src/paras/tests.rs +@@ -112,8 +112,12 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { + + /// An utility for checking that certain events were deposited. + struct EventValidator { +- events: +- Vec::Event, primitives::v2::Hash>>, ++ events: Vec< ++ frame_system::EventRecord< ++ ::RuntimeEvent, ++ primitives::v2::Hash, ++ >, ++ >, + } + + impl EventValidator { +@@ -124,7 +128,7 @@ impl EventValidator { + fn started(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { + self.events.push(frame_system::EventRecord { + phase: frame_system::Phase::Initialization, +- event: Event::PvfCheckStarted(code.hash(), id).into(), ++ event: PalletEvent::PvfCheckStarted(code.hash(), id).into(), + topics: vec![], + }); + self +@@ -133,7 +137,7 @@ impl EventValidator { + fn rejected(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { + self.events.push(frame_system::EventRecord { + phase: frame_system::Phase::Initialization, +- event: Event::PvfCheckRejected(code.hash(), id).into(), ++ event: PalletEvent::PvfCheckRejected(code.hash(), id).into(), + topics: vec![], + }); + self +@@ -142,7 +146,7 @@ impl EventValidator { + fn accepted(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { + self.events.push(frame_system::EventRecord { + phase: frame_system::Phase::Initialization, +- event: Event::PvfCheckAccepted(code.hash(), id).into(), ++ event: PalletEvent::PvfCheckAccepted(code.hash(), id).into(), + topics: vec![], + }); + self +diff --git a/runtime/parachains/src/runtime_api_impl/v2.rs b/runtime/parachains/src/runtime_api_impl/v2.rs +index 20ee41636d8..e13506de62a 100644 +--- a/runtime/parachains/src/runtime_api_impl/v2.rs ++++ b/runtime/parachains/src/runtime_api_impl/v2.rs +@@ -323,9 +323,9 @@ pub fn candidate_pending_availability( + pub fn candidate_events(extract_event: F) -> Vec> + where + T: initializer::Config, +- F: Fn(::Event) -> Option>, ++ F: Fn(::RuntimeEvent) -> Option>, + { +- use inclusion::Event as RawEvent; ++ use inclusion::PalletEvent as RawEvent; + + >::read_events_no_consensus() + .into_iter() +diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs +index 7d40a99e988..71b05d53420 100644 +--- a/runtime/parachains/src/ump.rs ++++ b/runtime/parachains/src/ump.rs +@@ -122,11 +122,11 @@ impl, C: Config> UmpSink for XcmSi + }); + match maybe_msg_and_weight { + Err(_) => { +- Pallet::::deposit_event(Event::InvalidFormat(id)); ++ Pallet::::deposit_event(PalletEvent::InvalidFormat(id)); + Ok(0) + }, + Ok((Err(()), weight_used)) => { +- Pallet::::deposit_event(Event::UnsupportedVersion(id)); ++ Pallet::::deposit_event(PalletEvent::UnsupportedVersion(id)); + Ok(weight_used) + }, + Ok((Ok(xcm_message), weight_used)) => { +@@ -136,7 +136,7 @@ impl, C: Config> UmpSink for XcmSi + Outcome::Error(XcmError::WeightLimitReached(required)) => Err((id, required)), + outcome => { + let outcome_weight = outcome.weight_used(); +- Pallet::::deposit_event(Event::ExecutedUpward(id, outcome)); ++ Pallet::::deposit_event(PalletEvent::ExecutedUpward(id, outcome)); + Ok(weight_used.saturating_add(outcome_weight)) + }, + } +@@ -216,7 +216,7 @@ pub mod pallet { + #[pallet::config] + pub trait Config: frame_system::Config + configuration::Config { + /// The aggregate event. +- type Event: From + IsType<::Event>; ++ type RuntimeEvent: From + IsType<::RuntimeEvent>; + + /// A place where all received upward messages are funneled. + type UmpSink: UmpSink; +@@ -238,7 +238,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// Upward message is invalid XCM. + /// \[ id \] + InvalidFormat(MessageId), +@@ -358,7 +358,7 @@ pub mod pallet { + let used = T::UmpSink::process_upward_message(sender, &data[..], weight_limit) + .map_err(|_| Error::::WeightOverLimit)?; + Overweight::::remove(index); +- Self::deposit_event(Event::OverweightServiced(index, used)); ++ Self::deposit_event(PalletEvent::OverweightServiced(index, used)); + Ok(Some(used.saturating_add(::WeightInfo::service_overweight())).into()) + } + } +@@ -495,7 +495,7 @@ impl Pallet { + // NOTE: The actual computation is not accounted for. It should be benchmarked. + weight += T::DbWeight::get().reads_writes(3, 3); + +- Self::deposit_event(Event::UpwardMessagesReceived(para, extra_count, extra_size)); ++ Self::deposit_event(PalletEvent::UpwardMessagesReceived(para, extra_count, extra_size)); + } + + weight +@@ -544,13 +544,15 @@ impl Pallet { + thus `upward_message` cannot be `None`; qed", + ); + let index = Self::stash_overweight(dispatchee, upward_message); +- Self::deposit_event(Event::OverweightEnqueued( ++ Self::deposit_event(PalletEvent::OverweightEnqueued( + dispatchee, id, index, required, + )); + } else { + // we process messages in order and don't drop them if we run out of weight, + // so need to break here without calling `consume_front`. +- Self::deposit_event(Event::WeightExhausted(id, max_weight, required)); ++ Self::deposit_event(PalletEvent::WeightExhausted( ++ id, max_weight, required, ++ )); + break + } + }, +diff --git a/runtime/parachains/src/ump/benchmarking.rs b/runtime/parachains/src/ump/benchmarking.rs +index 2c132324d44..513e16cb6fb 100644 +--- a/runtime/parachains/src/ump/benchmarking.rs ++++ b/runtime/parachains/src/ump/benchmarking.rs +@@ -18,9 +18,9 @@ use super::{Pallet as Ump, *}; + use frame_system::RawOrigin; + use xcm::prelude::*; + +-fn assert_last_event_type(generic_event: ::Event) { ++fn assert_last_event_type(generic_event: ::PalletEvent) { + let events = frame_system::Pallet::::events(); +- let system_event: ::Event = generic_event.into(); ++ let system_event: ::RuntimeEvent = generic_event.into(); + // compare to the last event record + let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; + assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event)); +@@ -35,7 +35,7 @@ fn queue_upward_msg( + let msgs = vec![msg]; + Ump::::check_upward_messages(host_conf, para, &msgs).unwrap(); + let _ = Ump::::receive_upward_messages(para, msgs); +- assert_last_event_type::(Event::UpwardMessagesReceived(para, 1, len).into()); ++ assert_last_event_type::(PalletEvent::UpwardMessagesReceived(para, 1, len).into()); + } + + // Create a message with at least `size` bytes encoded length +@@ -124,11 +124,11 @@ frame_benchmarking::benchmarks! { + queue_upward_msg::(&host_conf, para, msg.clone()); + Ump::::process_pending_upward_messages(); + assert_last_event_type::( +- Event::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() ++ PalletEvent::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() + ); + }: _(RawOrigin::Root, 0, Weight::MAX) + verify { +- assert_last_event_type::(Event::OverweightServiced(0, 0).into()); ++ assert_last_event_type::(PalletEvent::OverweightServiced(0, 0).into()); + } + } + +diff --git a/runtime/parachains/src/ump/tests.rs b/runtime/parachains/src/ump/tests.rs +index b4e758b4b88..698b9120617 100644 +--- a/runtime/parachains/src/ump/tests.rs ++++ b/runtime/parachains/src/ump/tests.rs +@@ -326,7 +326,7 @@ fn overweight_queue_works() { + queue_upward_msg(para_a, a_msg_3.clone()); + Ump::process_pending_upward_messages(); + assert_last_event( +- Event::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), ++ PalletEvent::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), + ); + + // Now verify that if we wanted to service this overweight message with less than enough +@@ -338,7 +338,7 @@ fn overweight_queue_works() { + + // ... and if we try to service it with just enough weight it will succeed as well. + assert_ok!(Ump::service_overweight(Origin::root(), 0, 500)); +- assert_last_event(Event::OverweightServiced(0, 500).into()); ++ assert_last_event(PalletEvent::OverweightServiced(0, 500).into()); + + // ... and if we try to service a message with index that doesn't exist it will error + // out. +diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs +index 9489df9f403..f9df916f2ac 100644 +--- a/runtime/polkadot/src/lib.rs ++++ b/runtime/polkadot/src/lib.rs +@@ -214,7 +214,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = AccountIdLookup; + type Header = generic::Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = RocksDbWeight; + type Version = Version; +@@ -264,7 +264,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { + } + + impl pallet_scheduler::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type PalletsOrigin = OriginCaller; + type Call = Call; +@@ -285,7 +285,7 @@ parameter_types! { + + impl pallet_preimage::Config for Runtime { + type WeightInfo = pallet_preimage::weights::SubstrateWeight; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type MaxSize = PreimageMaxSize; +@@ -341,7 +341,7 @@ impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_indices::WeightInfo; + } + +@@ -354,7 +354,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = MaxLocks; +@@ -371,7 +371,7 @@ parameter_types! { + } + + impl pallet_transaction_payment::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = WeightToFee; +@@ -413,7 +413,7 @@ impl_opaque_keys! { + } + + impl pallet_session::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorId = AccountId; + type ValidatorIdOf = pallet_staking::StashOf; + type ShouldEndSession = Babe; +@@ -505,7 +505,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { + } + + impl pallet_election_provider_multi_phase::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type EstimateCallFee = TransactionPayment; + type SignedPhase = SignedPhase; +@@ -548,7 +548,7 @@ parameter_types! { + } + + impl pallet_bags_list::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ScoreProvider = Staking; + type WeightInfo = weights::pallet_bags_list::WeightInfo; + type BagThresholds = BagThresholds; +@@ -596,7 +596,7 @@ impl pallet_staking::Config for Runtime { + type UnixTime = Timestamp; + type CurrencyToVote = CurrencyToVote; + type RewardRemainder = Treasury; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Slash = Treasury; + type Reward = (); + type SessionsPerEra = SessionsPerEra; +@@ -629,7 +629,7 @@ parameter_types! { + } + + impl pallet_identity::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BasicDeposit = BasicDeposit; + type FieldDeposit = FieldDeposit; +@@ -657,7 +657,7 @@ parameter_types! { + + impl pallet_democracy::Config for Runtime { + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type EnactmentPeriod = EnactmentPeriod; + type VoteLockingPeriod = EnactmentPeriod; +@@ -728,7 +728,7 @@ pub type CouncilCollective = pallet_collective::Instance1; + impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MotionDuration = CouncilMotionDuration; + type MaxProposals = CouncilMaxProposals; + type MaxMembers = CouncilMaxMembers; +@@ -755,7 +755,7 @@ parameter_types! { + const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); + + impl pallet_elections_phragmen::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PalletId = PhragmenElectionPalletId; + type Currency = Balances; + type ChangeMembers = Council; +@@ -784,7 +784,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; + impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MotionDuration = TechnicalMotionDuration; + type MaxProposals = TechnicalMaxProposals; + type MaxMembers = TechnicalMaxMembers; +@@ -793,7 +793,7 @@ impl pallet_collective::Config for Runtime { + } + + impl pallet_membership::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type AddOrigin = MoreThanHalfCouncil; + type RemoveOrigin = MoreThanHalfCouncil; + type SwapOrigin = MoreThanHalfCouncil; +@@ -834,7 +834,7 @@ impl pallet_treasury::Config for Runtime { + type Currency = Balances; + type ApproveOrigin = ApproveOrigin; + type RejectOrigin = MoreThanHalfCouncil; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnSlash = Treasury; + type ProposalBond = ProposalBond; + type ProposalBondMinimum = ProposalBondMinimum; +@@ -860,7 +860,7 @@ parameter_types! { + } + + impl pallet_bounties::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BountyDepositBase = BountyDepositBase; + type BountyDepositPayoutDelay = BountyDepositPayoutDelay; + type BountyUpdatePeriod = BountyUpdatePeriod; +@@ -880,14 +880,14 @@ parameter_types! { + } + + impl pallet_child_bounties::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MaxActiveChildBountyCount = MaxActiveChildBountyCount; + type ChildBountyValueMinimum = ChildBountyValueMinimum; + type WeightInfo = weights::pallet_child_bounties::WeightInfo; + } + + impl pallet_tips::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DataDepositPerByte = DataDepositPerByte; + type MaximumReasonLength = MaximumReasonLength; + type Tippers = PhragmenElection; +@@ -898,7 +898,7 @@ impl pallet_tips::Config for Runtime { + } + + impl pallet_offences::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type IdentificationTuple = pallet_session::historical::IdentificationTuple; + type OnOffenceHandler = Staking; + } +@@ -915,7 +915,7 @@ parameter_types! { + + impl pallet_im_online::Config for Runtime { + type AuthorityId = ImOnlineId; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorSet = Historical; + type NextSessionRotation = Babe; + type ReportUnresponsiveness = Offences; +@@ -927,7 +927,7 @@ impl pallet_im_online::Config for Runtime { + } + + impl pallet_grandpa::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + + type KeyOwnerProof = +@@ -1022,7 +1022,7 @@ parameter_types! { + } + + impl claims::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type VestingSchedule = Vesting; + type Prefix = Prefix; + /// At least 3/4 of the council must agree to a claim move before it can happen. +@@ -1036,7 +1036,7 @@ parameter_types! { + } + + impl pallet_vesting::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BlockNumberToBalance = ConvertInto; + type MinVestedTransfer = MinVestedTransfer; +@@ -1045,7 +1045,7 @@ impl pallet_vesting::Config for Runtime { + } + + impl pallet_utility::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type PalletsOrigin = OriginCaller; + type WeightInfo = weights::pallet_utility::WeightInfo; +@@ -1060,7 +1060,7 @@ parameter_types! { + } + + impl pallet_multisig::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type DepositBase = DepositBase; +@@ -1225,7 +1225,7 @@ impl InstanceFilter for ProxyType { + } + + impl pallet_proxy::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type ProxyType = ProxyType; +@@ -1252,7 +1252,7 @@ impl parachains_session_info::Config for Runtime { + } + + impl parachains_inclusion::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DisputesHandler = ParasDisputes; + type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; + } +@@ -1262,7 +1262,7 @@ parameter_types! { + } + + impl parachains_paras::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::runtime_parachains_paras::WeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = Babe; +@@ -1273,7 +1273,7 @@ parameter_types! { + } + + impl parachains_ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = + crate::parachains_ump::XcmSink, Runtime>; + type FirstMessageFactorPercent = FirstMessageFactorPercent; +@@ -1284,7 +1284,7 @@ impl parachains_ump::Config for Runtime { + impl parachains_dmp::Config for Runtime {} + + impl parachains_hrmp::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; +@@ -1303,7 +1303,7 @@ impl parachains_initializer::Config for Runtime { + } + + impl parachains_disputes::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type RewardValidators = (); + type PunishValidators = (); + type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; +@@ -1317,7 +1317,7 @@ parameter_types! { + } + + impl paras_registrar::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type OnSwap = (Crowdloan, Slots); +@@ -1338,7 +1338,7 @@ parameter_types! { + } + + impl slots::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Registrar = Registrar; + type LeasePeriod = LeasePeriod; +@@ -1360,7 +1360,7 @@ parameter_types! { + } + + impl crowdloan::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PalletId = CrowdloanId; + type SubmissionDeposit = SubmissionDeposit; + type MinContribution = MinContribution; +@@ -1385,7 +1385,7 @@ type AuctionInitiate = EitherOfDiverse< + >; + + impl auctions::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Leaser = Slots; + type Registrar = Registrar; + type EndingPeriod = EndingPeriod; +@@ -1402,7 +1402,7 @@ parameter_types! { + } + + impl pallet_nomination_pools::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type CurrencyBalance = Balance; + type RewardCounter = FixedU128; +@@ -1740,7 +1740,7 @@ sp_api::impl_runtime_apis! { + fn candidate_events() -> Vec> { + parachains_runtime_api_impl::candidate_events::(|ev| { + match ev { +- Event::ParaInclusion(ev) => { ++ RuntimeEvent::ParaInclusion(ev) => { + Some(ev) + } + _ => None, +@@ -2047,7 +2047,7 @@ sp_api::impl_runtime_apis! { + hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), + // Execution Phase + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), +- // Event Count ++ // PalletEvent Count + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), + // System Events + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), +diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs +index a7ea36445bd..36b6d07b86b 100644 +--- a/runtime/polkadot/src/xcm_config.rs ++++ b/runtime/polkadot/src/xcm_config.rs +@@ -17,8 +17,8 @@ + //! XCM configuration for Polkadot. + + use super::{ +- parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, +- Runtime, WeightToFee, XcmPallet, ++ parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, ++ RuntimeEvent, WeightToFee, XcmPallet, + }; + use frame_support::{ + match_types, parameter_types, +@@ -175,7 +175,7 @@ pub type LocalOriginToLocation = ( + ); + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + // Only allow the council to send messages. + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = XcmRouter; +diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs +index d745e109be4..7bbd30fa913 100644 +--- a/runtime/rococo/src/lib.rs ++++ b/runtime/rococo/src/lib.rs +@@ -267,7 +267,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = AccountIdLookup; + type Header = generic::Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = Version; + type PalletInfo = PalletInfo; +@@ -353,7 +353,7 @@ impl pallet_session::historical::Config for Runtime { + } + + impl parachains_disputes::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type RewardValidators = (); + type PunishValidators = (); + type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; +@@ -372,7 +372,7 @@ parameter_types! { + + impl pallet_im_online::Config for Runtime { + type AuthorityId = ImOnlineId; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorSet = Historical; + type NextSessionRotation = Babe; + type ReportUnresponsiveness = Offences; +@@ -392,7 +392,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = MaxLocks; +@@ -415,7 +415,7 @@ parameter_types! { + } + + impl pallet_offences::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type IdentificationTuple = pallet_session::historical::IdentificationTuple; + type OnOffenceHandler = (); + } +@@ -442,7 +442,7 @@ parameter_types! { + } + + impl pallet_transaction_payment::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = WeightToFee; +@@ -459,7 +459,7 @@ impl sp_runtime::traits::Convert> for ValidatorIdOf + } + + impl pallet_session::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorId = AccountId; + type ValidatorIdOf = ValidatorIdOf; + type ShouldEndSession = Babe; +@@ -512,7 +512,7 @@ impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_indices::WeightInfo; + } + +@@ -521,7 +521,7 @@ parameter_types! { + } + + impl pallet_grandpa::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + + type KeyOwnerProofSystem = Historical; +@@ -571,7 +571,7 @@ impl runtime_parachains::inclusion::RewardValidators for RewardValidators { + } + + impl parachains_inclusion::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DisputesHandler = ParasDisputes; + type RewardValidators = RewardValidators; + } +@@ -581,7 +581,7 @@ parameter_types! { + } + + impl parachains_paras::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::runtime_parachains_paras::WeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = Babe; +@@ -596,7 +596,7 @@ parameter_types! { + } + + impl parachains_ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = + crate::parachains_ump::XcmSink, Runtime>; + type FirstMessageFactorPercent = FirstMessageFactorPercent; +@@ -607,7 +607,7 @@ impl parachains_ump::Config for Runtime { + impl parachains_dmp::Config for Runtime {} + + impl parachains_hrmp::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; +@@ -636,7 +636,7 @@ parameter_types! { + } + + impl assigned_slots::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type AssignSlotOrigin = EnsureRoot; + type Leaser = Slots; + type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; +@@ -652,7 +652,7 @@ parameter_types! { + } + + impl paras_registrar::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type OnSwap = (Crowdloan, Slots); +@@ -723,7 +723,7 @@ parameter_types! { + } + + impl auctions::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Leaser = Slots; + type Registrar = Registrar; + type EndingPeriod = EndingPeriod; +@@ -738,7 +738,7 @@ parameter_types! { + } + + impl slots::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Registrar = Registrar; + type LeasePeriod = LeasePeriod; +@@ -757,7 +757,7 @@ parameter_types! { + } + + impl crowdloan::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PalletId = CrowdloanId; + type SubmissionDeposit = SubmissionDeposit; + type MinContribution = MinContribution; +@@ -769,17 +769,17 @@ impl crowdloan::Config for Runtime { + } + + impl pallet_sudo::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + } + + impl validator_manager::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PrivilegedOrigin = EnsureRoot; + } + + impl pallet_utility::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type PalletsOrigin = OriginCaller; + type WeightInfo = weights::pallet_utility::WeightInfo; +@@ -845,7 +845,7 @@ impl InstanceFilter for ProxyType { + } + + impl pallet_proxy::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type ProxyType = ProxyType; +@@ -868,7 +868,7 @@ parameter_types! { + impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type MotionDuration = MotionDuration; + type MaxProposals = MaxProposals; + type DefaultVote = pallet_collective::PrimeDefaultVote; +@@ -877,7 +877,7 @@ impl pallet_collective::Config for Runtime { + } + + impl pallet_membership::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type AddOrigin = EnsureRoot; + type RemoveOrigin = EnsureRoot; + type SwapOrigin = EnsureRoot; +@@ -898,7 +898,7 @@ parameter_types! { + } + + impl pallet_multisig::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type DepositBase = DepositBase; +@@ -1055,7 +1055,7 @@ sp_api::impl_runtime_apis! { + fn candidate_events() -> Vec> { + runtime_api_impl::candidate_events::(|ev| { + match ev { +- Event::ParaInclusion(ev) => { ++ RuntimeEvent::ParaInclusion(ev) => { + Some(ev) + } + _ => None, +@@ -1359,7 +1359,7 @@ sp_api::impl_runtime_apis! { + hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), + // Execution Phase + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), +- // Event Count ++ // PalletEvent Count + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), + // System Events + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), +diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs +index 2fd60b682ea..d0522522fb6 100644 +--- a/runtime/rococo/src/validator_manager.rs ++++ b/runtime/rococo/src/validator_manager.rs +@@ -37,7 +37,8 @@ pub mod pallet { + #[pallet::config] + pub trait Config: frame_system::Config + pallet_session::Config { + /// The overreaching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// Privileged origin that can add or remove validators. + type PrivilegedOrigin: EnsureOrigin<::Origin>; +@@ -45,7 +46,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// New validators were added to the set. + ValidatorsRegistered(Vec), + /// Validators were removed from the set. +@@ -75,7 +76,7 @@ pub mod pallet { + + validators.clone().into_iter().for_each(|v| ValidatorsToAdd::::append(v)); + +- Self::deposit_event(Event::ValidatorsRegistered(validators)); ++ Self::deposit_event(PalletEvent::ValidatorsRegistered(validators)); + Ok(()) + } + +@@ -91,7 +92,7 @@ pub mod pallet { + + validators.clone().into_iter().for_each(|v| ValidatorsToRetire::::append(v)); + +- Self::deposit_event(Event::ValidatorsDeregistered(validators)); ++ Self::deposit_event(PalletEvent::ValidatorsDeregistered(validators)); + Ok(()) + } + } +diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs +index 1512ef9e6cc..4a111d9a40a 100644 +--- a/runtime/rococo/src/xcm_config.rs ++++ b/runtime/rococo/src/xcm_config.rs +@@ -17,8 +17,8 @@ + //! XCM configuration for Rococo. + + use super::{ +- parachains_origin, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, WeightToFee, +- XcmPallet, ++ parachains_origin, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, ++ WeightToFee, XcmPallet, + }; + use frame_support::{ + parameter_types, +@@ -151,7 +151,7 @@ pub type LocalOriginToLocation = ( + ); + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = XcmRouter; + // Anyone can execute XCM messages locally... +diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs +index d18a2c9bb95..a703b68cf9c 100644 +--- a/runtime/test-runtime/src/lib.rs ++++ b/runtime/test-runtime/src/lib.rs +@@ -145,7 +145,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = Indices; + type Header = generic::Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = Version; + type PalletInfo = PalletInfo; +@@ -206,7 +206,7 @@ impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); + } + +@@ -219,7 +219,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = MaxLocks; +@@ -236,7 +236,7 @@ parameter_types! { + } + + impl pallet_transaction_payment::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter; + type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = WeightToFee; +@@ -282,7 +282,7 @@ impl_opaque_keys! { + } + + impl pallet_session::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorId = AccountId; + type ValidatorIdOf = pallet_staking::StashOf; + type ShouldEndSession = Babe; +@@ -337,7 +337,7 @@ impl pallet_staking::Config for Runtime { + type UnixTime = Timestamp; + type CurrencyToVote = frame_support::traits::U128CurrencyToVote; + type RewardRemainder = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Slash = (); + type Reward = (); + type SessionsPerEra = SessionsPerEra; +@@ -362,7 +362,7 @@ impl pallet_staking::Config for Runtime { + } + + impl pallet_grandpa::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + + type KeyOwnerProofSystem = (); +@@ -427,7 +427,7 @@ impl frame_system::offchain::SigningTypes for Runtime { + } + + impl pallet_offences::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type IdentificationTuple = pallet_session::historical::IdentificationTuple; + type OnOffenceHandler = Staking; + } +@@ -446,7 +446,7 @@ parameter_types! { + } + + impl claims::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type VestingSchedule = Vesting; + type Prefix = Prefix; + type MoveClaimOrigin = frame_system::EnsureRoot; +@@ -458,7 +458,7 @@ parameter_types! { + } + + impl pallet_vesting::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BlockNumberToBalance = ConvertInto; + type MinVestedTransfer = MinVestedTransfer; +@@ -467,7 +467,7 @@ impl pallet_vesting::Config for Runtime { + } + + impl pallet_sudo::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + } + +@@ -478,13 +478,13 @@ impl parachains_configuration::Config for Runtime { + impl parachains_shared::Config for Runtime {} + + impl parachains_inclusion::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DisputesHandler = ParasDisputes; + type RewardValidators = RewardValidatorsWithEraPoints; + } + + impl parachains_disputes::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type RewardValidators = (); + type PunishValidators = (); + type WeightInfo = parachains_disputes::TestWeightInfo; +@@ -509,7 +509,7 @@ parameter_types! { + } + + impl parachains_paras::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = parachains_paras::TestWeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = Babe; +@@ -522,7 +522,7 @@ parameter_types! { + } + + impl parachains_ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = (); + type FirstMessageFactorPercent = FirstMessageFactorPercent; + type ExecuteOverweightOrigin = frame_system::EnsureRoot; +@@ -540,7 +540,7 @@ pub type LocalOriginToLocation = xcm_builder::SignedToAccountId32; + type LocationInverter = xcm_config::InvertNothing; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; +@@ -557,7 +557,7 @@ impl pallet_xcm::Config for Runtime { + } + + impl parachains_hrmp::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type WeightInfo = parachains_hrmp::TestWeightInfo; +@@ -570,7 +570,7 @@ impl paras_sudo_wrapper::Config for Runtime {} + impl parachains_origin::Config for Runtime {} + + impl pallet_test_notifier::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Call = Call; + } +@@ -589,7 +589,8 @@ pub mod pallet_test_notifier { + + #[pallet::config] + pub trait Config: frame_system::Config + pallet_xcm::Config { +- type Event: IsType<::Event> + From>; ++ type RuntimeEvent: IsType<::RuntimeEvent> ++ + From>; + type Origin: IsType<::Origin> + + Into::Origin>>; + type Call: IsType<::Call> + From>; +@@ -597,7 +598,7 @@ pub mod pallet_test_notifier { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + QueryPrepared(QueryId), + NotifyQueryPrepared(QueryId), + ResponseReceived(MultiLocation, QueryId, Response), +@@ -621,7 +622,7 @@ pub mod pallet_test_notifier { + Junction::AccountId32 { network: Any, id }.into(), + 100u32.into(), + ); +- Self::deposit_event(Event::::QueryPrepared(qid)); ++ Self::deposit_event(PalletEvent::::QueryPrepared(qid)); + Ok(()) + } + +@@ -638,7 +639,7 @@ pub mod pallet_test_notifier { + ::Call::from(call), + 100u32.into(), + ); +- Self::deposit_event(Event::::NotifyQueryPrepared(qid)); ++ Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); + Ok(()) + } + +@@ -649,7 +650,7 @@ pub mod pallet_test_notifier { + response: Response, + ) -> DispatchResult { + let responder = ensure_response(::Origin::from(origin))?; +- Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); ++ Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); + Ok(()) + } + } +diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs +index 788aede7809..bec0be82d1f 100644 +--- a/runtime/westend/src/lib.rs ++++ b/runtime/westend/src/lib.rs +@@ -155,7 +155,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = AccountIdLookup; + type Header = generic::Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = RocksDbWeight; + type Version = Version; +@@ -177,7 +177,7 @@ parameter_types! { + } + + impl pallet_scheduler::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type PalletsOrigin = OriginCaller; + type Call = Call; +@@ -198,7 +198,7 @@ parameter_types! { + + impl pallet_preimage::Config for Runtime { + type WeightInfo = weights::pallet_preimage::WeightInfo; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type MaxSize = PreimageMaxSize; +@@ -253,7 +253,7 @@ impl pallet_indices::Config for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_indices::WeightInfo; + } + +@@ -266,7 +266,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = MaxLocks; +@@ -283,7 +283,7 @@ parameter_types! { + } + + impl pallet_transaction_payment::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter>; + type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = WeightToFee; +@@ -329,7 +329,7 @@ impl_opaque_keys! { + } + + impl pallet_session::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorId = AccountId; + type ValidatorIdOf = pallet_staking::StashOf; + type ShouldEndSession = Babe; +@@ -416,7 +416,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { + } + + impl pallet_election_provider_multi_phase::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type EstimateCallFee = TransactionPayment; + type SignedPhase = SignedPhase; +@@ -456,7 +456,7 @@ parameter_types! { + } + + impl pallet_bags_list::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ScoreProvider = Staking; + type WeightInfo = weights::pallet_bags_list::WeightInfo; + type BagThresholds = BagThresholds; +@@ -494,7 +494,7 @@ impl pallet_staking::Config for Runtime { + type UnixTime = Timestamp; + type CurrencyToVote = CurrencyToVote; + type RewardRemainder = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Slash = (); + type Reward = (); + type SessionsPerEra = SessionsPerEra; +@@ -521,7 +521,7 @@ parameter_types! { + } + + impl pallet_offences::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type IdentificationTuple = pallet_session::historical::IdentificationTuple; + type OnOffenceHandler = Staking; + } +@@ -540,7 +540,7 @@ parameter_types! { + + impl pallet_im_online::Config for Runtime { + type AuthorityId = ImOnlineId; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ValidatorSet = Historical; + type NextSessionRotation = Babe; + type ReportUnresponsiveness = Offences; +@@ -552,7 +552,7 @@ impl pallet_im_online::Config for Runtime { + } + + impl pallet_grandpa::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + + type KeyOwnerProofSystem = Historical; +@@ -647,7 +647,7 @@ parameter_types! { + } + + impl pallet_identity::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Slashed = (); + type BasicDeposit = BasicDeposit; +@@ -662,7 +662,7 @@ impl pallet_identity::Config for Runtime { + } + + impl pallet_utility::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type PalletsOrigin = OriginCaller; + type WeightInfo = weights::pallet_utility::WeightInfo; +@@ -677,7 +677,7 @@ parameter_types! { + } + + impl pallet_multisig::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type DepositBase = DepositBase; +@@ -694,7 +694,7 @@ parameter_types! { + } + + impl pallet_recovery::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); + type Call = Call; + type Currency = Balances; +@@ -709,7 +709,7 @@ parameter_types! { + } + + impl pallet_vesting::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type BlockNumberToBalance = ConvertInto; + type MinVestedTransfer = MinVestedTransfer; +@@ -718,7 +718,7 @@ impl pallet_vesting::Config for Runtime { + } + + impl pallet_sudo::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + } + +@@ -841,7 +841,7 @@ impl InstanceFilter for ProxyType { + } + + impl pallet_proxy::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Call = Call; + type Currency = Balances; + type ProxyType = ProxyType; +@@ -868,7 +868,7 @@ impl parachains_session_info::Config for Runtime { + } + + impl parachains_inclusion::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DisputesHandler = ParasDisputes; + type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; + } +@@ -878,7 +878,7 @@ parameter_types! { + } + + impl parachains_paras::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::runtime_parachains_paras::WeightInfo; + type UnsignedPriority = ParasUnsignedPriority; + type NextSessionRotation = Babe; +@@ -889,7 +889,7 @@ parameter_types! { + } + + impl parachains_ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = + crate::parachains_ump::XcmSink, Runtime>; + type FirstMessageFactorPercent = FirstMessageFactorPercent; +@@ -900,7 +900,7 @@ impl parachains_ump::Config for Runtime { + impl parachains_dmp::Config for Runtime {} + + impl parachains_hrmp::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; +@@ -929,7 +929,7 @@ parameter_types! { + } + + impl assigned_slots::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type AssignSlotOrigin = EnsureRoot; + type Leaser = Slots; + type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; +@@ -940,7 +940,7 @@ impl assigned_slots::Config for Runtime { + } + + impl parachains_disputes::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type RewardValidators = (); + type PunishValidators = (); + type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; +@@ -952,7 +952,7 @@ parameter_types! { + } + + impl paras_registrar::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Currency = Balances; + type OnSwap = (Crowdloan, Slots); +@@ -966,7 +966,7 @@ parameter_types! { + } + + impl slots::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type Registrar = Registrar; + type LeasePeriod = LeasePeriod; +@@ -985,7 +985,7 @@ parameter_types! { + } + + impl crowdloan::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type PalletId = CrowdloanId; + type SubmissionDeposit = SubmissionDeposit; + type MinContribution = MinContribution; +@@ -1005,7 +1005,7 @@ parameter_types! { + } + + impl auctions::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Leaser = Slots; + type Registrar = Registrar; + type EndingPeriod = EndingPeriod; +@@ -1021,7 +1021,7 @@ parameter_types! { + } + + impl pallet_nomination_pools::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type WeightInfo = weights::pallet_nomination_pools::WeightInfo; + type Currency = Balances; + type CurrencyBalance = Balance; +@@ -1324,7 +1324,7 @@ sp_api::impl_runtime_apis! { + fn candidate_events() -> Vec> { + parachains_runtime_api_impl::candidate_events::(|ev| { + match ev { +- Event::ParaInclusion(ev) => { ++ RuntimeEvent::ParaInclusion(ev) => { + Some(ev) + } + _ => None, +diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs +index 867bdb2cacf..c282dc2dcca 100644 +--- a/runtime/westend/src/xcm_config.rs ++++ b/runtime/westend/src/xcm_config.rs +@@ -17,7 +17,7 @@ + //! XCM configurations for Westend. + + use super::{ +- parachains_origin, weights, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, ++ parachains_origin, weights, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, + WeightToFee, XcmPallet, + }; + use frame_support::{ +@@ -131,7 +131,7 @@ pub type LocalOriginToLocation = ( + ); + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = XcmRouter; + // Anyone can execute XCM messages locally... +diff --git a/scripts/ci/run_benches_for_runtime.sh b/scripts/ci/run_benches_for_runtime.sh +index 8149195c82c..cd9cb5be8e9 100755 +--- a/scripts/ci/run_benches_for_runtime.sh ++++ b/scripts/ci/run_benches_for_runtime.sh +@@ -29,6 +29,12 @@ rm -f $ERR_FILE + for PALLET in "${PALLETS[@]}"; do + echo "[+] Benchmarking $PALLET for $runtime"; + ++ output_file="" ++ if [[ $PALLET == *"::"* ]]; then ++ # translates e.g. "pallet_foo::bar" to "pallet_foo_bar" ++ output_file="${PALLET//::/_}.rs" ++ fi ++ + OUTPUT=$( + ./target/production/polkadot benchmark pallet \ + --chain="${runtime}-dev" \ +@@ -39,7 +45,7 @@ for PALLET in "${PALLETS[@]}"; do + --execution=wasm \ + --wasm-execution=compiled \ + --header=./file_header.txt \ +- --output="./runtime/${runtime}/src/weights/${PALLET/::/_}.rs" 2>&1 ++ --output="./runtime/${runtime}/src/weights/${output_file}" 2>&1 + ) + if [ $? -ne 0 ]; then + echo "$OUTPUT" >> "$ERR_FILE" +diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +index 3f7e4f8f26e..3f5b4d9e662 100644 +--- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs ++++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +@@ -63,7 +63,7 @@ impl frame_system::Config for Test { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +@@ -86,7 +86,7 @@ impl pallet_balances::Config for Test { + type ReserveIdentifier = [u8; 8]; + type Balance = u64; + type DustRemoval = (); +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type WeightInfo = (); +diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +index 7782ba1d90e..7fec7a5e041 100644 +--- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs ++++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +@@ -68,7 +68,7 @@ impl frame_system::Config for Test { + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type Version = (); + type PalletInfo = PalletInfo; +diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs +index c237fc702a4..b286b41b384 100644 +--- a/xcm/pallet-xcm/src/lib.rs ++++ b/xcm/pallet-xcm/src/lib.rs +@@ -71,7 +71,8 @@ pub mod pallet { + /// The module configuration trait. + pub trait Config: frame_system::Config { + /// The overarching event type. +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + + /// Required origin for sending XCM messages. If successful, it resolves to `MultiLocation` + /// which exists as an interior location within this chain's XCM context. +@@ -124,7 +125,7 @@ pub mod pallet { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + /// Execution of an XCM message was attempted. + /// + /// \[ outcome \] +@@ -461,7 +462,7 @@ pub mod pallet { + SendError::CannotReachDestination(..) => Error::::Unreachable, + _ => Error::::SendFailure, + })?; +- Self::deposit_event(Event::Sent(origin_location, dest, message)); ++ Self::deposit_event(PalletEvent::Sent(origin_location, dest, message)); + Ok(()) + } + +@@ -579,7 +580,7 @@ pub mod pallet { + max_weight, + ); + let result = Ok(Some(outcome.weight_used().saturating_add(100_000_000)).into()); +- Self::deposit_event(Event::Attempted(outcome)); ++ Self::deposit_event(PalletEvent::Attempted(outcome)); + result + } + +@@ -602,7 +603,7 @@ pub mod pallet { + LatestVersionedMultiLocation(&location), + xcm_version, + ); +- Self::deposit_event(Event::SupportedVersionChanged(location, xcm_version)); ++ Self::deposit_event(PalletEvent::SupportedVersionChanged(location, xcm_version)); + Ok(()) + } + +@@ -818,7 +819,7 @@ pub mod pallet { + T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; + let outcome = + T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); +- Self::deposit_event(Event::Attempted(outcome)); ++ Self::deposit_event(PalletEvent::Attempted(outcome)); + Ok(()) + } + +@@ -876,7 +877,7 @@ pub mod pallet { + T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; + let outcome = + T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); +- Self::deposit_event(Event::Attempted(outcome)); ++ Self::deposit_event(PalletEvent::Attempted(outcome)); + Ok(()) + } + +@@ -954,11 +955,11 @@ pub mod pallet { + Ok(()) => { + let value = (query_id, max_weight, xcm_version); + VersionNotifyTargets::::insert(XCM_VERSION, key, value); +- Event::VersionChangeNotified(new_key, xcm_version) ++ PalletEvent::VersionChangeNotified(new_key, xcm_version) + }, + Err(e) => { + VersionNotifyTargets::::remove(XCM_VERSION, key); +- Event::NotifyTargetSendFail(new_key, query_id, e.into()) ++ PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()) + }, + }; + Self::deposit_event(event); +@@ -977,7 +978,7 @@ pub mod pallet { + let new_key = match MultiLocation::try_from(old_key.clone()) { + Ok(k) => k, + Err(()) => { +- Self::deposit_event(Event::NotifyTargetMigrationFail( ++ Self::deposit_event(PalletEvent::NotifyTargetMigrationFail( + old_key, value.0, + )); + weight_used.saturating_accrue(todo_vnt_migrate_fail_weight); +@@ -1004,9 +1005,10 @@ pub mod pallet { + versioned_key, + (query_id, max_weight, xcm_version), + ); +- Event::VersionChangeNotified(new_key, xcm_version) ++ PalletEvent::VersionChangeNotified(new_key, xcm_version) + }, +- Err(e) => Event::NotifyTargetSendFail(new_key, query_id, e.into()), ++ Err(e) => ++ PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()), + }; + Self::deposit_event(event); + weight_used.saturating_accrue(todo_vnt_notify_migrate_weight); +@@ -1182,7 +1184,7 @@ pub mod pallet { + if let Some(QueryStatus::Ready { response, at }) = Queries::::get(query_id) { + let response = response.try_into().ok()?; + Queries::::remove(query_id); +- Self::deposit_event(Event::ResponseTaken(query_id)); ++ Self::deposit_event(PalletEvent::ResponseTaken(query_id)); + Some((response, at)) + } else { + None +@@ -1277,7 +1279,7 @@ pub mod pallet { + let versioned = VersionedMultiAssets::from(MultiAssets::from(assets)); + let hash = BlakeTwo256::hash_of(&(&origin, &versioned)); + AssetTraps::::mutate(hash, |n| *n += 1); +- Self::deposit_event(Event::AssetsTrapped(hash, origin.clone(), versioned)); ++ Self::deposit_event(PalletEvent::AssetsTrapped(hash, origin.clone(), versioned)); + // TODO #3735: Put the real weight in there. + 0 + } +@@ -1334,7 +1336,7 @@ pub mod pallet { + let origin: MultiLocation = match expected_origin.try_into() { + Ok(o) if &o == origin => o, + Ok(o) => { +- Self::deposit_event(Event::InvalidResponder( ++ Self::deposit_event(PalletEvent::InvalidResponder( + origin.clone(), + query_id, + Some(o), +@@ -1342,7 +1344,7 @@ pub mod pallet { + return 0 + }, + _ => { +- Self::deposit_event(Event::InvalidResponder( ++ Self::deposit_event(PalletEvent::InvalidResponder( + origin.clone(), + query_id, + None, +@@ -1367,14 +1369,14 @@ pub mod pallet { + LatestVersionedMultiLocation(&origin), + v, + ); +- Self::deposit_event(Event::SupportedVersionChanged(origin, v)); ++ Self::deposit_event(PalletEvent::SupportedVersionChanged(origin, v)); + 0 + }, + (response, Some(QueryStatus::Pending { responder, maybe_notify, .. })) => { + let responder = match MultiLocation::try_from(responder) { + Ok(r) => r, + Err(_) => { +- Self::deposit_event(Event::InvalidResponderVersion( ++ Self::deposit_event(PalletEvent::InvalidResponderVersion( + origin.clone(), + query_id, + )); +@@ -1382,7 +1384,7 @@ pub mod pallet { + }, + }; + if origin != &responder { +- Self::deposit_event(Event::InvalidResponder( ++ Self::deposit_event(PalletEvent::InvalidResponder( + origin.clone(), + query_id, + Some(responder), +@@ -1401,7 +1403,7 @@ pub mod pallet { + Queries::::remove(query_id); + let weight = call.get_dispatch_info().weight; + if weight > max_weight { +- let e = Event::NotifyOverweight( ++ let e = PalletEvent::NotifyOverweight( + query_id, + pallet_index, + call_index, +@@ -1414,12 +1416,16 @@ pub mod pallet { + let dispatch_origin = Origin::Response(origin.clone()).into(); + match call.dispatch(dispatch_origin) { + Ok(post_info) => { +- let e = Event::Notified(query_id, pallet_index, call_index); ++ let e = PalletEvent::Notified( ++ query_id, ++ pallet_index, ++ call_index, ++ ); + Self::deposit_event(e); + post_info.actual_weight + }, + Err(error_and_info) => { +- let e = Event::NotifyDispatchError( ++ let e = PalletEvent::NotifyDispatchError( + query_id, + pallet_index, + call_index, +@@ -1432,14 +1438,17 @@ pub mod pallet { + } + .unwrap_or(weight) + } else { +- let e = +- Event::NotifyDecodeFailed(query_id, pallet_index, call_index); ++ let e = PalletEvent::NotifyDecodeFailed( ++ query_id, ++ pallet_index, ++ call_index, ++ ); + Self::deposit_event(e); + 0 + } + }, + None => { +- let e = Event::ResponseReady(query_id, response.clone()); ++ let e = PalletEvent::ResponseReady(query_id, response.clone()); + Self::deposit_event(e); + let at = frame_system::Pallet::::current_block_number(); + let response = response.into(); +@@ -1449,7 +1458,7 @@ pub mod pallet { + } + }, + _ => { +- Self::deposit_event(Event::UnexpectedResponse(origin.clone(), query_id)); ++ Self::deposit_event(PalletEvent::UnexpectedResponse(origin.clone(), query_id)); + return 0 + }, + } +diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs +index 5627acd31a3..3bd9bf395e3 100644 +--- a/xcm/pallet-xcm/src/mock.rs ++++ b/xcm/pallet-xcm/src/mock.rs +@@ -51,7 +51,8 @@ pub mod pallet_test_notifier { + + #[pallet::config] + pub trait Config: frame_system::Config + crate::Config { +- type Event: IsType<::Event> + From>; ++ type RuntimeEvent: IsType<::RuntimeEvent> ++ + From>; + type Origin: IsType<::Origin> + + Into::Origin>>; + type Call: IsType<::Call> + From>; +@@ -59,7 +60,7 @@ pub mod pallet_test_notifier { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + QueryPrepared(QueryId), + NotifyQueryPrepared(QueryId), + ResponseReceived(MultiLocation, QueryId, Response), +@@ -83,7 +84,7 @@ pub mod pallet_test_notifier { + Junction::AccountId32 { network: Any, id }.into(), + 100u32.into(), + ); +- Self::deposit_event(Event::::QueryPrepared(qid)); ++ Self::deposit_event(PalletEvent::::QueryPrepared(qid)); + Ok(()) + } + +@@ -100,7 +101,7 @@ pub mod pallet_test_notifier { + ::Call::from(call), + 100u32.into(), + ); +- Self::deposit_event(Event::::NotifyQueryPrepared(qid)); ++ Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); + Ok(()) + } + +@@ -111,7 +112,7 @@ pub mod pallet_test_notifier { + response: Response, + ) -> DispatchResult { + let responder = ensure_response(::Origin::from(origin))?; +- Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); ++ Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); + Ok(()) + } + } +@@ -180,7 +181,7 @@ impl frame_system::Config for Test { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockWeights = (); + type BlockLength = (); +@@ -206,7 +207,7 @@ parameter_types! { + impl pallet_balances::Config for Test { + type MaxLocks = MaxLocks; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -274,7 +275,7 @@ parameter_types! { + } + + impl pallet_xcm::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = (TestSendXcmErrX8, TestSendXcm); + type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; +@@ -293,16 +294,16 @@ impl pallet_xcm::Config for Test { + impl origin::Config for Test {} + + impl pallet_test_notifier::Config for Test { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type Origin = Origin; + type Call = Call; + } + +-pub(crate) fn last_event() -> Event { +- System::events().pop().expect("Event expected").event ++pub(crate) fn last_event() -> RuntimeEvent { ++ System::events().pop().expect("RuntimeEvent expected").event + } + +-pub(crate) fn last_events(n: usize) -> Vec { ++pub(crate) fn last_events(n: usize) -> Vec { + System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect() + } + +diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs +index 8ede7f11ae2..7aa2a8f9ed2 100644 +--- a/xcm/pallet-xcm/src/tests.rs ++++ b/xcm/pallet-xcm/src/tests.rs +@@ -84,12 +84,12 @@ fn report_outcome_notify_works() { + assert_eq!( + last_events(2), + vec![ +- Event::TestNotifier(pallet_test_notifier::Event::ResponseReceived( ++ RuntimeEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived( + Parachain(PARA_ID).into(), + 0, + Response::ExecutionResult(None), + )), +- Event::XcmPallet(crate::Event::Notified(0, 4, 2)), ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)), + ] + ); + assert_eq!(crate::Queries::::iter().collect::>(), vec![]); +@@ -139,7 +139,10 @@ fn report_outcome_works() { + assert_eq!(r, Outcome::Complete(1_000)); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::ResponseReady(0, Response::ExecutionResult(None),)) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::ResponseReady( ++ 0, ++ Response::ExecutionResult(None), ++ )) + ); + + let response = Some((Response::ExecutionResult(None), 1)); +@@ -180,7 +183,7 @@ fn send_works() { + ); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Sent(sender, RelayLocation::get(), message)) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message)) + ); + }); + } +@@ -252,7 +255,7 @@ fn teleport_assets_works() { + let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -296,7 +299,7 @@ fn limmited_teleport_assets_works() { + let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -338,7 +341,7 @@ fn unlimmited_teleport_assets_works() { + ); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -386,7 +389,7 @@ fn reserve_transfer_assets_works() { + let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -435,7 +438,7 @@ fn limited_reserve_transfer_assets_works() { + let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -482,7 +485,7 @@ fn unlimited_reserve_transfer_assets_works() { + ); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -515,7 +518,7 @@ fn execute_withdraw_to_deposit_works() { + assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + ); + }); + } +@@ -551,8 +554,12 @@ fn trapped_assets_can_be_claimed() { + assert_eq!( + last_events(2), + vec![ +- Event::XcmPallet(crate::Event::AssetsTrapped(hash.clone(), source, vma)), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete( ++ RuntimeEvent::XcmPallet(crate::PalletEvent::AssetsTrapped( ++ hash.clone(), ++ source, ++ vma ++ )), ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( + 5 * BaseXcmWeight::get() + ))) + ] +@@ -590,7 +597,7 @@ fn trapped_assets_can_be_claimed() { + )); + assert_eq!( + last_event(), +- Event::XcmPallet(crate::Event::Attempted(Outcome::Incomplete( ++ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete( + BaseXcmWeight::get(), + XcmError::UnknownClaim + ))) +diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs +index 9599efcd7f2..1eb51b7b24c 100644 +--- a/xcm/xcm-builder/tests/mock/mod.rs ++++ b/xcm/xcm-builder/tests/mock/mod.rs +@@ -71,7 +71,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockWeights = (); + type BlockLength = (); +@@ -97,7 +97,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type MaxLocks = MaxLocks; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -180,7 +180,7 @@ impl xcm_executor::Config for XcmConfig { + pub type LocalOriginToLocation = SignedToAccountId32; + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type LocationInverter = LocationInverter; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = TestSendXcm; +diff --git a/xcm/xcm-builder/tests/scenarios.rs b/xcm/xcm-builder/tests/scenarios.rs +index d826e652c5d..50842f89929 100644 +--- a/xcm/xcm-builder/tests/scenarios.rs ++++ b/xcm/xcm-builder/tests/scenarios.rs +@@ -89,7 +89,7 @@ fn transfer_asset_works() { + weight, + ); + System::assert_last_event( +- pallet_balances::Event::Transfer { from: ALICE, to: bob.clone(), amount }.into(), ++ pallet_balances::PalletEvent::Transfer { from: ALICE, to: bob.clone(), amount }.into(), + ); + assert_eq!(r, Outcome::Complete(weight)); + assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - amount); +diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs +index a6673aca7a9..a470e5bfd52 100644 +--- a/xcm/xcm-executor/integration-tests/src/lib.rs ++++ b/xcm/xcm-executor/integration-tests/src/lib.rs +@@ -66,18 +66,18 @@ fn basic_buy_fees_message_executes() { + .inspect_state(|| { + assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( + r.event, +- polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(Outcome::Complete( +- _ +- ))), ++ polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::Attempted( ++ Outcome::Complete(_) ++ )), + ))); + }); + } + + #[test] + fn query_response_fires() { +- use pallet_test_notifier::Event::*; ++ use pallet_test_notifier::PalletEvent::*; + use pallet_xcm::QueryStatus; +- use polkadot_test_runtime::Event::TestNotifier; ++ use polkadot_test_runtime::RuntimeEvent::TestNotifier; + + sp_tracing::try_init_simple(); + let mut client = TestClientBuilder::new() +@@ -146,7 +146,7 @@ fn query_response_fires() { + .inspect_state(|| { + assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( + r.event, +- polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::ResponseReady( ++ polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::ResponseReady( + q, + Response::ExecutionResult(None), + )) if q == query_id, +@@ -163,8 +163,8 @@ fn query_response_fires() { + + #[test] + fn query_response_elicits_handler() { +- use pallet_test_notifier::Event::*; +- use polkadot_test_runtime::Event::TestNotifier; ++ use pallet_test_notifier::PalletEvent::*; ++ use polkadot_test_runtime::RuntimeEvent::TestNotifier; + + sp_tracing::try_init_simple(); + let mut client = TestClientBuilder::new() +diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs +index 741732cc797..1fb659b082f 100644 +--- a/xcm/xcm-simulator/example/src/lib.rs ++++ b/xcm/xcm-simulator/example/src/lib.rs +@@ -135,10 +135,11 @@ mod tests { + }); + + ParaA::execute_with(|| { +- use parachain::{Event, System}; +- assert!(System::events() +- .iter() +- .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); ++ use parachain::{RuntimeEvent, System}; ++ assert!(System::events().iter().any(|r| matches!( ++ r.event, ++ RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) ++ ))); + }); + } + +@@ -162,10 +163,11 @@ mod tests { + }); + + Relay::execute_with(|| { +- use relay_chain::{Event, System}; +- assert!(System::events() +- .iter() +- .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); ++ use relay_chain::{RuntimeEvent, System}; ++ assert!(System::events().iter().any(|r| matches!( ++ r.event, ++ RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) ++ ))); + }); + } + +@@ -190,10 +192,11 @@ mod tests { + }); + + ParaB::execute_with(|| { +- use parachain::{Event, System}; +- assert!(System::events() +- .iter() +- .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); ++ use parachain::{RuntimeEvent, System}; ++ assert!(System::events().iter().any(|r| matches!( ++ r.event, ++ RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) ++ ))); + }); + } + +diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs +index 614d50e4fc6..984387e29e7 100644 +--- a/xcm/xcm-simulator/example/src/parachain.rs ++++ b/xcm/xcm-simulator/example/src/parachain.rs +@@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockWeights = (); + type BlockLength = (); +@@ -87,7 +87,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type MaxLocks = MaxLocks; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -156,7 +156,8 @@ pub mod mock_msg_queue { + + #[pallet::config] + pub trait Config: frame_system::Config { +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + type XcmExecutor: ExecuteXcm; + } + +@@ -187,7 +188,7 @@ pub mod mock_msg_queue { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + // XCMP + /// Some XCM was executed OK. + Success(Option), +@@ -223,14 +224,15 @@ pub mod mock_msg_queue { + Ok(xcm) => { + let location = (1, Parachain(sender.into())); + match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { +- Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), +- Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), ++ Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), ++ Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), + // As far as the caller is concerned, this was dispatched without error, so + // we just report the weight used. +- Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), ++ Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), + } + }, +- Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), ++ Err(()) => ++ (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), + }; + Self::deposit_event(event); + result +@@ -271,15 +273,15 @@ pub mod mock_msg_queue { + VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); + match maybe_msg { + Err(_) => { +- Self::deposit_event(Event::InvalidFormat(id)); ++ Self::deposit_event(PalletEvent::InvalidFormat(id)); + }, + Ok(Err(())) => { +- Self::deposit_event(Event::UnsupportedVersion(id)); ++ Self::deposit_event(PalletEvent::UnsupportedVersion(id)); + }, + Ok(Ok(x)) => { + let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); + >::append(x); +- Self::deposit_event(Event::ExecutedDownward(id, outcome)); ++ Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); + }, + } + } +@@ -289,14 +291,14 @@ pub mod mock_msg_queue { + } + + impl mock_msg_queue::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type XcmExecutor = XcmExecutor; + } + + pub type LocalOriginToLocation = SignedToAccountId32; + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = EnsureXcmOrigin; + type XcmRouter = XcmRouter; + type ExecuteXcmOrigin = EnsureXcmOrigin; +diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs +index a648ba96ba7..e9e6fe7608e 100644 +--- a/xcm/xcm-simulator/example/src/relay_chain.rs ++++ b/xcm/xcm-simulator/example/src/relay_chain.rs +@@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockWeights = (); + type BlockLength = (); +@@ -78,7 +78,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type MaxLocks = MaxLocks; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -144,7 +144,7 @@ impl Config for XcmConfig { + pub type LocalOriginToLocation = SignedToAccountId32; + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = XcmRouter; + // Anyone can execute XCM messages locally... +@@ -166,7 +166,7 @@ parameter_types! { + } + + impl ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = ump::XcmSink, Runtime>; + type FirstMessageFactorPercent = FirstMessageFactorPercent; + type ExecuteOverweightOrigin = frame_system::EnsureRoot; +diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs +index 3326875206b..b4c5abf14c7 100644 +--- a/xcm/xcm-simulator/fuzzer/src/parachain.rs ++++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs +@@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockWeights = (); + type BlockLength = (); +@@ -87,7 +87,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type MaxLocks = MaxLocks; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -156,7 +156,8 @@ pub mod mock_msg_queue { + + #[pallet::config] + pub trait Config: frame_system::Config { +- type Event: From> + IsType<::Event>; ++ type RuntimeEvent: From> ++ + IsType<::RuntimeEvent>; + type XcmExecutor: ExecuteXcm; + } + +@@ -187,7 +188,7 @@ pub mod mock_msg_queue { + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] +- pub enum Event { ++ pub enum PalletEvent { + // XCMP + /// Some XCM was executed OK. + Success(Option), +@@ -223,14 +224,15 @@ pub mod mock_msg_queue { + Ok(xcm) => { + let location = MultiLocation::new(1, X1(Parachain(sender.into()))); + match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { +- Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), +- Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), ++ Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), ++ Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), + // As far as the caller is concerned, this was dispatched without error, so + // we just report the weight used. +- Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), ++ Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), + } + }, +- Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), ++ Err(()) => ++ (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), + }; + Self::deposit_event(event); + result +@@ -271,15 +273,15 @@ pub mod mock_msg_queue { + VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); + match maybe_msg { + Err(_) => { +- Self::deposit_event(Event::InvalidFormat(id)); ++ Self::deposit_event(PalletEvent::InvalidFormat(id)); + }, + Ok(Err(())) => { +- Self::deposit_event(Event::UnsupportedVersion(id)); ++ Self::deposit_event(PalletEvent::UnsupportedVersion(id)); + }, + Ok(Ok(x)) => { + let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); + >::append(x); +- Self::deposit_event(Event::ExecutedDownward(id, outcome)); ++ Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); + }, + } + } +@@ -289,14 +291,14 @@ pub mod mock_msg_queue { + } + + impl mock_msg_queue::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type XcmExecutor = XcmExecutor; + } + + pub type LocalOriginToLocation = SignedToAccountId32; + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = EnsureXcmOrigin; + type XcmRouter = XcmRouter; + type ExecuteXcmOrigin = EnsureXcmOrigin; +diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +index a648ba96ba7..e9e6fe7608e 100644 +--- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs ++++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +@@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type BlockWeights = (); + type BlockLength = (); +@@ -78,7 +78,7 @@ parameter_types! { + impl pallet_balances::Config for Runtime { + type MaxLocks = MaxLocks; + type Balance = Balance; +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; +@@ -144,7 +144,7 @@ impl Config for XcmConfig { + pub type LocalOriginToLocation = SignedToAccountId32; + + impl pallet_xcm::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; + type XcmRouter = XcmRouter; + // Anyone can execute XCM messages locally... +@@ -166,7 +166,7 @@ parameter_types! { + } + + impl ump::Config for Runtime { +- type Event = Event; ++ type RuntimeEvent = RuntimeEvent; + type UmpSink = ump::XcmSink, Runtime>; + type FirstMessageFactorPercent = FirstMessageFactorPercent; + type ExecuteOverweightOrigin = frame_system::EnsureRoot; diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs index b5d8d7e9449b..bac642cde589 100644 --- a/runtime/common/src/assigned_slots.rs +++ b/runtime/common/src/assigned_slots.rs @@ -84,9 +84,8 @@ pub mod pallet { #[pallet::config] #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config + slots::Config { - /// The overarching PalletEvent type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + /// The overarching event type. + type Event: From> + IsType<::Event>; /// Origin for assigning slots. type AssignSlotOrigin: EnsureOrigin<::Origin>; @@ -153,7 +152,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// A para was assigned a permanent parachain slot PermanentSlotAssigned(ParaId), /// A para was assigned a temporary parachain slot @@ -251,7 +250,7 @@ pub mod pallet { ); >::mutate(|count| count.saturating_inc()); - Self::deposit_event(PalletEvent::::PermanentSlotAssigned(id)); + Self::deposit_event(Event::::PermanentSlotAssigned(id)); Ok(()) } @@ -335,7 +334,7 @@ pub mod pallet { TemporarySlots::::insert(id, temp_slot); >::mutate(|count| count.saturating_inc()); - Self::deposit_event(PalletEvent::::TemporarySlotAssigned(id)); + Self::deposit_event(Event::::TemporarySlotAssigned(id)); Ok(()) } @@ -602,7 +601,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type PalletEvent = PalletEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -622,7 +621,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type PalletEvent = PalletEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -641,7 +640,7 @@ mod tests { } impl parachains_paras::Config for Test { - type PalletEvent = PalletEvent; + type Event = Event; type WeightInfo = parachains_paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -656,7 +655,7 @@ mod tests { } impl slots::Config for Test { - type PalletEvent = PalletEvent; + type Event = Event; type Currency = Balances; type Registrar = TestRegistrar; type LeasePeriod = LeasePeriod; @@ -674,7 +673,7 @@ mod tests { } impl assigned_slots::Config for Test { - type PalletEvent = PalletEvent; + type Event = Event; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index 7971eafc04dc..b937a26d5671 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -91,8 +91,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// The type representing the leasing system. type Leaser: Leaser< @@ -126,7 +125,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// An auction started. Provides its index and the block number where it will begin to /// close and the first lease period of the quadruplet that is auctioned. AuctionStarted { @@ -403,7 +402,7 @@ impl Pallet { let ending = frame_system::Pallet::::block_number().saturating_add(duration); AuctionInfo::::put((lease_period_index, ending)); - Self::deposit_event(PalletEvent::::AuctionStarted { + Self::deposit_event(Event::::AuctionStarted { auction_index: n, lease_period: lease_period_index, ending, @@ -482,7 +481,7 @@ impl Pallet { // ...and record the amount reserved. ReservedAmounts::::insert(&bidder_para, reserve_required); - Self::deposit_event(PalletEvent::::Reserved { + Self::deposit_event(Event::::Reserved { bidder: bidder.clone(), extra_reserved: additional, total_amount: reserve_required, @@ -505,14 +504,14 @@ impl Pallet { // It really should be reserved; there's not much we can do here on fail. let err_amt = CurrencyOf::::unreserve(&who, amount); debug_assert!(err_amt.is_zero()); - Self::deposit_event(PalletEvent::::Unreserved { bidder: who, amount }); + Self::deposit_event(Event::::Unreserved { bidder: who, amount }); } } } // Update the range winner. Winning::::insert(offset, ¤t_winning); - Self::deposit_event(PalletEvent::::BidAccepted { + Self::deposit_event(Event::::BidAccepted { bidder, para_id: para, amount, @@ -549,7 +548,7 @@ impl Pallet { T::SampleLength::get().max(One::one()); let auction_counter = AuctionCounter::::get(); - Self::deposit_event(PalletEvent::::WinningOffset { + Self::deposit_event(Event::::WinningOffset { auction_index: auction_counter, block_number: offset, }); @@ -603,7 +602,7 @@ impl Pallet { // The leaser attempted to get a second lease on the same para ID, possibly griefing us. Let's // keep the amount reserved and let governance sort it out. if CurrencyOf::::reserve(&leaser, amount).is_ok() { - Self::deposit_event(PalletEvent::::ReserveConfiscated { + Self::deposit_event(Event::::ReserveConfiscated { para_id: para, leaser, amount, @@ -614,7 +613,7 @@ impl Pallet { } } - Self::deposit_event(PalletEvent::::AuctionClosed { + Self::deposit_event(Event::::AuctionClosed { auction_index: AuctionCounter::::get(), }); } @@ -719,7 +718,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type PalletEvent = PalletEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -740,7 +739,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; type DustRemoval = (); - type PalletEvent = PalletEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -868,7 +867,7 @@ mod tests { } impl Config for Test { - type PalletEvent = PalletEvent; + type Event = Event; type Leaser = TestLeaser; type Registrar = TestRegistrar; type EndingPeriod = EndingPeriod; @@ -1730,9 +1729,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::PalletEvent) { + fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1787,7 +1786,7 @@ mod benchmarking { let origin = T::InitiateOrigin::successful_origin(); }: _(origin, duration, lease_period_index) verify { - assert_last_event::(PalletEvent::::AuctionStarted { + assert_last_event::(Event::::AuctionStarted { auction_index: AuctionCounter::::get(), lease_period: LeasePeriodOf::::max_value(), ending: T::BlockNumber::max_value(), @@ -1885,7 +1884,7 @@ mod benchmarking { Auctions::::on_initialize(duration + now + T::EndingPeriod::get()); } verify { let auction_index = AuctionCounter::::get(); - assert_last_event::(PalletEvent::::AuctionClosed { auction_index }.into()); + assert_last_event::(Event::::AuctionClosed { auction_index }.into()); assert!(Winning::::iter().count().is_zero()); } diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index 315786308088..e2731f9336cc 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -172,8 +172,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; type VestingSchedule: VestingSchedule; #[pallet::constant] type Prefix: Get<&'static [u8]>; @@ -183,7 +182,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// Someone claimed some DOTs. Claimed { who: T::AccountId, ethereum_address: EthereumAddress, amount: BalanceOf }, } @@ -582,7 +581,7 @@ impl Pallet { Signing::::remove(&signer); // Let's deposit an event to let the outside world know this happened. - Self::deposit_event(PalletEvent::::Claimed { + Self::deposit_event(Event::::Claimed { who: dest, ethereum_address: signer, amount: balance_due, @@ -761,7 +760,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -780,7 +779,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -795,7 +794,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -811,7 +810,7 @@ mod tests { } impl Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureSignedBy; diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index 5366eb93cd15..4b2c29f5398d 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -189,8 +189,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")` #[pallet::constant] @@ -254,7 +253,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// Create a new crowdloaning campaign. Created { para_id: ParaId }, /// Contributed to a crowd sale. @@ -352,7 +351,7 @@ pub mod pallet { fund.raised, ); - Self::deposit_event(PalletEvent::::HandleBidResult { para_id, result }); + Self::deposit_event(Event::::HandleBidResult { para_id, result }); } T::WeightInfo::on_initialize(new_raise_len) } else { @@ -438,7 +437,7 @@ pub mod pallet { // Add a lock to the para so that the configuration cannot be changed. T::Registrar::apply_lock(index); - Self::deposit_event(PalletEvent::::Created { para_id: index }); + Self::deposit_event(Event::::Created { para_id: index }); Ok(()) } @@ -495,11 +494,7 @@ pub mod pallet { Funds::::insert(index, &fund); - Self::deposit_event(PalletEvent::::Withdrew { - who, - fund_index: index, - amount: balance, - }); + Self::deposit_event(Event::::Withdrew { who, fund_index: index, amount: balance }); Ok(()) } @@ -541,11 +536,11 @@ pub mod pallet { Funds::::insert(index, &fund); if all_refunded { - Self::deposit_event(PalletEvent::::AllRefunded { para_id: index }); + Self::deposit_event(Event::::AllRefunded { para_id: index }); // Refund for unused refund count. Ok(Some(T::WeightInfo::refund(refund_count)).into()) } else { - Self::deposit_event(PalletEvent::::PartiallyRefunded { para_id: index }); + Self::deposit_event(Event::::PartiallyRefunded { para_id: index }); // No weight to refund since we did not finish the loop. Ok(().into()) } @@ -572,7 +567,7 @@ pub mod pallet { CurrencyOf::::unreserve(&fund.depositor, fund.deposit); Funds::::remove(index); - Self::deposit_event(PalletEvent::::Dissolved { para_id: index }); + Self::deposit_event(Event::::Dissolved { para_id: index }); Ok(()) } @@ -609,7 +604,7 @@ pub mod pallet { }, ); - Self::deposit_event(PalletEvent::::Edited { para_id: index }); + Self::deposit_event(Event::::Edited { para_id: index }); Ok(()) } @@ -627,7 +622,7 @@ pub mod pallet { ensure!(balance > Zero::zero(), Error::::NoContributions); Self::contribution_put(fund.fund_index, &who, &balance, &memo); - Self::deposit_event(PalletEvent::::MemoUpdated { who, para_id: index, memo }); + Self::deposit_event(Event::::MemoUpdated { who, para_id: index, memo }); Ok(()) } @@ -641,7 +636,7 @@ pub mod pallet { ensure!(!fund.raised.is_zero(), Error::::NoContributions); ensure!(!NewRaise::::get().contains(&index), Error::::AlreadyInNewRaise); NewRaise::::append(index); - Self::deposit_event(PalletEvent::::AddedToNewRaise { para_id: index }); + Self::deposit_event(Event::::AddedToNewRaise { para_id: index }); Ok(()) } @@ -816,11 +811,7 @@ impl Pallet { Funds::::insert(index, &fund); - Self::deposit_event(PalletEvent::::Contributed { - who, - fund_index: index, - amount: value, - }); + Self::deposit_event(Event::::Contributed { who, fund_index: index, amount: value }); Ok(()) } } @@ -910,7 +901,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -929,7 +920,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -1081,7 +1072,7 @@ mod tests { } impl Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; type PalletId = CrowdloanPalletId; @@ -1138,8 +1129,8 @@ mod tests { } } - fn last_event() -> PalletEvent { - System::events().pop().expect("PalletEvent expected").event + fn last_event() -> Event { + System::events().pop().expect("Event expected").event } #[test] @@ -1660,7 +1651,7 @@ mod tests { assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); assert_eq!( last_event(), - super::PalletEvent::::PartiallyRefunded { para_id: para }.into() + super::Event::::PartiallyRefunded { para_id: para }.into() ); // Funds still left over @@ -1668,10 +1659,7 @@ mod tests { // Call again assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); - assert_eq!( - last_event(), - super::PalletEvent::::AllRefunded { para_id: para }.into() - ); + assert_eq!(last_event(), super::Event::::AllRefunded { para_id: para }.into()); // Funds are returned assert_eq!(Balances::free_balance(account_id), 0); @@ -1918,9 +1906,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::PalletEvent) { + fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1999,7 +1987,7 @@ mod benchmarking { }: _(RawOrigin::Signed(caller), para_id, cap, first_period, last_period, end, Some(verifier)) verify { - assert_last_event::(PalletEvent::::Created { para_id }.into()) + assert_last_event::(Event::::Created { para_id }.into()) } // Contribute has two arms: PreEnding and Ending, but both are equal complexity. @@ -2020,7 +2008,7 @@ mod benchmarking { verify { // NewRaise is appended to, so we don't need to fill it up for worst case scenario. assert!(!NewRaise::::get().is_empty()); - assert_last_event::(PalletEvent::::Contributed { who: caller, fund_index, amount: contribution }.into()); + assert_last_event::(Event::::Contributed { who: caller, fund_index, amount: contribution }.into()); } withdraw { @@ -2033,7 +2021,7 @@ mod benchmarking { frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); }: _(RawOrigin::Signed(caller), contributor.clone(), fund_index) verify { - assert_last_event::(PalletEvent::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); + assert_last_event::(Event::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); } // Worst case: Refund removes `RemoveKeysLimit` keys, and is fully refunded. @@ -2053,7 +2041,7 @@ mod benchmarking { frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); }: _(RawOrigin::Signed(caller), fund_index) verify { - assert_last_event::(PalletEvent::::AllRefunded { para_id: fund_index }.into()); + assert_last_event::(Event::::AllRefunded { para_id: fund_index }.into()); } dissolve { @@ -2064,7 +2052,7 @@ mod benchmarking { frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); }: _(RawOrigin::Signed(caller.clone()), fund_index) verify { - assert_last_event::(PalletEvent::::Dissolved { para_id: fund_index }.into()); + assert_last_event::(Event::::Dissolved { para_id: fund_index }.into()); } edit { @@ -2093,7 +2081,7 @@ mod benchmarking { // Doesn't matter what we edit to, so use the same values. }: _(RawOrigin::Root, para_id, cap, first_period, last_period, end, Some(verifier)) verify { - assert_last_event::(PalletEvent::::Edited { para_id }.into()) + assert_last_event::(Event::::Edited { para_id }.into()) } add_memo { @@ -2123,7 +2111,7 @@ mod benchmarking { }: _(RawOrigin::Signed(caller), fund_index) verify { assert!(!NewRaise::::get().is_empty()); - assert_last_event::(PalletEvent::::AddedToNewRaise { para_id: fund_index }.into()) + assert_last_event::(Event::::AddedToNewRaise { para_id: fund_index }.into()) } // Worst case scenario: N funds are all in the `NewRaise` list, we are @@ -2162,7 +2150,7 @@ mod benchmarking { Crowdloan::::on_initialize(end_block); } verify { assert_eq!(EndingsCount::::get(), old_endings_count + 1); - assert_last_event::(PalletEvent::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); + assert_last_event::(Event::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); } impl_benchmark_test_suite!( diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index c528f1915116..bce847c82a83 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -113,7 +113,7 @@ mod tests { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockLength = BlockLength; type BlockWeights = BlockWeights; @@ -131,7 +131,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = (); type AccountStore = System; @@ -150,7 +150,7 @@ mod tests { type Currency = pallet_balances::Pallet; type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnSlash = (); type ProposalBond = (); type ProposalBondMinimum = (); diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs index 89fbe2409643..76dc1f4c55b0 100644 --- a/runtime/common/src/integration_tests.rs +++ b/runtime/common/src/integration_tests.rs @@ -120,7 +120,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -178,7 +178,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -200,7 +200,7 @@ parameter_types! { } impl paras::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -212,7 +212,7 @@ parameter_types! { } impl paras_registrar::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnSwap = (Crowdloan, Slots); type ParaDeposit = ParaDeposit; type DataDepositPerByte = DataDepositPerByte; @@ -227,7 +227,7 @@ parameter_types! { } impl auctions::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -243,7 +243,7 @@ parameter_types! { } impl slots::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -261,7 +261,7 @@ parameter_types! { } impl crowdloan::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -342,11 +342,11 @@ fn run_to_session(n: u32) { run_to_block(block_number); } -fn last_event() -> PalletEvent { - System::events().pop().expect("PalletEvent expected").event +fn last_event() -> Event { + System::events().pop().expect("Event expected").event } -fn contains_event(event: PalletEvent) -> bool { +fn contains_event(event: Event) -> bool { System::events().iter().any(|x| x.event == event) } @@ -432,7 +432,7 @@ fn basic_end_to_end_works() { // Auction ends at block 110 + offset run_to_block(109 + offset); assert!(contains_event( - crowdloan::PalletEvent::::HandleBidResult { + crowdloan::Event::::HandleBidResult { para_id: ParaId::from(para_2), result: Ok(()) } @@ -441,7 +441,7 @@ fn basic_end_to_end_works() { run_to_block(110 + offset); assert_eq!( last_event(), - auctions::PalletEvent::::AuctionClosed { auction_index: 1 }.into() + auctions::Event::::AuctionClosed { auction_index: 1 }.into() ); // Paras should have won slots diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 183c307da316..7631914b9992 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -96,8 +96,7 @@ pub mod pallet { #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config { /// The overarching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// The aggregated origin type must support the `parachains` origin. We require that we can /// infallibly convert between this origin and the system origin, but in reality, they're the @@ -127,7 +126,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { Registered { para_id: ParaId, manager: T::AccountId }, Deregistered { para_id: ParaId }, Reserved { para_id: ParaId, who: T::AccountId }, @@ -493,7 +492,7 @@ impl Pallet { let info = ParaInfo { manager: who.clone(), deposit, locked: false }; Paras::::insert(id, info); - Self::deposit_event(PalletEvent::::Reserved { para_id: id, who }); + Self::deposit_event(Event::::Reserved { para_id: id, who }); Ok(()) } @@ -531,7 +530,7 @@ impl Pallet { // We check above that para has no lifecycle, so this should not fail. let res = runtime_parachains::schedule_para_initialize::(id, genesis); debug_assert!(res.is_ok()); - Self::deposit_event(PalletEvent::::Registered { para_id: id, manager: who }); + Self::deposit_event(Event::::Registered { para_id: id, manager: who }); Ok(()) } @@ -550,7 +549,7 @@ impl Pallet { } PendingSwap::::remove(id); - Self::deposit_event(PalletEvent::::Deregistered { para_id: id }); + Self::deposit_event(Event::::Deregistered { para_id: id }); Ok(()) } @@ -658,7 +657,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type DbWeight = (); type BlockWeights = BlockWeights; @@ -681,7 +680,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u128; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = (); @@ -699,7 +698,7 @@ mod tests { } impl paras::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -716,7 +715,7 @@ mod tests { } impl Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type OnSwap = MockSwap; @@ -1227,9 +1226,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::PalletEvent) { + fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1269,7 +1268,7 @@ mod benchmarking { T::Currency::make_free_balance_be(&caller, BalanceOf::::max_value()); }: _(RawOrigin::Signed(caller.clone())) verify { - assert_last_event::(PalletEvent::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); + assert_last_event::(Event::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); assert!(Paras::::get(LOWEST_PUBLIC_ID).is_some()); assert_eq!(paras::Pallet::::lifecycle(LOWEST_PUBLIC_ID), None); } @@ -1283,7 +1282,7 @@ mod benchmarking { assert_ok!(Registrar::::reserve(RawOrigin::Signed(caller.clone()).into())); }: _(RawOrigin::Signed(caller.clone()), para, genesis_head, validation_code) verify { - assert_last_event::(PalletEvent::::Registered{ para_id: para, manager: caller }.into()); + assert_last_event::(Event::::Registered{ para_id: para, manager: caller }.into()); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); next_scheduled_session::(); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); @@ -1297,7 +1296,7 @@ mod benchmarking { let validation_code = Registrar::::worst_validation_code(); }: _(RawOrigin::Root, manager.clone(), deposit, para, genesis_head, validation_code) verify { - assert_last_event::(PalletEvent::::Registered { para_id: para, manager }.into()); + assert_last_event::(Event::::Registered { para_id: para, manager }.into()); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); next_scheduled_session::(); assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); @@ -1309,7 +1308,7 @@ mod benchmarking { let caller: T::AccountId = whitelisted_caller(); }: _(RawOrigin::Signed(caller), para) verify { - assert_last_event::(PalletEvent::::Deregistered { para_id: para }.into()); + assert_last_event::(Event::::Deregistered { para_id: para }.into()); } swap { diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index c8cee4046331..3900f6edb318 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -98,8 +98,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// Balances Pallet type Currency: Currency; @@ -132,7 +131,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// A [new] account was created. AccountCreated { who: T::AccountId }, /// Someone's account validity was updated. @@ -223,7 +222,7 @@ pub mod pallet { vat: Permill::zero(), }; Accounts::::insert(&who, status); - Self::deposit_event(PalletEvent::::AccountCreated { who }); + Self::deposit_event(Event::::AccountCreated { who }); Ok(()) } @@ -252,7 +251,7 @@ pub mod pallet { Ok(()) }, )?; - Self::deposit_event(PalletEvent::::ValidityUpdated { who, validity }); + Self::deposit_event(Event::::ValidityUpdated { who, validity }); Ok(()) } @@ -284,7 +283,7 @@ pub mod pallet { Ok(()) }, )?; - Self::deposit_event(PalletEvent::::BalanceUpdated { + Self::deposit_event(Event::::BalanceUpdated { who, free: free_balance, locked: locked_balance, @@ -351,7 +350,7 @@ pub mod pallet { // Setting the user account to `Completed` ends the purchase process for this user. status.validity = AccountValidity::Completed; - Self::deposit_event(PalletEvent::::PaymentComplete { + Self::deposit_event(Event::::PaymentComplete { who: who.clone(), free: status.free_balance, locked: status.locked_balance, @@ -372,7 +371,7 @@ pub mod pallet { T::ConfigurationOrigin::ensure_origin(origin)?; // Possibly this is worse than having the caller account be the payment account? PaymentAccount::::put(who.clone()); - Self::deposit_event(PalletEvent::::PaymentAccountSet { who }); + Self::deposit_event(Event::::PaymentAccountSet { who }); Ok(()) } @@ -388,7 +387,7 @@ pub mod pallet { ); // Possibly this is worse than having the caller account be the payment account? Statement::::set(statement); - Self::deposit_event(PalletEvent::::StatementUpdated); + Self::deposit_event(Event::::StatementUpdated); Ok(()) } @@ -407,9 +406,7 @@ pub mod pallet { ); // Possibly this is worse than having the caller account be the payment account? UnlockBlock::::set(unlock_block); - Self::deposit_event(PalletEvent::::UnlockBlockUpdated { - block_number: unlock_block, - }); + Self::deposit_event(Event::::UnlockBlockUpdated { block_number: unlock_block }); Ok(()) } } @@ -522,7 +519,7 @@ mod tests { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -541,7 +538,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -556,7 +553,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -577,7 +574,7 @@ mod tests { } impl Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type VestingSchedule = Vesting; type ValidityOrigin = frame_system::EnsureSignedBy; diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index 2a52c8631cdb..76054ac989f9 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -74,8 +74,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// The currency type used for bidding. type Currency: ReservableCurrency; @@ -121,7 +120,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// A new `[lease_period]` is beginning. NewLeasePeriod { lease_period: LeasePeriodOf }, /// A para has won the right to a continuous set of lease periods as a parachain. @@ -228,7 +227,7 @@ impl Pallet { /// We need to on-board and off-board parachains as needed. We should also handle reducing/ /// returning deposits. fn manage_lease_period_start(lease_period_index: LeasePeriodOf) -> Weight { - Self::deposit_event(PalletEvent::::NewLeasePeriod { lease_period: lease_period_index }); + Self::deposit_event(Event::::NewLeasePeriod { lease_period: lease_period_index }); let old_parachains = T::Registrar::parachains(); @@ -408,7 +407,7 @@ impl Leaser for Pallet { let _ = T::Registrar::make_parachain(para); } - Self::deposit_event(PalletEvent::::Leased { + Self::deposit_event(Event::::Leased { para_id: para, leaser: leaser.clone(), period_begin, @@ -539,7 +538,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -559,7 +558,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -576,7 +575,7 @@ mod tests { } impl Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Registrar = TestRegistrar; type LeasePeriod = LeasePeriod; @@ -989,9 +988,9 @@ mod benchmarking { use crate::slots::Pallet as Slots; - fn assert_last_event(generic_event: ::PalletEvent) { + fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -1028,7 +1027,7 @@ mod benchmarking { let origin = T::ForceOrigin::successful_origin(); }: _(origin, para, leaser.clone(), amount, period_begin, period_count) verify { - assert_last_event::(PalletEvent::::Leased { + assert_last_event::(Event::::Leased { para_id: para, leaser, period_begin, period_count, diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs index b36380b4b3fd..a87ddf6ec1fc 100644 --- a/runtime/kusama/src/governance/old.rs +++ b/runtime/kusama/src/governance/old.rs @@ -33,7 +33,7 @@ parameter_types! { impl pallet_democracy::Config for Runtime { type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -94,7 +94,7 @@ pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -121,7 +121,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type ChangeMembers = Council; type InitializeMembers = Council; @@ -150,7 +150,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -159,7 +159,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 5e2fa13025cf..12b9554c5cff 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -175,7 +175,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -225,7 +225,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; @@ -246,7 +246,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -302,7 +302,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -315,7 +315,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -332,7 +332,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -378,7 +378,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -468,7 +468,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type EstimateCallFee = TransactionPayment; type UnsignedPhase = UnsignedPhase; @@ -511,7 +511,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -607,7 +607,7 @@ impl pallet_staking::Config for Runtime { type ElectionProvider = ElectionProviderMultiPhase; type GenesisElectionProvider = onchain::UnboundedExecution; type RewardRemainder = Treasury; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Slash = Treasury; type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -656,7 +656,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -691,7 +691,7 @@ impl pallet_bounties::Config for Runtime { type BountyValueMinimum = BountyValueMinimum; type ChildBountyManager = ChildBounties; type DataDepositPerByte = DataDepositPerByte; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } @@ -702,7 +702,7 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; @@ -715,12 +715,12 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_tips::WeightInfo; } impl pallet_offences::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -737,7 +737,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -749,7 +749,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type KeyOwnerProof = @@ -838,7 +838,7 @@ parameter_types! { } impl claims::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = @@ -857,7 +857,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BasicDeposit = BasicDeposit; type FieldDeposit = FieldDeposit; @@ -872,7 +872,7 @@ impl pallet_identity::Config for Runtime { } impl pallet_utility::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -887,7 +887,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -904,7 +904,7 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = (); type Call = Call; type Currency = Balances; @@ -927,7 +927,7 @@ parameter_types! { } impl pallet_society::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Randomness = pallet_babe::RandomnessFromOneEpochAgo; type CandidateDeposit = CandidateDeposit; @@ -950,7 +950,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -1094,7 +1094,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -1121,7 +1121,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -1131,7 +1131,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -1142,7 +1142,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -1153,7 +1153,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -1172,7 +1172,7 @@ impl parachains_initializer::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -1183,7 +1183,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -1198,7 +1198,7 @@ parameter_types! { } impl slots::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1217,7 +1217,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1242,7 +1242,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1264,7 +1264,7 @@ parameter_types! { } impl pallet_gilt::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type CurrencyBalance = Balance; type AdminOrigin = MoreThanHalfCouncil; @@ -1287,7 +1287,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; type Currency = Balances; type CurrencyBalance = Balance; @@ -1621,7 +1621,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - RuntimeEvent::ParaInclusion(ev) => { + Event::ParaInclusion(ev) => { Some(ev) } _ => None, diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 05c892d16bdc..5bf45cfc89c4 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configurations for the Kusama runtime. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, - RuntimeEvent, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, + Runtime, WeightToFee, XcmPallet, }; use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; use runtime_common::{xcm_sender, ToAuthor}; @@ -169,7 +169,7 @@ pub type LocalOriginToLocation = ( SignedToAccountId32, ); impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; // We only allow the council to send messages. This is basically safe to enable for everyone // (safe the possibility of someone spamming the parachain if they're willing to pay the KSM to // send from the Relay-chain), but it's useless until we bring in XCM v3 which will make diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index f9cdfe920101..aec60a4eb0f7 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -410,8 +410,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config + session_info::Config { - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; type RewardValidators: RewardValidators; type PunishValidators: PunishValidators; @@ -469,7 +468,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// A dispute has been initiated. \[candidate hash, dispute location\] DisputeInitiated(CandidateHash, DisputeLocation), /// A dispute has concluded for or against a candidate. @@ -805,7 +804,7 @@ impl Pallet { if dispute.concluded_at.is_none() && dispute.start + config.dispute_conclusion_by_time_out_period < now { - Self::deposit_event(PalletEvent::DisputeTimedOut(candidate_hash)); + Self::deposit_event(Event::DisputeTimedOut(candidate_hash)); dispute.concluded_at = Some(now); >::insert(session_index, candidate_hash, &dispute); @@ -1196,7 +1195,7 @@ impl Pallet { if fresh { let is_local = >::contains_key(&session, &candidate_hash); - Self::deposit_event(PalletEvent::DisputeInitiated( + Self::deposit_event(Event::DisputeInitiated( candidate_hash, if is_local { DisputeLocation::Local } else { DisputeLocation::Remote }, )); @@ -1204,10 +1203,7 @@ impl Pallet { { if summary.new_flags.contains(DisputeStateFlags::FOR_SUPERMAJORITY) { - Self::deposit_event(PalletEvent::DisputeConcluded( - candidate_hash, - DisputeResult::Valid, - )); + Self::deposit_event(Event::DisputeConcluded(candidate_hash, DisputeResult::Valid)); } // It is possible, although unexpected, for a dispute to conclude twice. @@ -1215,7 +1211,7 @@ impl Pallet { // A dispute cannot conclude more than once in each direction. if summary.new_flags.contains(DisputeStateFlags::AGAINST_SUPERMAJORITY) { - Self::deposit_event(PalletEvent::DisputeConcluded( + Self::deposit_event(Event::DisputeConcluded( candidate_hash, DisputeResult::Invalid, )); @@ -1308,7 +1304,7 @@ impl Pallet { // If we want to revert to block X in the current chain, we need to revert // block X+1. let revert = revert_to + One::one(); - Self::deposit_event(PalletEvent::Revert(revert)); + Self::deposit_event(Event::Revert(revert)); frame_system::Pallet::::deposit_log( ConsensusLog::Revert(revert.saturated_into()).into(), ); diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs index 937f45546a51..2897ced22ed0 100644 --- a/runtime/parachains/src/disputes/tests.rs +++ b/runtime/parachains/src/disputes/tests.rs @@ -1341,7 +1341,7 @@ fn test_revert_and_freeze() { assert_eq!(Frozen::::get(), Some(0)); assert_eq!(System::digest().logs[0], ConsensusLog::Revert(1).into()); - System::assert_has_event(PalletEvent::Revert(1).into()); + System::assert_has_event(Event::Revert(1).into()); }) } diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs index d8fa87015a8a..d18c2b3fc497 100644 --- a/runtime/parachains/src/hrmp.rs +++ b/runtime/parachains/src/hrmp.rs @@ -239,8 +239,7 @@ pub mod pallet { frame_system::Config + configuration::Config + paras::Config + dmp::Config { /// The outer event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; type Origin: From + From<::Origin> @@ -259,7 +258,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// Open HRMP channel requested. /// `[sender, recipient, proposed_max_capacity, proposed_max_message_size]` OpenChannelRequested(ParaId, ParaId, u32, u32), @@ -473,7 +472,7 @@ pub mod pallet { proposed_max_capacity, proposed_max_message_size, )?; - Self::deposit_event(PalletEvent::OpenChannelRequested( + Self::deposit_event(Event::OpenChannelRequested( origin, recipient, proposed_max_capacity, @@ -489,7 +488,7 @@ pub mod pallet { pub fn hrmp_accept_open_channel(origin: OriginFor, sender: ParaId) -> DispatchResult { let origin = ensure_parachain(::Origin::from(origin))?; Self::accept_open_channel(origin, sender)?; - Self::deposit_event(PalletEvent::OpenChannelAccepted(sender, origin)); + Self::deposit_event(Event::OpenChannelAccepted(sender, origin)); Ok(()) } @@ -504,7 +503,7 @@ pub mod pallet { ) -> DispatchResult { let origin = ensure_parachain(::Origin::from(origin))?; Self::close_channel(origin, channel_id.clone())?; - Self::deposit_event(PalletEvent::ChannelClosed(origin, channel_id)); + Self::deposit_event(Event::ChannelClosed(origin, channel_id)); Ok(()) } @@ -575,7 +574,7 @@ pub mod pallet { Error::::WrongWitness ); Self::cancel_open_request(origin, channel_id.clone())?; - Self::deposit_event(PalletEvent::OpenChannelCanceled(origin, channel_id)); + Self::deposit_event(Event::OpenChannelCanceled(origin, channel_id)); Ok(()) } } diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs index 321b9213561c..3486e990fe57 100644 --- a/runtime/parachains/src/hrmp/benchmarking.rs +++ b/runtime/parachains/src/hrmp/benchmarking.rs @@ -39,9 +39,9 @@ fn register_parachain_with_balance(id: ParaId, balance: BalanceOf) T::Currency::make_free_balance_be(&id.into_account_truncating(), balance); } -fn assert_last_event(generic_event: ::PalletEvent) { +fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -156,7 +156,7 @@ frame_benchmarking::benchmarks! { }: _(sender_origin, recipient_id, capacity, message_size) verify { assert_last_event::( - PalletEvent::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() + Event::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() ); } @@ -165,7 +165,7 @@ frame_benchmarking::benchmarks! { establish_para_connection::(1, 2, ParachainSetupStep::Requested); }: _(recipient_origin, sender) verify { - assert_last_event::(PalletEvent::::OpenChannelAccepted(sender, recipient).into()); + assert_last_event::(Event::::OpenChannelAccepted(sender, recipient).into()); } hrmp_close_channel { @@ -174,7 +174,7 @@ frame_benchmarking::benchmarks! { let channel_id = HrmpChannelId { sender, recipient }; }: _(sender_origin, channel_id.clone()) verify { - assert_last_event::(PalletEvent::::ChannelClosed(sender, channel_id).into()); + assert_last_event::(Event::::ChannelClosed(sender, channel_id).into()); } // NOTE: a single parachain should have the maximum number of allowed ingress and egress diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs index 18355ad73f7f..463c5eb39385 100644 --- a/runtime/parachains/src/hrmp/tests.rs +++ b/runtime/parachains/src/hrmp/tests.rs @@ -16,8 +16,8 @@ use super::*; use crate::mock::{ - new_test_ext, Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared, - RuntimeEvent as MockEvent, System, Test, + new_test_ext, Configuration, Event as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, + System, Test, }; use frame_support::{assert_noop, assert_ok, traits::Currency as _}; use primitives::v2::BlockNumber; @@ -173,12 +173,14 @@ fn open_channel_works() { Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap(); Hrmp::assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| record.event == - MockEvent::Hrmp(PalletEvent::OpenChannelRequested(para_a, para_b, 2, 8)))); + MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8)))); Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap(); Hrmp::assert_storage_consistency_exhaustive(); - assert!(System::events().iter().any(|record| record.event == - MockEvent::Hrmp(PalletEvent::OpenChannelAccepted(para_a, para_b)))); + assert!(System::events() + .iter() + .any(|record| record.event == + MockEvent::Hrmp(Event::OpenChannelAccepted(para_a, para_b)))); // Advance to a block 6, but without session change. That means that the channel has // not been created yet. @@ -221,7 +223,7 @@ fn close_channel_works() { assert!(!channel_exists(para_a, para_b)); Hrmp::assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| record.event == - MockEvent::Hrmp(PalletEvent::ChannelClosed(para_b, channel_id.clone())))); + MockEvent::Hrmp(Event::ChannelClosed(para_b, channel_id.clone())))); }); } diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index 39ef43be1655..c936b54eecfc 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -198,15 +198,14 @@ pub mod pallet { + hrmp::Config + configuration::Config { - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; type DisputesHandler: disputes::DisputesHandler; type RewardValidators: RewardValidators; } #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// A candidate was backed. `[candidate, head_data]` CandidateBacked(CandidateReceipt, HeadData, CoreIndex, GroupIndex), /// A candidate was included. `[candidate, head_data]` @@ -656,7 +655,7 @@ impl Pallet { let availability_votes: BitVec = bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()]; - Self::deposit_event(PalletEvent::::CandidateBacked( + Self::deposit_event(Event::::CandidateBacked( candidate.candidate.to_plain(), candidate.candidate.commitments.head_data.clone(), core, @@ -779,7 +778,7 @@ impl Pallet { commitments.horizontal_messages, ); - Self::deposit_event(PalletEvent::::CandidateIncluded( + Self::deposit_event(Event::::CandidateIncluded( plain, commitments.head_data.clone(), core_index, @@ -824,7 +823,7 @@ impl Pallet { commitments_hash: commitments.hash(), }; - Self::deposit_event(PalletEvent::::CandidateTimedOut( + Self::deposit_event(Event::::CandidateTimedOut( candidate, commitments.head_data, pending.core, diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index cbb7e01dd314..064b9918ff5f 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -101,7 +101,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -123,7 +123,7 @@ impl pallet_balances::Config for Test { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -213,7 +213,7 @@ impl frame_support::traits::EstimateNextSessionRotation for TestNextSession } impl crate::paras::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = crate::paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = TestNextSessionRotation; @@ -226,7 +226,7 @@ parameter_types! { } impl crate::ump::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = TestUmpSink; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -234,14 +234,14 @@ impl crate::ump::Config for Test { } impl crate::hrmp::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = pallet_balances::Pallet; type WeightInfo = crate::hrmp::TestWeightInfo; } impl crate::disputes::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type RewardValidators = Self; type PunishValidators = Self; type WeightInfo = crate::disputes::TestWeightInfo; @@ -292,7 +292,7 @@ impl crate::disputes::PunishValidators for Test { impl crate::scheduler::Config for Test {} impl crate::inclusion::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DisputesHandler = Disputes; type RewardValidators = TestRewardValidators; } @@ -455,9 +455,9 @@ pub struct MockGenesisConfig { pub paras: crate::paras::GenesisConfig, } -pub fn assert_last_event(generic_event: RuntimeEvent) { +pub fn assert_last_event(generic_event: Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/paras/benchmarking.rs b/runtime/parachains/src/paras/benchmarking.rs index 283cc3d35b0a..9d31453638a7 100644 --- a/runtime/parachains/src/paras/benchmarking.rs +++ b/runtime/parachains/src/paras/benchmarking.rs @@ -31,9 +31,9 @@ use self::pvf_check::{VoteCause, VoteOutcome}; // shouldn't exceed this number. const SAMPLE_SIZE: u32 = 1024; -fn assert_last_event(generic_event: ::PalletEvent) { +fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); @@ -89,7 +89,7 @@ benchmarks! { generate_disordered_pruning::(); }: _(RawOrigin::Root, para_id, new_code) verify { - assert_last_event::(PalletEvent::CurrentCodeUpdated(para_id).into()); + assert_last_event::(Event::CurrentCodeUpdated(para_id).into()); } force_set_current_head { let s in 1 .. MAX_HEAD_DATA_SIZE; @@ -97,7 +97,7 @@ benchmarks! { let para_id = ParaId::from(1000); }: _(RawOrigin::Root, para_id, new_head) verify { - assert_last_event::(PalletEvent::CurrentHeadUpdated(para_id).into()); + assert_last_event::(Event::CurrentHeadUpdated(para_id).into()); } force_schedule_code_upgrade { let c in 1 .. MAX_CODE_SIZE; @@ -107,7 +107,7 @@ benchmarks! { generate_disordered_upgrades::(); }: _(RawOrigin::Root, para_id, new_code, block) verify { - assert_last_event::(PalletEvent::CodeUpgradeScheduled(para_id).into()); + assert_last_event::(Event::CodeUpgradeScheduled(para_id).into()); } force_note_new_head { let s in 1 .. MAX_HEAD_DATA_SIZE; @@ -123,7 +123,7 @@ benchmarks! { Pallet::::schedule_code_upgrade(para_id, ValidationCode(vec![0]), expired, &config); }: _(RawOrigin::Root, para_id, new_head) verify { - assert_last_event::(PalletEvent::NewHeadNoted(para_id).into()); + assert_last_event::(Event::NewHeadNoted(para_id).into()); } force_queue_action { let para_id = ParaId::from(1000); @@ -131,7 +131,7 @@ benchmarks! { }: _(RawOrigin::Root, para_id) verify { let next_session = crate::shared::Pallet::::session_index().saturating_add(One::one()); - assert_last_event::(PalletEvent::ActionQueued(para_id, next_session).into()); + assert_last_event::(Event::ActionQueued(para_id, next_session).into()); } add_trusted_validation_code { diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs index 0075171b4659..3c5b82479395 100644 --- a/runtime/parachains/src/paras/mod.rs +++ b/runtime/parachains/src/paras/mod.rs @@ -473,7 +473,7 @@ pub mod pallet { + shared::Config + frame_system::offchain::SendTransactionTypes> { - type RuntimeEvent: From + IsType<::RuntimeEvent>; + type Event: From + IsType<::Event>; #[pallet::constant] type UnsignedPriority: Get; @@ -486,7 +486,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// Current code has been updated for a Para. `para_id` CurrentCodeUpdated(ParaId), /// Current head has been updated for a Para. `para_id` @@ -740,7 +740,7 @@ pub mod pallet { ¶ ); } - Self::deposit_event(PalletEvent::CurrentCodeUpdated(para)); + Self::deposit_event(Event::CurrentCodeUpdated(para)); Ok(()) } @@ -753,7 +753,7 @@ pub mod pallet { ) -> DispatchResult { ensure_root(origin)?; ::Heads::insert(¶, new_head); - Self::deposit_event(PalletEvent::CurrentHeadUpdated(para)); + Self::deposit_event(Event::CurrentHeadUpdated(para)); Ok(()) } @@ -768,7 +768,7 @@ pub mod pallet { ensure_root(origin)?; let config = configuration::Pallet::::config(); Self::schedule_code_upgrade(para, new_code, relay_parent_number, &config); - Self::deposit_event(PalletEvent::CodeUpgradeScheduled(para)); + Self::deposit_event(Event::CodeUpgradeScheduled(para)); Ok(()) } @@ -782,7 +782,7 @@ pub mod pallet { ensure_root(origin)?; let now = frame_system::Pallet::::block_number(); Self::note_new_head(para, new_head, now); - Self::deposit_event(PalletEvent::NewHeadNoted(para)); + Self::deposit_event(Event::NewHeadNoted(para)); Ok(()) } @@ -798,7 +798,7 @@ pub mod pallet { v.insert(i, para); } }); - Self::deposit_event(PalletEvent::ActionQueued(para, next_session)); + Self::deposit_event(Event::ActionQueued(para, next_session)); Ok(()) } @@ -1375,7 +1375,7 @@ impl Pallet { let mut weight = 0; for cause in causes { weight += T::DbWeight::get().reads_writes(3, 2); - Self::deposit_event(PalletEvent::PvfCheckAccepted(*code_hash, cause.para_id())); + Self::deposit_event(Event::PvfCheckAccepted(*code_hash, cause.para_id())); match cause { PvfCheckCause::Onboarding(id) => { @@ -1465,7 +1465,7 @@ impl Pallet { weight += Self::decrease_code_ref(code_hash); weight += T::DbWeight::get().reads_writes(3, 2); - Self::deposit_event(PalletEvent::PvfCheckRejected(*code_hash, cause.para_id())); + Self::deposit_event(Event::PvfCheckRejected(*code_hash, cause.para_id())); match cause { PvfCheckCause::Onboarding(id) => { @@ -1749,7 +1749,7 @@ impl Pallet { let mut weight = 0; weight += T::DbWeight::get().reads_writes(3, 2); - Self::deposit_event(PalletEvent::PvfCheckStarted(code_hash, cause.para_id())); + Self::deposit_event(Event::PvfCheckStarted(code_hash, cause.para_id())); weight += T::DbWeight::get().reads(1); match PvfActiveVoteMap::::get(&code_hash) { diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs index 32e0004049d9..960132d5f804 100644 --- a/runtime/parachains/src/paras/tests.rs +++ b/runtime/parachains/src/paras/tests.rs @@ -112,12 +112,8 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { /// An utility for checking that certain events were deposited. struct EventValidator { - events: Vec< - frame_system::EventRecord< - ::RuntimeEvent, - primitives::v2::Hash, - >, - >, + events: + Vec::Event, primitives::v2::Hash>>, } impl EventValidator { @@ -128,7 +124,7 @@ impl EventValidator { fn started(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { self.events.push(frame_system::EventRecord { phase: frame_system::Phase::Initialization, - event: PalletEvent::PvfCheckStarted(code.hash(), id).into(), + event: Event::PvfCheckStarted(code.hash(), id).into(), topics: vec![], }); self @@ -137,7 +133,7 @@ impl EventValidator { fn rejected(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { self.events.push(frame_system::EventRecord { phase: frame_system::Phase::Initialization, - event: PalletEvent::PvfCheckRejected(code.hash(), id).into(), + event: Event::PvfCheckRejected(code.hash(), id).into(), topics: vec![], }); self @@ -146,7 +142,7 @@ impl EventValidator { fn accepted(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { self.events.push(frame_system::EventRecord { phase: frame_system::Phase::Initialization, - event: PalletEvent::PvfCheckAccepted(code.hash(), id).into(), + event: Event::PvfCheckAccepted(code.hash(), id).into(), topics: vec![], }); self diff --git a/runtime/parachains/src/runtime_api_impl/v2.rs b/runtime/parachains/src/runtime_api_impl/v2.rs index e13506de62a0..20ee41636d81 100644 --- a/runtime/parachains/src/runtime_api_impl/v2.rs +++ b/runtime/parachains/src/runtime_api_impl/v2.rs @@ -323,9 +323,9 @@ pub fn candidate_pending_availability( pub fn candidate_events(extract_event: F) -> Vec> where T: initializer::Config, - F: Fn(::RuntimeEvent) -> Option>, + F: Fn(::Event) -> Option>, { - use inclusion::PalletEvent as RawEvent; + use inclusion::Event as RawEvent; >::read_events_no_consensus() .into_iter() diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 71b05d534209..7d40a99e9885 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -122,11 +122,11 @@ impl, C: Config> UmpSink for XcmSi }); match maybe_msg_and_weight { Err(_) => { - Pallet::::deposit_event(PalletEvent::InvalidFormat(id)); + Pallet::::deposit_event(Event::InvalidFormat(id)); Ok(0) }, Ok((Err(()), weight_used)) => { - Pallet::::deposit_event(PalletEvent::UnsupportedVersion(id)); + Pallet::::deposit_event(Event::UnsupportedVersion(id)); Ok(weight_used) }, Ok((Ok(xcm_message), weight_used)) => { @@ -136,7 +136,7 @@ impl, C: Config> UmpSink for XcmSi Outcome::Error(XcmError::WeightLimitReached(required)) => Err((id, required)), outcome => { let outcome_weight = outcome.weight_used(); - Pallet::::deposit_event(PalletEvent::ExecutedUpward(id, outcome)); + Pallet::::deposit_event(Event::ExecutedUpward(id, outcome)); Ok(weight_used.saturating_add(outcome_weight)) }, } @@ -216,7 +216,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config { /// The aggregate event. - type RuntimeEvent: From + IsType<::RuntimeEvent>; + type Event: From + IsType<::Event>; /// A place where all received upward messages are funneled. type UmpSink: UmpSink; @@ -238,7 +238,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// Upward message is invalid XCM. /// \[ id \] InvalidFormat(MessageId), @@ -358,7 +358,7 @@ pub mod pallet { let used = T::UmpSink::process_upward_message(sender, &data[..], weight_limit) .map_err(|_| Error::::WeightOverLimit)?; Overweight::::remove(index); - Self::deposit_event(PalletEvent::OverweightServiced(index, used)); + Self::deposit_event(Event::OverweightServiced(index, used)); Ok(Some(used.saturating_add(::WeightInfo::service_overweight())).into()) } } @@ -495,7 +495,7 @@ impl Pallet { // NOTE: The actual computation is not accounted for. It should be benchmarked. weight += T::DbWeight::get().reads_writes(3, 3); - Self::deposit_event(PalletEvent::UpwardMessagesReceived(para, extra_count, extra_size)); + Self::deposit_event(Event::UpwardMessagesReceived(para, extra_count, extra_size)); } weight @@ -544,15 +544,13 @@ impl Pallet { thus `upward_message` cannot be `None`; qed", ); let index = Self::stash_overweight(dispatchee, upward_message); - Self::deposit_event(PalletEvent::OverweightEnqueued( + Self::deposit_event(Event::OverweightEnqueued( dispatchee, id, index, required, )); } else { // we process messages in order and don't drop them if we run out of weight, // so need to break here without calling `consume_front`. - Self::deposit_event(PalletEvent::WeightExhausted( - id, max_weight, required, - )); + Self::deposit_event(Event::WeightExhausted(id, max_weight, required)); break } }, diff --git a/runtime/parachains/src/ump/benchmarking.rs b/runtime/parachains/src/ump/benchmarking.rs index 513e16cb6fbf..2c132324d44a 100644 --- a/runtime/parachains/src/ump/benchmarking.rs +++ b/runtime/parachains/src/ump/benchmarking.rs @@ -18,9 +18,9 @@ use super::{Pallet as Ump, *}; use frame_system::RawOrigin; use xcm::prelude::*; -fn assert_last_event_type(generic_event: ::PalletEvent) { +fn assert_last_event_type(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::RuntimeEvent = generic_event.into(); + let system_event: ::Event = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event)); @@ -35,7 +35,7 @@ fn queue_upward_msg( let msgs = vec![msg]; Ump::::check_upward_messages(host_conf, para, &msgs).unwrap(); let _ = Ump::::receive_upward_messages(para, msgs); - assert_last_event_type::(PalletEvent::UpwardMessagesReceived(para, 1, len).into()); + assert_last_event_type::(Event::UpwardMessagesReceived(para, 1, len).into()); } // Create a message with at least `size` bytes encoded length @@ -124,11 +124,11 @@ frame_benchmarking::benchmarks! { queue_upward_msg::(&host_conf, para, msg.clone()); Ump::::process_pending_upward_messages(); assert_last_event_type::( - PalletEvent::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() + Event::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() ); }: _(RawOrigin::Root, 0, Weight::MAX) verify { - assert_last_event_type::(PalletEvent::OverweightServiced(0, 0).into()); + assert_last_event_type::(Event::OverweightServiced(0, 0).into()); } } diff --git a/runtime/parachains/src/ump/tests.rs b/runtime/parachains/src/ump/tests.rs index 698b91206179..b4e758b4b88c 100644 --- a/runtime/parachains/src/ump/tests.rs +++ b/runtime/parachains/src/ump/tests.rs @@ -326,7 +326,7 @@ fn overweight_queue_works() { queue_upward_msg(para_a, a_msg_3.clone()); Ump::process_pending_upward_messages(); assert_last_event( - PalletEvent::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), + Event::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), ); // Now verify that if we wanted to service this overweight message with less than enough @@ -338,7 +338,7 @@ fn overweight_queue_works() { // ... and if we try to service it with just enough weight it will succeed as well. assert_ok!(Ump::service_overweight(Origin::root(), 0, 500)); - assert_last_event(PalletEvent::OverweightServiced(0, 500).into()); + assert_last_event(Event::OverweightServiced(0, 500).into()); // ... and if we try to service a message with index that doesn't exist it will error // out. diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index f9df916f2ac6..9489df9f403c 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -214,7 +214,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -264,7 +264,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; @@ -285,7 +285,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = pallet_preimage::weights::SubstrateWeight; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -341,7 +341,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -354,7 +354,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -371,7 +371,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -413,7 +413,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -505,7 +505,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; @@ -548,7 +548,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -596,7 +596,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type RewardRemainder = Treasury; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Slash = Treasury; type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -629,7 +629,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BasicDeposit = BasicDeposit; type FieldDeposit = FieldDeposit; @@ -657,7 +657,7 @@ parameter_types! { impl pallet_democracy::Config for Runtime { type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -728,7 +728,7 @@ pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -755,7 +755,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PalletId = PhragmenElectionPalletId; type Currency = Balances; type ChangeMembers = Council; @@ -784,7 +784,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -793,7 +793,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; @@ -834,7 +834,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -860,7 +860,7 @@ parameter_types! { } impl pallet_bounties::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; type BountyUpdatePeriod = BountyUpdatePeriod; @@ -880,14 +880,14 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type Tippers = PhragmenElection; @@ -898,7 +898,7 @@ impl pallet_tips::Config for Runtime { } impl pallet_offences::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -915,7 +915,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -927,7 +927,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type KeyOwnerProof = @@ -1022,7 +1022,7 @@ parameter_types! { } impl claims::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; /// At least 3/4 of the council must agree to a claim move before it can happen. @@ -1036,7 +1036,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -1045,7 +1045,7 @@ impl pallet_vesting::Config for Runtime { } impl pallet_utility::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -1060,7 +1060,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -1225,7 +1225,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -1252,7 +1252,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -1262,7 +1262,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -1273,7 +1273,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -1284,7 +1284,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -1303,7 +1303,7 @@ impl parachains_initializer::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -1317,7 +1317,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -1338,7 +1338,7 @@ parameter_types! { } impl slots::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1360,7 +1360,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1385,7 +1385,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1402,7 +1402,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type CurrencyBalance = Balance; type RewardCounter = FixedU128; @@ -1740,7 +1740,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - RuntimeEvent::ParaInclusion(ev) => { + Event::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -2047,7 +2047,7 @@ sp_api::impl_runtime_apis! { hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), // Execution Phase hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), - // PalletEvent Count + // Event Count hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), // System Events hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index 36b6d07b86ba..a7ea36445bd8 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Polkadot. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, - RuntimeEvent, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, + Runtime, WeightToFee, XcmPallet, }; use frame_support::{ match_types, parameter_types, @@ -175,7 +175,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; // Only allow the council to send messages. type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 7bbd30fa9137..d745e109be4d 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -267,7 +267,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -353,7 +353,7 @@ impl pallet_session::historical::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -372,7 +372,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -392,7 +392,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -415,7 +415,7 @@ parameter_types! { } impl pallet_offences::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = (); } @@ -442,7 +442,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -459,7 +459,7 @@ impl sp_runtime::traits::Convert> for ValidatorIdOf } impl pallet_session::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = ValidatorIdOf; type ShouldEndSession = Babe; @@ -512,7 +512,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -521,7 +521,7 @@ parameter_types! { } impl pallet_grandpa::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type KeyOwnerProofSystem = Historical; @@ -571,7 +571,7 @@ impl runtime_parachains::inclusion::RewardValidators for RewardValidators { } impl parachains_inclusion::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DisputesHandler = ParasDisputes; type RewardValidators = RewardValidators; } @@ -581,7 +581,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -596,7 +596,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -607,7 +607,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -636,7 +636,7 @@ parameter_types! { } impl assigned_slots::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; @@ -652,7 +652,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -723,7 +723,7 @@ parameter_types! { } impl auctions::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -738,7 +738,7 @@ parameter_types! { } impl slots::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -757,7 +757,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -769,17 +769,17 @@ impl crowdloan::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; } impl validator_manager::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PrivilegedOrigin = EnsureRoot; } impl pallet_utility::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -845,7 +845,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -868,7 +868,7 @@ parameter_types! { impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type MotionDuration = MotionDuration; type MaxProposals = MaxProposals; type DefaultVote = pallet_collective::PrimeDefaultVote; @@ -877,7 +877,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type AddOrigin = EnsureRoot; type RemoveOrigin = EnsureRoot; type SwapOrigin = EnsureRoot; @@ -898,7 +898,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -1055,7 +1055,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { runtime_api_impl::candidate_events::(|ev| { match ev { - RuntimeEvent::ParaInclusion(ev) => { + Event::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -1359,7 +1359,7 @@ sp_api::impl_runtime_apis! { hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), // Execution Phase hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), - // PalletEvent Count + // Event Count hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), // System Events hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs index d0522522fb62..2fd60b682ea5 100644 --- a/runtime/rococo/src/validator_manager.rs +++ b/runtime/rococo/src/validator_manager.rs @@ -37,8 +37,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_session::Config { /// The overreaching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// Privileged origin that can add or remove validators. type PrivilegedOrigin: EnsureOrigin<::Origin>; @@ -46,7 +45,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// New validators were added to the set. ValidatorsRegistered(Vec), /// Validators were removed from the set. @@ -76,7 +75,7 @@ pub mod pallet { validators.clone().into_iter().for_each(|v| ValidatorsToAdd::::append(v)); - Self::deposit_event(PalletEvent::ValidatorsRegistered(validators)); + Self::deposit_event(Event::ValidatorsRegistered(validators)); Ok(()) } @@ -92,7 +91,7 @@ pub mod pallet { validators.clone().into_iter().for_each(|v| ValidatorsToRetire::::append(v)); - Self::deposit_event(PalletEvent::ValidatorsDeregistered(validators)); + Self::deposit_event(Event::ValidatorsDeregistered(validators)); Ok(()) } } diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 4a111d9a40a5..1512ef9e6ccd 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Rococo. use super::{ - parachains_origin, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, - WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, WeightToFee, + XcmPallet, }; use frame_support::{ parameter_types, @@ -151,7 +151,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index a703b68cf9c2..d18a2c9bb95c 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -145,7 +145,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = Indices; type Header = generic::Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -206,7 +206,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = (); } @@ -219,7 +219,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -236,7 +236,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnChargeTransaction = CurrencyAdapter; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -282,7 +282,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -337,7 +337,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = frame_support::traits::U128CurrencyToVote; type RewardRemainder = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Slash = (); type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -362,7 +362,7 @@ impl pallet_staking::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type KeyOwnerProofSystem = (); @@ -427,7 +427,7 @@ impl frame_system::offchain::SigningTypes for Runtime { } impl pallet_offences::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -446,7 +446,7 @@ parameter_types! { } impl claims::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureRoot; @@ -458,7 +458,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -467,7 +467,7 @@ impl pallet_vesting::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; } @@ -478,13 +478,13 @@ impl parachains_configuration::Config for Runtime { impl parachains_shared::Config for Runtime {} impl parachains_inclusion::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DisputesHandler = ParasDisputes; type RewardValidators = RewardValidatorsWithEraPoints; } impl parachains_disputes::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type RewardValidators = (); type PunishValidators = (); type WeightInfo = parachains_disputes::TestWeightInfo; @@ -509,7 +509,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = parachains_paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -522,7 +522,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = (); type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -540,7 +540,7 @@ pub type LocalOriginToLocation = xcm_builder::SignedToAccountId32; type LocationInverter = xcm_config::InvertNothing; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -557,7 +557,7 @@ impl pallet_xcm::Config for Runtime { } impl parachains_hrmp::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type WeightInfo = parachains_hrmp::TestWeightInfo; @@ -570,7 +570,7 @@ impl paras_sudo_wrapper::Config for Runtime {} impl parachains_origin::Config for Runtime {} impl pallet_test_notifier::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Call = Call; } @@ -589,8 +589,7 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + pallet_xcm::Config { - type RuntimeEvent: IsType<::RuntimeEvent> - + From>; + type Event: IsType<::Event> + From>; type Origin: IsType<::Origin> + Into::Origin>>; type Call: IsType<::Call> + From>; @@ -598,7 +597,7 @@ pub mod pallet_test_notifier { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { QueryPrepared(QueryId), NotifyQueryPrepared(QueryId), ResponseReceived(MultiLocation, QueryId, Response), @@ -622,7 +621,7 @@ pub mod pallet_test_notifier { Junction::AccountId32 { network: Any, id }.into(), 100u32.into(), ); - Self::deposit_event(PalletEvent::::QueryPrepared(qid)); + Self::deposit_event(Event::::QueryPrepared(qid)); Ok(()) } @@ -639,7 +638,7 @@ pub mod pallet_test_notifier { ::Call::from(call), 100u32.into(), ); - Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); + Self::deposit_event(Event::::NotifyQueryPrepared(qid)); Ok(()) } @@ -650,7 +649,7 @@ pub mod pallet_test_notifier { response: Response, ) -> DispatchResult { let responder = ensure_response(::Origin::from(origin))?; - Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); + Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); Ok(()) } } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index bec0be82d1f4..788aede78092 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -155,7 +155,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -177,7 +177,7 @@ parameter_types! { } impl pallet_scheduler::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; type Call = Call; @@ -198,7 +198,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -253,7 +253,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -266,7 +266,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -283,7 +283,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -329,7 +329,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -416,7 +416,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; @@ -456,7 +456,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -494,7 +494,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type RewardRemainder = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Slash = (); type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -521,7 +521,7 @@ parameter_types! { } impl pallet_offences::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -540,7 +540,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -552,7 +552,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type KeyOwnerProofSystem = Historical; @@ -647,7 +647,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Slashed = (); type BasicDeposit = BasicDeposit; @@ -662,7 +662,7 @@ impl pallet_identity::Config for Runtime { } impl pallet_utility::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -677,7 +677,7 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type DepositBase = DepositBase; @@ -694,7 +694,7 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = (); type Call = Call; type Currency = Balances; @@ -709,7 +709,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -718,7 +718,7 @@ impl pallet_vesting::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; } @@ -841,7 +841,7 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Call = Call; type Currency = Balances; type ProxyType = ProxyType; @@ -868,7 +868,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -878,7 +878,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -889,7 +889,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -900,7 +900,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -929,7 +929,7 @@ parameter_types! { } impl assigned_slots::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; @@ -940,7 +940,7 @@ impl assigned_slots::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -952,7 +952,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -966,7 +966,7 @@ parameter_types! { } impl slots::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -985,7 +985,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1005,7 +1005,7 @@ parameter_types! { } impl auctions::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1021,7 +1021,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; type Currency = Balances; type CurrencyBalance = Balance; @@ -1324,7 +1324,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - RuntimeEvent::ParaInclusion(ev) => { + Event::ParaInclusion(ev) => { Some(ev) } _ => None, diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index c282dc2dcca0..867bdb2cacf3 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configurations for Westend. use super::{ - parachains_origin, weights, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, + parachains_origin, weights, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -131,7 +131,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... diff --git a/scripts/ci/run_benches_for_runtime.sh b/scripts/ci/run_benches_for_runtime.sh index cd9cb5be8e98..8149195c82c4 100755 --- a/scripts/ci/run_benches_for_runtime.sh +++ b/scripts/ci/run_benches_for_runtime.sh @@ -29,12 +29,6 @@ rm -f $ERR_FILE for PALLET in "${PALLETS[@]}"; do echo "[+] Benchmarking $PALLET for $runtime"; - output_file="" - if [[ $PALLET == *"::"* ]]; then - # translates e.g. "pallet_foo::bar" to "pallet_foo_bar" - output_file="${PALLET//::/_}.rs" - fi - OUTPUT=$( ./target/production/polkadot benchmark pallet \ --chain="${runtime}-dev" \ @@ -45,7 +39,7 @@ for PALLET in "${PALLETS[@]}"; do --execution=wasm \ --wasm-execution=compiled \ --header=./file_header.txt \ - --output="./runtime/${runtime}/src/weights/${output_file}" 2>&1 + --output="./runtime/${runtime}/src/weights/${PALLET/::/_}.rs" 2>&1 ) if [ $? -ne 0 ]; then echo "$OUTPUT" >> "$ERR_FILE" diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs index 3f5b4d9e662b..3f7e4f8f26e0 100644 --- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs @@ -63,7 +63,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -86,7 +86,7 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = [u8; 8]; type Balance = u64; type DustRemoval = (); - type RuntimeEvent = RuntimeEvent; + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs index 7fec7a5e041b..7782ba1d90ea 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs @@ -68,7 +68,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index b286b41b384a..c237fc702a4a 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -71,8 +71,7 @@ pub mod pallet { /// The module configuration trait. pub trait Config: frame_system::Config { /// The overarching event type. - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; /// Required origin for sending XCM messages. If successful, it resolves to `MultiLocation` /// which exists as an interior location within this chain's XCM context. @@ -125,7 +124,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { /// Execution of an XCM message was attempted. /// /// \[ outcome \] @@ -462,7 +461,7 @@ pub mod pallet { SendError::CannotReachDestination(..) => Error::::Unreachable, _ => Error::::SendFailure, })?; - Self::deposit_event(PalletEvent::Sent(origin_location, dest, message)); + Self::deposit_event(Event::Sent(origin_location, dest, message)); Ok(()) } @@ -580,7 +579,7 @@ pub mod pallet { max_weight, ); let result = Ok(Some(outcome.weight_used().saturating_add(100_000_000)).into()); - Self::deposit_event(PalletEvent::Attempted(outcome)); + Self::deposit_event(Event::Attempted(outcome)); result } @@ -603,7 +602,7 @@ pub mod pallet { LatestVersionedMultiLocation(&location), xcm_version, ); - Self::deposit_event(PalletEvent::SupportedVersionChanged(location, xcm_version)); + Self::deposit_event(Event::SupportedVersionChanged(location, xcm_version)); Ok(()) } @@ -819,7 +818,7 @@ pub mod pallet { T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; let outcome = T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); - Self::deposit_event(PalletEvent::Attempted(outcome)); + Self::deposit_event(Event::Attempted(outcome)); Ok(()) } @@ -877,7 +876,7 @@ pub mod pallet { T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; let outcome = T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); - Self::deposit_event(PalletEvent::Attempted(outcome)); + Self::deposit_event(Event::Attempted(outcome)); Ok(()) } @@ -955,11 +954,11 @@ pub mod pallet { Ok(()) => { let value = (query_id, max_weight, xcm_version); VersionNotifyTargets::::insert(XCM_VERSION, key, value); - PalletEvent::VersionChangeNotified(new_key, xcm_version) + Event::VersionChangeNotified(new_key, xcm_version) }, Err(e) => { VersionNotifyTargets::::remove(XCM_VERSION, key); - PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()) + Event::NotifyTargetSendFail(new_key, query_id, e.into()) }, }; Self::deposit_event(event); @@ -978,7 +977,7 @@ pub mod pallet { let new_key = match MultiLocation::try_from(old_key.clone()) { Ok(k) => k, Err(()) => { - Self::deposit_event(PalletEvent::NotifyTargetMigrationFail( + Self::deposit_event(Event::NotifyTargetMigrationFail( old_key, value.0, )); weight_used.saturating_accrue(todo_vnt_migrate_fail_weight); @@ -1005,10 +1004,9 @@ pub mod pallet { versioned_key, (query_id, max_weight, xcm_version), ); - PalletEvent::VersionChangeNotified(new_key, xcm_version) + Event::VersionChangeNotified(new_key, xcm_version) }, - Err(e) => - PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()), + Err(e) => Event::NotifyTargetSendFail(new_key, query_id, e.into()), }; Self::deposit_event(event); weight_used.saturating_accrue(todo_vnt_notify_migrate_weight); @@ -1184,7 +1182,7 @@ pub mod pallet { if let Some(QueryStatus::Ready { response, at }) = Queries::::get(query_id) { let response = response.try_into().ok()?; Queries::::remove(query_id); - Self::deposit_event(PalletEvent::ResponseTaken(query_id)); + Self::deposit_event(Event::ResponseTaken(query_id)); Some((response, at)) } else { None @@ -1279,7 +1277,7 @@ pub mod pallet { let versioned = VersionedMultiAssets::from(MultiAssets::from(assets)); let hash = BlakeTwo256::hash_of(&(&origin, &versioned)); AssetTraps::::mutate(hash, |n| *n += 1); - Self::deposit_event(PalletEvent::AssetsTrapped(hash, origin.clone(), versioned)); + Self::deposit_event(Event::AssetsTrapped(hash, origin.clone(), versioned)); // TODO #3735: Put the real weight in there. 0 } @@ -1336,7 +1334,7 @@ pub mod pallet { let origin: MultiLocation = match expected_origin.try_into() { Ok(o) if &o == origin => o, Ok(o) => { - Self::deposit_event(PalletEvent::InvalidResponder( + Self::deposit_event(Event::InvalidResponder( origin.clone(), query_id, Some(o), @@ -1344,7 +1342,7 @@ pub mod pallet { return 0 }, _ => { - Self::deposit_event(PalletEvent::InvalidResponder( + Self::deposit_event(Event::InvalidResponder( origin.clone(), query_id, None, @@ -1369,14 +1367,14 @@ pub mod pallet { LatestVersionedMultiLocation(&origin), v, ); - Self::deposit_event(PalletEvent::SupportedVersionChanged(origin, v)); + Self::deposit_event(Event::SupportedVersionChanged(origin, v)); 0 }, (response, Some(QueryStatus::Pending { responder, maybe_notify, .. })) => { let responder = match MultiLocation::try_from(responder) { Ok(r) => r, Err(_) => { - Self::deposit_event(PalletEvent::InvalidResponderVersion( + Self::deposit_event(Event::InvalidResponderVersion( origin.clone(), query_id, )); @@ -1384,7 +1382,7 @@ pub mod pallet { }, }; if origin != &responder { - Self::deposit_event(PalletEvent::InvalidResponder( + Self::deposit_event(Event::InvalidResponder( origin.clone(), query_id, Some(responder), @@ -1403,7 +1401,7 @@ pub mod pallet { Queries::::remove(query_id); let weight = call.get_dispatch_info().weight; if weight > max_weight { - let e = PalletEvent::NotifyOverweight( + let e = Event::NotifyOverweight( query_id, pallet_index, call_index, @@ -1416,16 +1414,12 @@ pub mod pallet { let dispatch_origin = Origin::Response(origin.clone()).into(); match call.dispatch(dispatch_origin) { Ok(post_info) => { - let e = PalletEvent::Notified( - query_id, - pallet_index, - call_index, - ); + let e = Event::Notified(query_id, pallet_index, call_index); Self::deposit_event(e); post_info.actual_weight }, Err(error_and_info) => { - let e = PalletEvent::NotifyDispatchError( + let e = Event::NotifyDispatchError( query_id, pallet_index, call_index, @@ -1438,17 +1432,14 @@ pub mod pallet { } .unwrap_or(weight) } else { - let e = PalletEvent::NotifyDecodeFailed( - query_id, - pallet_index, - call_index, - ); + let e = + Event::NotifyDecodeFailed(query_id, pallet_index, call_index); Self::deposit_event(e); 0 } }, None => { - let e = PalletEvent::ResponseReady(query_id, response.clone()); + let e = Event::ResponseReady(query_id, response.clone()); Self::deposit_event(e); let at = frame_system::Pallet::::current_block_number(); let response = response.into(); @@ -1458,7 +1449,7 @@ pub mod pallet { } }, _ => { - Self::deposit_event(PalletEvent::UnexpectedResponse(origin.clone(), query_id)); + Self::deposit_event(Event::UnexpectedResponse(origin.clone(), query_id)); return 0 }, } diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 3bd9bf395e39..5627acd31a3c 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -51,8 +51,7 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + crate::Config { - type RuntimeEvent: IsType<::RuntimeEvent> - + From>; + type Event: IsType<::Event> + From>; type Origin: IsType<::Origin> + Into::Origin>>; type Call: IsType<::Call> + From>; @@ -60,7 +59,7 @@ pub mod pallet_test_notifier { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { QueryPrepared(QueryId), NotifyQueryPrepared(QueryId), ResponseReceived(MultiLocation, QueryId, Response), @@ -84,7 +83,7 @@ pub mod pallet_test_notifier { Junction::AccountId32 { network: Any, id }.into(), 100u32.into(), ); - Self::deposit_event(PalletEvent::::QueryPrepared(qid)); + Self::deposit_event(Event::::QueryPrepared(qid)); Ok(()) } @@ -101,7 +100,7 @@ pub mod pallet_test_notifier { ::Call::from(call), 100u32.into(), ); - Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); + Self::deposit_event(Event::::NotifyQueryPrepared(qid)); Ok(()) } @@ -112,7 +111,7 @@ pub mod pallet_test_notifier { response: Response, ) -> DispatchResult { let responder = ensure_response(::Origin::from(origin))?; - Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); + Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); Ok(()) } } @@ -181,7 +180,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -207,7 +206,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -275,7 +274,7 @@ parameter_types! { } impl pallet_xcm::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = (TestSendXcmErrX8, TestSendXcm); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -294,16 +293,16 @@ impl pallet_xcm::Config for Test { impl origin::Config for Test {} impl pallet_test_notifier::Config for Test { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type Origin = Origin; type Call = Call; } -pub(crate) fn last_event() -> RuntimeEvent { - System::events().pop().expect("RuntimeEvent expected").event +pub(crate) fn last_event() -> Event { + System::events().pop().expect("Event expected").event } -pub(crate) fn last_events(n: usize) -> Vec { +pub(crate) fn last_events(n: usize) -> Vec { System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect() } diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs index 7aa2a8f9ed22..8ede7f11ae22 100644 --- a/xcm/pallet-xcm/src/tests.rs +++ b/xcm/pallet-xcm/src/tests.rs @@ -84,12 +84,12 @@ fn report_outcome_notify_works() { assert_eq!( last_events(2), vec![ - RuntimeEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived( + Event::TestNotifier(pallet_test_notifier::Event::ResponseReceived( Parachain(PARA_ID).into(), 0, Response::ExecutionResult(None), )), - RuntimeEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)), + Event::XcmPallet(crate::Event::Notified(0, 4, 2)), ] ); assert_eq!(crate::Queries::::iter().collect::>(), vec![]); @@ -139,10 +139,7 @@ fn report_outcome_works() { assert_eq!(r, Outcome::Complete(1_000)); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::ResponseReady( - 0, - Response::ExecutionResult(None), - )) + Event::XcmPallet(crate::Event::ResponseReady(0, Response::ExecutionResult(None),)) ); let response = Some((Response::ExecutionResult(None), 1)); @@ -183,7 +180,7 @@ fn send_works() { ); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message)) + Event::XcmPallet(crate::Event::Sent(sender, RelayLocation::get(), message)) ); }); } @@ -255,7 +252,7 @@ fn teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -299,7 +296,7 @@ fn limmited_teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -341,7 +338,7 @@ fn unlimmited_teleport_assets_works() { ); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -389,7 +386,7 @@ fn reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -438,7 +435,7 @@ fn limited_reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -485,7 +482,7 @@ fn unlimited_reserve_transfer_assets_works() { ); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -518,7 +515,7 @@ fn execute_withdraw_to_deposit_works() { assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -554,12 +551,8 @@ fn trapped_assets_can_be_claimed() { assert_eq!( last_events(2), vec![ - RuntimeEvent::XcmPallet(crate::PalletEvent::AssetsTrapped( - hash.clone(), - source, - vma - )), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( + Event::XcmPallet(crate::Event::AssetsTrapped(hash.clone(), source, vma)), + Event::XcmPallet(crate::Event::Attempted(Outcome::Complete( 5 * BaseXcmWeight::get() ))) ] @@ -597,7 +590,7 @@ fn trapped_assets_can_be_claimed() { )); assert_eq!( last_event(), - RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete( + Event::XcmPallet(crate::Event::Attempted(Outcome::Incomplete( BaseXcmWeight::get(), XcmError::UnknownClaim ))) diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs index 1eb51b7b24c5..9599efcd7f29 100644 --- a/xcm/xcm-builder/tests/mock/mod.rs +++ b/xcm/xcm-builder/tests/mock/mod.rs @@ -71,7 +71,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -97,7 +97,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -180,7 +180,7 @@ impl xcm_executor::Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type LocationInverter = LocationInverter; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = TestSendXcm; diff --git a/xcm/xcm-builder/tests/scenarios.rs b/xcm/xcm-builder/tests/scenarios.rs index 50842f899290..d826e652c5d6 100644 --- a/xcm/xcm-builder/tests/scenarios.rs +++ b/xcm/xcm-builder/tests/scenarios.rs @@ -89,7 +89,7 @@ fn transfer_asset_works() { weight, ); System::assert_last_event( - pallet_balances::PalletEvent::Transfer { from: ALICE, to: bob.clone(), amount }.into(), + pallet_balances::Event::Transfer { from: ALICE, to: bob.clone(), amount }.into(), ); assert_eq!(r, Outcome::Complete(weight)); assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - amount); diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index a470e5bfd52f..a6673aca7a92 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -66,18 +66,18 @@ fn basic_buy_fees_message_executes() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::Attempted( - Outcome::Complete(_) - )), + polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(Outcome::Complete( + _ + ))), ))); }); } #[test] fn query_response_fires() { - use pallet_test_notifier::PalletEvent::*; + use pallet_test_notifier::Event::*; use pallet_xcm::QueryStatus; - use polkadot_test_runtime::RuntimeEvent::TestNotifier; + use polkadot_test_runtime::Event::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() @@ -146,7 +146,7 @@ fn query_response_fires() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::ResponseReady( + polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::ResponseReady( q, Response::ExecutionResult(None), )) if q == query_id, @@ -163,8 +163,8 @@ fn query_response_fires() { #[test] fn query_response_elicits_handler() { - use pallet_test_notifier::PalletEvent::*; - use polkadot_test_runtime::RuntimeEvent::TestNotifier; + use pallet_test_notifier::Event::*; + use polkadot_test_runtime::Event::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index 1fb659b082f2..741732cc797a 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -135,11 +135,10 @@ mod tests { }); ParaA::execute_with(|| { - use parachain::{RuntimeEvent, System}; - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) - ))); + use parachain::{Event, System}; + assert!(System::events() + .iter() + .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); }); } @@ -163,11 +162,10 @@ mod tests { }); Relay::execute_with(|| { - use relay_chain::{RuntimeEvent, System}; - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) - ))); + use relay_chain::{Event, System}; + assert!(System::events() + .iter() + .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); }); } @@ -192,11 +190,10 @@ mod tests { }); ParaB::execute_with(|| { - use parachain::{RuntimeEvent, System}; - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) - ))); + use parachain::{Event, System}; + assert!(System::events() + .iter() + .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); }); } diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index 984387e29e71..614d50e4fc6e 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -87,7 +87,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -156,8 +156,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; type XcmExecutor: ExecuteXcm; } @@ -188,7 +187,7 @@ pub mod mock_msg_queue { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { // XCMP /// Some XCM was executed OK. Success(Option), @@ -224,15 +223,14 @@ pub mod mock_msg_queue { Ok(xcm) => { let location = (1, Parachain(sender.into())); match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { - Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), - Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), + Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), + Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), // As far as the caller is concerned, this was dispatched without error, so // we just report the weight used. - Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), + Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), } }, - Err(()) => - (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), + Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), }; Self::deposit_event(event); result @@ -273,15 +271,15 @@ pub mod mock_msg_queue { VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); match maybe_msg { Err(_) => { - Self::deposit_event(PalletEvent::InvalidFormat(id)); + Self::deposit_event(Event::InvalidFormat(id)); }, Ok(Err(())) => { - Self::deposit_event(PalletEvent::UnsupportedVersion(id)); + Self::deposit_event(Event::UnsupportedVersion(id)); }, Ok(Ok(x)) => { let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); >::append(x); - Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); + Self::deposit_event(Event::ExecutedDownward(id, outcome)); }, } } @@ -291,14 +289,14 @@ pub mod mock_msg_queue { } impl mock_msg_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type XcmExecutor = XcmExecutor; } pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs index e9e6fe7608e6..a648ba96ba70 100644 --- a/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/xcm/xcm-simulator/example/src/relay_chain.rs @@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -78,7 +78,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -144,7 +144,7 @@ impl Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -166,7 +166,7 @@ parameter_types! { } impl ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index b4c5abf14c77..3326875206b2 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -87,7 +87,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -156,8 +156,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type RuntimeEvent: From> - + IsType<::RuntimeEvent>; + type Event: From> + IsType<::Event>; type XcmExecutor: ExecuteXcm; } @@ -188,7 +187,7 @@ pub mod mock_msg_queue { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] - pub enum PalletEvent { + pub enum Event { // XCMP /// Some XCM was executed OK. Success(Option), @@ -224,15 +223,14 @@ pub mod mock_msg_queue { Ok(xcm) => { let location = MultiLocation::new(1, X1(Parachain(sender.into()))); match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { - Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), - Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), + Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), + Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), // As far as the caller is concerned, this was dispatched without error, so // we just report the weight used. - Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), + Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), } }, - Err(()) => - (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), + Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), }; Self::deposit_event(event); result @@ -273,15 +271,15 @@ pub mod mock_msg_queue { VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); match maybe_msg { Err(_) => { - Self::deposit_event(PalletEvent::InvalidFormat(id)); + Self::deposit_event(Event::InvalidFormat(id)); }, Ok(Err(())) => { - Self::deposit_event(PalletEvent::UnsupportedVersion(id)); + Self::deposit_event(Event::UnsupportedVersion(id)); }, Ok(Ok(x)) => { let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); >::append(x); - Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); + Self::deposit_event(Event::ExecutedDownward(id, outcome)); }, } } @@ -291,14 +289,14 @@ pub mod mock_msg_queue { } impl mock_msg_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type XcmExecutor = XcmExecutor; } pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index e9e6fe7608e6..a648ba96ba70 100644 --- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -78,7 +78,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type RuntimeEvent = RuntimeEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -144,7 +144,7 @@ impl Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -166,7 +166,7 @@ parameter_types! { } impl ump::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type Event = Event; type UmpSink = ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; From 4661fd374691e73d2031256d181f72612a6ee9e8 Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Thu, 25 Aug 2022 09:44:47 +0200 Subject: [PATCH 09/37] Delete rename-outer-enum.diff --- rename-outer-enum.diff | 6043 ---------------------------------------- 1 file changed, 6043 deletions(-) delete mode 100644 rename-outer-enum.diff diff --git a/rename-outer-enum.diff b/rename-outer-enum.diff deleted file mode 100644 index 355709a6394d..000000000000 --- a/rename-outer-enum.diff +++ /dev/null @@ -1,6043 +0,0 @@ -diff --git a/.github/workflows/auto-label-prs.yml b/.github/workflows/auto-label-prs.yml -index f0b8e9b343e..50539b80b98 100644 ---- a/.github/workflows/auto-label-prs.yml -+++ b/.github/workflows/auto-label-prs.yml -@@ -8,13 +8,13 @@ jobs: - runs-on: ubuntu-latest - steps: - - name: Label drafts -- uses: andymckay/labeler@master -+ uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 - if: github.event.pull_request.draft == true - with: - add-labels: 'A3-inprogress' - remove-labels: 'A0-pleasereview' - - name: Label PRs -- uses: andymckay/labeler@master -+ uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 - if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial') - with: - add-labels: 'A0-pleasereview' -diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml -index 51a82bc4f59..acffa6842d4 100644 ---- a/.github/workflows/release-10_candidate.yml -+++ b/.github/workflows/release-10_candidate.yml -@@ -34,7 +34,7 @@ jobs: - echo "::set-output name=first_rc::true" - fi - - name: Apply new tag -- uses: tvdias/github-tagger@v0.0.2 -+ uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2 - with: - # We can't use the normal GITHUB_TOKEN for the following reason: - # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token -@@ -42,7 +42,7 @@ jobs: - repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}" - tag: ${{ steps.compute_tag.outputs.new_tag }} - - id: create-issue -- uses: JasonEtco/create-an-issue@v2 -+ uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0 - # Only create the issue if it's the first release candidate - if: steps.compute_tag.outputs.first_rc == 'true' - env: -diff --git a/Cargo.lock b/Cargo.lock -index 0f65ff847ee..13743f95a97 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -423,7 +423,7 @@ dependencies = [ - [[package]] - name = "beefy-gadget" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "beefy-primitives", -@@ -459,7 +459,7 @@ dependencies = [ - [[package]] - name = "beefy-gadget-rpc" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "beefy-gadget", - "beefy-primitives", -@@ -479,7 +479,7 @@ dependencies = [ - [[package]] - name = "beefy-merkle-tree" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "beefy-primitives", - "sp-api", -@@ -488,7 +488,7 @@ dependencies = [ - [[package]] - name = "beefy-primitives" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -1974,7 +1974,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] - name = "fork-tree" - version = "3.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - ] -@@ -1992,7 +1992,7 @@ dependencies = [ - [[package]] - name = "frame-benchmarking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -2015,7 +2015,7 @@ dependencies = [ - [[package]] - name = "frame-benchmarking-cli" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "Inflector", - "chrono", -@@ -2066,7 +2066,7 @@ dependencies = [ - [[package]] - name = "frame-election-provider-solution-type" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -2077,7 +2077,7 @@ dependencies = [ - [[package]] - name = "frame-election-provider-support" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-election-provider-solution-type", - "frame-support", -@@ -2093,7 +2093,7 @@ dependencies = [ - [[package]] - name = "frame-executive" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -2121,7 +2121,7 @@ dependencies = [ - [[package]] - name = "frame-support" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "bitflags", - "frame-metadata", -@@ -2152,7 +2152,7 @@ dependencies = [ - [[package]] - name = "frame-support-procedural" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "Inflector", - "frame-support-procedural-tools", -@@ -2164,7 +2164,7 @@ dependencies = [ - [[package]] - name = "frame-support-procedural-tools" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support-procedural-tools-derive", - "proc-macro-crate", -@@ -2176,7 +2176,7 @@ dependencies = [ - [[package]] - name = "frame-support-procedural-tools-derive" - version = "3.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro2", - "quote", -@@ -2186,7 +2186,7 @@ dependencies = [ - [[package]] - name = "frame-support-test" - version = "3.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-support-test-pallet", -@@ -2209,7 +2209,7 @@ dependencies = [ - [[package]] - name = "frame-support-test-pallet" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -2220,7 +2220,7 @@ dependencies = [ - [[package]] - name = "frame-system" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "log", -@@ -2237,7 +2237,7 @@ dependencies = [ - [[package]] - name = "frame-system-benchmarking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -2252,7 +2252,7 @@ dependencies = [ - [[package]] - name = "frame-system-rpc-runtime-api" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "sp-api", -@@ -2261,7 +2261,7 @@ dependencies = [ - [[package]] - name = "frame-try-runtime" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "sp-api", -@@ -2443,7 +2443,7 @@ dependencies = [ - [[package]] - name = "generate-bags" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "chrono", - "frame-election-provider-support", -@@ -4816,7 +4816,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" - [[package]] - name = "pallet-assets" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -4830,7 +4830,7 @@ dependencies = [ - [[package]] - name = "pallet-authority-discovery" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -4846,7 +4846,7 @@ dependencies = [ - [[package]] - name = "pallet-authorship" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -4861,7 +4861,7 @@ dependencies = [ - [[package]] - name = "pallet-babe" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -4885,7 +4885,7 @@ dependencies = [ - [[package]] - name = "pallet-bags-list" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", -@@ -4905,7 +4905,7 @@ dependencies = [ - [[package]] - name = "pallet-bags-list-remote-tests" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-election-provider-support", - "frame-support", -@@ -4924,7 +4924,7 @@ dependencies = [ - [[package]] - name = "pallet-balances" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -4939,7 +4939,7 @@ dependencies = [ - [[package]] - name = "pallet-beefy" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "beefy-primitives", - "frame-support", -@@ -4955,7 +4955,7 @@ dependencies = [ - [[package]] - name = "pallet-beefy-mmr" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "beefy-merkle-tree", - "beefy-primitives", -@@ -4978,7 +4978,7 @@ dependencies = [ - [[package]] - name = "pallet-bounties" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -4996,7 +4996,7 @@ dependencies = [ - [[package]] - name = "pallet-child-bounties" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5015,7 +5015,7 @@ dependencies = [ - [[package]] - name = "pallet-collective" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5032,7 +5032,7 @@ dependencies = [ - [[package]] - name = "pallet-democracy" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5048,7 +5048,7 @@ dependencies = [ - [[package]] - name = "pallet-election-provider-multi-phase" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", -@@ -5071,7 +5071,7 @@ dependencies = [ - [[package]] - name = "pallet-election-provider-support-benchmarking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", -@@ -5084,7 +5084,7 @@ dependencies = [ - [[package]] - name = "pallet-elections-phragmen" - version = "5.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5102,7 +5102,7 @@ dependencies = [ - [[package]] - name = "pallet-gilt" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5117,7 +5117,7 @@ dependencies = [ - [[package]] - name = "pallet-grandpa" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5140,7 +5140,7 @@ dependencies = [ - [[package]] - name = "pallet-identity" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "enumflags2", - "frame-benchmarking", -@@ -5156,7 +5156,7 @@ dependencies = [ - [[package]] - name = "pallet-im-online" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5176,7 +5176,7 @@ dependencies = [ - [[package]] - name = "pallet-indices" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5193,7 +5193,7 @@ dependencies = [ - [[package]] - name = "pallet-membership" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5210,7 +5210,7 @@ dependencies = [ - [[package]] - name = "pallet-mmr" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ckb-merkle-mountain-range", - "frame-benchmarking", -@@ -5228,7 +5228,7 @@ dependencies = [ - [[package]] - name = "pallet-mmr-rpc" - version = "3.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "jsonrpsee", - "parity-scale-codec", -@@ -5243,7 +5243,7 @@ dependencies = [ - [[package]] - name = "pallet-multisig" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5258,7 +5258,7 @@ dependencies = [ - [[package]] - name = "pallet-nomination-pools" - version = "1.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -5275,7 +5275,7 @@ dependencies = [ - [[package]] - name = "pallet-nomination-pools-benchmarking" - version = "1.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", -@@ -5294,7 +5294,7 @@ dependencies = [ - [[package]] - name = "pallet-nomination-pools-runtime-api" - version = "1.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "sp-api", -@@ -5304,7 +5304,7 @@ dependencies = [ - [[package]] - name = "pallet-offences" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -5321,7 +5321,7 @@ dependencies = [ - [[package]] - name = "pallet-offences-benchmarking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", -@@ -5344,7 +5344,7 @@ dependencies = [ - [[package]] - name = "pallet-preimage" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5360,7 +5360,7 @@ dependencies = [ - [[package]] - name = "pallet-proxy" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5375,7 +5375,7 @@ dependencies = [ - [[package]] - name = "pallet-recovery" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5390,7 +5390,7 @@ dependencies = [ - [[package]] - name = "pallet-scheduler" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5406,7 +5406,7 @@ dependencies = [ - [[package]] - name = "pallet-session" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -5427,7 +5427,7 @@ dependencies = [ - [[package]] - name = "pallet-session-benchmarking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5443,7 +5443,7 @@ dependencies = [ - [[package]] - name = "pallet-society" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -5457,7 +5457,7 @@ dependencies = [ - [[package]] - name = "pallet-staking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", -@@ -5480,7 +5480,7 @@ dependencies = [ - [[package]] - name = "pallet-staking-reward-curve" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -5491,7 +5491,7 @@ dependencies = [ - [[package]] - name = "pallet-staking-reward-fn" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "sp-arithmetic", -@@ -5500,7 +5500,7 @@ dependencies = [ - [[package]] - name = "pallet-sudo" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -5514,7 +5514,7 @@ dependencies = [ - [[package]] - name = "pallet-timestamp" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5532,7 +5532,7 @@ dependencies = [ - [[package]] - name = "pallet-tips" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5551,7 +5551,7 @@ dependencies = [ - [[package]] - name = "pallet-transaction-payment" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-support", - "frame-system", -@@ -5567,7 +5567,7 @@ dependencies = [ - [[package]] - name = "pallet-transaction-payment-rpc" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "jsonrpsee", - "pallet-transaction-payment-rpc-runtime-api", -@@ -5582,7 +5582,7 @@ dependencies = [ - [[package]] - name = "pallet-transaction-payment-rpc-runtime-api" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "pallet-transaction-payment", - "parity-scale-codec", -@@ -5593,7 +5593,7 @@ dependencies = [ - [[package]] - name = "pallet-treasury" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5610,7 +5610,7 @@ dependencies = [ - [[package]] - name = "pallet-utility" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -5626,7 +5626,7 @@ dependencies = [ - [[package]] - name = "pallet-vesting" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-benchmarking", - "frame-support", -@@ -8100,7 +8100,7 @@ dependencies = [ - [[package]] - name = "remote-externalities" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "env_logger 0.9.0", - "jsonrpsee", -@@ -8442,7 +8442,7 @@ dependencies = [ - [[package]] - name = "sc-allocator" - version = "4.1.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "sp-core", -@@ -8453,7 +8453,7 @@ dependencies = [ - [[package]] - name = "sc-authority-discovery" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "futures-timer", -@@ -8465,7 +8465,6 @@ dependencies = [ - "prost-build", - "rand 0.7.3", - "sc-client-api", -- "sc-network", - "sc-network-common", - "sp-api", - "sp-authority-discovery", -@@ -8480,7 +8479,7 @@ dependencies = [ - [[package]] - name = "sc-basic-authorship" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "futures-timer", -@@ -8503,7 +8502,7 @@ dependencies = [ - [[package]] - name = "sc-block-builder" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "sc-client-api", -@@ -8519,13 +8518,13 @@ dependencies = [ - [[package]] - name = "sc-chain-spec" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "impl-trait-for-tuples", - "memmap2 0.5.0", - "parity-scale-codec", - "sc-chain-spec-derive", -- "sc-network", -+ "sc-network-common", - "sc-telemetry", - "serde", - "serde_json", -@@ -8536,7 +8535,7 @@ dependencies = [ - [[package]] - name = "sc-chain-spec-derive" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -8547,7 +8546,7 @@ dependencies = [ - [[package]] - name = "sc-cli" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "chrono", - "clap", -@@ -8586,7 +8585,7 @@ dependencies = [ - [[package]] - name = "sc-client-api" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "fnv", - "futures", -@@ -8614,7 +8613,7 @@ dependencies = [ - [[package]] - name = "sc-client-db" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "hash-db", - "kvdb", -@@ -8639,7 +8638,7 @@ dependencies = [ - [[package]] - name = "sc-consensus" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "futures", -@@ -8663,7 +8662,7 @@ dependencies = [ - [[package]] - name = "sc-consensus-babe" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "fork-tree", -@@ -8705,7 +8704,7 @@ dependencies = [ - [[package]] - name = "sc-consensus-babe-rpc" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "jsonrpsee", -@@ -8727,7 +8726,7 @@ dependencies = [ - [[package]] - name = "sc-consensus-epochs" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "fork-tree", - "parity-scale-codec", -@@ -8740,7 +8739,7 @@ dependencies = [ - [[package]] - name = "sc-consensus-slots" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "futures", -@@ -8765,7 +8764,7 @@ dependencies = [ - [[package]] - name = "sc-executor" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "lazy_static", - "lru 0.7.8", -@@ -8792,7 +8791,7 @@ dependencies = [ - [[package]] - name = "sc-executor-common" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "environmental", - "parity-scale-codec", -@@ -8808,7 +8807,7 @@ dependencies = [ - [[package]] - name = "sc-executor-wasmi" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "parity-scale-codec", -@@ -8823,7 +8822,7 @@ dependencies = [ - [[package]] - name = "sc-executor-wasmtime" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "cfg-if 1.0.0", - "libc", -@@ -8843,7 +8842,7 @@ dependencies = [ - [[package]] - name = "sc-finality-grandpa" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ahash", - "async-trait", -@@ -8884,7 +8883,7 @@ dependencies = [ - [[package]] - name = "sc-finality-grandpa-rpc" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "finality-grandpa", - "futures", -@@ -8905,7 +8904,7 @@ dependencies = [ - [[package]] - name = "sc-informant" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ansi_term", - "futures", -@@ -8922,7 +8921,7 @@ dependencies = [ - [[package]] - name = "sc-keystore" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "hex", -@@ -8937,7 +8936,7 @@ dependencies = [ - [[package]] - name = "sc-network" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "asynchronous-codec", -@@ -8986,7 +8985,7 @@ dependencies = [ - [[package]] - name = "sc-network-common" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "bitflags", -@@ -8997,6 +8996,7 @@ dependencies = [ - "prost-build", - "sc-consensus", - "sc-peerset", -+ "serde", - "smallvec", - "sp-consensus", - "sp-finality-grandpa", -@@ -9007,7 +9007,7 @@ dependencies = [ - [[package]] - name = "sc-network-gossip" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ahash", - "futures", -@@ -9015,8 +9015,8 @@ dependencies = [ - "libp2p", - "log", - "lru 0.7.8", -- "sc-network", - "sc-network-common", -+ "sc-peerset", - "sp-runtime", - "substrate-prometheus-endpoint", - "tracing", -@@ -9025,7 +9025,7 @@ dependencies = [ - [[package]] - name = "sc-network-light" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "hex", -@@ -9046,7 +9046,7 @@ dependencies = [ - [[package]] - name = "sc-network-sync" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "fork-tree", - "futures", -@@ -9074,7 +9074,7 @@ dependencies = [ - [[package]] - name = "sc-offchain" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "bytes", - "fnv", -@@ -9083,14 +9083,15 @@ dependencies = [ - "hex", - "hyper", - "hyper-rustls", -+ "libp2p", - "num_cpus", - "once_cell", - "parity-scale-codec", - "parking_lot 0.12.0", - "rand 0.7.3", - "sc-client-api", -- "sc-network", - "sc-network-common", -+ "sc-peerset", - "sc-utils", - "sp-api", - "sp-core", -@@ -9103,7 +9104,7 @@ dependencies = [ - [[package]] - name = "sc-peerset" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "libp2p", -@@ -9116,7 +9117,7 @@ dependencies = [ - [[package]] - name = "sc-proposer-metrics" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "substrate-prometheus-endpoint", -@@ -9125,7 +9126,7 @@ dependencies = [ - [[package]] - name = "sc-rpc" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "hash-db", -@@ -9155,7 +9156,7 @@ dependencies = [ - [[package]] - name = "sc-rpc-api" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "jsonrpsee", -@@ -9178,7 +9179,7 @@ dependencies = [ - [[package]] - name = "sc-rpc-server" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "jsonrpsee", -@@ -9191,7 +9192,7 @@ dependencies = [ - [[package]] - name = "sc-service" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "directories", -@@ -9258,7 +9259,7 @@ dependencies = [ - [[package]] - name = "sc-state-db" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "parity-scale-codec", -@@ -9272,7 +9273,7 @@ dependencies = [ - [[package]] - name = "sc-sync-state-rpc" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "jsonrpsee", - "parity-scale-codec", -@@ -9291,7 +9292,7 @@ dependencies = [ - [[package]] - name = "sc-sysinfo" - version = "6.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "libc", -@@ -9310,7 +9311,7 @@ dependencies = [ - [[package]] - name = "sc-telemetry" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "chrono", - "futures", -@@ -9328,7 +9329,7 @@ dependencies = [ - [[package]] - name = "sc-tracing" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ansi_term", - "atty", -@@ -9359,7 +9360,7 @@ dependencies = [ - [[package]] - name = "sc-tracing-proc-macro" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -9370,7 +9371,7 @@ dependencies = [ - [[package]] - name = "sc-transaction-pool" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "futures-timer", -@@ -9396,7 +9397,7 @@ dependencies = [ - [[package]] - name = "sc-transaction-pool-api" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "log", -@@ -9409,7 +9410,7 @@ dependencies = [ - [[package]] - name = "sc-utils" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "futures-timer", -@@ -9894,7 +9895,7 @@ dependencies = [ - [[package]] - name = "sp-api" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "hash-db", - "log", -@@ -9912,7 +9913,7 @@ dependencies = [ - [[package]] - name = "sp-api-proc-macro" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "blake2", - "proc-macro-crate", -@@ -9924,7 +9925,7 @@ dependencies = [ - [[package]] - name = "sp-application-crypto" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -9937,7 +9938,7 @@ dependencies = [ - [[package]] - name = "sp-arithmetic" - version = "5.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "integer-sqrt", - "num-traits", -@@ -9952,7 +9953,7 @@ dependencies = [ - [[package]] - name = "sp-authority-discovery" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -9965,7 +9966,7 @@ dependencies = [ - [[package]] - name = "sp-authorship" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "parity-scale-codec", -@@ -9977,7 +9978,7 @@ dependencies = [ - [[package]] - name = "sp-block-builder" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "sp-api", -@@ -9989,7 +9990,7 @@ dependencies = [ - [[package]] - name = "sp-blockchain" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "log", -@@ -10007,7 +10008,7 @@ dependencies = [ - [[package]] - name = "sp-consensus" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "futures", -@@ -10026,7 +10027,7 @@ dependencies = [ - [[package]] - name = "sp-consensus-babe" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "merlin", -@@ -10049,7 +10050,7 @@ dependencies = [ - [[package]] - name = "sp-consensus-slots" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -10063,7 +10064,7 @@ dependencies = [ - [[package]] - name = "sp-consensus-vrf" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -10076,7 +10077,7 @@ dependencies = [ - [[package]] - name = "sp-core" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "base58", - "bitflags", -@@ -10122,7 +10123,7 @@ dependencies = [ - [[package]] - name = "sp-core-hashing" - version = "4.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "blake2", - "byteorder", -@@ -10136,7 +10137,7 @@ dependencies = [ - [[package]] - name = "sp-core-hashing-proc-macro" - version = "5.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro2", - "quote", -@@ -10147,7 +10148,7 @@ dependencies = [ - [[package]] - name = "sp-database" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "kvdb", - "parking_lot 0.12.0", -@@ -10156,7 +10157,7 @@ dependencies = [ - [[package]] - name = "sp-debug-derive" - version = "4.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro2", - "quote", -@@ -10166,7 +10167,7 @@ dependencies = [ - [[package]] - name = "sp-externalities" - version = "0.12.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "environmental", - "parity-scale-codec", -@@ -10177,7 +10178,7 @@ dependencies = [ - [[package]] - name = "sp-finality-grandpa" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "finality-grandpa", - "log", -@@ -10195,7 +10196,7 @@ dependencies = [ - [[package]] - name = "sp-inherents" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "impl-trait-for-tuples", -@@ -10209,7 +10210,7 @@ dependencies = [ - [[package]] - name = "sp-io" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "bytes", - "futures", -@@ -10235,7 +10236,7 @@ dependencies = [ - [[package]] - name = "sp-keyring" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "lazy_static", - "sp-core", -@@ -10246,7 +10247,7 @@ dependencies = [ - [[package]] - name = "sp-keystore" - version = "0.12.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "futures", -@@ -10263,7 +10264,7 @@ dependencies = [ - [[package]] - name = "sp-maybe-compressed-blob" - version = "4.1.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "thiserror", - "zstd", -@@ -10272,7 +10273,7 @@ dependencies = [ - [[package]] - name = "sp-mmr-primitives" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "parity-scale-codec", -@@ -10287,7 +10288,7 @@ dependencies = [ - [[package]] - name = "sp-npos-elections" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -10301,7 +10302,7 @@ dependencies = [ - [[package]] - name = "sp-offchain" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "sp-api", - "sp-core", -@@ -10311,7 +10312,7 @@ dependencies = [ - [[package]] - name = "sp-panic-handler" - version = "4.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "backtrace", - "lazy_static", -@@ -10321,7 +10322,7 @@ dependencies = [ - [[package]] - name = "sp-rpc" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "rustc-hash", - "serde", -@@ -10331,7 +10332,7 @@ dependencies = [ - [[package]] - name = "sp-runtime" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "either", - "hash256-std-hasher", -@@ -10353,7 +10354,7 @@ dependencies = [ - [[package]] - name = "sp-runtime-interface" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "bytes", - "impl-trait-for-tuples", -@@ -10371,7 +10372,7 @@ dependencies = [ - [[package]] - name = "sp-runtime-interface-proc-macro" - version = "5.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "Inflector", - "proc-macro-crate", -@@ -10383,7 +10384,7 @@ dependencies = [ - [[package]] - name = "sp-sandbox" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "parity-scale-codec", -@@ -10397,7 +10398,7 @@ dependencies = [ - [[package]] - name = "sp-session" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -10411,7 +10412,7 @@ dependencies = [ - [[package]] - name = "sp-staking" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "scale-info", -@@ -10422,7 +10423,7 @@ dependencies = [ - [[package]] - name = "sp-state-machine" - version = "0.12.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "hash-db", - "log", -@@ -10444,12 +10445,12 @@ dependencies = [ - [[package]] - name = "sp-std" - version = "4.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - - [[package]] - name = "sp-storage" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "impl-serde", - "parity-scale-codec", -@@ -10462,7 +10463,7 @@ dependencies = [ - [[package]] - name = "sp-tasks" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "log", - "sp-core", -@@ -10475,7 +10476,7 @@ dependencies = [ - [[package]] - name = "sp-timestamp" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "futures-timer", -@@ -10491,7 +10492,7 @@ dependencies = [ - [[package]] - name = "sp-tracing" - version = "5.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "sp-std", -@@ -10503,7 +10504,7 @@ dependencies = [ - [[package]] - name = "sp-transaction-pool" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "sp-api", - "sp-runtime", -@@ -10512,7 +10513,7 @@ dependencies = [ - [[package]] - name = "sp-transaction-storage-proof" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "log", -@@ -10528,7 +10529,7 @@ dependencies = [ - [[package]] - name = "sp-trie" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ahash", - "hash-db", -@@ -10551,7 +10552,7 @@ dependencies = [ - [[package]] - name = "sp-version" - version = "5.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "impl-serde", - "parity-scale-codec", -@@ -10568,7 +10569,7 @@ dependencies = [ - [[package]] - name = "sp-version-proc-macro" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "parity-scale-codec", - "proc-macro2", -@@ -10579,7 +10580,7 @@ dependencies = [ - [[package]] - name = "sp-wasm-interface" - version = "6.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "impl-trait-for-tuples", - "log", -@@ -10753,7 +10754,7 @@ dependencies = [ - [[package]] - name = "substrate-build-script-utils" - version = "3.0.0" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "platforms", - ] -@@ -10761,7 +10762,7 @@ dependencies = [ - [[package]] - name = "substrate-frame-rpc-system" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "frame-system-rpc-runtime-api", - "futures", -@@ -10782,7 +10783,7 @@ dependencies = [ - [[package]] - name = "substrate-prometheus-endpoint" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures-util", - "hyper", -@@ -10795,7 +10796,7 @@ dependencies = [ - [[package]] - name = "substrate-state-trie-migration-rpc" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "jsonrpsee", - "log", -@@ -10816,7 +10817,7 @@ dependencies = [ - [[package]] - name = "substrate-test-client" - version = "2.0.1" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "async-trait", - "futures", -@@ -10842,7 +10843,7 @@ dependencies = [ - [[package]] - name = "substrate-test-utils" - version = "4.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "futures", - "substrate-test-utils-derive", -@@ -10852,7 +10853,7 @@ dependencies = [ - [[package]] - name = "substrate-test-utils-derive" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -10863,7 +10864,7 @@ dependencies = [ - [[package]] - name = "substrate-wasm-builder" - version = "5.0.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "ansi_term", - "build-helper", -@@ -11577,7 +11578,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - [[package]] - name = "try-runtime-cli" - version = "0.10.0-dev" --source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" -+source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" - dependencies = [ - "clap", - "jsonrpsee", -diff --git a/node/network/bridge/src/network.rs b/node/network/bridge/src/network.rs -index 00a950f35c5..e80094588e3 100644 ---- a/node/network/bridge/src/network.rs -+++ b/node/network/bridge/src/network.rs -@@ -22,11 +22,12 @@ use futures::{prelude::*, stream::BoxStream}; - use parity_scale_codec::Encode; - - use sc_network::{ -- config::parse_addr, multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, -- NetworkService, OutboundFailure, RequestFailure, -+ multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, NetworkService, OutboundFailure, -+ RequestFailure, - }; --use sc_network_common::service::{ -- NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest, -+use sc_network_common::{ -+ config::parse_addr, -+ service::{NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest}, - }; - - use polkadot_node_network_protocol::{ -diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs -index 21160bddaec..dd5177c6a38 100644 ---- a/node/overseer/src/lib.rs -+++ b/node/overseer/src/lib.rs -@@ -185,12 +185,13 @@ impl Handle { - - /// Inform the `Overseer` that that some block was imported. - pub async fn block_imported(&mut self, block: BlockInfo) { -- self.send_and_log_error(Event::BlockImported(block)).await -+ self.send_and_log_error(PalletEvent::BlockImported(block)).await - } - - /// Send some message to one of the `Subsystem`s. - pub async fn send_msg(&mut self, msg: impl Into, origin: &'static str) { -- self.send_and_log_error(Event::MsgToSubsystem { msg: msg.into(), origin }).await -+ self.send_and_log_error(PalletEvent::MsgToSubsystem { msg: msg.into(), origin }) -+ .await - } - - /// Send a message not providing an origin. -@@ -201,7 +202,7 @@ impl Handle { - - /// Inform the `Overseer` that some block was finalized. - pub async fn block_finalized(&mut self, block: BlockInfo) { -- self.send_and_log_error(Event::BlockFinalized(block)).await -+ self.send_and_log_error(PalletEvent::BlockFinalized(block)).await - } - - /// Wait for a block with the given hash to be in the active-leaves set. -@@ -215,7 +216,7 @@ impl Handle { - hash: Hash, - response_channel: oneshot::Sender>, - ) { -- self.send_and_log_error(Event::ExternalRequest(ExternalRequest::WaitForActivation { -+ self.send_and_log_error(PalletEvent::ExternalRequest(ExternalRequest::WaitForActivation { - hash, - response_channel, - })) -@@ -224,11 +225,11 @@ impl Handle { - - /// Tell `Overseer` to shutdown. - pub async fn stop(&mut self) { -- self.send_and_log_error(Event::Stop).await; -+ self.send_and_log_error(PalletEvent::Stop).await; - } - - /// Most basic operation, to stop a server. -- async fn send_and_log_error(&mut self, event: Event) { -+ async fn send_and_log_error(&mut self, event: PalletEvent) { - if self.0.send(event).await.is_err() { - gum::info!(target: LOG_TARGET, "Failed to send an event to Overseer"); - } -@@ -265,7 +266,7 @@ impl From> for BlockInfo { - - /// An event from outside the overseer scope, such - /// as the substrate framework or user interaction. --pub enum Event { -+pub enum PalletEvent { - /// A new block was imported. - BlockImported(BlockInfo), - /// A block was finalized with i.e. babe or another consensus algorithm. -@@ -442,7 +443,7 @@ pub async fn forward_events>(client: Arc

, mut hand - /// ``` - #[orchestra( - gen=AllMessages, -- event=Event, -+ event=PalletEvent, - signal=OverseerSignal, - error=SubsystemError, - message_capacity=2048, -@@ -724,21 +725,21 @@ where - select! { - msg = self.events_rx.select_next_some() => { - match msg { -- Event::MsgToSubsystem { msg, origin } => { -+ PalletEvent::MsgToSubsystem { msg, origin } => { - self.route_message(msg.into(), origin).await?; - self.metrics.on_message_relayed(); - } -- Event::Stop => { -+ PalletEvent::Stop => { - self.stop().await; - return Ok(()); - } -- Event::BlockImported(block) => { -+ PalletEvent::BlockImported(block) => { - self.block_imported(block).await?; - } -- Event::BlockFinalized(block) => { -+ PalletEvent::BlockFinalized(block) => { - self.block_finalized(block).await?; - } -- Event::ExternalRequest(request) => { -+ PalletEvent::ExternalRequest(request) => { - self.handle_external_request(request); - } - } -diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs -index bac642cde58..b5d8d7e9449 100644 ---- a/runtime/common/src/assigned_slots.rs -+++ b/runtime/common/src/assigned_slots.rs -@@ -84,8 +84,9 @@ pub mod pallet { - #[pallet::config] - #[pallet::disable_frame_system_supertrait_check] - pub trait Config: configuration::Config + paras::Config + slots::Config { -- /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ /// The overarching PalletEvent type. -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// Origin for assigning slots. - type AssignSlotOrigin: EnsureOrigin<::Origin>; -@@ -152,7 +153,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// A para was assigned a permanent parachain slot - PermanentSlotAssigned(ParaId), - /// A para was assigned a temporary parachain slot -@@ -250,7 +251,7 @@ pub mod pallet { - ); - >::mutate(|count| count.saturating_inc()); - -- Self::deposit_event(Event::::PermanentSlotAssigned(id)); -+ Self::deposit_event(PalletEvent::::PermanentSlotAssigned(id)); - Ok(()) - } - -@@ -334,7 +335,7 @@ pub mod pallet { - TemporarySlots::::insert(id, temp_slot); - >::mutate(|count| count.saturating_inc()); - -- Self::deposit_event(Event::::TemporarySlotAssigned(id)); -+ Self::deposit_event(PalletEvent::::TemporarySlotAssigned(id)); - - Ok(()) - } -@@ -601,7 +602,7 @@ mod tests { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type PalletEvent = PalletEvent; - type BlockHashCount = BlockHashCount; - type DbWeight = (); - type Version = (); -@@ -621,7 +622,7 @@ mod tests { - - impl pallet_balances::Config for Test { - type Balance = u64; -- type Event = Event; -+ type PalletEvent = PalletEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -640,7 +641,7 @@ mod tests { - } - - impl parachains_paras::Config for Test { -- type Event = Event; -+ type PalletEvent = PalletEvent; - type WeightInfo = parachains_paras::TestWeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = crate::mock::TestNextSessionRotation; -@@ -655,7 +656,7 @@ mod tests { - } - - impl slots::Config for Test { -- type Event = Event; -+ type PalletEvent = PalletEvent; - type Currency = Balances; - type Registrar = TestRegistrar; - type LeasePeriod = LeasePeriod; -@@ -673,7 +674,7 @@ mod tests { - } - - impl assigned_slots::Config for Test { -- type Event = Event; -+ type PalletEvent = PalletEvent; - type AssignSlotOrigin = EnsureRoot; - type Leaser = Slots; - type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; -diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs -index b937a26d567..7971eafc04d 100644 ---- a/runtime/common/src/auctions.rs -+++ b/runtime/common/src/auctions.rs -@@ -91,7 +91,8 @@ pub mod pallet { - #[pallet::config] - pub trait Config: frame_system::Config { - /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// The type representing the leasing system. - type Leaser: Leaser< -@@ -125,7 +126,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// An auction started. Provides its index and the block number where it will begin to - /// close and the first lease period of the quadruplet that is auctioned. - AuctionStarted { -@@ -402,7 +403,7 @@ impl Pallet { - let ending = frame_system::Pallet::::block_number().saturating_add(duration); - AuctionInfo::::put((lease_period_index, ending)); - -- Self::deposit_event(Event::::AuctionStarted { -+ Self::deposit_event(PalletEvent::::AuctionStarted { - auction_index: n, - lease_period: lease_period_index, - ending, -@@ -481,7 +482,7 @@ impl Pallet { - // ...and record the amount reserved. - ReservedAmounts::::insert(&bidder_para, reserve_required); - -- Self::deposit_event(Event::::Reserved { -+ Self::deposit_event(PalletEvent::::Reserved { - bidder: bidder.clone(), - extra_reserved: additional, - total_amount: reserve_required, -@@ -504,14 +505,14 @@ impl Pallet { - // It really should be reserved; there's not much we can do here on fail. - let err_amt = CurrencyOf::::unreserve(&who, amount); - debug_assert!(err_amt.is_zero()); -- Self::deposit_event(Event::::Unreserved { bidder: who, amount }); -+ Self::deposit_event(PalletEvent::::Unreserved { bidder: who, amount }); - } - } - } - - // Update the range winner. - Winning::::insert(offset, ¤t_winning); -- Self::deposit_event(Event::::BidAccepted { -+ Self::deposit_event(PalletEvent::::BidAccepted { - bidder, - para_id: para, - amount, -@@ -548,7 +549,7 @@ impl Pallet { - T::SampleLength::get().max(One::one()); - - let auction_counter = AuctionCounter::::get(); -- Self::deposit_event(Event::::WinningOffset { -+ Self::deposit_event(PalletEvent::::WinningOffset { - auction_index: auction_counter, - block_number: offset, - }); -@@ -602,7 +603,7 @@ impl Pallet { - // The leaser attempted to get a second lease on the same para ID, possibly griefing us. Let's - // keep the amount reserved and let governance sort it out. - if CurrencyOf::::reserve(&leaser, amount).is_ok() { -- Self::deposit_event(Event::::ReserveConfiscated { -+ Self::deposit_event(PalletEvent::::ReserveConfiscated { - para_id: para, - leaser, - amount, -@@ -613,7 +614,7 @@ impl Pallet { - } - } - -- Self::deposit_event(Event::::AuctionClosed { -+ Self::deposit_event(PalletEvent::::AuctionClosed { - auction_index: AuctionCounter::::get(), - }); - } -@@ -718,7 +719,7 @@ mod tests { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type PalletEvent = PalletEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -739,7 +740,7 @@ mod tests { - impl pallet_balances::Config for Test { - type Balance = u64; - type DustRemoval = (); -- type Event = Event; -+ type PalletEvent = PalletEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type WeightInfo = (); -@@ -867,7 +868,7 @@ mod tests { - } - - impl Config for Test { -- type Event = Event; -+ type PalletEvent = PalletEvent; - type Leaser = TestLeaser; - type Registrar = TestRegistrar; - type EndingPeriod = EndingPeriod; -@@ -1729,9 +1730,9 @@ mod benchmarking { - - use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - -- fn assert_last_event(generic_event: ::Event) { -+ fn assert_last_event(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -@@ -1786,7 +1787,7 @@ mod benchmarking { - let origin = T::InitiateOrigin::successful_origin(); - }: _(origin, duration, lease_period_index) - verify { -- assert_last_event::(Event::::AuctionStarted { -+ assert_last_event::(PalletEvent::::AuctionStarted { - auction_index: AuctionCounter::::get(), - lease_period: LeasePeriodOf::::max_value(), - ending: T::BlockNumber::max_value(), -@@ -1884,7 +1885,7 @@ mod benchmarking { - Auctions::::on_initialize(duration + now + T::EndingPeriod::get()); - } verify { - let auction_index = AuctionCounter::::get(); -- assert_last_event::(Event::::AuctionClosed { auction_index }.into()); -+ assert_last_event::(PalletEvent::::AuctionClosed { auction_index }.into()); - assert!(Winning::::iter().count().is_zero()); - } - -diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs -index e2731f9336c..31578630808 100644 ---- a/runtime/common/src/claims.rs -+++ b/runtime/common/src/claims.rs -@@ -172,7 +172,8 @@ pub mod pallet { - #[pallet::config] - pub trait Config: frame_system::Config { - /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - type VestingSchedule: VestingSchedule; - #[pallet::constant] - type Prefix: Get<&'static [u8]>; -@@ -182,7 +183,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// Someone claimed some DOTs. - Claimed { who: T::AccountId, ethereum_address: EthereumAddress, amount: BalanceOf }, - } -@@ -581,7 +582,7 @@ impl Pallet { - Signing::::remove(&signer); - - // Let's deposit an event to let the outside world know this happened. -- Self::deposit_event(Event::::Claimed { -+ Self::deposit_event(PalletEvent::::Claimed { - who: dest, - ethereum_address: signer, - amount: balance_due, -@@ -760,7 +761,7 @@ mod tests { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -779,7 +780,7 @@ mod tests { - - impl pallet_balances::Config for Test { - type Balance = u64; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -794,7 +795,7 @@ mod tests { - } - - impl pallet_vesting::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BlockNumberToBalance = Identity; - type MinVestedTransfer = MinVestedTransfer; -@@ -810,7 +811,7 @@ mod tests { - } - - impl Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type VestingSchedule = Vesting; - type Prefix = Prefix; - type MoveClaimOrigin = frame_system::EnsureSignedBy; -diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs -index 4b2c29f5398..5366eb93cd1 100644 ---- a/runtime/common/src/crowdloan/mod.rs -+++ b/runtime/common/src/crowdloan/mod.rs -@@ -189,7 +189,8 @@ pub mod pallet { - - #[pallet::config] - pub trait Config: frame_system::Config { -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")` - #[pallet::constant] -@@ -253,7 +254,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// Create a new crowdloaning campaign. - Created { para_id: ParaId }, - /// Contributed to a crowd sale. -@@ -351,7 +352,7 @@ pub mod pallet { - fund.raised, - ); - -- Self::deposit_event(Event::::HandleBidResult { para_id, result }); -+ Self::deposit_event(PalletEvent::::HandleBidResult { para_id, result }); - } - T::WeightInfo::on_initialize(new_raise_len) - } else { -@@ -437,7 +438,7 @@ pub mod pallet { - // Add a lock to the para so that the configuration cannot be changed. - T::Registrar::apply_lock(index); - -- Self::deposit_event(Event::::Created { para_id: index }); -+ Self::deposit_event(PalletEvent::::Created { para_id: index }); - Ok(()) - } - -@@ -494,7 +495,11 @@ pub mod pallet { - - Funds::::insert(index, &fund); - -- Self::deposit_event(Event::::Withdrew { who, fund_index: index, amount: balance }); -+ Self::deposit_event(PalletEvent::::Withdrew { -+ who, -+ fund_index: index, -+ amount: balance, -+ }); - Ok(()) - } - -@@ -536,11 +541,11 @@ pub mod pallet { - Funds::::insert(index, &fund); - - if all_refunded { -- Self::deposit_event(Event::::AllRefunded { para_id: index }); -+ Self::deposit_event(PalletEvent::::AllRefunded { para_id: index }); - // Refund for unused refund count. - Ok(Some(T::WeightInfo::refund(refund_count)).into()) - } else { -- Self::deposit_event(Event::::PartiallyRefunded { para_id: index }); -+ Self::deposit_event(PalletEvent::::PartiallyRefunded { para_id: index }); - // No weight to refund since we did not finish the loop. - Ok(().into()) - } -@@ -567,7 +572,7 @@ pub mod pallet { - - CurrencyOf::::unreserve(&fund.depositor, fund.deposit); - Funds::::remove(index); -- Self::deposit_event(Event::::Dissolved { para_id: index }); -+ Self::deposit_event(PalletEvent::::Dissolved { para_id: index }); - Ok(()) - } - -@@ -604,7 +609,7 @@ pub mod pallet { - }, - ); - -- Self::deposit_event(Event::::Edited { para_id: index }); -+ Self::deposit_event(PalletEvent::::Edited { para_id: index }); - Ok(()) - } - -@@ -622,7 +627,7 @@ pub mod pallet { - ensure!(balance > Zero::zero(), Error::::NoContributions); - - Self::contribution_put(fund.fund_index, &who, &balance, &memo); -- Self::deposit_event(Event::::MemoUpdated { who, para_id: index, memo }); -+ Self::deposit_event(PalletEvent::::MemoUpdated { who, para_id: index, memo }); - Ok(()) - } - -@@ -636,7 +641,7 @@ pub mod pallet { - ensure!(!fund.raised.is_zero(), Error::::NoContributions); - ensure!(!NewRaise::::get().contains(&index), Error::::AlreadyInNewRaise); - NewRaise::::append(index); -- Self::deposit_event(Event::::AddedToNewRaise { para_id: index }); -+ Self::deposit_event(PalletEvent::::AddedToNewRaise { para_id: index }); - Ok(()) - } - -@@ -811,7 +816,11 @@ impl Pallet { - - Funds::::insert(index, &fund); - -- Self::deposit_event(Event::::Contributed { who, fund_index: index, amount: value }); -+ Self::deposit_event(PalletEvent::::Contributed { -+ who, -+ fund_index: index, -+ amount: value, -+ }); - Ok(()) - } - } -@@ -901,7 +910,7 @@ mod tests { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -920,7 +929,7 @@ mod tests { - - impl pallet_balances::Config for Test { - type Balance = u64; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -1072,7 +1081,7 @@ mod tests { - } - - impl Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SubmissionDeposit = SubmissionDeposit; - type MinContribution = MinContribution; - type PalletId = CrowdloanPalletId; -@@ -1129,8 +1138,8 @@ mod tests { - } - } - -- fn last_event() -> Event { -- System::events().pop().expect("Event expected").event -+ fn last_event() -> PalletEvent { -+ System::events().pop().expect("PalletEvent expected").event - } - - #[test] -@@ -1651,7 +1660,7 @@ mod tests { - assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); - assert_eq!( - last_event(), -- super::Event::::PartiallyRefunded { para_id: para }.into() -+ super::PalletEvent::::PartiallyRefunded { para_id: para }.into() - ); - - // Funds still left over -@@ -1659,7 +1668,10 @@ mod tests { - - // Call again - assert_ok!(Crowdloan::refund(Origin::signed(1337), para)); -- assert_eq!(last_event(), super::Event::::AllRefunded { para_id: para }.into()); -+ assert_eq!( -+ last_event(), -+ super::PalletEvent::::AllRefunded { para_id: para }.into() -+ ); - - // Funds are returned - assert_eq!(Balances::free_balance(account_id), 0); -@@ -1906,9 +1918,9 @@ mod benchmarking { - - use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - -- fn assert_last_event(generic_event: ::Event) { -+ fn assert_last_event(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -@@ -1987,7 +1999,7 @@ mod benchmarking { - - }: _(RawOrigin::Signed(caller), para_id, cap, first_period, last_period, end, Some(verifier)) - verify { -- assert_last_event::(Event::::Created { para_id }.into()) -+ assert_last_event::(PalletEvent::::Created { para_id }.into()) - } - - // Contribute has two arms: PreEnding and Ending, but both are equal complexity. -@@ -2008,7 +2020,7 @@ mod benchmarking { - verify { - // NewRaise is appended to, so we don't need to fill it up for worst case scenario. - assert!(!NewRaise::::get().is_empty()); -- assert_last_event::(Event::::Contributed { who: caller, fund_index, amount: contribution }.into()); -+ assert_last_event::(PalletEvent::::Contributed { who: caller, fund_index, amount: contribution }.into()); - } - - withdraw { -@@ -2021,7 +2033,7 @@ mod benchmarking { - frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); - }: _(RawOrigin::Signed(caller), contributor.clone(), fund_index) - verify { -- assert_last_event::(Event::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); -+ assert_last_event::(PalletEvent::::Withdrew { who: contributor, fund_index, amount: T::MinContribution::get() }.into()); - } - - // Worst case: Refund removes `RemoveKeysLimit` keys, and is fully refunded. -@@ -2041,7 +2053,7 @@ mod benchmarking { - frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); - }: _(RawOrigin::Signed(caller), fund_index) - verify { -- assert_last_event::(Event::::AllRefunded { para_id: fund_index }.into()); -+ assert_last_event::(PalletEvent::::AllRefunded { para_id: fund_index }.into()); - } - - dissolve { -@@ -2052,7 +2064,7 @@ mod benchmarking { - frame_system::Pallet::::set_block_number(T::BlockNumber::max_value()); - }: _(RawOrigin::Signed(caller.clone()), fund_index) - verify { -- assert_last_event::(Event::::Dissolved { para_id: fund_index }.into()); -+ assert_last_event::(PalletEvent::::Dissolved { para_id: fund_index }.into()); - } - - edit { -@@ -2081,7 +2093,7 @@ mod benchmarking { - // Doesn't matter what we edit to, so use the same values. - }: _(RawOrigin::Root, para_id, cap, first_period, last_period, end, Some(verifier)) - verify { -- assert_last_event::(Event::::Edited { para_id }.into()) -+ assert_last_event::(PalletEvent::::Edited { para_id }.into()) - } - - add_memo { -@@ -2111,7 +2123,7 @@ mod benchmarking { - }: _(RawOrigin::Signed(caller), fund_index) - verify { - assert!(!NewRaise::::get().is_empty()); -- assert_last_event::(Event::::AddedToNewRaise { para_id: fund_index }.into()) -+ assert_last_event::(PalletEvent::::AddedToNewRaise { para_id: fund_index }.into()) - } - - // Worst case scenario: N funds are all in the `NewRaise` list, we are -@@ -2150,7 +2162,7 @@ mod benchmarking { - Crowdloan::::on_initialize(end_block); - } verify { - assert_eq!(EndingsCount::::get(), old_endings_count + 1); -- assert_last_event::(Event::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); -+ assert_last_event::(PalletEvent::::HandleBidResult { para_id: (n - 1).into(), result: Ok(()) }.into()); - } - - impl_benchmark_test_suite!( -diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs -index bce847c82a8..c528f191511 100644 ---- a/runtime/common/src/impls.rs -+++ b/runtime/common/src/impls.rs -@@ -113,7 +113,7 @@ mod tests { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockLength = BlockLength; - type BlockWeights = BlockWeights; -@@ -131,7 +131,7 @@ mod tests { - - impl pallet_balances::Config for Test { - type Balance = u64; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = (); - type AccountStore = System; -@@ -150,7 +150,7 @@ mod tests { - type Currency = pallet_balances::Pallet; - type ApproveOrigin = frame_system::EnsureRoot; - type RejectOrigin = frame_system::EnsureRoot; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnSlash = (); - type ProposalBond = (); - type ProposalBondMinimum = (); -diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs -index 76dc1f4c55b..89fbe240964 100644 ---- a/runtime/common/src/integration_tests.rs -+++ b/runtime/common/src/integration_tests.rs -@@ -120,7 +120,7 @@ impl frame_system::Config for Test { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -178,7 +178,7 @@ parameter_types! { - impl pallet_balances::Config for Test { - type MaxLocks = (); - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -200,7 +200,7 @@ parameter_types! { - } - - impl paras::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = paras::TestWeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = crate::mock::TestNextSessionRotation; -@@ -212,7 +212,7 @@ parameter_types! { - } - - impl paras_registrar::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnSwap = (Crowdloan, Slots); - type ParaDeposit = ParaDeposit; - type DataDepositPerByte = DataDepositPerByte; -@@ -227,7 +227,7 @@ parameter_types! { - } - - impl auctions::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Leaser = Slots; - type Registrar = Registrar; - type EndingPeriod = EndingPeriod; -@@ -243,7 +243,7 @@ parameter_types! { - } - - impl slots::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Registrar = Registrar; - type LeasePeriod = LeasePeriod; -@@ -261,7 +261,7 @@ parameter_types! { - } - - impl crowdloan::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PalletId = CrowdloanId; - type SubmissionDeposit = SubmissionDeposit; - type MinContribution = MinContribution; -@@ -342,11 +342,11 @@ fn run_to_session(n: u32) { - run_to_block(block_number); - } - --fn last_event() -> Event { -- System::events().pop().expect("Event expected").event -+fn last_event() -> PalletEvent { -+ System::events().pop().expect("PalletEvent expected").event - } - --fn contains_event(event: Event) -> bool { -+fn contains_event(event: PalletEvent) -> bool { - System::events().iter().any(|x| x.event == event) - } - -@@ -432,7 +432,7 @@ fn basic_end_to_end_works() { - // Auction ends at block 110 + offset - run_to_block(109 + offset); - assert!(contains_event( -- crowdloan::Event::::HandleBidResult { -+ crowdloan::PalletEvent::::HandleBidResult { - para_id: ParaId::from(para_2), - result: Ok(()) - } -@@ -441,7 +441,7 @@ fn basic_end_to_end_works() { - run_to_block(110 + offset); - assert_eq!( - last_event(), -- auctions::Event::::AuctionClosed { auction_index: 1 }.into() -+ auctions::PalletEvent::::AuctionClosed { auction_index: 1 }.into() - ); - - // Paras should have won slots -diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs -index 7631914b999..183c307da31 100644 ---- a/runtime/common/src/paras_registrar.rs -+++ b/runtime/common/src/paras_registrar.rs -@@ -96,7 +96,8 @@ pub mod pallet { - #[pallet::disable_frame_system_supertrait_check] - pub trait Config: configuration::Config + paras::Config { - /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// The aggregated origin type must support the `parachains` origin. We require that we can - /// infallibly convert between this origin and the system origin, but in reality, they're the -@@ -126,7 +127,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - Registered { para_id: ParaId, manager: T::AccountId }, - Deregistered { para_id: ParaId }, - Reserved { para_id: ParaId, who: T::AccountId }, -@@ -492,7 +493,7 @@ impl Pallet { - let info = ParaInfo { manager: who.clone(), deposit, locked: false }; - - Paras::::insert(id, info); -- Self::deposit_event(Event::::Reserved { para_id: id, who }); -+ Self::deposit_event(PalletEvent::::Reserved { para_id: id, who }); - Ok(()) - } - -@@ -530,7 +531,7 @@ impl Pallet { - // We check above that para has no lifecycle, so this should not fail. - let res = runtime_parachains::schedule_para_initialize::(id, genesis); - debug_assert!(res.is_ok()); -- Self::deposit_event(Event::::Registered { para_id: id, manager: who }); -+ Self::deposit_event(PalletEvent::::Registered { para_id: id, manager: who }); - Ok(()) - } - -@@ -549,7 +550,7 @@ impl Pallet { - } - - PendingSwap::::remove(id); -- Self::deposit_event(Event::::Deregistered { para_id: id }); -+ Self::deposit_event(PalletEvent::::Deregistered { para_id: id }); - Ok(()) - } - -@@ -657,7 +658,7 @@ mod tests { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type DbWeight = (); - type BlockWeights = BlockWeights; -@@ -680,7 +681,7 @@ mod tests { - impl pallet_balances::Config for Test { - type Balance = u128; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type MaxLocks = (); -@@ -698,7 +699,7 @@ mod tests { - } - - impl paras::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = paras::TestWeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = crate::mock::TestNextSessionRotation; -@@ -715,7 +716,7 @@ mod tests { - } - - impl Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type OnSwap = MockSwap; -@@ -1226,9 +1227,9 @@ mod benchmarking { - - use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - -- fn assert_last_event(generic_event: ::Event) { -+ fn assert_last_event(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -@@ -1268,7 +1269,7 @@ mod benchmarking { - T::Currency::make_free_balance_be(&caller, BalanceOf::::max_value()); - }: _(RawOrigin::Signed(caller.clone())) - verify { -- assert_last_event::(Event::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); -+ assert_last_event::(PalletEvent::::Reserved { para_id: LOWEST_PUBLIC_ID, who: caller }.into()); - assert!(Paras::::get(LOWEST_PUBLIC_ID).is_some()); - assert_eq!(paras::Pallet::::lifecycle(LOWEST_PUBLIC_ID), None); - } -@@ -1282,7 +1283,7 @@ mod benchmarking { - assert_ok!(Registrar::::reserve(RawOrigin::Signed(caller.clone()).into())); - }: _(RawOrigin::Signed(caller.clone()), para, genesis_head, validation_code) - verify { -- assert_last_event::(Event::::Registered{ para_id: para, manager: caller }.into()); -+ assert_last_event::(PalletEvent::::Registered{ para_id: para, manager: caller }.into()); - assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); - next_scheduled_session::(); - assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); -@@ -1296,7 +1297,7 @@ mod benchmarking { - let validation_code = Registrar::::worst_validation_code(); - }: _(RawOrigin::Root, manager.clone(), deposit, para, genesis_head, validation_code) - verify { -- assert_last_event::(Event::::Registered { para_id: para, manager }.into()); -+ assert_last_event::(PalletEvent::::Registered { para_id: para, manager }.into()); - assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Onboarding)); - next_scheduled_session::(); - assert_eq!(paras::Pallet::::lifecycle(para), Some(ParaLifecycle::Parathread)); -@@ -1308,7 +1309,7 @@ mod benchmarking { - let caller: T::AccountId = whitelisted_caller(); - }: _(RawOrigin::Signed(caller), para) - verify { -- assert_last_event::(Event::::Deregistered { para_id: para }.into()); -+ assert_last_event::(PalletEvent::::Deregistered { para_id: para }.into()); - } - - swap { -diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs -index 3900f6edb31..c8cee404633 100644 ---- a/runtime/common/src/purchase.rs -+++ b/runtime/common/src/purchase.rs -@@ -98,7 +98,8 @@ pub mod pallet { - #[pallet::config] - pub trait Config: frame_system::Config { - /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// Balances Pallet - type Currency: Currency; -@@ -131,7 +132,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// A [new] account was created. - AccountCreated { who: T::AccountId }, - /// Someone's account validity was updated. -@@ -222,7 +223,7 @@ pub mod pallet { - vat: Permill::zero(), - }; - Accounts::::insert(&who, status); -- Self::deposit_event(Event::::AccountCreated { who }); -+ Self::deposit_event(PalletEvent::::AccountCreated { who }); - Ok(()) - } - -@@ -251,7 +252,7 @@ pub mod pallet { - Ok(()) - }, - )?; -- Self::deposit_event(Event::::ValidityUpdated { who, validity }); -+ Self::deposit_event(PalletEvent::::ValidityUpdated { who, validity }); - Ok(()) - } - -@@ -283,7 +284,7 @@ pub mod pallet { - Ok(()) - }, - )?; -- Self::deposit_event(Event::::BalanceUpdated { -+ Self::deposit_event(PalletEvent::::BalanceUpdated { - who, - free: free_balance, - locked: locked_balance, -@@ -350,7 +351,7 @@ pub mod pallet { - - // Setting the user account to `Completed` ends the purchase process for this user. - status.validity = AccountValidity::Completed; -- Self::deposit_event(Event::::PaymentComplete { -+ Self::deposit_event(PalletEvent::::PaymentComplete { - who: who.clone(), - free: status.free_balance, - locked: status.locked_balance, -@@ -371,7 +372,7 @@ pub mod pallet { - T::ConfigurationOrigin::ensure_origin(origin)?; - // Possibly this is worse than having the caller account be the payment account? - PaymentAccount::::put(who.clone()); -- Self::deposit_event(Event::::PaymentAccountSet { who }); -+ Self::deposit_event(PalletEvent::::PaymentAccountSet { who }); - Ok(()) - } - -@@ -387,7 +388,7 @@ pub mod pallet { - ); - // Possibly this is worse than having the caller account be the payment account? - Statement::::set(statement); -- Self::deposit_event(Event::::StatementUpdated); -+ Self::deposit_event(PalletEvent::::StatementUpdated); - Ok(()) - } - -@@ -406,7 +407,9 @@ pub mod pallet { - ); - // Possibly this is worse than having the caller account be the payment account? - UnlockBlock::::set(unlock_block); -- Self::deposit_event(Event::::UnlockBlockUpdated { block_number: unlock_block }); -+ Self::deposit_event(PalletEvent::::UnlockBlockUpdated { -+ block_number: unlock_block, -+ }); - Ok(()) - } - } -@@ -519,7 +522,7 @@ mod tests { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -538,7 +541,7 @@ mod tests { - - impl pallet_balances::Config for Test { - type Balance = u64; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -553,7 +556,7 @@ mod tests { - } - - impl pallet_vesting::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BlockNumberToBalance = Identity; - type MinVestedTransfer = MinVestedTransfer; -@@ -574,7 +577,7 @@ mod tests { - } - - impl Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type VestingSchedule = Vesting; - type ValidityOrigin = frame_system::EnsureSignedBy; -diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs -index 76054ac989f..2a52c8631cd 100644 ---- a/runtime/common/src/slots/mod.rs -+++ b/runtime/common/src/slots/mod.rs -@@ -74,7 +74,8 @@ pub mod pallet { - #[pallet::config] - pub trait Config: frame_system::Config { - /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// The currency type used for bidding. - type Currency: ReservableCurrency; -@@ -120,7 +121,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// A new `[lease_period]` is beginning. - NewLeasePeriod { lease_period: LeasePeriodOf }, - /// A para has won the right to a continuous set of lease periods as a parachain. -@@ -227,7 +228,7 @@ impl Pallet { - /// We need to on-board and off-board parachains as needed. We should also handle reducing/ - /// returning deposits. - fn manage_lease_period_start(lease_period_index: LeasePeriodOf) -> Weight { -- Self::deposit_event(Event::::NewLeasePeriod { lease_period: lease_period_index }); -+ Self::deposit_event(PalletEvent::::NewLeasePeriod { lease_period: lease_period_index }); - - let old_parachains = T::Registrar::parachains(); - -@@ -407,7 +408,7 @@ impl Leaser for Pallet { - let _ = T::Registrar::make_parachain(para); - } - -- Self::deposit_event(Event::::Leased { -+ Self::deposit_event(PalletEvent::::Leased { - para_id: para, - leaser: leaser.clone(), - period_begin, -@@ -538,7 +539,7 @@ mod tests { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type DbWeight = (); - type Version = (); -@@ -558,7 +559,7 @@ mod tests { - - impl pallet_balances::Config for Test { - type Balance = u64; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -575,7 +576,7 @@ mod tests { - } - - impl Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Registrar = TestRegistrar; - type LeasePeriod = LeasePeriod; -@@ -988,9 +989,9 @@ mod benchmarking { - - use crate::slots::Pallet as Slots; - -- fn assert_last_event(generic_event: ::Event) { -+ fn assert_last_event(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -@@ -1027,7 +1028,7 @@ mod benchmarking { - let origin = T::ForceOrigin::successful_origin(); - }: _(origin, para, leaser.clone(), amount, period_begin, period_count) - verify { -- assert_last_event::(Event::::Leased { -+ assert_last_event::(PalletEvent::::Leased { - para_id: para, - leaser, period_begin, - period_count, -diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs -index a87ddf6ec1f..b36380b4b3f 100644 ---- a/runtime/kusama/src/governance/old.rs -+++ b/runtime/kusama/src/governance/old.rs -@@ -33,7 +33,7 @@ parameter_types! { - - impl pallet_democracy::Config for Runtime { - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type EnactmentPeriod = EnactmentPeriod; - type VoteLockingPeriod = EnactmentPeriod; -@@ -94,7 +94,7 @@ pub type CouncilCollective = pallet_collective::Instance1; - impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MotionDuration = CouncilMotionDuration; - type MaxProposals = CouncilMaxProposals; - type MaxMembers = CouncilMaxMembers; -@@ -121,7 +121,7 @@ parameter_types! { - const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); - - impl pallet_elections_phragmen::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type ChangeMembers = Council; - type InitializeMembers = Council; -@@ -150,7 +150,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; - impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MotionDuration = TechnicalMotionDuration; - type MaxProposals = TechnicalMaxProposals; - type MaxMembers = TechnicalMaxMembers; -@@ -159,7 +159,7 @@ impl pallet_collective::Config for Runtime { - } - - impl pallet_membership::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type AddOrigin = MoreThanHalfCouncil; - type RemoveOrigin = MoreThanHalfCouncil; - type SwapOrigin = MoreThanHalfCouncil; -diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs -index 12b9554c5cf..5e2fa13025c 100644 ---- a/runtime/kusama/src/lib.rs -+++ b/runtime/kusama/src/lib.rs -@@ -175,7 +175,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = AccountIdLookup; - type Header = generic::Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type DbWeight = RocksDbWeight; - type Version = Version; -@@ -225,7 +225,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { - } - - impl pallet_scheduler::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type PalletsOrigin = OriginCaller; - type Call = Call; -@@ -246,7 +246,7 @@ parameter_types! { - - impl pallet_preimage::Config for Runtime { - type WeightInfo = weights::pallet_preimage::WeightInfo; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; -@@ -302,7 +302,7 @@ impl pallet_indices::Config for Runtime { - type AccountIndex = AccountIndex; - type Currency = Balances; - type Deposit = IndexDeposit; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_indices::WeightInfo; - } - -@@ -315,7 +315,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type Balance = Balance; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type MaxLocks = MaxLocks; -@@ -332,7 +332,7 @@ parameter_types! { - } - - impl pallet_transaction_payment::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = CurrencyAdapter>; - type OperationalFeeMultiplier = OperationalFeeMultiplier; - type WeightToFee = WeightToFee; -@@ -378,7 +378,7 @@ impl_opaque_keys! { - } - - impl pallet_session::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorId = AccountId; - type ValidatorIdOf = pallet_staking::StashOf; - type ShouldEndSession = Babe; -@@ -468,7 +468,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { - } - - impl pallet_election_provider_multi_phase::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type EstimateCallFee = TransactionPayment; - type UnsignedPhase = UnsignedPhase; -@@ -511,7 +511,7 @@ parameter_types! { - } - - impl pallet_bags_list::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ScoreProvider = Staking; - type WeightInfo = weights::pallet_bags_list::WeightInfo; - type BagThresholds = BagThresholds; -@@ -607,7 +607,7 @@ impl pallet_staking::Config for Runtime { - type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = onchain::UnboundedExecution; - type RewardRemainder = Treasury; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Slash = Treasury; - type Reward = (); - type SessionsPerEra = SessionsPerEra; -@@ -656,7 +656,7 @@ impl pallet_treasury::Config for Runtime { - type Currency = Balances; - type ApproveOrigin = ApproveOrigin; - type RejectOrigin = MoreThanHalfCouncil; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnSlash = Treasury; - type ProposalBond = ProposalBond; - type ProposalBondMinimum = ProposalBondMinimum; -@@ -691,7 +691,7 @@ impl pallet_bounties::Config for Runtime { - type BountyValueMinimum = BountyValueMinimum; - type ChildBountyManager = ChildBounties; - type DataDepositPerByte = DataDepositPerByte; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MaximumReasonLength = MaximumReasonLength; - type WeightInfo = weights::pallet_bounties::WeightInfo; - } -@@ -702,7 +702,7 @@ parameter_types! { - } - - impl pallet_child_bounties::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MaxActiveChildBountyCount = MaxActiveChildBountyCount; - type ChildBountyValueMinimum = ChildBountyValueMinimum; - type WeightInfo = weights::pallet_child_bounties::WeightInfo; -@@ -715,12 +715,12 @@ impl pallet_tips::Config for Runtime { - type TipCountdown = TipCountdown; - type TipFindersFee = TipFindersFee; - type TipReportDepositBase = TipReportDepositBase; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_tips::WeightInfo; - } - - impl pallet_offences::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type IdentificationTuple = pallet_session::historical::IdentificationTuple; - type OnOffenceHandler = Staking; - } -@@ -737,7 +737,7 @@ parameter_types! { - - impl pallet_im_online::Config for Runtime { - type AuthorityId = ImOnlineId; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorSet = Historical; - type NextSessionRotation = Babe; - type ReportUnresponsiveness = Offences; -@@ -749,7 +749,7 @@ impl pallet_im_online::Config for Runtime { - } - - impl pallet_grandpa::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - - type KeyOwnerProof = -@@ -838,7 +838,7 @@ parameter_types! { - } - - impl claims::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type VestingSchedule = Vesting; - type Prefix = Prefix; - type MoveClaimOrigin = -@@ -857,7 +857,7 @@ parameter_types! { - } - - impl pallet_identity::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BasicDeposit = BasicDeposit; - type FieldDeposit = FieldDeposit; -@@ -872,7 +872,7 @@ impl pallet_identity::Config for Runtime { - } - - impl pallet_utility::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type PalletsOrigin = OriginCaller; - type WeightInfo = weights::pallet_utility::WeightInfo; -@@ -887,7 +887,7 @@ parameter_types! { - } - - impl pallet_multisig::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type DepositBase = DepositBase; -@@ -904,7 +904,7 @@ parameter_types! { - } - - impl pallet_recovery::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = (); - type Call = Call; - type Currency = Balances; -@@ -927,7 +927,7 @@ parameter_types! { - } - - impl pallet_society::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Randomness = pallet_babe::RandomnessFromOneEpochAgo; - type CandidateDeposit = CandidateDeposit; -@@ -950,7 +950,7 @@ parameter_types! { - } - - impl pallet_vesting::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BlockNumberToBalance = ConvertInto; - type MinVestedTransfer = MinVestedTransfer; -@@ -1094,7 +1094,7 @@ impl InstanceFilter for ProxyType { - } - - impl pallet_proxy::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type ProxyType = ProxyType; -@@ -1121,7 +1121,7 @@ impl parachains_session_info::Config for Runtime { - } - - impl parachains_inclusion::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DisputesHandler = ParasDisputes; - type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; - } -@@ -1131,7 +1131,7 @@ parameter_types! { - } - - impl parachains_paras::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::runtime_parachains_paras::WeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = Babe; -@@ -1142,7 +1142,7 @@ parameter_types! { - } - - impl parachains_ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = - crate::parachains_ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = FirstMessageFactorPercent; -@@ -1153,7 +1153,7 @@ impl parachains_ump::Config for Runtime { - impl parachains_dmp::Config for Runtime {} - - impl parachains_hrmp::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; -@@ -1172,7 +1172,7 @@ impl parachains_initializer::Config for Runtime { - } - - impl parachains_disputes::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type RewardValidators = (); - type PunishValidators = (); - type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; -@@ -1183,7 +1183,7 @@ parameter_types! { - } - - impl paras_registrar::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type OnSwap = (Crowdloan, Slots); -@@ -1198,7 +1198,7 @@ parameter_types! { - } - - impl slots::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Registrar = Registrar; - type LeasePeriod = LeasePeriod; -@@ -1217,7 +1217,7 @@ parameter_types! { - } - - impl crowdloan::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PalletId = CrowdloanId; - type SubmissionDeposit = SubmissionDeposit; - type MinContribution = MinContribution; -@@ -1242,7 +1242,7 @@ type AuctionInitiate = EitherOfDiverse< - >; - - impl auctions::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Leaser = Slots; - type Registrar = Registrar; - type EndingPeriod = EndingPeriod; -@@ -1264,7 +1264,7 @@ parameter_types! { - } - - impl pallet_gilt::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type CurrencyBalance = Balance; - type AdminOrigin = MoreThanHalfCouncil; -@@ -1287,7 +1287,7 @@ parameter_types! { - } - - impl pallet_nomination_pools::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_nomination_pools::WeightInfo; - type Currency = Balances; - type CurrencyBalance = Balance; -@@ -1621,7 +1621,7 @@ sp_api::impl_runtime_apis! { - fn candidate_events() -> Vec> { - parachains_runtime_api_impl::candidate_events::(|ev| { - match ev { -- Event::ParaInclusion(ev) => { -+ RuntimeEvent::ParaInclusion(ev) => { - Some(ev) - } - _ => None, -diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs -index 5bf45cfc89c..05c892d16bd 100644 ---- a/runtime/kusama/src/xcm_config.rs -+++ b/runtime/kusama/src/xcm_config.rs -@@ -17,8 +17,8 @@ - //! XCM configurations for the Kusama runtime. - - use super::{ -- parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, -- Runtime, WeightToFee, XcmPallet, -+ parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, -+ RuntimeEvent, WeightToFee, XcmPallet, - }; - use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; - use runtime_common::{xcm_sender, ToAuthor}; -@@ -169,7 +169,7 @@ pub type LocalOriginToLocation = ( - SignedToAccountId32, - ); - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - // We only allow the council to send messages. This is basically safe to enable for everyone - // (safe the possibility of someone spamming the parachain if they're willing to pay the KSM to - // send from the Relay-chain), but it's useless until we bring in XCM v3 which will make -diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs -index aec60a4eb0f..f9cdfe92010 100644 ---- a/runtime/parachains/src/disputes.rs -+++ b/runtime/parachains/src/disputes.rs -@@ -410,7 +410,8 @@ pub mod pallet { - - #[pallet::config] - pub trait Config: frame_system::Config + configuration::Config + session_info::Config { -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - type RewardValidators: RewardValidators; - type PunishValidators: PunishValidators; - -@@ -468,7 +469,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// A dispute has been initiated. \[candidate hash, dispute location\] - DisputeInitiated(CandidateHash, DisputeLocation), - /// A dispute has concluded for or against a candidate. -@@ -804,7 +805,7 @@ impl Pallet { - if dispute.concluded_at.is_none() && - dispute.start + config.dispute_conclusion_by_time_out_period < now - { -- Self::deposit_event(Event::DisputeTimedOut(candidate_hash)); -+ Self::deposit_event(PalletEvent::DisputeTimedOut(candidate_hash)); - - dispute.concluded_at = Some(now); - >::insert(session_index, candidate_hash, &dispute); -@@ -1195,7 +1196,7 @@ impl Pallet { - if fresh { - let is_local = >::contains_key(&session, &candidate_hash); - -- Self::deposit_event(Event::DisputeInitiated( -+ Self::deposit_event(PalletEvent::DisputeInitiated( - candidate_hash, - if is_local { DisputeLocation::Local } else { DisputeLocation::Remote }, - )); -@@ -1203,7 +1204,10 @@ impl Pallet { - - { - if summary.new_flags.contains(DisputeStateFlags::FOR_SUPERMAJORITY) { -- Self::deposit_event(Event::DisputeConcluded(candidate_hash, DisputeResult::Valid)); -+ Self::deposit_event(PalletEvent::DisputeConcluded( -+ candidate_hash, -+ DisputeResult::Valid, -+ )); - } - - // It is possible, although unexpected, for a dispute to conclude twice. -@@ -1211,7 +1215,7 @@ impl Pallet { - // A dispute cannot conclude more than once in each direction. - - if summary.new_flags.contains(DisputeStateFlags::AGAINST_SUPERMAJORITY) { -- Self::deposit_event(Event::DisputeConcluded( -+ Self::deposit_event(PalletEvent::DisputeConcluded( - candidate_hash, - DisputeResult::Invalid, - )); -@@ -1304,7 +1308,7 @@ impl Pallet { - // If we want to revert to block X in the current chain, we need to revert - // block X+1. - let revert = revert_to + One::one(); -- Self::deposit_event(Event::Revert(revert)); -+ Self::deposit_event(PalletEvent::Revert(revert)); - frame_system::Pallet::::deposit_log( - ConsensusLog::Revert(revert.saturated_into()).into(), - ); -diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs -index 2897ced22ed..937f45546a5 100644 ---- a/runtime/parachains/src/disputes/tests.rs -+++ b/runtime/parachains/src/disputes/tests.rs -@@ -1341,7 +1341,7 @@ fn test_revert_and_freeze() { - - assert_eq!(Frozen::::get(), Some(0)); - assert_eq!(System::digest().logs[0], ConsensusLog::Revert(1).into()); -- System::assert_has_event(Event::Revert(1).into()); -+ System::assert_has_event(PalletEvent::Revert(1).into()); - }) - } - -diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs -index d18c2b3fc49..d8fa87015a8 100644 ---- a/runtime/parachains/src/hrmp.rs -+++ b/runtime/parachains/src/hrmp.rs -@@ -239,7 +239,8 @@ pub mod pallet { - frame_system::Config + configuration::Config + paras::Config + dmp::Config - { - /// The outer event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - type Origin: From - + From<::Origin> -@@ -258,7 +259,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// Open HRMP channel requested. - /// `[sender, recipient, proposed_max_capacity, proposed_max_message_size]` - OpenChannelRequested(ParaId, ParaId, u32, u32), -@@ -472,7 +473,7 @@ pub mod pallet { - proposed_max_capacity, - proposed_max_message_size, - )?; -- Self::deposit_event(Event::OpenChannelRequested( -+ Self::deposit_event(PalletEvent::OpenChannelRequested( - origin, - recipient, - proposed_max_capacity, -@@ -488,7 +489,7 @@ pub mod pallet { - pub fn hrmp_accept_open_channel(origin: OriginFor, sender: ParaId) -> DispatchResult { - let origin = ensure_parachain(::Origin::from(origin))?; - Self::accept_open_channel(origin, sender)?; -- Self::deposit_event(Event::OpenChannelAccepted(sender, origin)); -+ Self::deposit_event(PalletEvent::OpenChannelAccepted(sender, origin)); - Ok(()) - } - -@@ -503,7 +504,7 @@ pub mod pallet { - ) -> DispatchResult { - let origin = ensure_parachain(::Origin::from(origin))?; - Self::close_channel(origin, channel_id.clone())?; -- Self::deposit_event(Event::ChannelClosed(origin, channel_id)); -+ Self::deposit_event(PalletEvent::ChannelClosed(origin, channel_id)); - Ok(()) - } - -@@ -574,7 +575,7 @@ pub mod pallet { - Error::::WrongWitness - ); - Self::cancel_open_request(origin, channel_id.clone())?; -- Self::deposit_event(Event::OpenChannelCanceled(origin, channel_id)); -+ Self::deposit_event(PalletEvent::OpenChannelCanceled(origin, channel_id)); - Ok(()) - } - } -diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs -index 3486e990fe5..321b9213561 100644 ---- a/runtime/parachains/src/hrmp/benchmarking.rs -+++ b/runtime/parachains/src/hrmp/benchmarking.rs -@@ -39,9 +39,9 @@ fn register_parachain_with_balance(id: ParaId, balance: BalanceOf) - T::Currency::make_free_balance_be(&id.into_account_truncating(), balance); - } - --fn assert_last_event(generic_event: ::Event) { -+fn assert_last_event(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -@@ -156,7 +156,7 @@ frame_benchmarking::benchmarks! { - }: _(sender_origin, recipient_id, capacity, message_size) - verify { - assert_last_event::( -- Event::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() -+ PalletEvent::::OpenChannelRequested(sender_id, recipient_id, capacity, message_size).into() - ); - } - -@@ -165,7 +165,7 @@ frame_benchmarking::benchmarks! { - establish_para_connection::(1, 2, ParachainSetupStep::Requested); - }: _(recipient_origin, sender) - verify { -- assert_last_event::(Event::::OpenChannelAccepted(sender, recipient).into()); -+ assert_last_event::(PalletEvent::::OpenChannelAccepted(sender, recipient).into()); - } - - hrmp_close_channel { -@@ -174,7 +174,7 @@ frame_benchmarking::benchmarks! { - let channel_id = HrmpChannelId { sender, recipient }; - }: _(sender_origin, channel_id.clone()) - verify { -- assert_last_event::(Event::::ChannelClosed(sender, channel_id).into()); -+ assert_last_event::(PalletEvent::::ChannelClosed(sender, channel_id).into()); - } - - // NOTE: a single parachain should have the maximum number of allowed ingress and egress -diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs -index 463c5eb3938..18355ad73f7 100644 ---- a/runtime/parachains/src/hrmp/tests.rs -+++ b/runtime/parachains/src/hrmp/tests.rs -@@ -16,8 +16,8 @@ - - use super::*; - use crate::mock::{ -- new_test_ext, Configuration, Event as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, -- System, Test, -+ new_test_ext, Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared, -+ RuntimeEvent as MockEvent, System, Test, - }; - use frame_support::{assert_noop, assert_ok, traits::Currency as _}; - use primitives::v2::BlockNumber; -@@ -173,14 +173,12 @@ fn open_channel_works() { - Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap(); - Hrmp::assert_storage_consistency_exhaustive(); - assert!(System::events().iter().any(|record| record.event == -- MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8)))); -+ MockEvent::Hrmp(PalletEvent::OpenChannelRequested(para_a, para_b, 2, 8)))); - - Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap(); - Hrmp::assert_storage_consistency_exhaustive(); -- assert!(System::events() -- .iter() -- .any(|record| record.event == -- MockEvent::Hrmp(Event::OpenChannelAccepted(para_a, para_b)))); -+ assert!(System::events().iter().any(|record| record.event == -+ MockEvent::Hrmp(PalletEvent::OpenChannelAccepted(para_a, para_b)))); - - // Advance to a block 6, but without session change. That means that the channel has - // not been created yet. -@@ -223,7 +221,7 @@ fn close_channel_works() { - assert!(!channel_exists(para_a, para_b)); - Hrmp::assert_storage_consistency_exhaustive(); - assert!(System::events().iter().any(|record| record.event == -- MockEvent::Hrmp(Event::ChannelClosed(para_b, channel_id.clone())))); -+ MockEvent::Hrmp(PalletEvent::ChannelClosed(para_b, channel_id.clone())))); - }); - } - -diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs -index c936b54eecf..39ef43be165 100644 ---- a/runtime/parachains/src/inclusion/mod.rs -+++ b/runtime/parachains/src/inclusion/mod.rs -@@ -198,14 +198,15 @@ pub mod pallet { - + hrmp::Config - + configuration::Config - { -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - type DisputesHandler: disputes::DisputesHandler; - type RewardValidators: RewardValidators; - } - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// A candidate was backed. `[candidate, head_data]` - CandidateBacked(CandidateReceipt, HeadData, CoreIndex, GroupIndex), - /// A candidate was included. `[candidate, head_data]` -@@ -655,7 +656,7 @@ impl Pallet { - let availability_votes: BitVec = - bitvec::bitvec![u8, BitOrderLsb0; 0; validators.len()]; - -- Self::deposit_event(Event::::CandidateBacked( -+ Self::deposit_event(PalletEvent::::CandidateBacked( - candidate.candidate.to_plain(), - candidate.candidate.commitments.head_data.clone(), - core, -@@ -778,7 +779,7 @@ impl Pallet { - commitments.horizontal_messages, - ); - -- Self::deposit_event(Event::::CandidateIncluded( -+ Self::deposit_event(PalletEvent::::CandidateIncluded( - plain, - commitments.head_data.clone(), - core_index, -@@ -823,7 +824,7 @@ impl Pallet { - commitments_hash: commitments.hash(), - }; - -- Self::deposit_event(Event::::CandidateTimedOut( -+ Self::deposit_event(PalletEvent::::CandidateTimedOut( - candidate, - commitments.head_data, - pending.core, -diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs -index 064b9918ff5..cbb7e01dd31 100644 ---- a/runtime/parachains/src/mock.rs -+++ b/runtime/parachains/src/mock.rs -@@ -101,7 +101,7 @@ impl frame_system::Config for Test { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -123,7 +123,7 @@ impl pallet_balances::Config for Test { - type MaxReserves = (); - type ReserveIdentifier = [u8; 8]; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -213,7 +213,7 @@ impl frame_support::traits::EstimateNextSessionRotation for TestNextSession - } - - impl crate::paras::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = crate::paras::TestWeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = TestNextSessionRotation; -@@ -226,7 +226,7 @@ parameter_types! { - } - - impl crate::ump::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = TestUmpSink; - type FirstMessageFactorPercent = FirstMessageFactorPercent; - type ExecuteOverweightOrigin = frame_system::EnsureRoot; -@@ -234,14 +234,14 @@ impl crate::ump::Config for Test { - } - - impl crate::hrmp::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = pallet_balances::Pallet; - type WeightInfo = crate::hrmp::TestWeightInfo; - } - - impl crate::disputes::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type RewardValidators = Self; - type PunishValidators = Self; - type WeightInfo = crate::disputes::TestWeightInfo; -@@ -292,7 +292,7 @@ impl crate::disputes::PunishValidators for Test { - impl crate::scheduler::Config for Test {} - - impl crate::inclusion::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DisputesHandler = Disputes; - type RewardValidators = TestRewardValidators; - } -@@ -455,9 +455,9 @@ pub struct MockGenesisConfig { - pub paras: crate::paras::GenesisConfig, - } - --pub fn assert_last_event(generic_event: Event) { -+pub fn assert_last_event(generic_event: RuntimeEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -diff --git a/runtime/parachains/src/paras/benchmarking.rs b/runtime/parachains/src/paras/benchmarking.rs -index 9d31453638a..283cc3d35b0 100644 ---- a/runtime/parachains/src/paras/benchmarking.rs -+++ b/runtime/parachains/src/paras/benchmarking.rs -@@ -31,9 +31,9 @@ use self::pvf_check::{VoteCause, VoteOutcome}; - // shouldn't exceed this number. - const SAMPLE_SIZE: u32 = 1024; - --fn assert_last_event(generic_event: ::Event) { -+fn assert_last_event(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(event, &system_event); -@@ -89,7 +89,7 @@ benchmarks! { - generate_disordered_pruning::(); - }: _(RawOrigin::Root, para_id, new_code) - verify { -- assert_last_event::(Event::CurrentCodeUpdated(para_id).into()); -+ assert_last_event::(PalletEvent::CurrentCodeUpdated(para_id).into()); - } - force_set_current_head { - let s in 1 .. MAX_HEAD_DATA_SIZE; -@@ -97,7 +97,7 @@ benchmarks! { - let para_id = ParaId::from(1000); - }: _(RawOrigin::Root, para_id, new_head) - verify { -- assert_last_event::(Event::CurrentHeadUpdated(para_id).into()); -+ assert_last_event::(PalletEvent::CurrentHeadUpdated(para_id).into()); - } - force_schedule_code_upgrade { - let c in 1 .. MAX_CODE_SIZE; -@@ -107,7 +107,7 @@ benchmarks! { - generate_disordered_upgrades::(); - }: _(RawOrigin::Root, para_id, new_code, block) - verify { -- assert_last_event::(Event::CodeUpgradeScheduled(para_id).into()); -+ assert_last_event::(PalletEvent::CodeUpgradeScheduled(para_id).into()); - } - force_note_new_head { - let s in 1 .. MAX_HEAD_DATA_SIZE; -@@ -123,7 +123,7 @@ benchmarks! { - Pallet::::schedule_code_upgrade(para_id, ValidationCode(vec![0]), expired, &config); - }: _(RawOrigin::Root, para_id, new_head) - verify { -- assert_last_event::(Event::NewHeadNoted(para_id).into()); -+ assert_last_event::(PalletEvent::NewHeadNoted(para_id).into()); - } - force_queue_action { - let para_id = ParaId::from(1000); -@@ -131,7 +131,7 @@ benchmarks! { - }: _(RawOrigin::Root, para_id) - verify { - let next_session = crate::shared::Pallet::::session_index().saturating_add(One::one()); -- assert_last_event::(Event::ActionQueued(para_id, next_session).into()); -+ assert_last_event::(PalletEvent::ActionQueued(para_id, next_session).into()); - } - - add_trusted_validation_code { -diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs -index 3c5b8247939..0075171b465 100644 ---- a/runtime/parachains/src/paras/mod.rs -+++ b/runtime/parachains/src/paras/mod.rs -@@ -473,7 +473,7 @@ pub mod pallet { - + shared::Config - + frame_system::offchain::SendTransactionTypes> - { -- type Event: From + IsType<::Event>; -+ type RuntimeEvent: From + IsType<::RuntimeEvent>; - - #[pallet::constant] - type UnsignedPriority: Get; -@@ -486,7 +486,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// Current code has been updated for a Para. `para_id` - CurrentCodeUpdated(ParaId), - /// Current head has been updated for a Para. `para_id` -@@ -740,7 +740,7 @@ pub mod pallet { - ¶ - ); - } -- Self::deposit_event(Event::CurrentCodeUpdated(para)); -+ Self::deposit_event(PalletEvent::CurrentCodeUpdated(para)); - Ok(()) - } - -@@ -753,7 +753,7 @@ pub mod pallet { - ) -> DispatchResult { - ensure_root(origin)?; - ::Heads::insert(¶, new_head); -- Self::deposit_event(Event::CurrentHeadUpdated(para)); -+ Self::deposit_event(PalletEvent::CurrentHeadUpdated(para)); - Ok(()) - } - -@@ -768,7 +768,7 @@ pub mod pallet { - ensure_root(origin)?; - let config = configuration::Pallet::::config(); - Self::schedule_code_upgrade(para, new_code, relay_parent_number, &config); -- Self::deposit_event(Event::CodeUpgradeScheduled(para)); -+ Self::deposit_event(PalletEvent::CodeUpgradeScheduled(para)); - Ok(()) - } - -@@ -782,7 +782,7 @@ pub mod pallet { - ensure_root(origin)?; - let now = frame_system::Pallet::::block_number(); - Self::note_new_head(para, new_head, now); -- Self::deposit_event(Event::NewHeadNoted(para)); -+ Self::deposit_event(PalletEvent::NewHeadNoted(para)); - Ok(()) - } - -@@ -798,7 +798,7 @@ pub mod pallet { - v.insert(i, para); - } - }); -- Self::deposit_event(Event::ActionQueued(para, next_session)); -+ Self::deposit_event(PalletEvent::ActionQueued(para, next_session)); - Ok(()) - } - -@@ -1375,7 +1375,7 @@ impl Pallet { - let mut weight = 0; - for cause in causes { - weight += T::DbWeight::get().reads_writes(3, 2); -- Self::deposit_event(Event::PvfCheckAccepted(*code_hash, cause.para_id())); -+ Self::deposit_event(PalletEvent::PvfCheckAccepted(*code_hash, cause.para_id())); - - match cause { - PvfCheckCause::Onboarding(id) => { -@@ -1465,7 +1465,7 @@ impl Pallet { - weight += Self::decrease_code_ref(code_hash); - - weight += T::DbWeight::get().reads_writes(3, 2); -- Self::deposit_event(Event::PvfCheckRejected(*code_hash, cause.para_id())); -+ Self::deposit_event(PalletEvent::PvfCheckRejected(*code_hash, cause.para_id())); - - match cause { - PvfCheckCause::Onboarding(id) => { -@@ -1749,7 +1749,7 @@ impl Pallet { - let mut weight = 0; - - weight += T::DbWeight::get().reads_writes(3, 2); -- Self::deposit_event(Event::PvfCheckStarted(code_hash, cause.para_id())); -+ Self::deposit_event(PalletEvent::PvfCheckStarted(code_hash, cause.para_id())); - - weight += T::DbWeight::get().reads(1); - match PvfActiveVoteMap::::get(&code_hash) { -diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs -index 960132d5f80..32e0004049d 100644 ---- a/runtime/parachains/src/paras/tests.rs -+++ b/runtime/parachains/src/paras/tests.rs -@@ -112,8 +112,12 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { - - /// An utility for checking that certain events were deposited. - struct EventValidator { -- events: -- Vec::Event, primitives::v2::Hash>>, -+ events: Vec< -+ frame_system::EventRecord< -+ ::RuntimeEvent, -+ primitives::v2::Hash, -+ >, -+ >, - } - - impl EventValidator { -@@ -124,7 +128,7 @@ impl EventValidator { - fn started(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { - self.events.push(frame_system::EventRecord { - phase: frame_system::Phase::Initialization, -- event: Event::PvfCheckStarted(code.hash(), id).into(), -+ event: PalletEvent::PvfCheckStarted(code.hash(), id).into(), - topics: vec![], - }); - self -@@ -133,7 +137,7 @@ impl EventValidator { - fn rejected(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { - self.events.push(frame_system::EventRecord { - phase: frame_system::Phase::Initialization, -- event: Event::PvfCheckRejected(code.hash(), id).into(), -+ event: PalletEvent::PvfCheckRejected(code.hash(), id).into(), - topics: vec![], - }); - self -@@ -142,7 +146,7 @@ impl EventValidator { - fn accepted(&mut self, code: &ValidationCode, id: ParaId) -> &mut Self { - self.events.push(frame_system::EventRecord { - phase: frame_system::Phase::Initialization, -- event: Event::PvfCheckAccepted(code.hash(), id).into(), -+ event: PalletEvent::PvfCheckAccepted(code.hash(), id).into(), - topics: vec![], - }); - self -diff --git a/runtime/parachains/src/runtime_api_impl/v2.rs b/runtime/parachains/src/runtime_api_impl/v2.rs -index 20ee41636d8..e13506de62a 100644 ---- a/runtime/parachains/src/runtime_api_impl/v2.rs -+++ b/runtime/parachains/src/runtime_api_impl/v2.rs -@@ -323,9 +323,9 @@ pub fn candidate_pending_availability( - pub fn candidate_events(extract_event: F) -> Vec> - where - T: initializer::Config, -- F: Fn(::Event) -> Option>, -+ F: Fn(::RuntimeEvent) -> Option>, - { -- use inclusion::Event as RawEvent; -+ use inclusion::PalletEvent as RawEvent; - - >::read_events_no_consensus() - .into_iter() -diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs -index 7d40a99e988..71b05d53420 100644 ---- a/runtime/parachains/src/ump.rs -+++ b/runtime/parachains/src/ump.rs -@@ -122,11 +122,11 @@ impl, C: Config> UmpSink for XcmSi - }); - match maybe_msg_and_weight { - Err(_) => { -- Pallet::::deposit_event(Event::InvalidFormat(id)); -+ Pallet::::deposit_event(PalletEvent::InvalidFormat(id)); - Ok(0) - }, - Ok((Err(()), weight_used)) => { -- Pallet::::deposit_event(Event::UnsupportedVersion(id)); -+ Pallet::::deposit_event(PalletEvent::UnsupportedVersion(id)); - Ok(weight_used) - }, - Ok((Ok(xcm_message), weight_used)) => { -@@ -136,7 +136,7 @@ impl, C: Config> UmpSink for XcmSi - Outcome::Error(XcmError::WeightLimitReached(required)) => Err((id, required)), - outcome => { - let outcome_weight = outcome.weight_used(); -- Pallet::::deposit_event(Event::ExecutedUpward(id, outcome)); -+ Pallet::::deposit_event(PalletEvent::ExecutedUpward(id, outcome)); - Ok(weight_used.saturating_add(outcome_weight)) - }, - } -@@ -216,7 +216,7 @@ pub mod pallet { - #[pallet::config] - pub trait Config: frame_system::Config + configuration::Config { - /// The aggregate event. -- type Event: From + IsType<::Event>; -+ type RuntimeEvent: From + IsType<::RuntimeEvent>; - - /// A place where all received upward messages are funneled. - type UmpSink: UmpSink; -@@ -238,7 +238,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// Upward message is invalid XCM. - /// \[ id \] - InvalidFormat(MessageId), -@@ -358,7 +358,7 @@ pub mod pallet { - let used = T::UmpSink::process_upward_message(sender, &data[..], weight_limit) - .map_err(|_| Error::::WeightOverLimit)?; - Overweight::::remove(index); -- Self::deposit_event(Event::OverweightServiced(index, used)); -+ Self::deposit_event(PalletEvent::OverweightServiced(index, used)); - Ok(Some(used.saturating_add(::WeightInfo::service_overweight())).into()) - } - } -@@ -495,7 +495,7 @@ impl Pallet { - // NOTE: The actual computation is not accounted for. It should be benchmarked. - weight += T::DbWeight::get().reads_writes(3, 3); - -- Self::deposit_event(Event::UpwardMessagesReceived(para, extra_count, extra_size)); -+ Self::deposit_event(PalletEvent::UpwardMessagesReceived(para, extra_count, extra_size)); - } - - weight -@@ -544,13 +544,15 @@ impl Pallet { - thus `upward_message` cannot be `None`; qed", - ); - let index = Self::stash_overweight(dispatchee, upward_message); -- Self::deposit_event(Event::OverweightEnqueued( -+ Self::deposit_event(PalletEvent::OverweightEnqueued( - dispatchee, id, index, required, - )); - } else { - // we process messages in order and don't drop them if we run out of weight, - // so need to break here without calling `consume_front`. -- Self::deposit_event(Event::WeightExhausted(id, max_weight, required)); -+ Self::deposit_event(PalletEvent::WeightExhausted( -+ id, max_weight, required, -+ )); - break - } - }, -diff --git a/runtime/parachains/src/ump/benchmarking.rs b/runtime/parachains/src/ump/benchmarking.rs -index 2c132324d44..513e16cb6fb 100644 ---- a/runtime/parachains/src/ump/benchmarking.rs -+++ b/runtime/parachains/src/ump/benchmarking.rs -@@ -18,9 +18,9 @@ use super::{Pallet as Ump, *}; - use frame_system::RawOrigin; - use xcm::prelude::*; - --fn assert_last_event_type(generic_event: ::Event) { -+fn assert_last_event_type(generic_event: ::PalletEvent) { - let events = frame_system::Pallet::::events(); -- let system_event: ::Event = generic_event.into(); -+ let system_event: ::RuntimeEvent = generic_event.into(); - // compare to the last event record - let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; - assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event)); -@@ -35,7 +35,7 @@ fn queue_upward_msg( - let msgs = vec![msg]; - Ump::::check_upward_messages(host_conf, para, &msgs).unwrap(); - let _ = Ump::::receive_upward_messages(para, msgs); -- assert_last_event_type::(Event::UpwardMessagesReceived(para, 1, len).into()); -+ assert_last_event_type::(PalletEvent::UpwardMessagesReceived(para, 1, len).into()); - } - - // Create a message with at least `size` bytes encoded length -@@ -124,11 +124,11 @@ frame_benchmarking::benchmarks! { - queue_upward_msg::(&host_conf, para, msg.clone()); - Ump::::process_pending_upward_messages(); - assert_last_event_type::( -- Event::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() -+ PalletEvent::OverweightEnqueued(para, upward_message_id(&msg), 0, 0).into() - ); - }: _(RawOrigin::Root, 0, Weight::MAX) - verify { -- assert_last_event_type::(Event::OverweightServiced(0, 0).into()); -+ assert_last_event_type::(PalletEvent::OverweightServiced(0, 0).into()); - } - } - -diff --git a/runtime/parachains/src/ump/tests.rs b/runtime/parachains/src/ump/tests.rs -index b4e758b4b88..698b9120617 100644 ---- a/runtime/parachains/src/ump/tests.rs -+++ b/runtime/parachains/src/ump/tests.rs -@@ -326,7 +326,7 @@ fn overweight_queue_works() { - queue_upward_msg(para_a, a_msg_3.clone()); - Ump::process_pending_upward_messages(); - assert_last_event( -- Event::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), -+ PalletEvent::OverweightEnqueued(para_a, upward_message_id(&a_msg_3[..]), 0, 500).into(), - ); - - // Now verify that if we wanted to service this overweight message with less than enough -@@ -338,7 +338,7 @@ fn overweight_queue_works() { - - // ... and if we try to service it with just enough weight it will succeed as well. - assert_ok!(Ump::service_overweight(Origin::root(), 0, 500)); -- assert_last_event(Event::OverweightServiced(0, 500).into()); -+ assert_last_event(PalletEvent::OverweightServiced(0, 500).into()); - - // ... and if we try to service a message with index that doesn't exist it will error - // out. -diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs -index 9489df9f403..f9df916f2ac 100644 ---- a/runtime/polkadot/src/lib.rs -+++ b/runtime/polkadot/src/lib.rs -@@ -214,7 +214,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = AccountIdLookup; - type Header = generic::Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type DbWeight = RocksDbWeight; - type Version = Version; -@@ -264,7 +264,7 @@ impl PrivilegeCmp for OriginPrivilegeCmp { - } - - impl pallet_scheduler::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type PalletsOrigin = OriginCaller; - type Call = Call; -@@ -285,7 +285,7 @@ parameter_types! { - - impl pallet_preimage::Config for Runtime { - type WeightInfo = pallet_preimage::weights::SubstrateWeight; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; -@@ -341,7 +341,7 @@ impl pallet_indices::Config for Runtime { - type AccountIndex = AccountIndex; - type Currency = Balances; - type Deposit = IndexDeposit; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_indices::WeightInfo; - } - -@@ -354,7 +354,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type Balance = Balance; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type MaxLocks = MaxLocks; -@@ -371,7 +371,7 @@ parameter_types! { - } - - impl pallet_transaction_payment::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = CurrencyAdapter>; - type OperationalFeeMultiplier = OperationalFeeMultiplier; - type WeightToFee = WeightToFee; -@@ -413,7 +413,7 @@ impl_opaque_keys! { - } - - impl pallet_session::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorId = AccountId; - type ValidatorIdOf = pallet_staking::StashOf; - type ShouldEndSession = Babe; -@@ -505,7 +505,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { - } - - impl pallet_election_provider_multi_phase::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type EstimateCallFee = TransactionPayment; - type SignedPhase = SignedPhase; -@@ -548,7 +548,7 @@ parameter_types! { - } - - impl pallet_bags_list::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ScoreProvider = Staking; - type WeightInfo = weights::pallet_bags_list::WeightInfo; - type BagThresholds = BagThresholds; -@@ -596,7 +596,7 @@ impl pallet_staking::Config for Runtime { - type UnixTime = Timestamp; - type CurrencyToVote = CurrencyToVote; - type RewardRemainder = Treasury; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Slash = Treasury; - type Reward = (); - type SessionsPerEra = SessionsPerEra; -@@ -629,7 +629,7 @@ parameter_types! { - } - - impl pallet_identity::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BasicDeposit = BasicDeposit; - type FieldDeposit = FieldDeposit; -@@ -657,7 +657,7 @@ parameter_types! { - - impl pallet_democracy::Config for Runtime { - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type EnactmentPeriod = EnactmentPeriod; - type VoteLockingPeriod = EnactmentPeriod; -@@ -728,7 +728,7 @@ pub type CouncilCollective = pallet_collective::Instance1; - impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MotionDuration = CouncilMotionDuration; - type MaxProposals = CouncilMaxProposals; - type MaxMembers = CouncilMaxMembers; -@@ -755,7 +755,7 @@ parameter_types! { - const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); - - impl pallet_elections_phragmen::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PalletId = PhragmenElectionPalletId; - type Currency = Balances; - type ChangeMembers = Council; -@@ -784,7 +784,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; - impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MotionDuration = TechnicalMotionDuration; - type MaxProposals = TechnicalMaxProposals; - type MaxMembers = TechnicalMaxMembers; -@@ -793,7 +793,7 @@ impl pallet_collective::Config for Runtime { - } - - impl pallet_membership::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type AddOrigin = MoreThanHalfCouncil; - type RemoveOrigin = MoreThanHalfCouncil; - type SwapOrigin = MoreThanHalfCouncil; -@@ -834,7 +834,7 @@ impl pallet_treasury::Config for Runtime { - type Currency = Balances; - type ApproveOrigin = ApproveOrigin; - type RejectOrigin = MoreThanHalfCouncil; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnSlash = Treasury; - type ProposalBond = ProposalBond; - type ProposalBondMinimum = ProposalBondMinimum; -@@ -860,7 +860,7 @@ parameter_types! { - } - - impl pallet_bounties::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BountyDepositBase = BountyDepositBase; - type BountyDepositPayoutDelay = BountyDepositPayoutDelay; - type BountyUpdatePeriod = BountyUpdatePeriod; -@@ -880,14 +880,14 @@ parameter_types! { - } - - impl pallet_child_bounties::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MaxActiveChildBountyCount = MaxActiveChildBountyCount; - type ChildBountyValueMinimum = ChildBountyValueMinimum; - type WeightInfo = weights::pallet_child_bounties::WeightInfo; - } - - impl pallet_tips::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DataDepositPerByte = DataDepositPerByte; - type MaximumReasonLength = MaximumReasonLength; - type Tippers = PhragmenElection; -@@ -898,7 +898,7 @@ impl pallet_tips::Config for Runtime { - } - - impl pallet_offences::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type IdentificationTuple = pallet_session::historical::IdentificationTuple; - type OnOffenceHandler = Staking; - } -@@ -915,7 +915,7 @@ parameter_types! { - - impl pallet_im_online::Config for Runtime { - type AuthorityId = ImOnlineId; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorSet = Historical; - type NextSessionRotation = Babe; - type ReportUnresponsiveness = Offences; -@@ -927,7 +927,7 @@ impl pallet_im_online::Config for Runtime { - } - - impl pallet_grandpa::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - - type KeyOwnerProof = -@@ -1022,7 +1022,7 @@ parameter_types! { - } - - impl claims::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type VestingSchedule = Vesting; - type Prefix = Prefix; - /// At least 3/4 of the council must agree to a claim move before it can happen. -@@ -1036,7 +1036,7 @@ parameter_types! { - } - - impl pallet_vesting::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BlockNumberToBalance = ConvertInto; - type MinVestedTransfer = MinVestedTransfer; -@@ -1045,7 +1045,7 @@ impl pallet_vesting::Config for Runtime { - } - - impl pallet_utility::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type PalletsOrigin = OriginCaller; - type WeightInfo = weights::pallet_utility::WeightInfo; -@@ -1060,7 +1060,7 @@ parameter_types! { - } - - impl pallet_multisig::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type DepositBase = DepositBase; -@@ -1225,7 +1225,7 @@ impl InstanceFilter for ProxyType { - } - - impl pallet_proxy::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type ProxyType = ProxyType; -@@ -1252,7 +1252,7 @@ impl parachains_session_info::Config for Runtime { - } - - impl parachains_inclusion::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DisputesHandler = ParasDisputes; - type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; - } -@@ -1262,7 +1262,7 @@ parameter_types! { - } - - impl parachains_paras::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::runtime_parachains_paras::WeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = Babe; -@@ -1273,7 +1273,7 @@ parameter_types! { - } - - impl parachains_ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = - crate::parachains_ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = FirstMessageFactorPercent; -@@ -1284,7 +1284,7 @@ impl parachains_ump::Config for Runtime { - impl parachains_dmp::Config for Runtime {} - - impl parachains_hrmp::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; -@@ -1303,7 +1303,7 @@ impl parachains_initializer::Config for Runtime { - } - - impl parachains_disputes::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type RewardValidators = (); - type PunishValidators = (); - type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; -@@ -1317,7 +1317,7 @@ parameter_types! { - } - - impl paras_registrar::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type OnSwap = (Crowdloan, Slots); -@@ -1338,7 +1338,7 @@ parameter_types! { - } - - impl slots::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Registrar = Registrar; - type LeasePeriod = LeasePeriod; -@@ -1360,7 +1360,7 @@ parameter_types! { - } - - impl crowdloan::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PalletId = CrowdloanId; - type SubmissionDeposit = SubmissionDeposit; - type MinContribution = MinContribution; -@@ -1385,7 +1385,7 @@ type AuctionInitiate = EitherOfDiverse< - >; - - impl auctions::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Leaser = Slots; - type Registrar = Registrar; - type EndingPeriod = EndingPeriod; -@@ -1402,7 +1402,7 @@ parameter_types! { - } - - impl pallet_nomination_pools::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type CurrencyBalance = Balance; - type RewardCounter = FixedU128; -@@ -1740,7 +1740,7 @@ sp_api::impl_runtime_apis! { - fn candidate_events() -> Vec> { - parachains_runtime_api_impl::candidate_events::(|ev| { - match ev { -- Event::ParaInclusion(ev) => { -+ RuntimeEvent::ParaInclusion(ev) => { - Some(ev) - } - _ => None, -@@ -2047,7 +2047,7 @@ sp_api::impl_runtime_apis! { - hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), - // Execution Phase - hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), -- // Event Count -+ // PalletEvent Count - hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), - // System Events - hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), -diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs -index a7ea36445bd..36b6d07b86b 100644 ---- a/runtime/polkadot/src/xcm_config.rs -+++ b/runtime/polkadot/src/xcm_config.rs -@@ -17,8 +17,8 @@ - //! XCM configuration for Polkadot. - - use super::{ -- parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, -- Runtime, WeightToFee, XcmPallet, -+ parachains_origin, AccountId, Balances, Call, CouncilCollective, Origin, ParaId, Runtime, -+ RuntimeEvent, WeightToFee, XcmPallet, - }; - use frame_support::{ - match_types, parameter_types, -@@ -175,7 +175,7 @@ pub type LocalOriginToLocation = ( - ); - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - // Only allow the council to send messages. - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = XcmRouter; -diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs -index d745e109be4..7bbd30fa913 100644 ---- a/runtime/rococo/src/lib.rs -+++ b/runtime/rococo/src/lib.rs -@@ -267,7 +267,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = AccountIdLookup; - type Header = generic::Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = Version; - type PalletInfo = PalletInfo; -@@ -353,7 +353,7 @@ impl pallet_session::historical::Config for Runtime { - } - - impl parachains_disputes::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type RewardValidators = (); - type PunishValidators = (); - type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; -@@ -372,7 +372,7 @@ parameter_types! { - - impl pallet_im_online::Config for Runtime { - type AuthorityId = ImOnlineId; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorSet = Historical; - type NextSessionRotation = Babe; - type ReportUnresponsiveness = Offences; -@@ -392,7 +392,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type Balance = Balance; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type MaxLocks = MaxLocks; -@@ -415,7 +415,7 @@ parameter_types! { - } - - impl pallet_offences::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type IdentificationTuple = pallet_session::historical::IdentificationTuple; - type OnOffenceHandler = (); - } -@@ -442,7 +442,7 @@ parameter_types! { - } - - impl pallet_transaction_payment::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = CurrencyAdapter>; - type OperationalFeeMultiplier = OperationalFeeMultiplier; - type WeightToFee = WeightToFee; -@@ -459,7 +459,7 @@ impl sp_runtime::traits::Convert> for ValidatorIdOf - } - - impl pallet_session::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorId = AccountId; - type ValidatorIdOf = ValidatorIdOf; - type ShouldEndSession = Babe; -@@ -512,7 +512,7 @@ impl pallet_indices::Config for Runtime { - type AccountIndex = AccountIndex; - type Currency = Balances; - type Deposit = IndexDeposit; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_indices::WeightInfo; - } - -@@ -521,7 +521,7 @@ parameter_types! { - } - - impl pallet_grandpa::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - - type KeyOwnerProofSystem = Historical; -@@ -571,7 +571,7 @@ impl runtime_parachains::inclusion::RewardValidators for RewardValidators { - } - - impl parachains_inclusion::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DisputesHandler = ParasDisputes; - type RewardValidators = RewardValidators; - } -@@ -581,7 +581,7 @@ parameter_types! { - } - - impl parachains_paras::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::runtime_parachains_paras::WeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = Babe; -@@ -596,7 +596,7 @@ parameter_types! { - } - - impl parachains_ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = - crate::parachains_ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = FirstMessageFactorPercent; -@@ -607,7 +607,7 @@ impl parachains_ump::Config for Runtime { - impl parachains_dmp::Config for Runtime {} - - impl parachains_hrmp::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; -@@ -636,7 +636,7 @@ parameter_types! { - } - - impl assigned_slots::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type AssignSlotOrigin = EnsureRoot; - type Leaser = Slots; - type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; -@@ -652,7 +652,7 @@ parameter_types! { - } - - impl paras_registrar::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type OnSwap = (Crowdloan, Slots); -@@ -723,7 +723,7 @@ parameter_types! { - } - - impl auctions::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Leaser = Slots; - type Registrar = Registrar; - type EndingPeriod = EndingPeriod; -@@ -738,7 +738,7 @@ parameter_types! { - } - - impl slots::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Registrar = Registrar; - type LeasePeriod = LeasePeriod; -@@ -757,7 +757,7 @@ parameter_types! { - } - - impl crowdloan::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PalletId = CrowdloanId; - type SubmissionDeposit = SubmissionDeposit; - type MinContribution = MinContribution; -@@ -769,17 +769,17 @@ impl crowdloan::Config for Runtime { - } - - impl pallet_sudo::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - } - - impl validator_manager::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PrivilegedOrigin = EnsureRoot; - } - - impl pallet_utility::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type PalletsOrigin = OriginCaller; - type WeightInfo = weights::pallet_utility::WeightInfo; -@@ -845,7 +845,7 @@ impl InstanceFilter for ProxyType { - } - - impl pallet_proxy::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type ProxyType = ProxyType; -@@ -868,7 +868,7 @@ parameter_types! { - impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type MotionDuration = MotionDuration; - type MaxProposals = MaxProposals; - type DefaultVote = pallet_collective::PrimeDefaultVote; -@@ -877,7 +877,7 @@ impl pallet_collective::Config for Runtime { - } - - impl pallet_membership::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type AddOrigin = EnsureRoot; - type RemoveOrigin = EnsureRoot; - type SwapOrigin = EnsureRoot; -@@ -898,7 +898,7 @@ parameter_types! { - } - - impl pallet_multisig::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type DepositBase = DepositBase; -@@ -1055,7 +1055,7 @@ sp_api::impl_runtime_apis! { - fn candidate_events() -> Vec> { - runtime_api_impl::candidate_events::(|ev| { - match ev { -- Event::ParaInclusion(ev) => { -+ RuntimeEvent::ParaInclusion(ev) => { - Some(ev) - } - _ => None, -@@ -1359,7 +1359,7 @@ sp_api::impl_runtime_apis! { - hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), - // Execution Phase - hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), -- // Event Count -+ // PalletEvent Count - hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), - // System Events - hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), -diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs -index 2fd60b682ea..d0522522fb6 100644 ---- a/runtime/rococo/src/validator_manager.rs -+++ b/runtime/rococo/src/validator_manager.rs -@@ -37,7 +37,8 @@ pub mod pallet { - #[pallet::config] - pub trait Config: frame_system::Config + pallet_session::Config { - /// The overreaching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// Privileged origin that can add or remove validators. - type PrivilegedOrigin: EnsureOrigin<::Origin>; -@@ -45,7 +46,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// New validators were added to the set. - ValidatorsRegistered(Vec), - /// Validators were removed from the set. -@@ -75,7 +76,7 @@ pub mod pallet { - - validators.clone().into_iter().for_each(|v| ValidatorsToAdd::::append(v)); - -- Self::deposit_event(Event::ValidatorsRegistered(validators)); -+ Self::deposit_event(PalletEvent::ValidatorsRegistered(validators)); - Ok(()) - } - -@@ -91,7 +92,7 @@ pub mod pallet { - - validators.clone().into_iter().for_each(|v| ValidatorsToRetire::::append(v)); - -- Self::deposit_event(Event::ValidatorsDeregistered(validators)); -+ Self::deposit_event(PalletEvent::ValidatorsDeregistered(validators)); - Ok(()) - } - } -diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs -index 1512ef9e6cc..4a111d9a40a 100644 ---- a/runtime/rococo/src/xcm_config.rs -+++ b/runtime/rococo/src/xcm_config.rs -@@ -17,8 +17,8 @@ - //! XCM configuration for Rococo. - - use super::{ -- parachains_origin, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, WeightToFee, -- XcmPallet, -+ parachains_origin, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, -+ WeightToFee, XcmPallet, - }; - use frame_support::{ - parameter_types, -@@ -151,7 +151,7 @@ pub type LocalOriginToLocation = ( - ); - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = XcmRouter; - // Anyone can execute XCM messages locally... -diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs -index d18a2c9bb95..a703b68cf9c 100644 ---- a/runtime/test-runtime/src/lib.rs -+++ b/runtime/test-runtime/src/lib.rs -@@ -145,7 +145,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = Indices; - type Header = generic::Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = Version; - type PalletInfo = PalletInfo; -@@ -206,7 +206,7 @@ impl pallet_indices::Config for Runtime { - type AccountIndex = AccountIndex; - type Currency = Balances; - type Deposit = IndexDeposit; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = (); - } - -@@ -219,7 +219,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type Balance = Balance; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type MaxLocks = MaxLocks; -@@ -236,7 +236,7 @@ parameter_types! { - } - - impl pallet_transaction_payment::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = CurrencyAdapter; - type OperationalFeeMultiplier = OperationalFeeMultiplier; - type WeightToFee = WeightToFee; -@@ -282,7 +282,7 @@ impl_opaque_keys! { - } - - impl pallet_session::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorId = AccountId; - type ValidatorIdOf = pallet_staking::StashOf; - type ShouldEndSession = Babe; -@@ -337,7 +337,7 @@ impl pallet_staking::Config for Runtime { - type UnixTime = Timestamp; - type CurrencyToVote = frame_support::traits::U128CurrencyToVote; - type RewardRemainder = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Slash = (); - type Reward = (); - type SessionsPerEra = SessionsPerEra; -@@ -362,7 +362,7 @@ impl pallet_staking::Config for Runtime { - } - - impl pallet_grandpa::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - - type KeyOwnerProofSystem = (); -@@ -427,7 +427,7 @@ impl frame_system::offchain::SigningTypes for Runtime { - } - - impl pallet_offences::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type IdentificationTuple = pallet_session::historical::IdentificationTuple; - type OnOffenceHandler = Staking; - } -@@ -446,7 +446,7 @@ parameter_types! { - } - - impl claims::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type VestingSchedule = Vesting; - type Prefix = Prefix; - type MoveClaimOrigin = frame_system::EnsureRoot; -@@ -458,7 +458,7 @@ parameter_types! { - } - - impl pallet_vesting::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BlockNumberToBalance = ConvertInto; - type MinVestedTransfer = MinVestedTransfer; -@@ -467,7 +467,7 @@ impl pallet_vesting::Config for Runtime { - } - - impl pallet_sudo::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - } - -@@ -478,13 +478,13 @@ impl parachains_configuration::Config for Runtime { - impl parachains_shared::Config for Runtime {} - - impl parachains_inclusion::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DisputesHandler = ParasDisputes; - type RewardValidators = RewardValidatorsWithEraPoints; - } - - impl parachains_disputes::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type RewardValidators = (); - type PunishValidators = (); - type WeightInfo = parachains_disputes::TestWeightInfo; -@@ -509,7 +509,7 @@ parameter_types! { - } - - impl parachains_paras::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = parachains_paras::TestWeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = Babe; -@@ -522,7 +522,7 @@ parameter_types! { - } - - impl parachains_ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = (); - type FirstMessageFactorPercent = FirstMessageFactorPercent; - type ExecuteOverweightOrigin = frame_system::EnsureRoot; -@@ -540,7 +540,7 @@ pub type LocalOriginToLocation = xcm_builder::SignedToAccountId32; - type LocationInverter = xcm_config::InvertNothing; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; -@@ -557,7 +557,7 @@ impl pallet_xcm::Config for Runtime { - } - - impl parachains_hrmp::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type WeightInfo = parachains_hrmp::TestWeightInfo; -@@ -570,7 +570,7 @@ impl paras_sudo_wrapper::Config for Runtime {} - impl parachains_origin::Config for Runtime {} - - impl pallet_test_notifier::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Call = Call; - } -@@ -589,7 +589,8 @@ pub mod pallet_test_notifier { - - #[pallet::config] - pub trait Config: frame_system::Config + pallet_xcm::Config { -- type Event: IsType<::Event> + From>; -+ type RuntimeEvent: IsType<::RuntimeEvent> -+ + From>; - type Origin: IsType<::Origin> - + Into::Origin>>; - type Call: IsType<::Call> + From>; -@@ -597,7 +598,7 @@ pub mod pallet_test_notifier { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - QueryPrepared(QueryId), - NotifyQueryPrepared(QueryId), - ResponseReceived(MultiLocation, QueryId, Response), -@@ -621,7 +622,7 @@ pub mod pallet_test_notifier { - Junction::AccountId32 { network: Any, id }.into(), - 100u32.into(), - ); -- Self::deposit_event(Event::::QueryPrepared(qid)); -+ Self::deposit_event(PalletEvent::::QueryPrepared(qid)); - Ok(()) - } - -@@ -638,7 +639,7 @@ pub mod pallet_test_notifier { - ::Call::from(call), - 100u32.into(), - ); -- Self::deposit_event(Event::::NotifyQueryPrepared(qid)); -+ Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); - Ok(()) - } - -@@ -649,7 +650,7 @@ pub mod pallet_test_notifier { - response: Response, - ) -> DispatchResult { - let responder = ensure_response(::Origin::from(origin))?; -- Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); -+ Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); - Ok(()) - } - } -diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs -index 788aede7809..bec0be82d1f 100644 ---- a/runtime/westend/src/lib.rs -+++ b/runtime/westend/src/lib.rs -@@ -155,7 +155,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = AccountIdLookup; - type Header = generic::Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type DbWeight = RocksDbWeight; - type Version = Version; -@@ -177,7 +177,7 @@ parameter_types! { - } - - impl pallet_scheduler::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type PalletsOrigin = OriginCaller; - type Call = Call; -@@ -198,7 +198,7 @@ parameter_types! { - - impl pallet_preimage::Config for Runtime { - type WeightInfo = weights::pallet_preimage::WeightInfo; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; -@@ -253,7 +253,7 @@ impl pallet_indices::Config for Runtime { - type AccountIndex = AccountIndex; - type Currency = Balances; - type Deposit = IndexDeposit; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_indices::WeightInfo; - } - -@@ -266,7 +266,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type Balance = Balance; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type MaxLocks = MaxLocks; -@@ -283,7 +283,7 @@ parameter_types! { - } - - impl pallet_transaction_payment::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = CurrencyAdapter>; - type OperationalFeeMultiplier = OperationalFeeMultiplier; - type WeightToFee = WeightToFee; -@@ -329,7 +329,7 @@ impl_opaque_keys! { - } - - impl pallet_session::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorId = AccountId; - type ValidatorIdOf = pallet_staking::StashOf; - type ShouldEndSession = Babe; -@@ -416,7 +416,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { - } - - impl pallet_election_provider_multi_phase::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type EstimateCallFee = TransactionPayment; - type SignedPhase = SignedPhase; -@@ -456,7 +456,7 @@ parameter_types! { - } - - impl pallet_bags_list::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ScoreProvider = Staking; - type WeightInfo = weights::pallet_bags_list::WeightInfo; - type BagThresholds = BagThresholds; -@@ -494,7 +494,7 @@ impl pallet_staking::Config for Runtime { - type UnixTime = Timestamp; - type CurrencyToVote = CurrencyToVote; - type RewardRemainder = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Slash = (); - type Reward = (); - type SessionsPerEra = SessionsPerEra; -@@ -521,7 +521,7 @@ parameter_types! { - } - - impl pallet_offences::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type IdentificationTuple = pallet_session::historical::IdentificationTuple; - type OnOffenceHandler = Staking; - } -@@ -540,7 +540,7 @@ parameter_types! { - - impl pallet_im_online::Config for Runtime { - type AuthorityId = ImOnlineId; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ValidatorSet = Historical; - type NextSessionRotation = Babe; - type ReportUnresponsiveness = Offences; -@@ -552,7 +552,7 @@ impl pallet_im_online::Config for Runtime { - } - - impl pallet_grandpa::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - - type KeyOwnerProofSystem = Historical; -@@ -647,7 +647,7 @@ parameter_types! { - } - - impl pallet_identity::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Slashed = (); - type BasicDeposit = BasicDeposit; -@@ -662,7 +662,7 @@ impl pallet_identity::Config for Runtime { - } - - impl pallet_utility::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type PalletsOrigin = OriginCaller; - type WeightInfo = weights::pallet_utility::WeightInfo; -@@ -677,7 +677,7 @@ parameter_types! { - } - - impl pallet_multisig::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type DepositBase = DepositBase; -@@ -694,7 +694,7 @@ parameter_types! { - } - - impl pallet_recovery::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = (); - type Call = Call; - type Currency = Balances; -@@ -709,7 +709,7 @@ parameter_types! { - } - - impl pallet_vesting::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type BlockNumberToBalance = ConvertInto; - type MinVestedTransfer = MinVestedTransfer; -@@ -718,7 +718,7 @@ impl pallet_vesting::Config for Runtime { - } - - impl pallet_sudo::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - } - -@@ -841,7 +841,7 @@ impl InstanceFilter for ProxyType { - } - - impl pallet_proxy::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Call = Call; - type Currency = Balances; - type ProxyType = ProxyType; -@@ -868,7 +868,7 @@ impl parachains_session_info::Config for Runtime { - } - - impl parachains_inclusion::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DisputesHandler = ParasDisputes; - type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; - } -@@ -878,7 +878,7 @@ parameter_types! { - } - - impl parachains_paras::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::runtime_parachains_paras::WeightInfo; - type UnsignedPriority = ParasUnsignedPriority; - type NextSessionRotation = Babe; -@@ -889,7 +889,7 @@ parameter_types! { - } - - impl parachains_ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = - crate::parachains_ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = FirstMessageFactorPercent; -@@ -900,7 +900,7 @@ impl parachains_ump::Config for Runtime { - impl parachains_dmp::Config for Runtime {} - - impl parachains_hrmp::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; -@@ -929,7 +929,7 @@ parameter_types! { - } - - impl assigned_slots::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type AssignSlotOrigin = EnsureRoot; - type Leaser = Slots; - type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; -@@ -940,7 +940,7 @@ impl assigned_slots::Config for Runtime { - } - - impl parachains_disputes::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type RewardValidators = (); - type PunishValidators = (); - type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; -@@ -952,7 +952,7 @@ parameter_types! { - } - - impl paras_registrar::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Currency = Balances; - type OnSwap = (Crowdloan, Slots); -@@ -966,7 +966,7 @@ parameter_types! { - } - - impl slots::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Currency = Balances; - type Registrar = Registrar; - type LeasePeriod = LeasePeriod; -@@ -985,7 +985,7 @@ parameter_types! { - } - - impl crowdloan::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type PalletId = CrowdloanId; - type SubmissionDeposit = SubmissionDeposit; - type MinContribution = MinContribution; -@@ -1005,7 +1005,7 @@ parameter_types! { - } - - impl auctions::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Leaser = Slots; - type Registrar = Registrar; - type EndingPeriod = EndingPeriod; -@@ -1021,7 +1021,7 @@ parameter_types! { - } - - impl pallet_nomination_pools::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::pallet_nomination_pools::WeightInfo; - type Currency = Balances; - type CurrencyBalance = Balance; -@@ -1324,7 +1324,7 @@ sp_api::impl_runtime_apis! { - fn candidate_events() -> Vec> { - parachains_runtime_api_impl::candidate_events::(|ev| { - match ev { -- Event::ParaInclusion(ev) => { -+ RuntimeEvent::ParaInclusion(ev) => { - Some(ev) - } - _ => None, -diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs -index 867bdb2cacf..c282dc2dcca 100644 ---- a/runtime/westend/src/xcm_config.rs -+++ b/runtime/westend/src/xcm_config.rs -@@ -17,7 +17,7 @@ - //! XCM configurations for Westend. - - use super::{ -- parachains_origin, weights, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, -+ parachains_origin, weights, AccountId, Balances, Call, Origin, ParaId, Runtime, RuntimeEvent, - WeightToFee, XcmPallet, - }; - use frame_support::{ -@@ -131,7 +131,7 @@ pub type LocalOriginToLocation = ( - ); - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = XcmRouter; - // Anyone can execute XCM messages locally... -diff --git a/scripts/ci/run_benches_for_runtime.sh b/scripts/ci/run_benches_for_runtime.sh -index 8149195c82c..cd9cb5be8e9 100755 ---- a/scripts/ci/run_benches_for_runtime.sh -+++ b/scripts/ci/run_benches_for_runtime.sh -@@ -29,6 +29,12 @@ rm -f $ERR_FILE - for PALLET in "${PALLETS[@]}"; do - echo "[+] Benchmarking $PALLET for $runtime"; - -+ output_file="" -+ if [[ $PALLET == *"::"* ]]; then -+ # translates e.g. "pallet_foo::bar" to "pallet_foo_bar" -+ output_file="${PALLET//::/_}.rs" -+ fi -+ - OUTPUT=$( - ./target/production/polkadot benchmark pallet \ - --chain="${runtime}-dev" \ -@@ -39,7 +45,7 @@ for PALLET in "${PALLETS[@]}"; do - --execution=wasm \ - --wasm-execution=compiled \ - --header=./file_header.txt \ -- --output="./runtime/${runtime}/src/weights/${PALLET/::/_}.rs" 2>&1 -+ --output="./runtime/${runtime}/src/weights/${output_file}" 2>&1 - ) - if [ $? -ne 0 ]; then - echo "$OUTPUT" >> "$ERR_FILE" -diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs -index 3f7e4f8f26e..3f5b4d9e662 100644 ---- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs -+++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs -@@ -63,7 +63,7 @@ impl frame_system::Config for Test { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -@@ -86,7 +86,7 @@ impl pallet_balances::Config for Test { - type ReserveIdentifier = [u8; 8]; - type Balance = u64; - type DustRemoval = (); -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; - type WeightInfo = (); -diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs -index 7782ba1d90e..7fec7a5e041 100644 ---- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs -+++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs -@@ -68,7 +68,7 @@ impl frame_system::Config for Test { - type AccountId = u64; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type Version = (); - type PalletInfo = PalletInfo; -diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs -index c237fc702a4..b286b41b384 100644 ---- a/xcm/pallet-xcm/src/lib.rs -+++ b/xcm/pallet-xcm/src/lib.rs -@@ -71,7 +71,8 @@ pub mod pallet { - /// The module configuration trait. - pub trait Config: frame_system::Config { - /// The overarching event type. -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - - /// Required origin for sending XCM messages. If successful, it resolves to `MultiLocation` - /// which exists as an interior location within this chain's XCM context. -@@ -124,7 +125,7 @@ pub mod pallet { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - /// Execution of an XCM message was attempted. - /// - /// \[ outcome \] -@@ -461,7 +462,7 @@ pub mod pallet { - SendError::CannotReachDestination(..) => Error::::Unreachable, - _ => Error::::SendFailure, - })?; -- Self::deposit_event(Event::Sent(origin_location, dest, message)); -+ Self::deposit_event(PalletEvent::Sent(origin_location, dest, message)); - Ok(()) - } - -@@ -579,7 +580,7 @@ pub mod pallet { - max_weight, - ); - let result = Ok(Some(outcome.weight_used().saturating_add(100_000_000)).into()); -- Self::deposit_event(Event::Attempted(outcome)); -+ Self::deposit_event(PalletEvent::Attempted(outcome)); - result - } - -@@ -602,7 +603,7 @@ pub mod pallet { - LatestVersionedMultiLocation(&location), - xcm_version, - ); -- Self::deposit_event(Event::SupportedVersionChanged(location, xcm_version)); -+ Self::deposit_event(PalletEvent::SupportedVersionChanged(location, xcm_version)); - Ok(()) - } - -@@ -818,7 +819,7 @@ pub mod pallet { - T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; - let outcome = - T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); -- Self::deposit_event(Event::Attempted(outcome)); -+ Self::deposit_event(PalletEvent::Attempted(outcome)); - Ok(()) - } - -@@ -876,7 +877,7 @@ pub mod pallet { - T::Weigher::weight(&mut message).map_err(|()| Error::::UnweighableMessage)?; - let outcome = - T::XcmExecutor::execute_xcm_in_credit(origin_location, message, weight, weight); -- Self::deposit_event(Event::Attempted(outcome)); -+ Self::deposit_event(PalletEvent::Attempted(outcome)); - Ok(()) - } - -@@ -954,11 +955,11 @@ pub mod pallet { - Ok(()) => { - let value = (query_id, max_weight, xcm_version); - VersionNotifyTargets::::insert(XCM_VERSION, key, value); -- Event::VersionChangeNotified(new_key, xcm_version) -+ PalletEvent::VersionChangeNotified(new_key, xcm_version) - }, - Err(e) => { - VersionNotifyTargets::::remove(XCM_VERSION, key); -- Event::NotifyTargetSendFail(new_key, query_id, e.into()) -+ PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()) - }, - }; - Self::deposit_event(event); -@@ -977,7 +978,7 @@ pub mod pallet { - let new_key = match MultiLocation::try_from(old_key.clone()) { - Ok(k) => k, - Err(()) => { -- Self::deposit_event(Event::NotifyTargetMigrationFail( -+ Self::deposit_event(PalletEvent::NotifyTargetMigrationFail( - old_key, value.0, - )); - weight_used.saturating_accrue(todo_vnt_migrate_fail_weight); -@@ -1004,9 +1005,10 @@ pub mod pallet { - versioned_key, - (query_id, max_weight, xcm_version), - ); -- Event::VersionChangeNotified(new_key, xcm_version) -+ PalletEvent::VersionChangeNotified(new_key, xcm_version) - }, -- Err(e) => Event::NotifyTargetSendFail(new_key, query_id, e.into()), -+ Err(e) => -+ PalletEvent::NotifyTargetSendFail(new_key, query_id, e.into()), - }; - Self::deposit_event(event); - weight_used.saturating_accrue(todo_vnt_notify_migrate_weight); -@@ -1182,7 +1184,7 @@ pub mod pallet { - if let Some(QueryStatus::Ready { response, at }) = Queries::::get(query_id) { - let response = response.try_into().ok()?; - Queries::::remove(query_id); -- Self::deposit_event(Event::ResponseTaken(query_id)); -+ Self::deposit_event(PalletEvent::ResponseTaken(query_id)); - Some((response, at)) - } else { - None -@@ -1277,7 +1279,7 @@ pub mod pallet { - let versioned = VersionedMultiAssets::from(MultiAssets::from(assets)); - let hash = BlakeTwo256::hash_of(&(&origin, &versioned)); - AssetTraps::::mutate(hash, |n| *n += 1); -- Self::deposit_event(Event::AssetsTrapped(hash, origin.clone(), versioned)); -+ Self::deposit_event(PalletEvent::AssetsTrapped(hash, origin.clone(), versioned)); - // TODO #3735: Put the real weight in there. - 0 - } -@@ -1334,7 +1336,7 @@ pub mod pallet { - let origin: MultiLocation = match expected_origin.try_into() { - Ok(o) if &o == origin => o, - Ok(o) => { -- Self::deposit_event(Event::InvalidResponder( -+ Self::deposit_event(PalletEvent::InvalidResponder( - origin.clone(), - query_id, - Some(o), -@@ -1342,7 +1344,7 @@ pub mod pallet { - return 0 - }, - _ => { -- Self::deposit_event(Event::InvalidResponder( -+ Self::deposit_event(PalletEvent::InvalidResponder( - origin.clone(), - query_id, - None, -@@ -1367,14 +1369,14 @@ pub mod pallet { - LatestVersionedMultiLocation(&origin), - v, - ); -- Self::deposit_event(Event::SupportedVersionChanged(origin, v)); -+ Self::deposit_event(PalletEvent::SupportedVersionChanged(origin, v)); - 0 - }, - (response, Some(QueryStatus::Pending { responder, maybe_notify, .. })) => { - let responder = match MultiLocation::try_from(responder) { - Ok(r) => r, - Err(_) => { -- Self::deposit_event(Event::InvalidResponderVersion( -+ Self::deposit_event(PalletEvent::InvalidResponderVersion( - origin.clone(), - query_id, - )); -@@ -1382,7 +1384,7 @@ pub mod pallet { - }, - }; - if origin != &responder { -- Self::deposit_event(Event::InvalidResponder( -+ Self::deposit_event(PalletEvent::InvalidResponder( - origin.clone(), - query_id, - Some(responder), -@@ -1401,7 +1403,7 @@ pub mod pallet { - Queries::::remove(query_id); - let weight = call.get_dispatch_info().weight; - if weight > max_weight { -- let e = Event::NotifyOverweight( -+ let e = PalletEvent::NotifyOverweight( - query_id, - pallet_index, - call_index, -@@ -1414,12 +1416,16 @@ pub mod pallet { - let dispatch_origin = Origin::Response(origin.clone()).into(); - match call.dispatch(dispatch_origin) { - Ok(post_info) => { -- let e = Event::Notified(query_id, pallet_index, call_index); -+ let e = PalletEvent::Notified( -+ query_id, -+ pallet_index, -+ call_index, -+ ); - Self::deposit_event(e); - post_info.actual_weight - }, - Err(error_and_info) => { -- let e = Event::NotifyDispatchError( -+ let e = PalletEvent::NotifyDispatchError( - query_id, - pallet_index, - call_index, -@@ -1432,14 +1438,17 @@ pub mod pallet { - } - .unwrap_or(weight) - } else { -- let e = -- Event::NotifyDecodeFailed(query_id, pallet_index, call_index); -+ let e = PalletEvent::NotifyDecodeFailed( -+ query_id, -+ pallet_index, -+ call_index, -+ ); - Self::deposit_event(e); - 0 - } - }, - None => { -- let e = Event::ResponseReady(query_id, response.clone()); -+ let e = PalletEvent::ResponseReady(query_id, response.clone()); - Self::deposit_event(e); - let at = frame_system::Pallet::::current_block_number(); - let response = response.into(); -@@ -1449,7 +1458,7 @@ pub mod pallet { - } - }, - _ => { -- Self::deposit_event(Event::UnexpectedResponse(origin.clone(), query_id)); -+ Self::deposit_event(PalletEvent::UnexpectedResponse(origin.clone(), query_id)); - return 0 - }, - } -diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs -index 5627acd31a3..3bd9bf395e3 100644 ---- a/xcm/pallet-xcm/src/mock.rs -+++ b/xcm/pallet-xcm/src/mock.rs -@@ -51,7 +51,8 @@ pub mod pallet_test_notifier { - - #[pallet::config] - pub trait Config: frame_system::Config + crate::Config { -- type Event: IsType<::Event> + From>; -+ type RuntimeEvent: IsType<::RuntimeEvent> -+ + From>; - type Origin: IsType<::Origin> - + Into::Origin>>; - type Call: IsType<::Call> + From>; -@@ -59,7 +60,7 @@ pub mod pallet_test_notifier { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - QueryPrepared(QueryId), - NotifyQueryPrepared(QueryId), - ResponseReceived(MultiLocation, QueryId, Response), -@@ -83,7 +84,7 @@ pub mod pallet_test_notifier { - Junction::AccountId32 { network: Any, id }.into(), - 100u32.into(), - ); -- Self::deposit_event(Event::::QueryPrepared(qid)); -+ Self::deposit_event(PalletEvent::::QueryPrepared(qid)); - Ok(()) - } - -@@ -100,7 +101,7 @@ pub mod pallet_test_notifier { - ::Call::from(call), - 100u32.into(), - ); -- Self::deposit_event(Event::::NotifyQueryPrepared(qid)); -+ Self::deposit_event(PalletEvent::::NotifyQueryPrepared(qid)); - Ok(()) - } - -@@ -111,7 +112,7 @@ pub mod pallet_test_notifier { - response: Response, - ) -> DispatchResult { - let responder = ensure_response(::Origin::from(origin))?; -- Self::deposit_event(Event::::ResponseReceived(responder, query_id, response)); -+ Self::deposit_event(PalletEvent::::ResponseReceived(responder, query_id, response)); - Ok(()) - } - } -@@ -180,7 +181,7 @@ impl frame_system::Config for Test { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockWeights = (); - type BlockLength = (); -@@ -206,7 +207,7 @@ parameter_types! { - impl pallet_balances::Config for Test { - type MaxLocks = MaxLocks; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -274,7 +275,7 @@ parameter_types! { - } - - impl pallet_xcm::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = (TestSendXcmErrX8, TestSendXcm); - type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; -@@ -293,16 +294,16 @@ impl pallet_xcm::Config for Test { - impl origin::Config for Test {} - - impl pallet_test_notifier::Config for Test { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type Origin = Origin; - type Call = Call; - } - --pub(crate) fn last_event() -> Event { -- System::events().pop().expect("Event expected").event -+pub(crate) fn last_event() -> RuntimeEvent { -+ System::events().pop().expect("RuntimeEvent expected").event - } - --pub(crate) fn last_events(n: usize) -> Vec { -+pub(crate) fn last_events(n: usize) -> Vec { - System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect() - } - -diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs -index 8ede7f11ae2..7aa2a8f9ed2 100644 ---- a/xcm/pallet-xcm/src/tests.rs -+++ b/xcm/pallet-xcm/src/tests.rs -@@ -84,12 +84,12 @@ fn report_outcome_notify_works() { - assert_eq!( - last_events(2), - vec![ -- Event::TestNotifier(pallet_test_notifier::Event::ResponseReceived( -+ RuntimeEvent::TestNotifier(pallet_test_notifier::PalletEvent::ResponseReceived( - Parachain(PARA_ID).into(), - 0, - Response::ExecutionResult(None), - )), -- Event::XcmPallet(crate::Event::Notified(0, 4, 2)), -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Notified(0, 4, 2)), - ] - ); - assert_eq!(crate::Queries::::iter().collect::>(), vec![]); -@@ -139,7 +139,10 @@ fn report_outcome_works() { - assert_eq!(r, Outcome::Complete(1_000)); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::ResponseReady(0, Response::ExecutionResult(None),)) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::ResponseReady( -+ 0, -+ Response::ExecutionResult(None), -+ )) - ); - - let response = Some((Response::ExecutionResult(None), 1)); -@@ -180,7 +183,7 @@ fn send_works() { - ); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Sent(sender, RelayLocation::get(), message)) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Sent(sender, RelayLocation::get(), message)) - ); - }); - } -@@ -252,7 +255,7 @@ fn teleport_assets_works() { - let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -296,7 +299,7 @@ fn limmited_teleport_assets_works() { - let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -338,7 +341,7 @@ fn unlimmited_teleport_assets_works() { - ); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -386,7 +389,7 @@ fn reserve_transfer_assets_works() { - let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -435,7 +438,7 @@ fn limited_reserve_transfer_assets_works() { - let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -482,7 +485,7 @@ fn unlimited_reserve_transfer_assets_works() { - ); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -515,7 +518,7 @@ fn execute_withdraw_to_deposit_works() { - assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete(weight))) - ); - }); - } -@@ -551,8 +554,12 @@ fn trapped_assets_can_be_claimed() { - assert_eq!( - last_events(2), - vec![ -- Event::XcmPallet(crate::Event::AssetsTrapped(hash.clone(), source, vma)), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Complete( -+ RuntimeEvent::XcmPallet(crate::PalletEvent::AssetsTrapped( -+ hash.clone(), -+ source, -+ vma -+ )), -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Complete( - 5 * BaseXcmWeight::get() - ))) - ] -@@ -590,7 +597,7 @@ fn trapped_assets_can_be_claimed() { - )); - assert_eq!( - last_event(), -- Event::XcmPallet(crate::Event::Attempted(Outcome::Incomplete( -+ RuntimeEvent::XcmPallet(crate::PalletEvent::Attempted(Outcome::Incomplete( - BaseXcmWeight::get(), - XcmError::UnknownClaim - ))) -diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs -index 9599efcd7f2..1eb51b7b24c 100644 ---- a/xcm/xcm-builder/tests/mock/mod.rs -+++ b/xcm/xcm-builder/tests/mock/mod.rs -@@ -71,7 +71,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockWeights = (); - type BlockLength = (); -@@ -97,7 +97,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type MaxLocks = MaxLocks; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -180,7 +180,7 @@ impl xcm_executor::Config for XcmConfig { - pub type LocalOriginToLocation = SignedToAccountId32; - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type LocationInverter = LocationInverter; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = TestSendXcm; -diff --git a/xcm/xcm-builder/tests/scenarios.rs b/xcm/xcm-builder/tests/scenarios.rs -index d826e652c5d..50842f89929 100644 ---- a/xcm/xcm-builder/tests/scenarios.rs -+++ b/xcm/xcm-builder/tests/scenarios.rs -@@ -89,7 +89,7 @@ fn transfer_asset_works() { - weight, - ); - System::assert_last_event( -- pallet_balances::Event::Transfer { from: ALICE, to: bob.clone(), amount }.into(), -+ pallet_balances::PalletEvent::Transfer { from: ALICE, to: bob.clone(), amount }.into(), - ); - assert_eq!(r, Outcome::Complete(weight)); - assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE - amount); -diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs -index a6673aca7a9..a470e5bfd52 100644 ---- a/xcm/xcm-executor/integration-tests/src/lib.rs -+++ b/xcm/xcm-executor/integration-tests/src/lib.rs -@@ -66,18 +66,18 @@ fn basic_buy_fees_message_executes() { - .inspect_state(|| { - assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( - r.event, -- polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(Outcome::Complete( -- _ -- ))), -+ polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::Attempted( -+ Outcome::Complete(_) -+ )), - ))); - }); - } - - #[test] - fn query_response_fires() { -- use pallet_test_notifier::Event::*; -+ use pallet_test_notifier::PalletEvent::*; - use pallet_xcm::QueryStatus; -- use polkadot_test_runtime::Event::TestNotifier; -+ use polkadot_test_runtime::RuntimeEvent::TestNotifier; - - sp_tracing::try_init_simple(); - let mut client = TestClientBuilder::new() -@@ -146,7 +146,7 @@ fn query_response_fires() { - .inspect_state(|| { - assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( - r.event, -- polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::ResponseReady( -+ polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::PalletEvent::ResponseReady( - q, - Response::ExecutionResult(None), - )) if q == query_id, -@@ -163,8 +163,8 @@ fn query_response_fires() { - - #[test] - fn query_response_elicits_handler() { -- use pallet_test_notifier::Event::*; -- use polkadot_test_runtime::Event::TestNotifier; -+ use pallet_test_notifier::PalletEvent::*; -+ use polkadot_test_runtime::RuntimeEvent::TestNotifier; - - sp_tracing::try_init_simple(); - let mut client = TestClientBuilder::new() -diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs -index 741732cc797..1fb659b082f 100644 ---- a/xcm/xcm-simulator/example/src/lib.rs -+++ b/xcm/xcm-simulator/example/src/lib.rs -@@ -135,10 +135,11 @@ mod tests { - }); - - ParaA::execute_with(|| { -- use parachain::{Event, System}; -- assert!(System::events() -- .iter() -- .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); -+ use parachain::{RuntimeEvent, System}; -+ assert!(System::events().iter().any(|r| matches!( -+ r.event, -+ RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) -+ ))); - }); - } - -@@ -162,10 +163,11 @@ mod tests { - }); - - Relay::execute_with(|| { -- use relay_chain::{Event, System}; -- assert!(System::events() -- .iter() -- .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); -+ use relay_chain::{RuntimeEvent, System}; -+ assert!(System::events().iter().any(|r| matches!( -+ r.event, -+ RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) -+ ))); - }); - } - -@@ -190,10 +192,11 @@ mod tests { - }); - - ParaB::execute_with(|| { -- use parachain::{Event, System}; -- assert!(System::events() -- .iter() -- .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); -+ use parachain::{RuntimeEvent, System}; -+ assert!(System::events().iter().any(|r| matches!( -+ r.event, -+ RuntimeEvent::System(frame_system::PalletEvent::Remarked { .. }) -+ ))); - }); - } - -diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs -index 614d50e4fc6..984387e29e7 100644 ---- a/xcm/xcm-simulator/example/src/parachain.rs -+++ b/xcm/xcm-simulator/example/src/parachain.rs -@@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockWeights = (); - type BlockLength = (); -@@ -87,7 +87,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type MaxLocks = MaxLocks; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -156,7 +156,8 @@ pub mod mock_msg_queue { - - #[pallet::config] - pub trait Config: frame_system::Config { -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - type XcmExecutor: ExecuteXcm; - } - -@@ -187,7 +188,7 @@ pub mod mock_msg_queue { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - // XCMP - /// Some XCM was executed OK. - Success(Option), -@@ -223,14 +224,15 @@ pub mod mock_msg_queue { - Ok(xcm) => { - let location = (1, Parachain(sender.into())); - match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { -- Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), -- Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), -+ Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), -+ Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), - // As far as the caller is concerned, this was dispatched without error, so - // we just report the weight used. -- Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), -+ Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), - } - }, -- Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), -+ Err(()) => -+ (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), - }; - Self::deposit_event(event); - result -@@ -271,15 +273,15 @@ pub mod mock_msg_queue { - VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); - match maybe_msg { - Err(_) => { -- Self::deposit_event(Event::InvalidFormat(id)); -+ Self::deposit_event(PalletEvent::InvalidFormat(id)); - }, - Ok(Err(())) => { -- Self::deposit_event(Event::UnsupportedVersion(id)); -+ Self::deposit_event(PalletEvent::UnsupportedVersion(id)); - }, - Ok(Ok(x)) => { - let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); - >::append(x); -- Self::deposit_event(Event::ExecutedDownward(id, outcome)); -+ Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); - }, - } - } -@@ -289,14 +291,14 @@ pub mod mock_msg_queue { - } - - impl mock_msg_queue::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor; - } - - pub type LocalOriginToLocation = SignedToAccountId32; - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = EnsureXcmOrigin; - type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; -diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs -index a648ba96ba7..e9e6fe7608e 100644 ---- a/xcm/xcm-simulator/example/src/relay_chain.rs -+++ b/xcm/xcm-simulator/example/src/relay_chain.rs -@@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockWeights = (); - type BlockLength = (); -@@ -78,7 +78,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type MaxLocks = MaxLocks; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -144,7 +144,7 @@ impl Config for XcmConfig { - pub type LocalOriginToLocation = SignedToAccountId32; - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = XcmRouter; - // Anyone can execute XCM messages locally... -@@ -166,7 +166,7 @@ parameter_types! { - } - - impl ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = FirstMessageFactorPercent; - type ExecuteOverweightOrigin = frame_system::EnsureRoot; -diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs -index 3326875206b..b4c5abf14c7 100644 ---- a/xcm/xcm-simulator/fuzzer/src/parachain.rs -+++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs -@@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockWeights = (); - type BlockLength = (); -@@ -87,7 +87,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type MaxLocks = MaxLocks; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -156,7 +156,8 @@ pub mod mock_msg_queue { - - #[pallet::config] - pub trait Config: frame_system::Config { -- type Event: From> + IsType<::Event>; -+ type RuntimeEvent: From> -+ + IsType<::RuntimeEvent>; - type XcmExecutor: ExecuteXcm; - } - -@@ -187,7 +188,7 @@ pub mod mock_msg_queue { - - #[pallet::event] - #[pallet::generate_deposit(pub(super) fn deposit_event)] -- pub enum Event { -+ pub enum PalletEvent { - // XCMP - /// Some XCM was executed OK. - Success(Option), -@@ -223,14 +224,15 @@ pub mod mock_msg_queue { - Ok(xcm) => { - let location = MultiLocation::new(1, X1(Parachain(sender.into()))); - match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { -- Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), -- Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), -+ Outcome::Error(e) => (Err(e.clone()), PalletEvent::Fail(Some(hash), e)), -+ Outcome::Complete(w) => (Ok(w), PalletEvent::Success(Some(hash))), - // As far as the caller is concerned, this was dispatched without error, so - // we just report the weight used. -- Outcome::Incomplete(w, e) => (Ok(w), Event::Fail(Some(hash), e)), -+ Outcome::Incomplete(w, e) => (Ok(w), PalletEvent::Fail(Some(hash), e)), - } - }, -- Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))), -+ Err(()) => -+ (Err(XcmError::UnhandledXcmVersion), PalletEvent::BadVersion(Some(hash))), - }; - Self::deposit_event(event); - result -@@ -271,15 +273,15 @@ pub mod mock_msg_queue { - VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); - match maybe_msg { - Err(_) => { -- Self::deposit_event(Event::InvalidFormat(id)); -+ Self::deposit_event(PalletEvent::InvalidFormat(id)); - }, - Ok(Err(())) => { -- Self::deposit_event(Event::UnsupportedVersion(id)); -+ Self::deposit_event(PalletEvent::UnsupportedVersion(id)); - }, - Ok(Ok(x)) => { - let outcome = T::XcmExecutor::execute_xcm(Parent, x.clone(), limit); - >::append(x); -- Self::deposit_event(Event::ExecutedDownward(id, outcome)); -+ Self::deposit_event(PalletEvent::ExecutedDownward(id, outcome)); - }, - } - } -@@ -289,14 +291,14 @@ pub mod mock_msg_queue { - } - - impl mock_msg_queue::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor; - } - - pub type LocalOriginToLocation = SignedToAccountId32; - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = EnsureXcmOrigin; - type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; -diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs -index a648ba96ba7..e9e6fe7608e 100644 ---- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs -+++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs -@@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { - type AccountId = AccountId; - type Lookup = IdentityLookup; - type Header = Header; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type BlockHashCount = BlockHashCount; - type BlockWeights = (); - type BlockLength = (); -@@ -78,7 +78,7 @@ parameter_types! { - impl pallet_balances::Config for Runtime { - type MaxLocks = MaxLocks; - type Balance = Balance; -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type DustRemoval = (); - type ExistentialDeposit = ExistentialDeposit; - type AccountStore = System; -@@ -144,7 +144,7 @@ impl Config for XcmConfig { - pub type LocalOriginToLocation = SignedToAccountId32; - - impl pallet_xcm::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type XcmRouter = XcmRouter; - // Anyone can execute XCM messages locally... -@@ -166,7 +166,7 @@ parameter_types! { - } - - impl ump::Config for Runtime { -- type Event = Event; -+ type RuntimeEvent = RuntimeEvent; - type UmpSink = ump::XcmSink, Runtime>; - type FirstMessageFactorPercent = FirstMessageFactorPercent; - type ExecuteOverweightOrigin = frame_system::EnsureRoot; From b65102bea81eab09f4be18250c80800ef86cd866 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 25 Aug 2022 09:54:24 +0200 Subject: [PATCH 10/37] revert --- .github/workflows/auto-label-prs.yml | 4 +- .github/workflows/release-10_candidate.yml | 4 +- Cargo.lock | 349 +++++++++++---------- node/network/bridge/src/network.rs | 9 +- runtime/polkadot/src/lib.rs | 2 +- scripts/ci/run_benches_for_runtime.sh | 10 +- 6 files changed, 193 insertions(+), 185 deletions(-) diff --git a/.github/workflows/auto-label-prs.yml b/.github/workflows/auto-label-prs.yml index f0b8e9b343e2..50539b80b98b 100644 --- a/.github/workflows/auto-label-prs.yml +++ b/.github/workflows/auto-label-prs.yml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Label drafts - uses: andymckay/labeler@master + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 if: github.event.pull_request.draft == true with: add-labels: 'A3-inprogress' remove-labels: 'A0-pleasereview' - name: Label PRs - uses: andymckay/labeler@master + uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4 if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial') with: add-labels: 'A0-pleasereview' diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml index 51a82bc4f593..acffa6842d49 100644 --- a/.github/workflows/release-10_candidate.yml +++ b/.github/workflows/release-10_candidate.yml @@ -34,7 +34,7 @@ jobs: echo "::set-output name=first_rc::true" fi - name: Apply new tag - uses: tvdias/github-tagger@v0.0.2 + uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2 with: # We can't use the normal GITHUB_TOKEN for the following reason: # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token @@ -42,7 +42,7 @@ jobs: repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}" tag: ${{ steps.compute_tag.outputs.new_tag }} - id: create-issue - uses: JasonEtco/create-an-issue@v2 + uses: JasonEtco/create-an-issue@9e6213aec58987fa7d2f4deb8b256b99e63107a2 # v2.6.0 # Only create the issue if it's the first release candidate if: steps.compute_tag.outputs.first_rc == 'true' env: diff --git a/Cargo.lock b/Cargo.lock index a62642dace9e..a10aa2823625 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -423,7 +423,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "beefy-primitives", @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "beefy-primitives", "sp-api", @@ -488,7 +488,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -1974,7 +1974,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", ] @@ -1992,7 +1992,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -2015,7 +2015,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "Inflector", "chrono", @@ -2066,7 +2066,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2077,7 +2077,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -2121,7 +2121,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "bitflags", "frame-metadata", @@ -2152,7 +2152,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2176,7 +2176,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro2", "quote", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2209,7 +2209,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -2220,7 +2220,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "log", @@ -2237,7 +2237,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -2252,7 +2252,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "sp-api", @@ -2261,7 +2261,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "sp-api", @@ -2443,7 +2443,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "chrono", "frame-election-provider-support", @@ -4816,7 +4816,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -4830,7 +4830,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -4846,7 +4846,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -4861,7 +4861,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -4885,7 +4885,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4905,7 +4905,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4924,7 +4924,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -4939,7 +4939,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "beefy-primitives", "frame-support", @@ -4955,7 +4955,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4978,7 +4978,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -4996,7 +4996,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5015,7 +5015,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5032,7 +5032,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5048,7 +5048,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5071,7 +5071,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5084,7 +5084,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5102,7 +5102,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5117,7 +5117,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5140,7 +5140,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5156,7 +5156,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5176,7 +5176,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5193,7 +5193,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5210,7 +5210,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5228,7 +5228,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5243,7 +5243,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5258,7 +5258,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -5275,7 +5275,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "sp-api", @@ -5304,7 +5304,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -5321,7 +5321,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5344,7 +5344,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5360,7 +5360,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5375,7 +5375,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5390,7 +5390,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5406,7 +5406,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -5427,7 +5427,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5443,7 +5443,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -5457,7 +5457,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5480,7 +5480,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5491,7 +5491,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "sp-arithmetic", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -5514,7 +5514,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5532,7 +5532,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5551,7 +5551,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-support", "frame-system", @@ -5567,7 +5567,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5582,7 +5582,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5593,7 +5593,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5610,7 +5610,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -5626,7 +5626,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-benchmarking", "frame-support", @@ -8100,7 +8100,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8442,7 +8442,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "sp-core", @@ -8453,7 +8453,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "futures-timer", @@ -8465,7 +8465,6 @@ dependencies = [ "prost-build", "rand 0.7.3", "sc-client-api", - "sc-network", "sc-network-common", "sp-api", "sp-authority-discovery", @@ -8480,7 +8479,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "futures-timer", @@ -8503,7 +8502,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8519,13 +8518,13 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", "parity-scale-codec", "sc-chain-spec-derive", - "sc-network", + "sc-network-common", "sc-telemetry", "serde", "serde_json", @@ -8536,7 +8535,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8547,7 +8546,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "chrono", "clap", @@ -8586,7 +8585,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "fnv", "futures", @@ -8614,7 +8613,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "hash-db", "kvdb", @@ -8639,7 +8638,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "futures", @@ -8663,7 +8662,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "fork-tree", @@ -8705,7 +8704,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "jsonrpsee", @@ -8727,7 +8726,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8740,7 +8739,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "futures", @@ -8765,7 +8764,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "lazy_static", "lru 0.7.8", @@ -8792,7 +8791,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "environmental", "parity-scale-codec", @@ -8808,7 +8807,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "parity-scale-codec", @@ -8823,7 +8822,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8843,7 +8842,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ahash", "async-trait", @@ -8884,7 +8883,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "finality-grandpa", "futures", @@ -8905,7 +8904,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ansi_term", "futures", @@ -8922,7 +8921,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "hex", @@ -8937,7 +8936,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "asynchronous-codec", @@ -8986,7 +8985,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "bitflags", @@ -8997,6 +8996,7 @@ dependencies = [ "prost-build", "sc-consensus", "sc-peerset", + "serde", "smallvec", "sp-consensus", "sp-finality-grandpa", @@ -9007,7 +9007,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ahash", "futures", @@ -9015,8 +9015,8 @@ dependencies = [ "libp2p", "log", "lru 0.7.8", - "sc-network", "sc-network-common", + "sc-peerset", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -9025,7 +9025,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "hex", @@ -9046,7 +9046,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "fork-tree", "futures", @@ -9074,7 +9074,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "bytes", "fnv", @@ -9083,14 +9083,15 @@ dependencies = [ "hex", "hyper", "hyper-rustls", + "libp2p", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", - "sc-network", "sc-network-common", + "sc-peerset", "sc-utils", "sp-api", "sp-core", @@ -9103,7 +9104,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "libp2p", @@ -9116,7 +9117,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9125,7 +9126,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "hash-db", @@ -9155,7 +9156,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "jsonrpsee", @@ -9178,7 +9179,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "jsonrpsee", @@ -9191,7 +9192,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "directories", @@ -9258,7 +9259,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "parity-scale-codec", @@ -9272,7 +9273,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9291,7 +9292,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "libc", @@ -9310,7 +9311,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "chrono", "futures", @@ -9328,7 +9329,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ansi_term", "atty", @@ -9359,7 +9360,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9370,7 +9371,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "futures-timer", @@ -9396,7 +9397,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "log", @@ -9409,7 +9410,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "futures-timer", @@ -9894,7 +9895,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "hash-db", "log", @@ -9912,7 +9913,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "blake2", "proc-macro-crate", @@ -9924,7 +9925,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -9937,7 +9938,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "integer-sqrt", "num-traits", @@ -9952,7 +9953,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -9965,7 +9966,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "parity-scale-codec", @@ -9977,7 +9978,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "sp-api", @@ -9989,7 +9990,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "log", @@ -10007,7 +10008,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "futures", @@ -10026,7 +10027,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "merlin", @@ -10049,7 +10050,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -10063,7 +10064,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -10076,7 +10077,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "base58", "bitflags", @@ -10122,7 +10123,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "blake2", "byteorder", @@ -10136,7 +10137,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro2", "quote", @@ -10147,7 +10148,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -10156,7 +10157,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro2", "quote", @@ -10166,7 +10167,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "environmental", "parity-scale-codec", @@ -10177,7 +10178,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "finality-grandpa", "log", @@ -10195,7 +10196,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10209,7 +10210,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "bytes", "futures", @@ -10235,7 +10236,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "lazy_static", "sp-core", @@ -10246,7 +10247,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "futures", @@ -10263,7 +10264,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "thiserror", "zstd", @@ -10272,7 +10273,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "parity-scale-codec", @@ -10287,7 +10288,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -10301,7 +10302,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "sp-api", "sp-core", @@ -10311,7 +10312,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "backtrace", "lazy_static", @@ -10321,7 +10322,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "rustc-hash", "serde", @@ -10331,7 +10332,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "either", "hash256-std-hasher", @@ -10353,7 +10354,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10371,7 +10372,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "Inflector", "proc-macro-crate", @@ -10383,7 +10384,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "parity-scale-codec", @@ -10397,7 +10398,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -10411,7 +10412,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "scale-info", @@ -10422,7 +10423,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "hash-db", "log", @@ -10444,12 +10445,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10462,7 +10463,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "log", "sp-core", @@ -10475,7 +10476,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "futures-timer", @@ -10491,7 +10492,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "sp-std", @@ -10503,7 +10504,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "sp-api", "sp-runtime", @@ -10512,7 +10513,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "log", @@ -10528,7 +10529,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ahash", "hash-db", @@ -10551,7 +10552,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10568,7 +10569,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10579,7 +10580,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "impl-trait-for-tuples", "log", @@ -10753,7 +10754,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "platforms", ] @@ -10761,7 +10762,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10782,7 +10783,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures-util", "hyper", @@ -10795,7 +10796,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "jsonrpsee", "log", @@ -10816,7 +10817,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "async-trait", "futures", @@ -10842,7 +10843,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10852,7 +10853,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10863,7 +10864,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "ansi_term", "build-helper", @@ -11577,7 +11578,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#00cc5f104176fac6f5a624bced22a2192c7c0470" +source = "git+https://github.com/paritytech/substrate?branch=master#57e3486d9c7bb4deaef33cf9ba2da083b4e40314" dependencies = [ "clap", "jsonrpsee", diff --git a/node/network/bridge/src/network.rs b/node/network/bridge/src/network.rs index 00a950f35c54..e80094588e33 100644 --- a/node/network/bridge/src/network.rs +++ b/node/network/bridge/src/network.rs @@ -22,11 +22,12 @@ use futures::{prelude::*, stream::BoxStream}; use parity_scale_codec::Encode; use sc_network::{ - config::parse_addr, multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, - NetworkService, OutboundFailure, RequestFailure, + multiaddr::Multiaddr, Event as NetworkEvent, IfDisconnected, NetworkService, OutboundFailure, + RequestFailure, }; -use sc_network_common::service::{ - NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest, +use sc_network_common::{ + config::parse_addr, + service::{NetworkEventStream, NetworkNotification, NetworkPeers, NetworkRequest}, }; use polkadot_node_network_protocol::{ diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 9489df9f403c..e0b0240d0b19 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -2121,7 +2121,7 @@ mod test_fees { }; let info = call.get_dispatch_info(); println!("call = {:?} / info = {:?}", call, info); - // convert to outer call. + // convert to runtime call. let call = Call::Balances(call); let extra: SignedExtra = ( frame_system::CheckNonZeroSender::::new(), diff --git a/scripts/ci/run_benches_for_runtime.sh b/scripts/ci/run_benches_for_runtime.sh index 8149195c82c4..5c633c81b06b 100755 --- a/scripts/ci/run_benches_for_runtime.sh +++ b/scripts/ci/run_benches_for_runtime.sh @@ -29,6 +29,12 @@ rm -f $ERR_FILE for PALLET in "${PALLETS[@]}"; do echo "[+] Benchmarking $PALLET for $runtime"; + output_file="" + if [[ $PALLET == *"::"* ]]; then + # translates e.g. "pallet_foo::bar" to "pallet_foo_bar" + output_file="${PALLET//::/_}.rs" + fi + OUTPUT=$( ./target/production/polkadot benchmark pallet \ --chain="${runtime}-dev" \ @@ -39,7 +45,7 @@ for PALLET in "${PALLETS[@]}"; do --execution=wasm \ --wasm-execution=compiled \ --header=./file_header.txt \ - --output="./runtime/${runtime}/src/weights/${PALLET/::/_}.rs" 2>&1 + --output="./runtime/${runtime}/src/weights/${output_file}" 2>&1 ) if [ $? -ne 0 ]; then echo "$OUTPUT" >> "$ERR_FILE" @@ -68,4 +74,4 @@ if [ -f "$ERR_FILE" ]; then echo "[-] Some benchmarks failed. See: $ERR_FILE" else echo "[+] All benchmarks passed." -fi +fi \ No newline at end of file From edb24968fff33e5cb9cd41c4a4d5316136cb39cb Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Thu, 25 Aug 2022 09:57:12 +0200 Subject: [PATCH 11/37] Update run_benches_for_runtime.sh --- scripts/ci/run_benches_for_runtime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/run_benches_for_runtime.sh b/scripts/ci/run_benches_for_runtime.sh index 5c633c81b06b..cd9cb5be8e98 100755 --- a/scripts/ci/run_benches_for_runtime.sh +++ b/scripts/ci/run_benches_for_runtime.sh @@ -74,4 +74,4 @@ if [ -f "$ERR_FILE" ]; then echo "[-] Some benchmarks failed. See: $ERR_FILE" else echo "[+] All benchmarks passed." -fi \ No newline at end of file +fi From c359f5fb1c8f05b8c83729e4d7fe6d32d789d0f6 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 25 Aug 2022 10:02:25 +0200 Subject: [PATCH 12/37] rename type Call & type Event --- runtime/common/src/assigned_slots.rs | 12 +-- runtime/common/src/auctions.rs | 8 +- runtime/common/src/claims.rs | 10 +-- runtime/common/src/crowdloan/mod.rs | 8 +- runtime/common/src/impls.rs | 8 +- runtime/common/src/integration_tests.rs | 16 ++-- runtime/common/src/paras_registrar.rs | 10 +-- runtime/common/src/purchase.rs | 10 +-- runtime/common/src/slots/mod.rs | 8 +- runtime/kusama/src/governance/old.rs | 10 +-- runtime/kusama/src/lib.rs | 88 +++++++++---------- runtime/kusama/src/xcm_config.rs | 6 +- runtime/parachains/src/mock.rs | 16 ++-- runtime/polkadot/src/lib.rs | 88 +++++++++---------- runtime/polkadot/src/xcm_config.rs | 6 +- runtime/rococo/src/lib.rs | 62 ++++++------- runtime/rococo/src/xcm_config.rs | 6 +- runtime/test-runtime/src/lib.rs | 46 +++++----- runtime/westend/src/lib.rs | 80 ++++++++--------- runtime/westend/src/xcm_config.rs | 6 +- .../src/fungible/mock.rs | 8 +- xcm/pallet-xcm-benchmarks/src/generic/mock.rs | 8 +- xcm/pallet-xcm/src/mock.rs | 16 ++-- xcm/xcm-builder/tests/mock/mod.rs | 12 +-- xcm/xcm-simulator/example/src/parachain.rs | 14 +-- xcm/xcm-simulator/example/src/relay_chain.rs | 14 +-- xcm/xcm-simulator/fuzzer/src/parachain.rs | 14 +-- xcm/xcm-simulator/fuzzer/src/relay_chain.rs | 14 +-- 28 files changed, 302 insertions(+), 302 deletions(-) diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs index bac642cde589..71723b6764f2 100644 --- a/runtime/common/src/assigned_slots.rs +++ b/runtime/common/src/assigned_slots.rs @@ -593,7 +593,7 @@ mod tests { type BlockWeights = (); type BlockLength = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -601,7 +601,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -621,7 +621,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -640,7 +640,7 @@ mod tests { } impl parachains_paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = parachains_paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -655,7 +655,7 @@ mod tests { } impl slots::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = TestRegistrar; type LeasePeriod = LeasePeriod; @@ -673,7 +673,7 @@ mod tests { } impl assigned_slots::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index b937a26d5671..1893bd17bdd6 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -710,7 +710,7 @@ mod tests { type BlockLength = (); type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -718,7 +718,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -739,7 +739,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -867,7 +867,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = TestLeaser; type Registrar = TestRegistrar; type EndingPeriod = EndingPeriod; diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index e2731f9336cc..9a2fad3054c1 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -752,7 +752,7 @@ mod tests { type BlockLength = (); type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -760,7 +760,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -779,7 +779,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -794,7 +794,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -810,7 +810,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureSignedBy; diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index 4b2c29f5398d..d972ba7ccdfb 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -893,7 +893,7 @@ mod tests { type BlockLength = (); type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -901,7 +901,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -920,7 +920,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -1072,7 +1072,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; type PalletId = CrowdloanPalletId; diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index bce847c82a83..03a85d09a50e 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -107,13 +107,13 @@ mod tests { type Origin = Origin; type Index = u64; type BlockNumber = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockLength = BlockLength; type BlockWeights = BlockWeights; @@ -131,7 +131,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = (); type AccountStore = System; @@ -150,7 +150,7 @@ mod tests { type Currency = pallet_balances::Pallet; type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = (); type ProposalBond = (); type ProposalBondMinimum = (); diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs index 76dc1f4c55b0..1ae397fddc97 100644 --- a/runtime/common/src/integration_tests.rs +++ b/runtime/common/src/integration_tests.rs @@ -112,7 +112,7 @@ impl frame_system::Config for Test { type BlockLength = (); type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -120,7 +120,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -178,7 +178,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -200,7 +200,7 @@ parameter_types! { } impl paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -212,7 +212,7 @@ parameter_types! { } impl paras_registrar::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSwap = (Crowdloan, Slots); type ParaDeposit = ParaDeposit; type DataDepositPerByte = DataDepositPerByte; @@ -227,7 +227,7 @@ parameter_types! { } impl auctions::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -243,7 +243,7 @@ parameter_types! { } impl slots::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -261,7 +261,7 @@ parameter_types! { } impl crowdloan::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 7631914b9992..ee8b40953be5 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -649,7 +649,7 @@ mod tests { impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -657,7 +657,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type BlockWeights = BlockWeights; @@ -680,7 +680,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u128; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = (); @@ -698,7 +698,7 @@ mod tests { } impl paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = crate::mock::TestNextSessionRotation; @@ -715,7 +715,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = MockSwap; diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 3900f6edb318..98133acaa46c 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -511,7 +511,7 @@ mod tests { type BlockLength = (); type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -519,7 +519,7 @@ mod tests { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -538,7 +538,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -553,7 +553,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -574,7 +574,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type VestingSchedule = Vesting; type ValidityOrigin = frame_system::EnsureSignedBy; diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index 76054ac989f9..27b0ad0eb977 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -530,7 +530,7 @@ mod tests { type BlockWeights = (); type BlockLength = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -538,7 +538,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -558,7 +558,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -575,7 +575,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = TestRegistrar; type LeasePeriod = LeasePeriod; diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs index a87ddf6ec1fc..b36380b4b3fd 100644 --- a/runtime/kusama/src/governance/old.rs +++ b/runtime/kusama/src/governance/old.rs @@ -33,7 +33,7 @@ parameter_types! { impl pallet_democracy::Config for Runtime { type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -94,7 +94,7 @@ pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -121,7 +121,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ChangeMembers = Council; type InitializeMembers = Council; @@ -150,7 +150,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -159,7 +159,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 12b9554c5cff..577af74cc518 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -167,7 +167,7 @@ impl frame_system::Config for Runtime { type BlockWeights = BlockWeights; type BlockLength = BlockLength; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = Nonce; type BlockNumber = BlockNumber; type Hash = Hash; @@ -175,7 +175,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -225,10 +225,10 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = ScheduleOrigin; type MaxScheduledPerBlock = MaxScheduledPerBlock; @@ -246,7 +246,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -302,7 +302,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -315,7 +315,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -332,7 +332,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -378,7 +378,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -468,7 +468,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EstimateCallFee = TransactionPayment; type UnsignedPhase = UnsignedPhase; @@ -511,7 +511,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -607,7 +607,7 @@ impl pallet_staking::Config for Runtime { type ElectionProvider = ElectionProviderMultiPhase; type GenesisElectionProvider = onchain::UnboundedExecution; type RewardRemainder = Treasury; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = Treasury; type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -656,7 +656,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -691,7 +691,7 @@ impl pallet_bounties::Config for Runtime { type BountyValueMinimum = BountyValueMinimum; type ChildBountyManager = ChildBounties; type DataDepositPerByte = DataDepositPerByte; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } @@ -702,7 +702,7 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; @@ -715,12 +715,12 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_tips::WeightInfo; } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -737,7 +737,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -749,8 +749,8 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type KeyOwnerProof = >::Proof; @@ -838,7 +838,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = @@ -857,7 +857,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BasicDeposit = BasicDeposit; type FieldDeposit = FieldDeposit; @@ -872,8 +872,8 @@ impl pallet_identity::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; } @@ -887,8 +887,8 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; @@ -904,9 +904,9 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ConfigDepositBase = ConfigDepositBase; type FriendDepositFactor = FriendDepositFactor; @@ -927,7 +927,7 @@ parameter_types! { } impl pallet_society::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Randomness = pallet_babe::RandomnessFromOneEpochAgo; type CandidateDeposit = CandidateDeposit; @@ -950,7 +950,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -1094,8 +1094,8 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ProxyType = ProxyType; type ProxyDepositBase = ProxyDepositBase; @@ -1121,7 +1121,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -1131,7 +1131,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -1142,7 +1142,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -1153,7 +1153,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -1172,7 +1172,7 @@ impl parachains_initializer::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -1183,7 +1183,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -1198,7 +1198,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1217,7 +1217,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1242,7 +1242,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1264,7 +1264,7 @@ parameter_types! { } impl pallet_gilt::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; type AdminOrigin = MoreThanHalfCouncil; @@ -1287,7 +1287,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; type Currency = Balances; type CurrencyBalance = Balance; @@ -1974,7 +1974,7 @@ sp_api::impl_runtime_apis! { } impl pallet_xcm_benchmarks::generic::Config for Runtime { - type Call = Call; + type RuntimeCall = RuntimeCall; fn worst_case_response() -> (u64, Response) { (0u64, Response::Version(Default::default())) diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 5bf45cfc89c4..9e6c1902a51e 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -130,7 +130,7 @@ pub type Barrier = ( pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -169,7 +169,7 @@ pub type LocalOriginToLocation = ( SignedToAccountId32, ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; // We only allow the council to send messages. This is basically safe to enable for everyone // (safe the possibility of someone spamming the parachain if they're willing to pay the KSM to // send from the Relay-chain), but it's useless until we bring in XCM v3 which will make @@ -188,7 +188,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 064b9918ff5f..2e524fa75ec0 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -93,7 +93,7 @@ impl frame_system::Config for Test { type BlockLength = (); type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -101,7 +101,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -123,7 +123,7 @@ impl pallet_balances::Config for Test { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -213,7 +213,7 @@ impl frame_support::traits::EstimateNextSessionRotation for TestNextSession } impl crate::paras::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = crate::paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = TestNextSessionRotation; @@ -226,7 +226,7 @@ parameter_types! { } impl crate::ump::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = TestUmpSink; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -234,14 +234,14 @@ impl crate::ump::Config for Test { } impl crate::hrmp::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = pallet_balances::Pallet; type WeightInfo = crate::hrmp::TestWeightInfo; } impl crate::disputes::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = Self; type PunishValidators = Self; type WeightInfo = crate::disputes::TestWeightInfo; @@ -292,7 +292,7 @@ impl crate::disputes::PunishValidators for Test { impl crate::scheduler::Config for Test {} impl crate::inclusion::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = Disputes; type RewardValidators = TestRewardValidators; } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index e0b0240d0b19..b7dd4903d913 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -206,7 +206,7 @@ impl frame_system::Config for Runtime { type BlockWeights = BlockWeights; type BlockLength = BlockLength; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = Nonce; type BlockNumber = BlockNumber; type Hash = Hash; @@ -214,7 +214,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -264,10 +264,10 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = ScheduleOrigin; type MaxScheduledPerBlock = MaxScheduledPerBlock; @@ -285,7 +285,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = pallet_preimage::weights::SubstrateWeight; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -341,7 +341,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -354,7 +354,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -371,7 +371,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -413,7 +413,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -505,7 +505,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; @@ -548,7 +548,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -596,7 +596,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type RewardRemainder = Treasury; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = Treasury; type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -629,7 +629,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BasicDeposit = BasicDeposit; type FieldDeposit = FieldDeposit; @@ -657,7 +657,7 @@ parameter_types! { impl pallet_democracy::Config for Runtime { type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -728,7 +728,7 @@ pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -755,7 +755,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = PhragmenElectionPalletId; type Currency = Balances; type ChangeMembers = Council; @@ -784,7 +784,7 @@ pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -793,7 +793,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; @@ -834,7 +834,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -860,7 +860,7 @@ parameter_types! { } impl pallet_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BountyDepositBase = BountyDepositBase; type BountyDepositPayoutDelay = BountyDepositPayoutDelay; type BountyUpdatePeriod = BountyUpdatePeriod; @@ -880,14 +880,14 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; } impl pallet_tips::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type Tippers = PhragmenElection; @@ -898,7 +898,7 @@ impl pallet_tips::Config for Runtime { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -915,7 +915,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -927,8 +927,8 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type KeyOwnerProof = >::Proof; @@ -1022,7 +1022,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; /// At least 3/4 of the council must agree to a claim move before it can happen. @@ -1036,7 +1036,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -1045,8 +1045,8 @@ impl pallet_vesting::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; } @@ -1060,8 +1060,8 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; @@ -1225,8 +1225,8 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ProxyType = ProxyType; type ProxyDepositBase = ProxyDepositBase; @@ -1252,7 +1252,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -1262,7 +1262,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -1273,7 +1273,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -1284,7 +1284,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -1303,7 +1303,7 @@ impl parachains_initializer::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -1317,7 +1317,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -1338,7 +1338,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1360,7 +1360,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1385,7 +1385,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1402,7 +1402,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; type RewardCounter = FixedU128; diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index a7ea36445bd8..9442d2ba12a2 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -133,7 +133,7 @@ pub type Barrier = ( pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -175,7 +175,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; // Only allow the council to send messages. type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; @@ -189,7 +189,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = AdvertisedXcmVersion; } diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index d745e109be4d..f06a9bf4c019 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -259,7 +259,7 @@ impl frame_system::Config for Runtime { type BlockLength = BlockLength; type DbWeight = RocksDbWeight; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = Nonce; type BlockNumber = BlockNumber; type Hash = Hash; @@ -267,7 +267,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -353,7 +353,7 @@ impl pallet_session::historical::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -372,7 +372,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -392,7 +392,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -415,7 +415,7 @@ parameter_types! { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = (); } @@ -442,7 +442,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -459,7 +459,7 @@ impl sp_runtime::traits::Convert> for ValidatorIdOf } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = ValidatorIdOf; type ShouldEndSession = Babe; @@ -512,7 +512,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -521,8 +521,8 @@ parameter_types! { } impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type KeyOwnerProofSystem = Historical; @@ -571,7 +571,7 @@ impl runtime_parachains::inclusion::RewardValidators for RewardValidators { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = RewardValidators; } @@ -581,7 +581,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -596,7 +596,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -607,7 +607,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -636,7 +636,7 @@ parameter_types! { } impl assigned_slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; @@ -652,7 +652,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -723,7 +723,7 @@ parameter_types! { } impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -738,7 +738,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -757,7 +757,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -769,18 +769,18 @@ impl crowdloan::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } impl validator_manager::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PrivilegedOrigin = EnsureRoot; } impl pallet_utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; } @@ -845,8 +845,8 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ProxyType = ProxyType; type ProxyDepositBase = ProxyDepositBase; @@ -868,7 +868,7 @@ parameter_types! { impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = MotionDuration; type MaxProposals = MaxProposals; type DefaultVote = pallet_collective::PrimeDefaultVote; @@ -877,7 +877,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRoot; type RemoveOrigin = EnsureRoot; type SwapOrigin = EnsureRoot; @@ -898,8 +898,8 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 1512ef9e6ccd..9fb7e847230f 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -120,7 +120,7 @@ pub type Barrier = ( pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -151,7 +151,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -164,7 +164,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index d18a2c9bb95c..15ffeccdd739 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -137,7 +137,7 @@ impl frame_system::Config for Runtime { type BlockLength = BlockLength; type DbWeight = (); type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = Nonce; type BlockNumber = BlockNumber; type Hash = HashT; @@ -145,7 +145,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = Indices; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -206,7 +206,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -219,7 +219,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -236,7 +236,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -282,7 +282,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -337,7 +337,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = frame_support::traits::U128CurrencyToVote; type RewardRemainder = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = (); type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -362,8 +362,8 @@ impl pallet_staking::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type KeyOwnerProofSystem = (); @@ -427,7 +427,7 @@ impl frame_system::offchain::SigningTypes for Runtime { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -446,7 +446,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureRoot; @@ -458,7 +458,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -467,8 +467,8 @@ impl pallet_vesting::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } impl parachains_configuration::Config for Runtime { @@ -478,13 +478,13 @@ impl parachains_configuration::Config for Runtime { impl parachains_shared::Config for Runtime {} impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = RewardValidatorsWithEraPoints; } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = parachains_disputes::TestWeightInfo; @@ -509,7 +509,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = parachains_paras::TestWeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -522,7 +522,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = (); type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -540,7 +540,7 @@ pub type LocalOriginToLocation = xcm_builder::SignedToAccountId32; type LocationInverter = xcm_config::InvertNothing; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -551,13 +551,13 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = parachains_hrmp::TestWeightInfo; @@ -570,9 +570,9 @@ impl paras_sudo_wrapper::Config for Runtime {} impl parachains_origin::Config for Runtime {} impl pallet_test_notifier::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; } #[frame_support::pallet] diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 788aede78092..64bba64519ec 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -147,7 +147,7 @@ impl frame_system::Config for Runtime { type BlockWeights = BlockWeights; type BlockLength = BlockLength; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = Nonce; type BlockNumber = BlockNumber; type Hash = Hash; @@ -155,7 +155,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = RocksDbWeight; type Version = Version; @@ -177,10 +177,10 @@ parameter_types! { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type MaxScheduledPerBlock = MaxScheduledPerBlock; @@ -198,7 +198,7 @@ parameter_types! { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -253,7 +253,7 @@ impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_indices::WeightInfo; } @@ -266,7 +266,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = MaxLocks; @@ -283,7 +283,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = WeightToFee; @@ -329,7 +329,7 @@ impl_opaque_keys! { } impl pallet_session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; type ShouldEndSession = Babe; @@ -416,7 +416,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { } impl pallet_election_provider_multi_phase::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EstimateCallFee = TransactionPayment; type SignedPhase = SignedPhase; @@ -456,7 +456,7 @@ parameter_types! { } impl pallet_bags_list::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ScoreProvider = Staking; type WeightInfo = weights::pallet_bags_list::WeightInfo; type BagThresholds = BagThresholds; @@ -494,7 +494,7 @@ impl pallet_staking::Config for Runtime { type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; type RewardRemainder = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Slash = (); type Reward = (); type SessionsPerEra = SessionsPerEra; @@ -521,7 +521,7 @@ parameter_types! { } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; } @@ -540,7 +540,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -552,8 +552,8 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type KeyOwnerProofSystem = Historical; @@ -647,7 +647,7 @@ parameter_types! { } impl pallet_identity::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Slashed = (); type BasicDeposit = BasicDeposit; @@ -662,8 +662,8 @@ impl pallet_identity::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; } @@ -677,8 +677,8 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; @@ -694,9 +694,9 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ConfigDepositBase = ConfigDepositBase; type FriendDepositFactor = FriendDepositFactor; @@ -709,7 +709,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -718,8 +718,8 @@ impl pallet_vesting::Config for Runtime { } impl pallet_sudo::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } parameter_types! { @@ -841,8 +841,8 @@ impl InstanceFilter for ProxyType { } impl pallet_proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ProxyType = ProxyType; type ProxyDepositBase = ProxyDepositBase; @@ -868,7 +868,7 @@ impl parachains_session_info::Config for Runtime { } impl parachains_inclusion::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputesHandler = ParasDisputes; type RewardValidators = parachains_reward_points::RewardValidatorsWithEraPoints; } @@ -878,7 +878,7 @@ parameter_types! { } impl parachains_paras::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::runtime_parachains_paras::WeightInfo; type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = Babe; @@ -889,7 +889,7 @@ parameter_types! { } impl parachains_ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = crate::parachains_ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; @@ -900,7 +900,7 @@ impl parachains_ump::Config for Runtime { impl parachains_dmp::Config for Runtime {} impl parachains_hrmp::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type WeightInfo = weights::runtime_parachains_hrmp::WeightInfo; @@ -929,7 +929,7 @@ parameter_types! { } impl assigned_slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssignSlotOrigin = EnsureRoot; type Leaser = Slots; type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength; @@ -940,7 +940,7 @@ impl assigned_slots::Config for Runtime { } impl parachains_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardValidators = (); type PunishValidators = (); type WeightInfo = weights::runtime_parachains_disputes::WeightInfo; @@ -952,7 +952,7 @@ parameter_types! { } impl paras_registrar::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type Currency = Balances; type OnSwap = (Crowdloan, Slots); @@ -966,7 +966,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -985,7 +985,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1005,7 +1005,7 @@ parameter_types! { } impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1021,7 +1021,7 @@ parameter_types! { } impl pallet_nomination_pools::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_nomination_pools::WeightInfo; type Currency = Balances; type CurrencyBalance = Balance; @@ -1688,7 +1688,7 @@ sp_api::impl_runtime_apis! { } impl pallet_xcm_benchmarks::generic::Config for Runtime { - type Call = Call; + type RuntimeCall = RuntimeCall; fn worst_case_response() -> (u64, Response) { (0u64, Response::Version(Default::default())) diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index 867bdb2cacf3..3340a36da2fc 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -107,7 +107,7 @@ pub type Barrier = ( pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -131,7 +131,7 @@ pub type LocalOriginToLocation = ( ); impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -144,7 +144,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = WeightInfoBounds, Call, MaxInstructions>; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs index 3f7e4f8f26e0..9abdc7896152 100644 --- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs @@ -58,12 +58,12 @@ impl frame_system::Config for Test { type Index = u64; type BlockNumber = u64; type Hash = H256; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -86,7 +86,7 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = [u8; 8]; type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -128,7 +128,7 @@ parameter_types! { pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = DevNull; type AssetTransactor = AssetTransactor; type OriginConverter = (); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs index 7782ba1d90ea..de4f341a2d42 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs @@ -63,12 +63,12 @@ impl frame_system::Config for Test { type Index = u64; type BlockNumber = u64; type Hash = H256; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -99,7 +99,7 @@ parameter_types! { pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = DevNull; type AssetTransactor = NoAssetTransactor; type OriginConverter = AlwaysSignedByDefault; @@ -130,7 +130,7 @@ impl crate::Config for Test { } impl generic::Config for Test { - type Call = Call; + type RuntimeCall = RuntimeCall; fn worst_case_response() -> (u64, Response) { let assets: MultiAssets = (Concrete(Here.into()), 100).into(); diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 5627acd31a3c..042073fbf217 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -172,7 +172,7 @@ parameter_types! { impl frame_system::Config for Test { type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -180,7 +180,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -206,7 +206,7 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -251,7 +251,7 @@ pub type Barrier = ( pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = TestSendXcm; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -274,7 +274,7 @@ parameter_types! { } impl pallet_xcm::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = (TestSendXcmErrX8, TestSendXcm); type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -285,7 +285,7 @@ impl pallet_xcm::Config for Test { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = AdvertisedXcmVersion; } @@ -293,9 +293,9 @@ impl pallet_xcm::Config for Test { impl origin::Config for Test {} impl pallet_test_notifier::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; } pub(crate) fn last_event() -> Event { diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs index 9599efcd7f29..9d126ff6b5c3 100644 --- a/xcm/xcm-builder/tests/mock/mod.rs +++ b/xcm/xcm-builder/tests/mock/mod.rs @@ -63,7 +63,7 @@ parameter_types! { impl frame_system::Config for Runtime { type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -71,7 +71,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -97,7 +97,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -161,7 +161,7 @@ pub type TrustedTeleporters = (xcm_builder::Case,); pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = TestSendXcm; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -180,7 +180,7 @@ impl xcm_executor::Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LocationInverter = LocationInverter; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = TestSendXcm; @@ -191,7 +191,7 @@ impl pallet_xcm::Config for Runtime { type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type Weigher = FixedWeightBounds; - type Call = Call; + type RuntimeCall = RuntimeCall; type Origin = Origin; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index 614d50e4fc6e..9a142220ce10 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -53,7 +53,7 @@ parameter_types! { impl frame_system::Config for Runtime { type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -87,7 +87,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -133,7 +133,7 @@ pub type Barrier = AllowUnpaidExecutionFrom; pub struct XcmConfig; impl Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToCallOrigin; @@ -289,14 +289,14 @@ pub mod mock_msg_queue { } impl mock_msg_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; @@ -307,7 +307,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs index a648ba96ba70..fd49ffe0c228 100644 --- a/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/xcm/xcm-simulator/example/src/relay_chain.rs @@ -44,7 +44,7 @@ parameter_types! { impl frame_system::Config for Runtime { type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -78,7 +78,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -125,7 +125,7 @@ pub type Barrier = AllowUnpaidExecutionFrom; pub struct XcmConfig; impl Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -144,7 +144,7 @@ impl Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -156,7 +156,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } @@ -166,7 +166,7 @@ parameter_types! { } impl ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index 3326875206b2..b746551348e0 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -53,7 +53,7 @@ parameter_types! { impl frame_system::Config for Runtime { type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -87,7 +87,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -133,7 +133,7 @@ pub type Barrier = AllowUnpaidExecutionFrom; pub struct XcmConfig; impl Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToCallOrigin; @@ -289,14 +289,14 @@ pub mod mock_msg_queue { } impl mock_msg_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; @@ -307,7 +307,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index a648ba96ba70..fd49ffe0c228 100644 --- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -44,7 +44,7 @@ parameter_types! { impl frame_system::Config for Runtime { type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -52,7 +52,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -78,7 +78,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -125,7 +125,7 @@ pub type Barrier = AllowUnpaidExecutionFrom; pub struct XcmConfig; impl Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = LocalOriginConverter; @@ -144,7 +144,7 @@ impl Config for XcmConfig { pub type LocalOriginToLocation = SignedToAccountId32; impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; type XcmRouter = XcmRouter; // Anyone can execute XCM messages locally... @@ -156,7 +156,7 @@ impl pallet_xcm::Config for Runtime { type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; - type Call = Call; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } @@ -166,7 +166,7 @@ parameter_types! { } impl ump::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UmpSink = ump::XcmSink, Runtime>; type FirstMessageFactorPercent = FirstMessageFactorPercent; type ExecuteOverweightOrigin = frame_system::EnsureRoot; From 78213479c2f5d425a4dab713f2e96b72ce583e72 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 25 Aug 2022 14:19:48 +0200 Subject: [PATCH 13/37] passing tests --- node/client/src/benchmarking.rs | 28 +-- node/test/service/src/lib.rs | 2 +- node/test/service/tests/call-function.rs | 2 +- runtime/common/src/assigned_slots.rs | 6 +- runtime/common/src/auctions.rs | 6 +- runtime/common/src/claims.rs | 18 +- runtime/common/src/crowdloan/mod.rs | 6 +- runtime/common/src/integration_tests.rs | 4 +- runtime/common/src/paras_registrar.rs | 10 +- runtime/common/src/purchase.rs | 4 +- runtime/common/src/slots/mod.rs | 6 +- runtime/kusama/src/governance/old.rs | 6 +- runtime/kusama/src/lib.rs | 142 +++++------ runtime/kusama/src/tests.rs | 2 +- runtime/kusama/src/weights/xcm/mod.rs | 10 +- runtime/kusama/src/xcm_config.rs | 6 +- runtime/parachains/src/disputes.rs | 2 +- runtime/parachains/src/hrmp.rs | 2 +- runtime/parachains/src/hrmp/benchmarking.rs | 4 +- runtime/parachains/src/inclusion/mod.rs | 2 +- runtime/parachains/src/mock.rs | 6 +- runtime/parachains/src/paras/benchmarking.rs | 4 +- runtime/parachains/src/paras/mod.rs | 2 +- runtime/parachains/src/paras/tests.rs | 2 +- runtime/parachains/src/runtime_api_impl/v2.rs | 2 +- runtime/parachains/src/ump.rs | 8 +- runtime/parachains/src/ump/benchmarking.rs | 4 +- runtime/polkadot/src/lib.rs | 223 +++++++++--------- runtime/polkadot/src/xcm_config.rs | 6 +- runtime/rococo/src/lib.rs | 42 ++-- runtime/rococo/src/validator_manager.rs | 2 +- runtime/rococo/src/xcm_config.rs | 6 +- runtime/test-runtime/src/lib.rs | 26 +- runtime/westend/src/lib.rs | 108 ++++----- runtime/westend/src/weights/xcm/mod.rs | 10 +- runtime/westend/src/xcm_config.rs | 6 +- utils/staking-miner/src/main.rs | 2 +- .../src/generic/benchmarking.rs | 2 +- xcm/pallet-xcm-benchmarks/src/generic/mod.rs | 2 +- xcm/pallet-xcm-benchmarks/src/lib.rs | 4 +- xcm/pallet-xcm/src/lib.rs | 22 +- xcm/pallet-xcm/src/mock.rs | 10 +- xcm/src/lib.rs | 70 +++--- xcm/src/v0/mod.rs | 20 +- xcm/src/v0/order.rs | 14 +- xcm/src/v0/traits.rs | 6 +- xcm/src/v1/mod.rs | 24 +- xcm/src/v1/order.rs | 18 +- xcm/src/v1/traits.rs | 6 +- xcm/src/v2/mod.rs | 40 ++-- xcm/src/v2/traits.rs | 6 +- xcm/xcm-builder/src/barriers.rs | 20 +- xcm/xcm-builder/tests/mock/mod.rs | 4 +- xcm/xcm-executor/src/config.rs | 6 +- xcm/xcm-executor/src/lib.rs | 22 +- xcm/xcm-executor/src/traits/should_execute.rs | 8 +- xcm/xcm-executor/src/traits/weight.rs | 6 +- xcm/xcm-simulator/example/src/lib.rs | 6 +- xcm/xcm-simulator/example/src/parachain.rs | 2 +- xcm/xcm-simulator/example/src/relay_chain.rs | 4 +- xcm/xcm-simulator/fuzzer/src/parachain.rs | 2 +- xcm/xcm-simulator/fuzzer/src/relay_chain.rs | 4 +- 62 files changed, 528 insertions(+), 527 deletions(-) diff --git a/node/client/src/benchmarking.rs b/node/client/src/benchmarking.rs index 02c0d316c0ad..7990bc88d218 100644 --- a/node/client/src/benchmarking.rs +++ b/node/client/src/benchmarking.rs @@ -49,9 +49,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder { fn build(&self, nonce: u32) -> std::result::Result { with_client! { self.client.as_ref(), client, { - use runtime::{Call, SystemCall}; + use runtime::{RuntimeCall, SystemCall}; - let call = Call::System(SystemCall::remark { remark: vec![] }); + let call = RuntimeCall::System(SystemCall::remark { remark: vec![] }); let signer = Sr25519Keyring::Bob.pair(); let period = polkadot_runtime_common::BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64; @@ -92,9 +92,9 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder { fn build(&self, nonce: u32) -> std::result::Result { with_client! { self.client.as_ref(), client, { - use runtime::{Call, BalancesCall}; + use runtime::{RuntimeCall, BalancesCall}; - let call = Call::Balances(BalancesCall::transfer_keep_alive { + let call = RuntimeCall::Balances(BalancesCall::transfer_keep_alive { dest: self.dest.clone().into(), value: self.value.into(), }); @@ -113,14 +113,14 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder { /// /// Should only be used for benchmarking since it makes strong assumptions /// about the chain state that these calls will be valid for. -trait BenchmarkCallSigner { +trait BenchmarkCallSigner { /// Signs a call together with the signed extensions of the specific runtime. /// /// Only works if the current block is the genesis block since the /// `CheckMortality` check is mocked by using the genesis block. fn sign_call( &self, - call: Call, + call: RuntimeCall, nonce: u32, current_block: u64, period: u64, @@ -130,12 +130,12 @@ trait BenchmarkCallSigner { } #[cfg(feature = "polkadot")] -impl BenchmarkCallSigner +impl BenchmarkCallSigner for FullClient { fn sign_call( &self, - call: polkadot_runtime::Call, + call: polkadot_runtime::RuntimeCall, nonce: u32, current_block: u64, period: u64, @@ -186,12 +186,12 @@ impl BenchmarkCallSigner } #[cfg(feature = "westend")] -impl BenchmarkCallSigner +impl BenchmarkCallSigner for FullClient { fn sign_call( &self, - call: westend_runtime::Call, + call: westend_runtime::RuntimeCall, nonce: u32, current_block: u64, period: u64, @@ -240,12 +240,12 @@ impl BenchmarkCallSigner } #[cfg(feature = "kusama")] -impl BenchmarkCallSigner +impl BenchmarkCallSigner for FullClient { fn sign_call( &self, - call: kusama_runtime::Call, + call: kusama_runtime::RuntimeCall, nonce: u32, current_block: u64, period: u64, @@ -294,12 +294,12 @@ impl BenchmarkCallSigner } #[cfg(feature = "rococo")] -impl BenchmarkCallSigner +impl BenchmarkCallSigner for FullClient { fn sign_call( &self, - call: rococo_runtime::Call, + call: rococo_runtime::RuntimeCall, nonce: u32, current_block: u64, period: u64, diff --git a/node/test/service/src/lib.rs b/node/test/service/src/lib.rs index 9b5e55289832..cd8345ca96c2 100644 --- a/node/test/service/src/lib.rs +++ b/node/test/service/src/lib.rs @@ -396,7 +396,7 @@ pub fn construct_transfer_extrinsic( dest: sp_keyring::AccountKeyring, value: Balance, ) -> UncheckedExtrinsic { - let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer { + let function = polkadot_test_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer { dest: MultiSigner::from(dest.public()).into_account().into(), value, }); diff --git a/node/test/service/tests/call-function.rs b/node/test/service/tests/call-function.rs index 5c149766c6fb..8678a0a08a2b 100644 --- a/node/test/service/tests/call-function.rs +++ b/node/test/service/tests/call-function.rs @@ -24,7 +24,7 @@ async fn call_function_actually_work() { let alice = run_validator_node(alice_config, None); - let function = polkadot_test_runtime::Call::Balances(pallet_balances::Call::transfer { + let function = polkadot_test_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer { dest: Charlie.to_account_id().into(), value: 1, }); diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs index 71723b6764f2..5964b19e5009 100644 --- a/runtime/common/src/assigned_slots.rs +++ b/runtime/common/src/assigned_slots.rs @@ -85,7 +85,7 @@ pub mod pallet { #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config + slots::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Origin for assigning slots. type AssignSlotOrigin: EnsureOrigin<::Origin>; @@ -579,10 +579,10 @@ mod tests { impl frame_system::offchain::SendTransactionTypes for Test where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } parameter_types! { diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index 1893bd17bdd6..633653952897 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -91,7 +91,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The type representing the leasing system. type Leaser: Leaser< @@ -1729,9 +1729,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index 9a2fad3054c1..4886be0bedd4 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -172,7 +172,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type VestingSchedule: VestingSchedule; #[pallet::constant] type Prefix: Get<&'static [u8]>; @@ -597,11 +597,11 @@ impl Pallet { #[scale_info(skip_type_params(T))] pub struct PrevalidateAttests(sp_std::marker::PhantomData) where - ::Call: IsSubType>; + ::RuntimeCall: IsSubType>; impl Debug for PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { #[cfg(feature = "std")] fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { @@ -616,7 +616,7 @@ where impl PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { /// Create new `SignedExtension` to check runtime version. pub fn new() -> Self { @@ -626,10 +626,10 @@ where impl SignedExtension for PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { type AccountId = T::AccountId; - type Call = ::Call; + type Call = ::RuntimeCall; type AdditionalSigned = (); type Pre = (); const IDENTIFIER: &'static str = "PrevalidateAttests"; @@ -1052,7 +1052,7 @@ mod tests { fn valid_attest_transactions_are_free() { new_test_ext().execute_with(|| { let p = PrevalidateAttests::::new(); - let c = Call::Claims(ClaimsCall::attest { + let c = RuntimeCall::Claims(ClaimsCall::attest { statement: StatementKind::Saft.to_text().to_vec(), }); let di = c.get_dispatch_info(); @@ -1066,13 +1066,13 @@ mod tests { fn invalid_attest_transactions_are_recognized() { new_test_ext().execute_with(|| { let p = PrevalidateAttests::::new(); - let c = Call::Claims(ClaimsCall::attest { + let c = RuntimeCall::Claims(ClaimsCall::attest { statement: StatementKind::Regular.to_text().to_vec(), }); let di = c.get_dispatch_info(); let r = p.validate(&42, &c, &di, 20); assert!(r.is_err()); - let c = Call::Claims(ClaimsCall::attest { + let c = RuntimeCall::Claims(ClaimsCall::attest { statement: StatementKind::Saft.to_text().to_vec(), }); let di = c.get_dispatch_info(); diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index d972ba7ccdfb..8b4bab260efb 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -189,7 +189,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// `PalletId` for the crowdloan pallet. An appropriate value could be `PalletId(*b"py/cfund")` #[pallet::constant] @@ -1906,9 +1906,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs index 1ae397fddc97..aab98333721c 100644 --- a/runtime/common/src/integration_tests.rs +++ b/runtime/common/src/integration_tests.rs @@ -92,10 +92,10 @@ frame_support::construct_runtime!( impl frame_system::offchain::SendTransactionTypes for Test where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } use crate::{auctions::Error as AuctionsError, crowdloan::Error as CrowdloanError}; diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index ee8b40953be5..f5930bd371a0 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -96,7 +96,7 @@ pub mod pallet { #[pallet::disable_frame_system_supertrait_check] pub trait Config: configuration::Config + paras::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The aggregated origin type must support the `parachains` origin. We require that we can /// infallibly convert between this origin and the system origin, but in reality, they're the @@ -631,10 +631,10 @@ mod tests { impl frame_system::offchain::SendTransactionTypes for Test where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } const NORMAL_RATIO: Perbill = Perbill::from_percent(75); @@ -1226,9 +1226,9 @@ mod benchmarking { use frame_benchmarking::{account, benchmarks, whitelisted_caller}; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 98133acaa46c..540f7c1be500 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -98,7 +98,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Balances Pallet type Currency: Currency; @@ -1081,7 +1081,7 @@ mod tests { ); // Vesting lock is removed in whole on block 101 (100 blocks after block 1) System::set_block_number(100); - let vest_call = Call::Vesting(pallet_vesting::Call::::vest {}); + let vest_call = RuntimeCall::Vesting(pallet_vesting::Call::::vest {}); assert_ok!(vest_call.clone().dispatch(Origin::signed(alice()))); assert_ok!(vest_call.clone().dispatch(Origin::signed(bob()))); assert_eq!(::VestingSchedule::vesting_balance(&alice()), Some(45)); diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs index 27b0ad0eb977..d2db2c1b7513 100644 --- a/runtime/common/src/slots/mod.rs +++ b/runtime/common/src/slots/mod.rs @@ -74,7 +74,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The currency type used for bidding. type Currency: ReservableCurrency; @@ -988,9 +988,9 @@ mod benchmarking { use crate::slots::Pallet as Slots; - fn assert_last_event(generic_event: ::Event) { + fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs index b36380b4b3fd..61a2f9074282 100644 --- a/runtime/kusama/src/governance/old.rs +++ b/runtime/kusama/src/governance/old.rs @@ -32,7 +32,7 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -93,7 +93,7 @@ parameter_types! { pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; @@ -149,7 +149,7 @@ parameter_types! { pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 577af74cc518..a3ddfa516538 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -146,8 +146,8 @@ pub fn native_version() -> NativeVersion { /// We currently allow all calls. pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(_c: &Call) -> bool { +impl Contains for BaseFilter { + fn contains(_c: &RuntimeCall) -> bool { true } } @@ -776,14 +776,14 @@ impl pallet_grandpa::Config for Runtime { /// format of the chain. impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: ::Index, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { use sp_runtime::traits::StaticLookup; // take the biggest period possible. let period = @@ -827,10 +827,10 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } parameter_types! { @@ -1000,86 +1000,86 @@ impl Default for ProxyType { } } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::NonTransfer => matches!( c, - Call::System(..) | - Call::Babe(..) | - Call::Timestamp(..) | - Call::Indices(pallet_indices::Call::claim {..}) | - Call::Indices(pallet_indices::Call::free {..}) | - Call::Indices(pallet_indices::Call::freeze {..}) | + RuntimeCall::System(..) | + RuntimeCall::Babe(..) | + RuntimeCall::Timestamp(..) | + RuntimeCall::Indices(pallet_indices::Call::claim {..}) | + RuntimeCall::Indices(pallet_indices::Call::free {..}) | + RuntimeCall::Indices(pallet_indices::Call::freeze {..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet - Call::Authorship(..) | - Call::Staking(..) | - Call::Session(..) | - Call::Grandpa(..) | - Call::ImOnline(..) | - Call::Democracy(..) | - Call::Council(..) | - Call::TechnicalCommittee(..) | - Call::PhragmenElection(..) | - Call::TechnicalMembership(..) | - Call::Treasury(..) | - Call::Bounties(..) | - Call::ChildBounties(..) | - Call::Tips(..) | - Call::Claims(..) | - Call::Utility(..) | - Call::Identity(..) | - Call::Society(..) | - Call::Recovery(pallet_recovery::Call::as_recovered {..}) | - Call::Recovery(pallet_recovery::Call::vouch_recovery {..}) | - Call::Recovery(pallet_recovery::Call::claim_recovery {..}) | - Call::Recovery(pallet_recovery::Call::close_recovery {..}) | - Call::Recovery(pallet_recovery::Call::remove_recovery {..}) | - Call::Recovery(pallet_recovery::Call::cancel_recovered {..}) | + RuntimeCall::Authorship(..) | + RuntimeCall::Staking(..) | + RuntimeCall::Session(..) | + RuntimeCall::Grandpa(..) | + RuntimeCall::ImOnline(..) | + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | + RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::TechnicalMembership(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Bounties(..) | + RuntimeCall::ChildBounties(..) | + RuntimeCall::Tips(..) | + RuntimeCall::Claims(..) | + RuntimeCall::Utility(..) | + RuntimeCall::Identity(..) | + RuntimeCall::Society(..) | + RuntimeCall::Recovery(pallet_recovery::Call::as_recovered {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::claim_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::close_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::remove_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::cancel_recovered {..}) | // Specifically omitting Recovery `create_recovery`, `initiate_recovery` - Call::Vesting(pallet_vesting::Call::vest {..}) | - Call::Vesting(pallet_vesting::Call::vest_other {..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest {..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest_other {..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - Call::Scheduler(..) | - Call::Proxy(..) | - Call::Multisig(..) | - Call::Gilt(..) | - Call::Registrar(paras_registrar::Call::register {..}) | - Call::Registrar(paras_registrar::Call::deregister {..}) | + RuntimeCall::Vesting(..) | + RuntimeCall::Proxy(..) | + RuntimeCall::Multisig(..) | + RuntimeCall::Gilt(..) | + RuntimeCall::Registrar(paras_registrar::Call::register {..}) | + RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) | // Specifically omitting Registrar `swap` - Call::Registrar(paras_registrar::Call::reserve {..}) | - Call::Crowdloan(..) | - Call::Slots(..) | - Call::Auctions(..) | // Specifically omitting the entire XCM Pallet - Call::VoterList(..) | - Call::NominationPools(..) + RuntimeCall::Registrar(paras_registrar::Call::reserve {..}) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Slots(..) | + RuntimeCall::Auctions(..) | // Specifically omitting the entire XCM Pallet + RuntimeCall::VoterList(..) | + RuntimeCall::NominationPools(..) ), ProxyType::Governance => matches!( c, - Call::Democracy(..) | - Call::Council(..) | Call::TechnicalCommittee(..) | - Call::PhragmenElection(..) | - Call::Treasury(..) | Call::Bounties(..) | - Call::Tips(..) | Call::Utility(..) | - Call::ChildBounties(..) + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::Treasury(..) | RuntimeCall::Bounties(..) | + RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | + RuntimeCall::ChildBounties(..) ), ProxyType::Staking => { - matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)) + matches!(c, RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..)) }, ProxyType::IdentityJudgement => matches!( c, - Call::Identity(pallet_identity::Call::provide_judgement { .. }) | Call::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - Call::Auctions(..) | Call::Crowdloan(..) | Call::Registrar(..) | Call::Slots(..) + RuntimeCall::Auctions(..) | RuntimeCall::Crowdloan(..) | RuntimeCall::Registrar(..) | RuntimeCall::Slots(..) ), - ProxyType::Society => matches!(c, Call::Society(..)), + ProxyType::Society => matches!(c, RuntimeCall::Society(..)), } } fn is_superset(&self, o: &Self) -> bool { @@ -1438,7 +1438,7 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -1449,7 +1449,7 @@ pub type Executive = frame_executive::Executive< (pallet_staking::migrations::v10::MigrateToV10,), >; /// The payload being signed in the transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; #[cfg(feature = "runtime-benchmarks")] #[macro_use] @@ -1621,7 +1621,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -1851,13 +1851,13 @@ sp_api::impl_runtime_apis! { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi for Runtime { - fn query_call_info(call: Call, len: u32) -> RuntimeDispatchInfo { + fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo { TransactionPayment::query_call_info(call, len) } - fn query_call_fee_details(call: Call, len: u32) -> FeeDetails { + fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails { TransactionPayment::query_call_fee_details(call, len) } } @@ -2093,7 +2093,7 @@ mod multiplier_tests { println!("calling {:?}", call); let info = call.get_dispatch_info(); // convert to outer call. - let call = Call::System(call); + let call = RuntimeCall::System(call); let len = call.using_encoded(|e| e.len()) as u32; let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() diff --git a/runtime/kusama/src/tests.rs b/runtime/kusama/src/tests.rs index 891aebe060ba..34ca6333fd29 100644 --- a/runtime/kusama/src/tests.rs +++ b/runtime/kusama/src/tests.rs @@ -87,7 +87,7 @@ fn transfer_cost_min_multiplier() { }; let info = call.get_dispatch_info(); // convert to outer call. - let call = Call::Balances(call); + let call = RuntimeCall::Balances(call); let len = call.using_encoded(|e| e.len()) as u32; let mut ext = sp_io::TestExternalities::new_empty(); diff --git a/runtime/kusama/src/weights/xcm/mod.rs b/runtime/kusama/src/weights/xcm/mod.rs index f266e076636f..8a7f3a0e9f07 100644 --- a/runtime/kusama/src/weights/xcm/mod.rs +++ b/runtime/kusama/src/weights/xcm/mod.rs @@ -64,8 +64,8 @@ impl WeighMultiAssets for MultiAssets { } } -pub struct KusamaXcmWeight(core::marker::PhantomData); -impl XcmWeightInfo for KusamaXcmWeight { +pub struct KusamaXcmWeight(core::marker::PhantomData); +impl XcmWeightInfo for KusamaXcmWeight { fn withdraw_asset(assets: &MultiAssets) -> Weight { assets.weigh_multi_assets(XcmBalancesWeight::::withdraw_asset()) } @@ -91,7 +91,7 @@ impl XcmWeightInfo for KusamaXcmWeight { fn transact( _origin_type: &OriginKind, _require_weight_at_most: &u64, - _call: &DoubleEncoded, + _call: &DoubleEncoded, ) -> Weight { XcmGeneric::::transact() } @@ -171,10 +171,10 @@ impl XcmWeightInfo for KusamaXcmWeight { fn refund_surplus() -> Weight { XcmGeneric::::refund_surplus() } - fn set_error_handler(_xcm: &Xcm) -> Weight { + fn set_error_handler(_xcm: &Xcm) -> Weight { XcmGeneric::::set_error_handler() } - fn set_appendix(_xcm: &Xcm) -> Weight { + fn set_appendix(_xcm: &Xcm) -> Weight { XcmGeneric::::set_appendix() } fn clear_error() -> Weight { diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 9e6c1902a51e..51af0bd9dc63 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configurations for the Kusama runtime. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, + parachains_origin, AccountId, Balances, RuntimeCall, CouncilCollective, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; @@ -139,7 +139,7 @@ impl xcm_executor::Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = - WeightInfoBounds, Call, MaxInstructions>; + WeightInfoBounds, RuntimeCall, MaxInstructions>; // The weight trader piggybacks on the existing transaction-fee conversion logic. type Trader = UsingComponents>; type ResponseHandler = XcmPallet; @@ -185,7 +185,7 @@ impl pallet_xcm::Config for Runtime { // Anyone is able to use reserve transfers regardless of who they are and what they want to // transfer. type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index aec60a4eb0f7..aac0c7944e02 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -410,7 +410,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config + session_info::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type RewardValidators: RewardValidators; type PunishValidators: PunishValidators; diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs index d18c2b3fc497..535780457633 100644 --- a/runtime/parachains/src/hrmp.rs +++ b/runtime/parachains/src/hrmp.rs @@ -239,7 +239,7 @@ pub mod pallet { frame_system::Config + configuration::Config + paras::Config + dmp::Config { /// The outer event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Origin: From + From<::Origin> diff --git a/runtime/parachains/src/hrmp/benchmarking.rs b/runtime/parachains/src/hrmp/benchmarking.rs index 3486e990fe57..125a56279944 100644 --- a/runtime/parachains/src/hrmp/benchmarking.rs +++ b/runtime/parachains/src/hrmp/benchmarking.rs @@ -39,9 +39,9 @@ fn register_parachain_with_balance(id: ParaId, balance: BalanceOf) T::Currency::make_free_balance_be(&id.into_account_truncating(), balance); } -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index c936b54eecfc..bc33ec8ca8be 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -198,7 +198,7 @@ pub mod pallet { + hrmp::Config + configuration::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type DisputesHandler: disputes::DisputesHandler; type RewardValidators: RewardValidators; } diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 2e524fa75ec0..916ee0be70d1 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -73,10 +73,10 @@ frame_support::construct_runtime!( impl frame_system::offchain::SendTransactionTypes for Test where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } parameter_types! { @@ -457,7 +457,7 @@ pub struct MockGenesisConfig { pub fn assert_last_event(generic_event: Event) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/paras/benchmarking.rs b/runtime/parachains/src/paras/benchmarking.rs index 9d31453638a7..9970937f4558 100644 --- a/runtime/parachains/src/paras/benchmarking.rs +++ b/runtime/parachains/src/paras/benchmarking.rs @@ -31,9 +31,9 @@ use self::pvf_check::{VoteCause, VoteOutcome}; // shouldn't exceed this number. const SAMPLE_SIZE: u32 = 1024; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs index 3c5b82479395..b7806ec8a38d 100644 --- a/runtime/parachains/src/paras/mod.rs +++ b/runtime/parachains/src/paras/mod.rs @@ -473,7 +473,7 @@ pub mod pallet { + shared::Config + frame_system::offchain::SendTransactionTypes> { - type Event: From + IsType<::Event>; + type RuntimeEvent: From + IsType<::RuntimeEvent>; #[pallet::constant] type UnsignedPriority: Get; diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs index 960132d5f804..83a452b28b3c 100644 --- a/runtime/parachains/src/paras/tests.rs +++ b/runtime/parachains/src/paras/tests.rs @@ -113,7 +113,7 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { /// An utility for checking that certain events were deposited. struct EventValidator { events: - Vec::Event, primitives::v2::Hash>>, + Vec::RuntimeEvent, primitives::v2::Hash>>, } impl EventValidator { diff --git a/runtime/parachains/src/runtime_api_impl/v2.rs b/runtime/parachains/src/runtime_api_impl/v2.rs index 20ee41636d81..77ea96742b54 100644 --- a/runtime/parachains/src/runtime_api_impl/v2.rs +++ b/runtime/parachains/src/runtime_api_impl/v2.rs @@ -323,7 +323,7 @@ pub fn candidate_pending_availability( pub fn candidate_events(extract_event: F) -> Vec> where T: initializer::Config, - F: Fn(::Event) -> Option>, + F: Fn(::RuntimeEvent) -> Option>, { use inclusion::Event as RawEvent; diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 7d40a99e9885..c514a465e4c5 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -93,7 +93,7 @@ fn upward_message_id(data: &[u8]) -> MessageId { sp_io::hashing::blake2_256(data) } -impl, C: Config> UmpSink for XcmSink { +impl, C: Config> UmpSink for XcmSink { fn process_upward_message( origin: ParaId, mut data: &[u8], @@ -106,13 +106,13 @@ impl, C: Config> UmpSink for XcmSi }; let id = upward_message_id(&data[..]); - let maybe_msg_and_weight = VersionedXcm::::decode_all_with_depth_limit( + let maybe_msg_and_weight = VersionedXcm::::decode_all_with_depth_limit( xcm::MAX_XCM_DECODE_DEPTH, &mut data, ) .map(|xcm| { ( - Xcm::::try_from(xcm), + Xcm::::try_from(xcm), // NOTE: We are overestimating slightly here. // The benchmark is timing this whole function with different message sizes and a NOOP extrinsic to // measure the size-dependent weight. But as we use the weight funtion **in** the benchmarked funtion we @@ -216,7 +216,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + configuration::Config { /// The aggregate event. - type Event: From + IsType<::Event>; + type RuntimeEvent: From + IsType<::RuntimeEvent>; /// A place where all received upward messages are funneled. type UmpSink: UmpSink; diff --git a/runtime/parachains/src/ump/benchmarking.rs b/runtime/parachains/src/ump/benchmarking.rs index 2c132324d44a..83b23067a199 100644 --- a/runtime/parachains/src/ump/benchmarking.rs +++ b/runtime/parachains/src/ump/benchmarking.rs @@ -18,9 +18,9 @@ use super::{Pallet as Ump, *}; use frame_system::RawOrigin; use xcm::prelude::*; -fn assert_last_event_type(generic_event: ::Event) { +fn assert_last_event_type(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(sp_std::mem::discriminant(event), sp_std::mem::discriminant(&system_event)); diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index b7dd4903d913..b5e63cc40d70 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -136,55 +136,56 @@ pub fn native_version() -> NativeVersion { } pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(call: &Call) -> bool { +impl Contains for BaseFilter { + fn contains(call: &RuntimeCall) -> bool { match call { // These modules are all allowed to be called by transactions: - Call::Democracy(_) | - Call::Council(_) | - Call::TechnicalCommittee(_) | - Call::TechnicalMembership(_) | - Call::Treasury(_) | - Call::PhragmenElection(_) | - Call::System(_) | - Call::Scheduler(_) | - Call::Preimage(_) | - Call::Indices(_) | - Call::Babe(_) | - Call::Timestamp(_) | - Call::Balances(_) | - Call::Authorship(_) | - Call::Staking(_) | - Call::Session(_) | - Call::Grandpa(_) | - Call::ImOnline(_) | - Call::Utility(_) | - Call::Claims(_) | - Call::Vesting(_) | - Call::Identity(_) | - Call::Proxy(_) | - Call::Multisig(_) | - Call::Bounties(_) | - Call::ChildBounties(_) | - Call::Tips(_) | - Call::ElectionProviderMultiPhase(_) | - Call::Configuration(_) | - Call::ParasShared(_) | - Call::ParaInclusion(_) | - Call::Paras(_) | - Call::Initializer(_) | - Call::ParaInherent(_) | - Call::ParasDisputes(_) | - Call::Dmp(_) | - Call::Ump(_) | - Call::Hrmp(_) | - Call::Slots(_) | - Call::Registrar(_) | - Call::Auctions(_) | - Call::Crowdloan(_) | - Call::VoterList(_) | - Call::XcmPallet(_) | - Call::NominationPools(_) => true, + RuntimeCall::Democracy(_) | + RuntimeCall::Council(_) | + RuntimeCall::TechnicalCommittee(_) | + RuntimeCall::TechnicalMembership(_) | + RuntimeCall::Treasury(_) | + RuntimeCall::PhragmenElection(_) | + RuntimeCall::System(_) | + RuntimeCall::Scheduler(_) | + RuntimeCall::Vesting(_) | + RuntimeCall::Preimage(_) | + RuntimeCall::Indices(_) | + RuntimeCall::Babe(_) | + RuntimeCall::Timestamp(_) | + RuntimeCall::Balances(_) | + RuntimeCall::Authorship(_) | + RuntimeCall::Staking(_) | + RuntimeCall::Session(_) | + RuntimeCall::Grandpa(_) | + RuntimeCall::ImOnline(_) | + RuntimeCall::Utility(_) | + RuntimeCall::Claims(_) | + RuntimeCall::Vesting(_) | + RuntimeCall::Identity(_) | + RuntimeCall::Proxy(_) | + RuntimeCall::Multisig(_) | + RuntimeCall::Bounties(_) | + RuntimeCall::ChildBounties(_) | + RuntimeCall::Tips(_) | + RuntimeCall::ElectionProviderMultiPhase(_) | + RuntimeCall::Configuration(_) | + RuntimeCall::ParasShared(_) | + RuntimeCall::ParaInclusion(_) | + RuntimeCall::Paras(_) | + RuntimeCall::Initializer(_) | + RuntimeCall::ParaInherent(_) | + RuntimeCall::ParasDisputes(_) | + RuntimeCall::Dmp(_) | + RuntimeCall::Ump(_) | + RuntimeCall::Hrmp(_) | + RuntimeCall::Slots(_) | + RuntimeCall::Registrar(_) | + RuntimeCall::Auctions(_) | + RuntimeCall::Crowdloan(_) | + RuntimeCall::VoterList(_) | + RuntimeCall::XcmPallet(_) | + RuntimeCall::NominationPools(_) => true, // All pallets are allowed, but exhaustive match is defensive // in the case of adding new pallets. } @@ -656,7 +657,7 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -727,7 +728,7 @@ parameter_types! { pub type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; @@ -783,7 +784,7 @@ parameter_types! { pub type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; @@ -954,14 +955,14 @@ impl pallet_grandpa::Config for Runtime { /// format of the chain. impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: ::Index, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { use sp_runtime::traits::StaticLookup; // take the biggest period possible. let period = @@ -1006,10 +1007,10 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } parameter_types! { @@ -1141,75 +1142,75 @@ impl Default for ProxyType { Self::Any } } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::NonTransfer => matches!( c, - Call::System(..) | - Call::Scheduler(..) | - Call::Babe(..) | - Call::Timestamp(..) | - Call::Indices(pallet_indices::Call::claim{..}) | - Call::Indices(pallet_indices::Call::free{..}) | - Call::Indices(pallet_indices::Call::freeze{..}) | + RuntimeCall::System(..) | + RuntimeCall::Vesting(..) | + RuntimeCall::Babe(..) | + RuntimeCall::Timestamp(..) | + RuntimeCall::Indices(pallet_indices::Call::claim{..}) | + RuntimeCall::Indices(pallet_indices::Call::free{..}) | + RuntimeCall::Indices(pallet_indices::Call::freeze{..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet - Call::Authorship(..) | - Call::Staking(..) | - Call::Session(..) | - Call::Grandpa(..) | - Call::ImOnline(..) | - Call::Democracy(..) | - Call::Council(..) | - Call::TechnicalCommittee(..) | - Call::PhragmenElection(..) | - Call::TechnicalMembership(..) | - Call::Treasury(..) | - Call::Bounties(..) | - Call::ChildBounties(..) | - Call::Tips(..) | - Call::Claims(..) | - Call::Vesting(pallet_vesting::Call::vest{..}) | - Call::Vesting(pallet_vesting::Call::vest_other{..}) | + RuntimeCall::Authorship(..) | + RuntimeCall::Staking(..) | + RuntimeCall::Session(..) | + RuntimeCall::Grandpa(..) | + RuntimeCall::ImOnline(..) | + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | + RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::TechnicalMembership(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Bounties(..) | + RuntimeCall::ChildBounties(..) | + RuntimeCall::Tips(..) | + RuntimeCall::Claims(..) | + RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - Call::Utility(..) | - Call::Identity(..) | - Call::Proxy(..) | - Call::Multisig(..) | - Call::Registrar(paras_registrar::Call::register {..}) | - Call::Registrar(paras_registrar::Call::deregister {..}) | + RuntimeCall::Utility(..) | + RuntimeCall::Identity(..) | + RuntimeCall::Proxy(..) | + RuntimeCall::Multisig(..) | + RuntimeCall::Registrar(paras_registrar::Call::register {..}) | + RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) | // Specifically omitting Registrar `swap` - Call::Registrar(paras_registrar::Call::reserve {..}) | - Call::Crowdloan(..) | - Call::Slots(..) | - Call::Auctions(..) | // Specifically omitting the entire XCM Pallet - Call::VoterList(..) | - Call::NominationPools(..) + RuntimeCall::Registrar(paras_registrar::Call::reserve {..}) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Slots(..) | + RuntimeCall::Auctions(..) | // Specifically omitting the entire XCM Pallet + RuntimeCall::VoterList(..) | + RuntimeCall::NominationPools(..) ), ProxyType::Governance => matches!( c, - Call::Democracy(..) | - Call::Council(..) | Call::TechnicalCommittee(..) | - Call::PhragmenElection(..) | - Call::Treasury(..) | Call::Bounties(..) | - Call::Tips(..) | Call::Utility(..) | - Call::ChildBounties(..) + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::Treasury(..) | RuntimeCall::Bounties(..) | + RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | + RuntimeCall::ChildBounties(..) ), ProxyType::Staking => { - matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)) + matches!(c, RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..)) }, ProxyType::IdentityJudgement => matches!( c, - Call::Identity(pallet_identity::Call::provide_judgement { .. }) | Call::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - Call::Auctions(..) | Call::Crowdloan(..) | Call::Registrar(..) | Call::Slots(..) + RuntimeCall::Auctions(..) | RuntimeCall::Crowdloan(..) | RuntimeCall::Registrar(..) | RuntimeCall::Slots(..) ), } } @@ -1563,7 +1564,7 @@ pub type SignedExtra = ( claims::PrevalidateAttests, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -1574,7 +1575,7 @@ pub type Executive = frame_executive::Executive< (pallet_staking::migrations::v10::MigrateToV10, InitiateNominationPools), >; /// The payload being signed in transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; #[cfg(feature = "runtime-benchmarks")] #[macro_use] @@ -1740,7 +1741,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -1970,13 +1971,13 @@ sp_api::impl_runtime_apis! { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi for Runtime { - fn query_call_info(call: Call, len: u32) -> RuntimeDispatchInfo { + fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo { TransactionPayment::query_call_info(call, len) } - fn query_call_fee_details(call: Call, len: u32) -> FeeDetails { + fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails { TransactionPayment::query_call_fee_details(call, len) } } @@ -2122,7 +2123,7 @@ mod test_fees { let info = call.get_dispatch_info(); println!("call = {:?} / info = {:?}", call, info); // convert to runtime call. - let call = Call::Balances(call); + let call = RuntimeCall::Balances(call); let extra: SignedExtra = ( frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), @@ -2306,7 +2307,7 @@ mod multiplier_tests { println!("calling {:?}", call); let info = call.get_dispatch_info(); // convert to outer call. - let call = Call::System(call); + let call = RuntimeCall::System(call); let len = call.using_encoded(|e| e.len()) as u32; let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index 9442d2ba12a2..19f252df150a 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configuration for Polkadot. use super::{ - parachains_origin, AccountId, Balances, Call, CouncilCollective, Event, Origin, ParaId, + parachains_origin, AccountId, Balances, RuntimeCall, CouncilCollective, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -142,7 +142,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; // The weight trader piggybacks on the existing transaction-fee conversion logic. type Trader = UsingComponents>; type ResponseHandler = XcmPallet; @@ -186,7 +186,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = xcm_executor::XcmExecutor; type XcmTeleportFilter = Everything; // == Allow All type XcmReserveTransferFilter = Everything; // == Allow All - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index f06a9bf4c019..9fa3a0a49646 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -142,7 +142,7 @@ pub type SignedExtra = ( ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -152,7 +152,7 @@ pub type Executive = frame_executive::Executive< AllPalletsWithSystem, >; /// The payload being signed in transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; impl_opaque_keys! { pub struct SessionKeys { @@ -242,8 +242,8 @@ construct_runtime! { } pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(_call: &Call) -> bool { +impl Contains for BaseFilter { + fn contains(_call: &RuntimeCall) -> bool { true } } @@ -290,14 +290,14 @@ parameter_types! { /// format of the chain. impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: ::Index, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { use sp_runtime::traits::StaticLookup; // take the biggest period possible. let period = @@ -403,9 +403,9 @@ impl pallet_balances::Config for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } @@ -820,19 +820,19 @@ impl Default for ProxyType { Self::Any } } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - Call::Auctions { .. } | - Call::Crowdloan { .. } | - Call::Registrar { .. } | - Call::Multisig(..) | Call::Slots { .. } + RuntimeCall::Auctions { .. } | + RuntimeCall::Crowdloan { .. } | + RuntimeCall::Registrar { .. } | + RuntimeCall::Multisig(..) | RuntimeCall::Slots { .. } ), } } @@ -867,7 +867,7 @@ parameter_types! { impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = MotionDuration; type MaxProposals = MaxProposals; @@ -1055,7 +1055,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -1308,13 +1308,13 @@ sp_api::impl_runtime_apis! { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi for Runtime { - fn query_call_info(call: Call, len: u32) -> RuntimeDispatchInfo { + fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo { TransactionPayment::query_call_info(call, len) } - fn query_call_fee_details(call: Call, len: u32) -> FeeDetails { + fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails { TransactionPayment::query_call_fee_details(call, len) } } diff --git a/runtime/rococo/src/validator_manager.rs b/runtime/rococo/src/validator_manager.rs index 2fd60b682ea5..b6b1b8c22d24 100644 --- a/runtime/rococo/src/validator_manager.rs +++ b/runtime/rococo/src/validator_manager.rs @@ -37,7 +37,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_session::Config { /// The overreaching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Privileged origin that can add or remove validators. type PrivilegedOrigin: EnsureOrigin<::Origin>; diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 9fb7e847230f..bb3994f459ce 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configuration for Rococo. use super::{ - parachains_origin, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, WeightToFee, + parachains_origin, AccountId, Balances, RuntimeCall, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -128,7 +128,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = UsingComponents>; type ResponseHandler = XcmPallet; type AssetTrap = XcmPallet; @@ -161,7 +161,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = xcm_executor::XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 15ffeccdd739..f52137f77d19 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -160,9 +160,9 @@ impl frame_system::Config for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } @@ -383,14 +383,14 @@ impl pallet_grandpa::Config for Runtime { impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: ::Index, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { let period = BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64; @@ -589,10 +589,10 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + pallet_xcm::Config { - type Event: IsType<::Event> + From>; + type RuntimeEvent: IsType<::RuntimeEvent> + From>; type Origin: IsType<::Origin> + Into::Origin>>; - type Call: IsType<::Call> + From>; + type RuntimeCall: IsType<::RuntimeCall> + From>; } #[pallet::event] @@ -635,7 +635,7 @@ pub mod pallet_test_notifier { Call::::notification_received { query_id: 0, response: Default::default() }; let qid = pallet_xcm::Pallet::::new_notify_query( Junction::AccountId32 { network: Any, id }.into(), - ::Call::from(call), + ::RuntimeCall::from(call), 100u32.into(), ); Self::deposit_event(Event::::NotifyQueryPrepared(qid)); @@ -732,7 +732,7 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -742,7 +742,7 @@ pub type Executive = frame_executive::Executive< AllPalletsWithSystem, >; /// The payload being signed in transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; pub type Hash = ::Hash; pub type Extrinsic = ::Extrinsic; @@ -1065,13 +1065,13 @@ sp_api::impl_runtime_apis! { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi for Runtime { - fn query_call_info(call: Call, len: u32) -> RuntimeDispatchInfo { + fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo { TransactionPayment::query_call_info(call, len) } - fn query_call_fee_details(call: Call, len: u32) -> FeeDetails { + fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails { TransactionPayment::query_call_fee_details(call, len) } } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 64bba64519ec..769a8a30bc02 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -131,8 +131,8 @@ pub fn native_version() -> NativeVersion { /// Allow everything. pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(_: &Call) -> bool { +impl Contains for BaseFilter { + fn contains(_: &RuntimeCall) -> bool { true } } @@ -579,14 +579,14 @@ impl pallet_grandpa::Config for Runtime { /// format of the chain. impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: ::Index, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { use sp_runtime::traits::StaticLookup; // take the biggest period possible. let period = @@ -630,9 +630,9 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } @@ -761,71 +761,71 @@ impl Default for ProxyType { Self::Any } } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::NonTransfer => matches!( c, - Call::System(..) | - Call::Babe(..) | - Call::Timestamp(..) | - Call::Indices(pallet_indices::Call::claim{..}) | - Call::Indices(pallet_indices::Call::free{..}) | - Call::Indices(pallet_indices::Call::freeze{..}) | + RuntimeCall::System(..) | + RuntimeCall::Babe(..) | + RuntimeCall::Timestamp(..) | + RuntimeCall::Indices(pallet_indices::Call::claim{..}) | + RuntimeCall::Indices(pallet_indices::Call::free{..}) | + RuntimeCall::Indices(pallet_indices::Call::freeze{..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet - Call::Authorship(..) | - Call::Staking(..) | - Call::Session(..) | - Call::Grandpa(..) | - Call::ImOnline(..) | - Call::Utility(..) | - Call::Identity(..) | - Call::Recovery(pallet_recovery::Call::as_recovered{..}) | - Call::Recovery(pallet_recovery::Call::vouch_recovery{..}) | - Call::Recovery(pallet_recovery::Call::claim_recovery{..}) | - Call::Recovery(pallet_recovery::Call::close_recovery{..}) | - Call::Recovery(pallet_recovery::Call::remove_recovery{..}) | - Call::Recovery(pallet_recovery::Call::cancel_recovered{..}) | + RuntimeCall::Authorship(..) | + RuntimeCall::Staking(..) | + RuntimeCall::Session(..) | + RuntimeCall::Grandpa(..) | + RuntimeCall::ImOnline(..) | + RuntimeCall::Utility(..) | + RuntimeCall::Identity(..) | + RuntimeCall::Recovery(pallet_recovery::Call::as_recovered{..}) | + RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery{..}) | + RuntimeCall::Recovery(pallet_recovery::Call::claim_recovery{..}) | + RuntimeCall::Recovery(pallet_recovery::Call::close_recovery{..}) | + RuntimeCall::Recovery(pallet_recovery::Call::remove_recovery{..}) | + RuntimeCall::Recovery(pallet_recovery::Call::cancel_recovered{..}) | // Specifically omitting Recovery `create_recovery`, `initiate_recovery` - Call::Vesting(pallet_vesting::Call::vest{..}) | - Call::Vesting(pallet_vesting::Call::vest_other{..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - Call::Scheduler(..) | + RuntimeCall::Vesting(..) | // Specifically omitting Sudo pallet - Call::Proxy(..) | - Call::Multisig(..) | - Call::Registrar(paras_registrar::Call::register{..}) | - Call::Registrar(paras_registrar::Call::deregister{..}) | + RuntimeCall::Proxy(..) | + RuntimeCall::Multisig(..) | + RuntimeCall::Registrar(paras_registrar::Call::register{..}) | + RuntimeCall::Registrar(paras_registrar::Call::deregister{..}) | // Specifically omitting Registrar `swap` - Call::Registrar(paras_registrar::Call::reserve{..}) | - Call::Crowdloan(..) | - Call::Slots(..) | - Call::Auctions(..) | // Specifically omitting the entire XCM Pallet - Call::VoterList(..) | - Call::NominationPools(..) + RuntimeCall::Registrar(paras_registrar::Call::reserve{..}) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Slots(..) | + RuntimeCall::Auctions(..) | // Specifically omitting the entire XCM Pallet + RuntimeCall::VoterList(..) | + RuntimeCall::NominationPools(..) ), ProxyType::Staking => { - matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)) + matches!(c, RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..)) }, ProxyType::SudoBalances => match c { - Call::Sudo(pallet_sudo::Call::sudo { call: ref x }) => { - matches!(x.as_ref(), &Call::Balances(..)) + RuntimeCall::Sudo(pallet_sudo::Call::sudo { call: ref x }) => { + matches!(x.as_ref(), &RuntimeCall::Balances(..)) }, - Call::Utility(..) => true, + RuntimeCall::Utility(..) => true, _ => false, }, ProxyType::IdentityJudgement => matches!( c, - Call::Identity(pallet_identity::Call::provide_judgement { .. }) | Call::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - Call::Auctions(..) | Call::Crowdloan(..) | Call::Registrar(..) | Call::Slots(..) + RuntimeCall::Auctions(..) | RuntimeCall::Crowdloan(..) | RuntimeCall::Registrar(..) | RuntimeCall::Slots(..) ), } } @@ -1152,7 +1152,7 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -1163,7 +1163,7 @@ pub type Executive = frame_executive::Executive< (pallet_staking::migrations::v10::MigrateToV10,), >; /// The payload being signed in transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; #[cfg(feature = "runtime-benchmarks")] #[macro_use] @@ -1324,7 +1324,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::ParaInclusion(ev) => { + RuntimeEvent::ParaInclusion(ev) => { Some(ev) } _ => None, @@ -1561,13 +1561,13 @@ sp_api::impl_runtime_apis! { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi for Runtime { - fn query_call_info(call: Call, len: u32) -> RuntimeDispatchInfo { + fn query_call_info(call: RuntimeCall, len: u32) -> RuntimeDispatchInfo { TransactionPayment::query_call_info(call, len) } - fn query_call_fee_details(call: Call, len: u32) -> FeeDetails { + fn query_call_fee_details(call: RuntimeCall, len: u32) -> FeeDetails { TransactionPayment::query_call_fee_details(call, len) } } diff --git a/runtime/westend/src/weights/xcm/mod.rs b/runtime/westend/src/weights/xcm/mod.rs index a06120b7b0ad..386418653ba2 100644 --- a/runtime/westend/src/weights/xcm/mod.rs +++ b/runtime/westend/src/weights/xcm/mod.rs @@ -64,8 +64,8 @@ impl WeighMultiAssets for MultiAssets { } } -pub struct WestendXcmWeight(core::marker::PhantomData); -impl XcmWeightInfo for WestendXcmWeight { +pub struct WestendXcmWeight(core::marker::PhantomData); +impl XcmWeightInfo for WestendXcmWeight { fn withdraw_asset(assets: &MultiAssets) -> Weight { assets.weigh_multi_assets(XcmBalancesWeight::::withdraw_asset()) } @@ -91,7 +91,7 @@ impl XcmWeightInfo for WestendXcmWeight { fn transact( _origin_type: &OriginKind, _require_weight_at_most: &u64, - _call: &DoubleEncoded, + _call: &DoubleEncoded, ) -> Weight { XcmGeneric::::transact() } @@ -171,10 +171,10 @@ impl XcmWeightInfo for WestendXcmWeight { fn refund_surplus() -> Weight { XcmGeneric::::refund_surplus() } - fn set_error_handler(_xcm: &Xcm) -> Weight { + fn set_error_handler(_xcm: &Xcm) -> Weight { XcmGeneric::::set_error_handler() } - fn set_appendix(_xcm: &Xcm) -> Weight { + fn set_appendix(_xcm: &Xcm) -> Weight { XcmGeneric::::set_appendix() } fn clear_error() -> Weight { diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index 3340a36da2fc..8a1d03e77088 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -17,7 +17,7 @@ //! XCM configurations for Westend. use super::{ - parachains_origin, weights, AccountId, Balances, Call, Event, Origin, ParaId, Runtime, + parachains_origin, weights, AccountId, Balances, RuntimeCall, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, XcmPallet, }; use frame_support::{ @@ -115,7 +115,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = WeightInfoBounds, Call, MaxInstructions>; + type Weigher = WeightInfoBounds, RuntimeCall, MaxInstructions>; type Trader = UsingComponents>; type ResponseHandler = XcmPallet; type AssetTrap = XcmPallet; @@ -141,7 +141,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = xcm_executor::XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = WeightInfoBounds, Call, MaxInstructions>; + type Weigher = WeightInfoBounds, RuntimeCall, MaxInstructions>; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/utils/staking-miner/src/main.rs b/utils/staking-miner/src/main.rs index 971e771e0073..43b3d51b1a06 100644 --- a/utils/staking-miner/src/main.rs +++ b/utils/staking-miner/src/main.rs @@ -94,7 +94,7 @@ macro_rules! construct_runtime_prelude { let crate::signer::Signer { account, pair, .. } = signer; let local_call = EPMCall::::submit { raw_solution: Box::new(raw_solution) }; - let call: Call = as std::convert::TryInto>::try_into(local_call) + let call: RuntimeCall = as std::convert::TryInto>::try_into(local_call) .expect("election provider pallet must exist in the runtime, thus \ inner call can be converted, qed." ); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs b/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs index 62d0df265c42..e868431908e3 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs @@ -108,7 +108,7 @@ benchmarks! { transact { let origin = T::transact_origin()?; let mut executor = new_executor::(origin); - let noop_call: ::Call = frame_system::Call::remark_with_event { + let noop_call: ::RuntimeCall = frame_system::Call::remark_with_event { remark: Default::default() }.into(); let double_encoded_noop_call: DoubleEncoded<_> = noop_call.encode().into(); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mod.rs b/xcm/pallet-xcm-benchmarks/src/generic/mod.rs index 270eaf896e7e..9b8b718c6bd4 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mod.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mod.rs @@ -12,7 +12,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + crate::Config { - type Call: Dispatchable + type RuntimeCall: Dispatchable + GetDispatchInfo + From> + Encode; diff --git a/xcm/pallet-xcm-benchmarks/src/lib.rs b/xcm/pallet-xcm-benchmarks/src/lib.rs index 8492dac5a622..352f7376ef46 100644 --- a/xcm/pallet-xcm-benchmarks/src/lib.rs +++ b/xcm/pallet-xcm-benchmarks/src/lib.rs @@ -54,11 +54,11 @@ const SEED: u32 = 0; /// The XCM executor to use for doing stuff. pub type ExecutorOf = xcm_executor::XcmExecutor<::XcmConfig>; /// The overarching call type. -pub type OverArchingCallOf = ::Call; +pub type OverArchingCallOf = ::RuntimeCall; /// The asset transactor of our executor pub type AssetTransactorOf = <::XcmConfig as xcm_executor::Config>::AssetTransactor; /// The call type of executor's config. Should eventually resolve to the same overarching call type. -pub type XcmCallOf = <::XcmConfig as xcm_executor::Config>::Call; +pub type XcmCallOf = <::XcmConfig as xcm_executor::Config>::RuntimeCall; pub fn mock_worst_case_holding() -> MultiAssets { const HOLDING_FUNGIBLES: u32 = 99; diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index c237fc702a4a..de43d45642ce 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -71,7 +71,7 @@ pub mod pallet { /// The module configuration trait. pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Required origin for sending XCM messages. If successful, it resolves to `MultiLocation` /// which exists as an interior location within this chain's XCM context. @@ -86,10 +86,10 @@ pub mod pallet { type ExecuteXcmOrigin: EnsureOrigin<::Origin, Success = MultiLocation>; /// Our XCM filter which messages to be executed using `XcmExecutor` must pass. - type XcmExecuteFilter: Contains<(MultiLocation, Xcm<::Call>)>; + type XcmExecuteFilter: Contains<(MultiLocation, Xcm<::RuntimeCall>)>; /// Something to execute an XCM message. - type XcmExecutor: ExecuteXcm<::Call>; + type XcmExecutor: ExecuteXcm<::RuntimeCall>; /// Our XCM filter which messages to be teleported using the dedicated extrinsic must pass. type XcmTeleportFilter: Contains<(MultiLocation, Vec)>; @@ -98,7 +98,7 @@ pub mod pallet { type XcmReserveTransferFilter: Contains<(MultiLocation, Vec)>; /// Means of measuring the weight consumed by an XCM message locally. - type Weigher: WeightBounds<::Call>; + type Weigher: WeightBounds<::RuntimeCall>; /// Means of inverting a location. type LocationInverter: InvertLocation; @@ -107,9 +107,9 @@ pub mod pallet { type Origin: From + From<::Origin>; /// The outer `Call` type. - type Call: Parameter + type RuntimeCall: Parameter + GetDispatchInfo - + IsType<::Call> + + IsType<::RuntimeCall> + Dispatchable::Origin, PostInfo = PostDispatchInfo>; const VERSION_DISCOVERY_QUEUE_SIZE: u32; @@ -564,7 +564,7 @@ pub mod pallet { #[pallet::weight(max_weight.saturating_add(100_000_000u64))] pub fn execute( origin: OriginFor, - message: Box::Call>>, + message: Box::RuntimeCall>>, max_weight: Weight, ) -> DispatchResultWithPostInfo { let origin_location = T::ExecuteXcmOrigin::ensure_origin(origin)?; @@ -1142,13 +1142,13 @@ pub mod pallet { pub fn report_outcome_notify( message: &mut Xcm<()>, responder: impl Into, - notify: impl Into<::Call>, + notify: impl Into<::RuntimeCall>, timeout: T::BlockNumber, ) -> Result<(), XcmError> { let responder = responder.into(); let dest = T::LocationInverter::invert_location(&responder) .map_err(|()| XcmError::MultiLocationNotInvertible)?; - let notify: ::Call = notify.into(); + let notify: ::RuntimeCall = notify.into(); let max_response_weight = notify.get_dispatch_info().weight; let query_id = Self::new_notify_query(responder, notify, timeout); let report_error = Xcm(vec![ReportError { dest, query_id, max_response_weight }]); @@ -1165,7 +1165,7 @@ pub mod pallet { /// which will call a dispatchable when a response happens. pub fn new_notify_query( responder: impl Into, - notify: impl Into<::Call>, + notify: impl Into<::RuntimeCall>, timeout: T::BlockNumber, ) -> u64 { let notify = @@ -1396,7 +1396,7 @@ pub mod pallet { // So we just encode that and then re-encode to a real Call. let bare = (pallet_index, call_index, query_id, response); if let Ok(call) = bare - .using_encoded(|mut bytes| ::Call::decode(&mut bytes)) + .using_encoded(|mut bytes| ::RuntimeCall::decode(&mut bytes)) { Queries::::remove(query_id); let weight = call.get_dispatch_info().weight; diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index 042073fbf217..e75bd5a39337 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -51,10 +51,10 @@ pub mod pallet_test_notifier { #[pallet::config] pub trait Config: frame_system::Config + crate::Config { - type Event: IsType<::Event> + From>; + type RuntimeEvent: IsType<::RuntimeEvent> + From>; type Origin: IsType<::Origin> + Into::Origin>>; - type Call: IsType<::Call> + From>; + type RuntimeCall: IsType<::RuntimeCall> + From>; } #[pallet::event] @@ -97,7 +97,7 @@ pub mod pallet_test_notifier { Call::::notification_received { query_id: 0, response: Default::default() }; let qid = crate::Pallet::::new_notify_query( Junction::AccountId32 { network: Any, id }.into(), - ::Call::from(call), + ::RuntimeCall::from(call), 100u32.into(), ); Self::deposit_event(Event::::NotifyQueryPrepared(qid)); @@ -259,7 +259,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = Case; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = FixedRateOfFungible; type ResponseHandler = XcmPallet; type AssetTrap = XcmPallet; @@ -282,7 +282,7 @@ impl pallet_xcm::Config for Test { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/xcm/src/lib.rs b/xcm/src/lib.rs index 37157f2c3499..6396f2228e33 100644 --- a/xcm/src/lib.rs +++ b/xcm/src/lib.rs @@ -308,11 +308,11 @@ impl TryFrom for v1::MultiAssets { #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub enum VersionedXcm { - V0(v0::Xcm), - V1(v1::Xcm), - V2(v2::Xcm), +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub enum VersionedXcm { + V0(v0::Xcm), + V1(v1::Xcm), + V2(v2::Xcm), } impl IntoVersion for VersionedXcm { @@ -326,27 +326,27 @@ impl IntoVersion for VersionedXcm { } } -impl From> for VersionedXcm { - fn from(x: v0::Xcm) -> Self { +impl From> for VersionedXcm { + fn from(x: v0::Xcm) -> Self { VersionedXcm::V0(x) } } -impl From> for VersionedXcm { - fn from(x: v1::Xcm) -> Self { +impl From> for VersionedXcm { + fn from(x: v1::Xcm) -> Self { VersionedXcm::V1(x) } } -impl From> for VersionedXcm { - fn from(x: v2::Xcm) -> Self { +impl From> for VersionedXcm { + fn from(x: v2::Xcm) -> Self { VersionedXcm::V2(x) } } -impl TryFrom> for v0::Xcm { +impl TryFrom> for v0::Xcm { type Error = (); - fn try_from(x: VersionedXcm) -> Result { + fn try_from(x: VersionedXcm) -> Result { use VersionedXcm::*; match x { V0(x) => Ok(x), @@ -356,9 +356,9 @@ impl TryFrom> for v0::Xcm { } } -impl TryFrom> for v1::Xcm { +impl TryFrom> for v1::Xcm { type Error = (); - fn try_from(x: VersionedXcm) -> Result { + fn try_from(x: VersionedXcm) -> Result { use VersionedXcm::*; match x { V0(x) => x.try_into(), @@ -368,9 +368,9 @@ impl TryFrom> for v1::Xcm { } } -impl TryFrom> for v2::Xcm { +impl TryFrom> for v2::Xcm { type Error = (); - fn try_from(x: VersionedXcm) -> Result { + fn try_from(x: VersionedXcm) -> Result { use VersionedXcm::*; match x { V0(x) => V1(x.try_into()?).try_into(), @@ -382,18 +382,18 @@ impl TryFrom> for v2::Xcm { /// Convert an `Xcm` datum into a `VersionedXcm`, based on a destination `MultiLocation` which will interpret it. pub trait WrapVersion { - fn wrap_version( + fn wrap_version( dest: &latest::MultiLocation, - xcm: impl Into>, - ) -> Result, ()>; + xcm: impl Into>, + ) -> Result, ()>; } /// `()` implementation does nothing with the XCM, just sending with whatever version it was authored as. impl WrapVersion for () { - fn wrap_version( + fn wrap_version( _: &latest::MultiLocation, - xcm: impl Into>, - ) -> Result, ()> { + xcm: impl Into>, + ) -> Result, ()> { Ok(xcm.into()) } } @@ -401,33 +401,33 @@ impl WrapVersion for () { /// `WrapVersion` implementation which attempts to always convert the XCM to version 0 before wrapping it. pub struct AlwaysV0; impl WrapVersion for AlwaysV0 { - fn wrap_version( + fn wrap_version( _: &latest::MultiLocation, - xcm: impl Into>, - ) -> Result, ()> { - Ok(VersionedXcm::::V0(xcm.into().try_into()?)) + xcm: impl Into>, + ) -> Result, ()> { + Ok(VersionedXcm::::V0(xcm.into().try_into()?)) } } /// `WrapVersion` implementation which attempts to always convert the XCM to version 1 before wrapping it. pub struct AlwaysV1; impl WrapVersion for AlwaysV1 { - fn wrap_version( + fn wrap_version( _: &latest::MultiLocation, - xcm: impl Into>, - ) -> Result, ()> { - Ok(VersionedXcm::::V1(xcm.into().try_into()?)) + xcm: impl Into>, + ) -> Result, ()> { + Ok(VersionedXcm::::V1(xcm.into().try_into()?)) } } /// `WrapVersion` implementation which attempts to always convert the XCM to version 2 before wrapping it. pub struct AlwaysV2; impl WrapVersion for AlwaysV2 { - fn wrap_version( + fn wrap_version( _: &latest::MultiLocation, - xcm: impl Into>, - ) -> Result, ()> { - Ok(VersionedXcm::::V2(xcm.into().try_into()?)) + xcm: impl Into>, + ) -> Result, ()> { + Ok(VersionedXcm::::V2(xcm.into().try_into()?)) } } diff --git a/xcm/src/v0/mod.rs b/xcm/src/v0/mod.rs index 08db57c2e061..57df14cbacb6 100644 --- a/xcm/src/v0/mod.rs +++ b/xcm/src/v0/mod.rs @@ -97,8 +97,8 @@ pub enum Response { #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub enum Xcm { +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub enum Xcm { /// Withdraw asset(s) (`assets`) from the ownership of `origin` and place them into `holding`. Execute the /// orders (`effects`). /// @@ -109,7 +109,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 0)] - WithdrawAsset { assets: Vec, effects: Vec> }, + WithdrawAsset { assets: Vec, effects: Vec> }, /// Asset(s) (`assets`) have been received into the ownership of this system on the `origin` system. /// @@ -126,7 +126,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 1)] - ReserveAssetDeposit { assets: Vec, effects: Vec> }, + ReserveAssetDeposit { assets: Vec, effects: Vec> }, /// Asset(s) (`assets`) have been destroyed on the `origin` system and equivalent assets should be /// created on this system. @@ -144,7 +144,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 2)] - TeleportAsset { assets: Vec, effects: Vec> }, + TeleportAsset { assets: Vec, effects: Vec> }, /// Indication of the contents of the holding account corresponding to the `QueryHolding` order of `query_id`. /// @@ -209,7 +209,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 6)] - Transact { origin_type: OriginKind, require_weight_at_most: u64, call: DoubleEncoded }, + Transact { origin_type: OriginKind, require_weight_at_most: u64, call: DoubleEncoded }, /// A message to notify about a new incoming HRMP channel. This message is meant to be sent by the /// relay-chain to a para. @@ -276,10 +276,10 @@ pub enum Xcm { /// /// Errors: #[codec(index = 10)] - RelayedFrom { who: MultiLocation, message: alloc::boxed::Box> }, + RelayedFrom { who: MultiLocation, message: alloc::boxed::Box> }, } -impl Xcm { +impl Xcm { pub fn into(self) -> Xcm { Xcm::from(self) } @@ -330,9 +330,9 @@ impl TryFrom for Response { } } -impl TryFrom> for Xcm { +impl TryFrom> for Xcm { type Error = (); - fn try_from(x: Xcm1) -> result::Result, ()> { + fn try_from(x: Xcm1) -> result::Result, ()> { use Xcm::*; Ok(match x { Xcm1::WithdrawAsset { assets, effects } => WithdrawAsset { diff --git a/xcm/src/v0/order.rs b/xcm/src/v0/order.rs index c55a61f6ffe9..306610c28c9c 100644 --- a/xcm/src/v0/order.rs +++ b/xcm/src/v0/order.rs @@ -27,8 +27,8 @@ use parity_scale_codec::{self, Decode, Encode}; #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub enum Order { +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub enum Order { /// Do nothing. Not generally used. #[codec(index = 0)] Null, @@ -122,7 +122,7 @@ pub enum Order { weight: u64, debt: u64, halt_on_error: bool, - xcm: Vec>, + xcm: Vec>, }, } @@ -130,7 +130,7 @@ pub mod opaque { pub type Order = super::Order<()>; } -impl Order { +impl Order { pub fn into(self) -> Order { Order::from(self) } @@ -155,9 +155,9 @@ impl Order { } } -impl TryFrom> for Order { +impl TryFrom> for Order { type Error = (); - fn try_from(old: Order1) -> result::Result, ()> { + fn try_from(old: Order1) -> result::Result, ()> { use Order::*; Ok(match old { Order1::Noop => Null, @@ -195,7 +195,7 @@ impl TryFrom> for Order { Order1::BuyExecution { fees, weight, debt, halt_on_error, instructions } => { let xcm = instructions .into_iter() - .map(Xcm::::try_from) + .map(Xcm::::try_from) .collect::>()?; BuyExecution { fees: fees.try_into()?, weight, debt, halt_on_error, xcm } }, diff --git a/xcm/src/v0/traits.rs b/xcm/src/v0/traits.rs index cfbc6a2e6a8f..0b1bc19cf297 100644 --- a/xcm/src/v0/traits.rs +++ b/xcm/src/v0/traits.rs @@ -139,11 +139,11 @@ impl Outcome { } /// Type of XCM message executor. -pub trait ExecuteXcm { +pub trait ExecuteXcm { /// Execute some XCM `message` from `origin` using no more than `weight_limit` weight. The weight limit is /// a basic hard-limit and the implementation may place further restrictions or requirements on weight and /// other aspects. - fn execute_xcm(origin: MultiLocation, message: Xcm, weight_limit: Weight) -> Outcome { + fn execute_xcm(origin: MultiLocation, message: Xcm, weight_limit: Weight) -> Outcome { log::debug!( target: "xcm::execute_xcm", "origin: {:?}, message: {:?}, weight_limit: {:?}", @@ -160,7 +160,7 @@ pub trait ExecuteXcm { /// execution without associated payment. fn execute_xcm_in_credit( origin: MultiLocation, - message: Xcm, + message: Xcm, weight_limit: Weight, weight_credit: Weight, ) -> Outcome; diff --git a/xcm/src/v1/mod.rs b/xcm/src/v1/mod.rs index 83b1124904e5..02d62de59995 100644 --- a/xcm/src/v1/mod.rs +++ b/xcm/src/v1/mod.rs @@ -136,8 +136,8 @@ pub enum Response { #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub enum Xcm { +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub enum Xcm { /// Withdraw asset(s) (`assets`) from the ownership of `origin` and place them into `holding`. Execute the /// orders (`effects`). /// @@ -148,7 +148,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 0)] - WithdrawAsset { assets: MultiAssets, effects: Vec> }, + WithdrawAsset { assets: MultiAssets, effects: Vec> }, /// Asset(s) (`assets`) have been received into the ownership of this system on the `origin` system. /// @@ -165,7 +165,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 1)] - ReserveAssetDeposited { assets: MultiAssets, effects: Vec> }, + ReserveAssetDeposited { assets: MultiAssets, effects: Vec> }, /// Asset(s) (`assets`) have been destroyed on the `origin` system and equivalent assets should be /// created on this system. @@ -183,7 +183,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 2)] - ReceiveTeleportedAsset { assets: MultiAssets, effects: Vec> }, + ReceiveTeleportedAsset { assets: MultiAssets, effects: Vec> }, /// Indication of the contents of the holding register corresponding to the `QueryHolding` order of `query_id`. /// @@ -249,7 +249,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 6)] - Transact { origin_type: OriginKind, require_weight_at_most: u64, call: DoubleEncoded }, + Transact { origin_type: OriginKind, require_weight_at_most: u64, call: DoubleEncoded }, /// A message to notify about a new incoming HRMP channel. This message is meant to be sent by the /// relay-chain to a para. @@ -313,7 +313,7 @@ pub enum Xcm { /// /// Errors: #[codec(index = 10)] - RelayedFrom { who: InteriorMultiLocation, message: alloc::boxed::Box> }, + RelayedFrom { who: InteriorMultiLocation, message: alloc::boxed::Box> }, /// Ask the destination system to respond with the most recent version of XCM that they /// support in a `QueryResponse` instruction. Any changes to this should also elicit similar @@ -335,7 +335,7 @@ pub enum Xcm { UnsubscribeVersion, } -impl Xcm { +impl Xcm { pub fn into(self) -> Xcm { Xcm::from(self) } @@ -390,9 +390,9 @@ impl TryFrom for Response { } } -impl TryFrom> for Xcm { +impl TryFrom> for Xcm { type Error = (); - fn try_from(old: OldXcm) -> result::Result, ()> { + fn try_from(old: OldXcm) -> result::Result, ()> { use Xcm::*; Ok(match old { OldXcm::WithdrawAsset { assets, effects } => WithdrawAsset { @@ -443,9 +443,9 @@ impl TryFrom> for Xcm { } } -impl TryFrom> for Xcm { +impl TryFrom> for Xcm { type Error = (); - fn try_from(old: NewXcm) -> result::Result, ()> { + fn try_from(old: NewXcm) -> result::Result, ()> { use Xcm::*; let mut iter = old.0.into_iter(); let instruction = iter.next().ok_or(())?; diff --git a/xcm/src/v1/order.rs b/xcm/src/v1/order.rs index f97e56f653f4..23e923e9d47c 100644 --- a/xcm/src/v1/order.rs +++ b/xcm/src/v1/order.rs @@ -29,8 +29,8 @@ use scale_info::TypeInfo; #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub enum Order { +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub enum Order { /// Do nothing. Not generally used. #[codec(index = 0)] Noop, @@ -148,7 +148,7 @@ pub enum Order { weight: u64, debt: u64, halt_on_error: bool, - instructions: Vec>, + instructions: Vec>, }, } @@ -156,7 +156,7 @@ pub mod opaque { pub type Order = super::Order<()>; } -impl Order { +impl Order { pub fn into(self) -> Order { Order::from(self) } @@ -182,9 +182,9 @@ impl Order { } } -impl TryFrom> for Order { +impl TryFrom> for Order { type Error = (); - fn try_from(old: OldOrder) -> result::Result, ()> { + fn try_from(old: OldOrder) -> result::Result, ()> { use Order::*; Ok(match old { OldOrder::Null => Noop, @@ -225,16 +225,16 @@ impl TryFrom> for Order { QueryHolding { query_id, dest: dest.try_into()?, assets: assets.try_into()? }, OldOrder::BuyExecution { fees, weight, debt, halt_on_error, xcm } => { let instructions = - xcm.into_iter().map(Xcm::::try_from).collect::>()?; + xcm.into_iter().map(Xcm::::try_from).collect::>()?; BuyExecution { fees: fees.try_into()?, weight, debt, halt_on_error, instructions } }, }) } } -impl TryFrom> for Order { +impl TryFrom> for Order { type Error = (); - fn try_from(old: Instruction) -> result::Result, ()> { + fn try_from(old: Instruction) -> result::Result, ()> { use Order::*; Ok(match old { Instruction::DepositAsset { assets, max_assets, beneficiary } => diff --git a/xcm/src/v1/traits.rs b/xcm/src/v1/traits.rs index 33b60455b0b2..e4b3542d41a4 100644 --- a/xcm/src/v1/traits.rs +++ b/xcm/src/v1/traits.rs @@ -142,13 +142,13 @@ impl Outcome { } /// Type of XCM message executor. -pub trait ExecuteXcm { +pub trait ExecuteXcm { /// Execute some XCM `message` from `origin` using no more than `weight_limit` weight. The weight limit is /// a basic hard-limit and the implementation may place further restrictions or requirements on weight and /// other aspects. fn execute_xcm( origin: impl Into, - message: Xcm, + message: Xcm, weight_limit: Weight, ) -> Outcome { let origin = origin.into(); @@ -168,7 +168,7 @@ pub trait ExecuteXcm { /// execution without associated payment. fn execute_xcm_in_credit( origin: impl Into, - message: Xcm, + message: Xcm, weight_limit: Weight, weight_credit: Weight, ) -> Outcome; diff --git a/xcm/src/v2/mod.rs b/xcm/src/v2/mod.rs index 94e9ddf3817d..50f15689fc2c 100644 --- a/xcm/src/v2/mod.rs +++ b/xcm/src/v2/mod.rs @@ -78,10 +78,10 @@ pub type QueryId = u64; #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub struct Xcm(pub Vec>); +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub struct Xcm(pub Vec>); -impl Xcm { +impl Xcm { /// Create an empty instance. pub fn new() -> Self { Self(vec![]) @@ -108,17 +108,17 @@ impl Xcm { } /// Return the first instruction, if any. - pub fn first(&self) -> Option<&Instruction> { + pub fn first(&self) -> Option<&Instruction> { self.0.first() } /// Return the last instruction, if any. - pub fn last(&self) -> Option<&Instruction> { + pub fn last(&self) -> Option<&Instruction> { self.0.last() } /// Return the only instruction, contained in `Self`, iff only one exists (`None` otherwise). - pub fn only(&self) -> Option<&Instruction> { + pub fn only(&self) -> Option<&Instruction> { if self.0.len() == 1 { self.0.first() } else { @@ -128,7 +128,7 @@ impl Xcm { /// Return the only instruction, contained in `Self`, iff only one exists (returns `self` /// otherwise). - pub fn into_only(mut self) -> core::result::Result, Self> { + pub fn into_only(mut self) -> core::result::Result, Self> { if self.0.len() == 1 { self.0.pop().ok_or(self) } else { @@ -233,8 +233,8 @@ pub type Weight = u64; #[derivative(Clone(bound = ""), Eq(bound = ""), PartialEq(bound = ""), Debug(bound = ""))] #[codec(encode_bound())] #[codec(decode_bound())] -#[scale_info(bounds(), skip_type_params(Call))] -pub enum Instruction { +#[scale_info(bounds(), skip_type_params(RuntimeCall))] +pub enum Instruction { /// Withdraw asset(s) (`assets`) from the ownership of `origin` and place them into the Holding /// Register. /// @@ -340,7 +340,7 @@ pub enum Instruction { origin_type: OriginKind, #[codec(compact)] require_weight_at_most: u64, - call: DoubleEncoded, + call: DoubleEncoded, }, /// A message to notify about a new incoming HRMP channel. This message is meant to be sent by the @@ -584,7 +584,7 @@ pub enum Instruction { /// Kind: *Instruction* /// /// Errors: None. - SetErrorHandler(Xcm), + SetErrorHandler(Xcm), /// Set the Appendix Register. This is code that should be called after code execution /// (including the error handler if any) is finished. This will be called regardless of whether @@ -600,7 +600,7 @@ pub enum Instruction { /// Kind: *Instruction* /// /// Errors: None. - SetAppendix(Xcm), + SetAppendix(Xcm), /// Clear the Error Register. /// @@ -647,16 +647,16 @@ pub enum Instruction { UnsubscribeVersion, } -impl Xcm { +impl Xcm { pub fn into(self) -> Xcm { Xcm::from(self) } pub fn from(xcm: Xcm) -> Self { - Self(xcm.0.into_iter().map(Instruction::::from).collect()) + Self(xcm.0.into_iter().map(Instruction::::from).collect()) } } -impl Instruction { +impl Instruction { pub fn into(self) -> Instruction { Instruction::from(self) } @@ -707,7 +707,7 @@ impl Instruction { } // TODO: Automate Generation -impl> GetWeight for Instruction { +impl> GetWeight for Instruction { fn weight(&self) -> Weight { use Instruction::*; match self { @@ -775,9 +775,9 @@ impl TryFrom for Response { } } -impl TryFrom> for Xcm { +impl TryFrom> for Xcm { type Error = (); - fn try_from(old: OldXcm) -> result::Result, ()> { + fn try_from(old: OldXcm) -> result::Result, ()> { use Instruction::*; Ok(Xcm(match old { OldXcm::WithdrawAsset { assets, effects } => Some(Ok(WithdrawAsset(assets))) @@ -827,9 +827,9 @@ impl TryFrom> for Xcm { } } -impl TryFrom> for Instruction { +impl TryFrom> for Instruction { type Error = (); - fn try_from(old: OldOrder) -> result::Result, ()> { + fn try_from(old: OldOrder) -> result::Result, ()> { use Instruction::*; Ok(match old { OldOrder::Noop => return Err(()), diff --git a/xcm/src/v2/traits.rs b/xcm/src/v2/traits.rs index 059def0b7259..94d48034fc36 100644 --- a/xcm/src/v2/traits.rs +++ b/xcm/src/v2/traits.rs @@ -160,13 +160,13 @@ impl Outcome { } /// Type of XCM message executor. -pub trait ExecuteXcm { +pub trait ExecuteXcm { /// Execute some XCM `message` from `origin` using no more than `weight_limit` weight. The weight limit is /// a basic hard-limit and the implementation may place further restrictions or requirements on weight and /// other aspects. fn execute_xcm( origin: impl Into, - message: Xcm, + message: Xcm, weight_limit: Weight, ) -> Outcome { let origin = origin.into(); @@ -186,7 +186,7 @@ pub trait ExecuteXcm { /// execution without associated payment. fn execute_xcm_in_credit( origin: impl Into, - message: Xcm, + message: Xcm, weight_limit: Weight, weight_credit: Weight, ) -> Outcome; diff --git a/xcm/xcm-builder/src/barriers.rs b/xcm/xcm-builder/src/barriers.rs index ef7333e6d140..b7defd072b55 100644 --- a/xcm/xcm-builder/src/barriers.rs +++ b/xcm/xcm-builder/src/barriers.rs @@ -29,9 +29,9 @@ use xcm_executor::traits::{OnResponse, ShouldExecute}; /// out of the local chain to another one. pub struct TakeWeightCredit; impl ShouldExecute for TakeWeightCredit { - fn should_execute( + fn should_execute( _origin: &MultiLocation, - _message: &mut Xcm, + _message: &mut Xcm, max_weight: Weight, weight_credit: &mut Weight, ) -> Result<(), ()> { @@ -52,9 +52,9 @@ impl ShouldExecute for TakeWeightCredit { /// because they are the only ones that place assets in the Holding Register to pay for execution. pub struct AllowTopLevelPaidExecutionFrom(PhantomData); impl> ShouldExecute for AllowTopLevelPaidExecutionFrom { - fn should_execute( + fn should_execute( origin: &MultiLocation, - message: &mut Xcm, + message: &mut Xcm, max_weight: Weight, _weight_credit: &mut Weight, ) -> Result<(), ()> { @@ -95,9 +95,9 @@ impl> ShouldExecute for AllowTopLevelPaidExecutionFro /// Use only for executions from trusted origin groups. pub struct AllowUnpaidExecutionFrom(PhantomData); impl> ShouldExecute for AllowUnpaidExecutionFrom { - fn should_execute( + fn should_execute( origin: &MultiLocation, - _message: &mut Xcm, + _message: &mut Xcm, _max_weight: Weight, _weight_credit: &mut Weight, ) -> Result<(), ()> { @@ -126,9 +126,9 @@ impl> Contains for IsChildSystemPara /// Allows only messages if the generic `ResponseHandler` expects them via `expecting_response`. pub struct AllowKnownQueryResponses(PhantomData); impl ShouldExecute for AllowKnownQueryResponses { - fn should_execute( + fn should_execute( origin: &MultiLocation, - message: &mut Xcm, + message: &mut Xcm, _max_weight: Weight, _weight_credit: &mut Weight, ) -> Result<(), ()> { @@ -150,9 +150,9 @@ impl ShouldExecute for AllowKnownQueryResponses(PhantomData); impl> ShouldExecute for AllowSubscriptionsFrom { - fn should_execute( + fn should_execute( origin: &MultiLocation, - message: &mut Xcm, + message: &mut Xcm, _max_weight: Weight, _weight_credit: &mut Weight, ) -> Result<(), ()> { diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs index 9d126ff6b5c3..547895a77ae8 100644 --- a/xcm/xcm-builder/tests/mock/mod.rs +++ b/xcm/xcm-builder/tests/mock/mod.rs @@ -169,7 +169,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = FixedRateOfFungible; type ResponseHandler = XcmPallet; type AssetTrap = XcmPallet; @@ -190,7 +190,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type RuntimeCall = RuntimeCall; type Origin = Origin; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; diff --git a/xcm/xcm-executor/src/config.rs b/xcm/xcm-executor/src/config.rs index e7d81dc8328c..5f9021f7018c 100644 --- a/xcm/xcm-executor/src/config.rs +++ b/xcm/xcm-executor/src/config.rs @@ -27,7 +27,7 @@ use xcm::latest::SendXcm; /// The trait to parameterize the `XcmExecutor`. pub trait Config { /// The outer call dispatch type. - type Call: Parameter + Dispatchable + GetDispatchInfo; + type RuntimeCall: Parameter + Dispatchable + GetDispatchInfo; /// How to send an onward XCM message. type XcmSender: SendXcm; @@ -36,7 +36,7 @@ pub trait Config { type AssetTransactor: TransactAsset; /// How to get a call origin from a `OriginKind` value. - type OriginConverter: ConvertOrigin<::Origin>; + type OriginConverter: ConvertOrigin<::Origin>; /// Combinations of (Location, Asset) pairs which we trust as reserves. type IsReserve: FilterAssetLocation; @@ -51,7 +51,7 @@ pub trait Config { type Barrier: ShouldExecute; /// The means of determining an XCM message's weight. - type Weigher: WeightBounds; + type Weigher: WeightBounds; /// The means of purchasing weight credit for XCM execution. type Trader: WeightTrader; diff --git a/xcm/xcm-executor/src/lib.rs b/xcm/xcm-executor/src/lib.rs index a68f2db71b6c..ba3900559cee 100644 --- a/xcm/xcm-executor/src/lib.rs +++ b/xcm/xcm-executor/src/lib.rs @@ -55,9 +55,9 @@ pub struct XcmExecutor { /// the weight of dynamically determined instructions such as `Transact`). pub total_surplus: u64, pub total_refunded: u64, - pub error_handler: Xcm, + pub error_handler: Xcm, pub error_handler_weight: u64, - pub appendix: Xcm, + pub appendix: Xcm, pub appendix_weight: u64, _config: PhantomData, } @@ -65,10 +65,10 @@ pub struct XcmExecutor { /// The maximum recursion limit for `execute_xcm` and `execute_effects`. pub const MAX_RECURSION_LIMIT: u32 = 8; -impl ExecuteXcm for XcmExecutor { +impl ExecuteXcm for XcmExecutor { fn execute_xcm_in_credit( origin: impl Into, - mut message: Xcm, + mut message: Xcm, weight_limit: Weight, mut weight_credit: Weight, ) -> Outcome { @@ -184,7 +184,7 @@ impl XcmExecutor { /// Execute the XCM program fragment and report back the error and which instruction caused it, /// or `Ok` if there was no error. - pub fn execute(&mut self, xcm: Xcm) -> Result<(), ExecutorError> { + pub fn execute(&mut self, xcm: Xcm) -> Result<(), ExecutorError> { log::trace!( target: "xcm::execute", "origin: {:?}, total_surplus/refunded: {:?}/{:?}, error_handler_weight: {:?}", @@ -235,8 +235,8 @@ impl XcmExecutor { } /// Remove the registered error handler and return it. Do not refund its weight. - fn take_error_handler(&mut self) -> Xcm { - let mut r = Xcm::(vec![]); + fn take_error_handler(&mut self) -> Xcm { + let mut r = Xcm::(vec![]); sp_std::mem::swap(&mut self.error_handler, &mut r); self.error_handler_weight = 0; r @@ -244,14 +244,14 @@ impl XcmExecutor { /// Drop the registered error handler and refund its weight. fn drop_error_handler(&mut self) { - self.error_handler = Xcm::(vec![]); + self.error_handler = Xcm::(vec![]); self.total_surplus.saturating_accrue(self.error_handler_weight); self.error_handler_weight = 0; } /// Remove the registered appendix and return it. - fn take_appendix(&mut self) -> Xcm { - let mut r = Xcm::(vec![]); + fn take_appendix(&mut self) -> Xcm { + let mut r = Xcm::(vec![]); sp_std::mem::swap(&mut self.appendix, &mut r); self.appendix_weight = 0; r @@ -269,7 +269,7 @@ impl XcmExecutor { } /// Process a single XCM instruction, mutating the state of the XCM virtual machine. - fn process_instruction(&mut self, instr: Instruction) -> Result<(), XcmError> { + fn process_instruction(&mut self, instr: Instruction) -> Result<(), XcmError> { match instr { WithdrawAsset(assets) => { // Take `assets` from the origin account (on-chain) and place in holding. diff --git a/xcm/xcm-executor/src/traits/should_execute.rs b/xcm/xcm-executor/src/traits/should_execute.rs index 5f94db0066b4..24e8ea94177c 100644 --- a/xcm/xcm-executor/src/traits/should_execute.rs +++ b/xcm/xcm-executor/src/traits/should_execute.rs @@ -31,9 +31,9 @@ pub trait ShouldExecute { /// - `weight_credit`: The pre-established amount of weight that the system has determined this /// message may utilize in its execution. Typically non-zero only because of prior fee /// payment, but could in principle be due to other factors. - fn should_execute( + fn should_execute( origin: &MultiLocation, - message: &mut Xcm, + message: &mut Xcm, max_weight: Weight, weight_credit: &mut Weight, ) -> Result<(), ()>; @@ -41,9 +41,9 @@ pub trait ShouldExecute { #[impl_trait_for_tuples::impl_for_tuples(30)] impl ShouldExecute for Tuple { - fn should_execute( + fn should_execute( origin: &MultiLocation, - message: &mut Xcm, + message: &mut Xcm, max_weight: Weight, weight_credit: &mut Weight, ) -> Result<(), ()> { diff --git a/xcm/xcm-executor/src/traits/weight.rs b/xcm/xcm-executor/src/traits/weight.rs index a3c7d2a2f645..0f25e007bca5 100644 --- a/xcm/xcm-executor/src/traits/weight.rs +++ b/xcm/xcm-executor/src/traits/weight.rs @@ -20,14 +20,14 @@ use sp_std::result::Result; use xcm::latest::prelude::*; /// Determine the weight of an XCM message. -pub trait WeightBounds { +pub trait WeightBounds { /// Return the maximum amount of weight that an attempted execution of this message could /// consume. - fn weight(message: &mut Xcm) -> Result; + fn weight(message: &mut Xcm) -> Result; /// Return the maximum amount of weight that an attempted execution of this instruction could /// consume. - fn instr_weight(instruction: &Instruction) -> Result; + fn instr_weight(instruction: &Instruction) -> Result; } /// A means of getting approximate weight consumption for a given destination message executor and a diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index 741732cc797a..befb11a3faf1 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -119,7 +119,7 @@ mod tests { MockNet::reset(); let remark = - parachain::Call::System(frame_system::Call::::remark_with_event { + parachain::RuntimeCall::System(frame_system::Call::::remark_with_event { remark: vec![1, 2, 3], }); Relay::execute_with(|| { @@ -146,7 +146,7 @@ mod tests { fn ump() { MockNet::reset(); - let remark = relay_chain::Call::System( + let remark = relay_chain::RuntimeCall::System( frame_system::Call::::remark_with_event { remark: vec![1, 2, 3] }, ); ParaA::execute_with(|| { @@ -174,7 +174,7 @@ mod tests { MockNet::reset(); let remark = - parachain::Call::System(frame_system::Call::::remark_with_event { + parachain::RuntimeCall::System(frame_system::Call::::remark_with_event { remark: vec![1, 2, 3], }); ParaA::execute_with(|| { diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index 9a142220ce10..c54c3ab6827c 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -156,7 +156,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type XcmExecutor: ExecuteXcm; } diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs index fd49ffe0c228..cbcfaed6b099 100644 --- a/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/xcm/xcm-simulator/example/src/relay_chain.rs @@ -133,7 +133,7 @@ impl Config for XcmConfig { type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = FixedRateOfFungible; type ResponseHandler = (); type AssetTrap = (); @@ -153,7 +153,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index b746551348e0..318bd0ad5b8a 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -156,7 +156,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type XcmExecutor: ExecuteXcm; } diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index fd49ffe0c228..cbcfaed6b099 100644 --- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -133,7 +133,7 @@ impl Config for XcmConfig { type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = FixedRateOfFungible; type ResponseHandler = (); type AssetTrap = (); @@ -153,7 +153,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; From 6bba1ede5ed29300b4621a7737d8960b1a7c6a06 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 25 Aug 2022 14:20:44 +0200 Subject: [PATCH 14/37] fmt --- runtime/kusama/src/lib.rs | 36 +++++++++++++++++---------- runtime/kusama/src/xcm_config.rs | 11 +++++--- runtime/parachains/src/paras/tests.rs | 8 ++++-- runtime/parachains/src/ump.rs | 4 ++- runtime/polkadot/src/lib.rs | 36 +++++++++++++++++---------- runtime/polkadot/src/xcm_config.rs | 4 +-- runtime/rococo/src/lib.rs | 6 +++-- runtime/rococo/src/xcm_config.rs | 4 +-- runtime/test-runtime/src/lib.rs | 3 ++- runtime/westend/src/lib.rs | 16 +++++++++--- runtime/westend/src/xcm_config.rs | 10 +++++--- xcm/pallet-xcm/src/lib.rs | 6 ++--- xcm/src/v0/mod.rs | 6 ++++- xcm/src/v0/traits.rs | 6 ++++- xcm/src/v1/mod.rs | 6 ++++- xcm/src/v1/order.rs | 6 +++-- xcm/xcm-executor/src/lib.rs | 5 +++- xcm/xcm-simulator/example/src/lib.rs | 14 +++++------ 18 files changed, 122 insertions(+), 65 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index a3ddfa516538..1f1167973b25 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1056,28 +1056,37 @@ impl InstanceFilter for ProxyType { RuntimeCall::VoterList(..) | RuntimeCall::NominationPools(..) ), - ProxyType::Governance => matches!( - c, - RuntimeCall::Democracy(..) | - RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | - RuntimeCall::PhragmenElection(..) | - RuntimeCall::Treasury(..) | RuntimeCall::Bounties(..) | - RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | - RuntimeCall::ChildBounties(..) - ), + ProxyType::Governance => + matches!( + c, + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Bounties(..) | + RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | + RuntimeCall::ChildBounties(..) + ), ProxyType::Staking => { - matches!(c, RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..)) + matches!( + c, + RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..) + ) }, ProxyType::IdentityJudgement => matches!( c, - RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | + RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - RuntimeCall::Auctions(..) | RuntimeCall::Crowdloan(..) | RuntimeCall::Registrar(..) | RuntimeCall::Slots(..) + RuntimeCall::Auctions(..) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Registrar(..) | + RuntimeCall::Slots(..) ), ProxyType::Society => matches!(c, RuntimeCall::Society(..)), } @@ -1438,7 +1447,8 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/kusama/src/xcm_config.rs b/runtime/kusama/src/xcm_config.rs index 51af0bd9dc63..a8ff8716aaa1 100644 --- a/runtime/kusama/src/xcm_config.rs +++ b/runtime/kusama/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configurations for the Kusama runtime. use super::{ - parachains_origin, AccountId, Balances, RuntimeCall, CouncilCollective, RuntimeEvent, Origin, ParaId, - Runtime, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, CouncilCollective, Origin, ParaId, Runtime, + RuntimeCall, RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{match_types, parameter_types, traits::Everything, weights::Weight}; use runtime_common::{xcm_sender, ToAuthor}; @@ -138,8 +138,11 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::KusamaXcmWeight, + RuntimeCall, + MaxInstructions, + >; // The weight trader piggybacks on the existing transaction-fee conversion logic. type Trader = UsingComponents>; type ResponseHandler = XcmPallet; diff --git a/runtime/parachains/src/paras/tests.rs b/runtime/parachains/src/paras/tests.rs index 83a452b28b3c..47fd15793181 100644 --- a/runtime/parachains/src/paras/tests.rs +++ b/runtime/parachains/src/paras/tests.rs @@ -112,8 +112,12 @@ fn check_code_is_not_stored(validation_code: &ValidationCode) { /// An utility for checking that certain events were deposited. struct EventValidator { - events: - Vec::RuntimeEvent, primitives::v2::Hash>>, + events: Vec< + frame_system::EventRecord< + ::RuntimeEvent, + primitives::v2::Hash, + >, + >, } impl EventValidator { diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index c514a465e4c5..60f4d8162d72 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -93,7 +93,9 @@ fn upward_message_id(data: &[u8]) -> MessageId { sp_io::hashing::blake2_256(data) } -impl, C: Config> UmpSink for XcmSink { +impl, C: Config> UmpSink + for XcmSink +{ fn process_upward_message( origin: ParaId, mut data: &[u8], diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index b5e63cc40d70..bb3455c546be 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1189,28 +1189,37 @@ impl InstanceFilter for ProxyType { RuntimeCall::VoterList(..) | RuntimeCall::NominationPools(..) ), - ProxyType::Governance => matches!( - c, - RuntimeCall::Democracy(..) | - RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | - RuntimeCall::PhragmenElection(..) | - RuntimeCall::Treasury(..) | RuntimeCall::Bounties(..) | - RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | - RuntimeCall::ChildBounties(..) - ), + ProxyType::Governance => + matches!( + c, + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Bounties(..) | + RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | + RuntimeCall::ChildBounties(..) + ), ProxyType::Staking => { - matches!(c, RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..)) + matches!( + c, + RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..) + ) }, ProxyType::IdentityJudgement => matches!( c, - RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | + RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - RuntimeCall::Auctions(..) | RuntimeCall::Crowdloan(..) | RuntimeCall::Registrar(..) | RuntimeCall::Slots(..) + RuntimeCall::Auctions(..) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Registrar(..) | + RuntimeCall::Slots(..) ), } } @@ -1564,7 +1573,8 @@ pub type SignedExtra = ( claims::PrevalidateAttests, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/polkadot/src/xcm_config.rs b/runtime/polkadot/src/xcm_config.rs index 19f252df150a..e23d43e16b3a 100644 --- a/runtime/polkadot/src/xcm_config.rs +++ b/runtime/polkadot/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Polkadot. use super::{ - parachains_origin, AccountId, Balances, RuntimeCall, CouncilCollective, RuntimeEvent, Origin, ParaId, - Runtime, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, CouncilCollective, Origin, ParaId, Runtime, + RuntimeCall, RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{ match_types, parameter_types, diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 9fa3a0a49646..0caa858a52f9 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -142,7 +142,8 @@ pub type SignedExtra = ( ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -832,7 +833,8 @@ impl InstanceFilter for ProxyType { RuntimeCall::Auctions { .. } | RuntimeCall::Crowdloan { .. } | RuntimeCall::Registrar { .. } | - RuntimeCall::Multisig(..) | RuntimeCall::Slots { .. } + RuntimeCall::Multisig(..) | + RuntimeCall::Slots { .. } ), } } diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index bb3994f459ce..9fa354cd0297 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Rococo. use super::{ - parachains_origin, AccountId, Balances, RuntimeCall, RuntimeEvent, Origin, ParaId, Runtime, WeightToFee, - XcmPallet, + parachains_origin, AccountId, Balances, Origin, ParaId, Runtime, RuntimeCall, RuntimeEvent, + WeightToFee, XcmPallet, }; use frame_support::{ parameter_types, diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index f52137f77d19..ec3bcd9a4f72 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -732,7 +732,8 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 769a8a30bc02..c51dccf096f5 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -807,7 +807,10 @@ impl InstanceFilter for ProxyType { RuntimeCall::NominationPools(..) ), ProxyType::Staking => { - matches!(c, RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..)) + matches!( + c, + RuntimeCall::Staking(..) | RuntimeCall::Session(..) | RuntimeCall::Utility(..) + ) }, ProxyType::SudoBalances => match c { RuntimeCall::Sudo(pallet_sudo::Call::sudo { call: ref x }) => { @@ -818,14 +821,18 @@ impl InstanceFilter for ProxyType { }, ProxyType::IdentityJudgement => matches!( c, - RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | + RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - RuntimeCall::Auctions(..) | RuntimeCall::Crowdloan(..) | RuntimeCall::Registrar(..) | RuntimeCall::Slots(..) + RuntimeCall::Auctions(..) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Registrar(..) | + RuntimeCall::Slots(..) ), } } @@ -1152,7 +1159,8 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs index 8a1d03e77088..36b9893662bb 100644 --- a/runtime/westend/src/xcm_config.rs +++ b/runtime/westend/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configurations for Westend. use super::{ - parachains_origin, weights, AccountId, Balances, RuntimeCall, RuntimeEvent, Origin, ParaId, Runtime, - WeightToFee, XcmPallet, + parachains_origin, weights, AccountId, Balances, Origin, ParaId, Runtime, RuntimeCall, + RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{ parameter_types, @@ -115,7 +115,8 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = + WeightInfoBounds, RuntimeCall, MaxInstructions>; type Trader = UsingComponents>; type ResponseHandler = XcmPallet; type AssetTrap = XcmPallet; @@ -141,7 +142,8 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = xcm_executor::XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; - type Weigher = WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = + WeightInfoBounds, RuntimeCall, MaxInstructions>; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index de43d45642ce..b233fd22c1c0 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -1395,9 +1395,9 @@ pub mod pallet { // be built by `(pallet_index: u8, call_index: u8, QueryId, Response)`. // So we just encode that and then re-encode to a real Call. let bare = (pallet_index, call_index, query_id, response); - if let Ok(call) = bare - .using_encoded(|mut bytes| ::RuntimeCall::decode(&mut bytes)) - { + if let Ok(call) = bare.using_encoded(|mut bytes| { + ::RuntimeCall::decode(&mut bytes) + }) { Queries::::remove(query_id); let weight = call.get_dispatch_info().weight; if weight > max_weight { diff --git a/xcm/src/v0/mod.rs b/xcm/src/v0/mod.rs index 57df14cbacb6..2a7bd3625bb0 100644 --- a/xcm/src/v0/mod.rs +++ b/xcm/src/v0/mod.rs @@ -209,7 +209,11 @@ pub enum Xcm { /// /// Errors: #[codec(index = 6)] - Transact { origin_type: OriginKind, require_weight_at_most: u64, call: DoubleEncoded }, + Transact { + origin_type: OriginKind, + require_weight_at_most: u64, + call: DoubleEncoded, + }, /// A message to notify about a new incoming HRMP channel. This message is meant to be sent by the /// relay-chain to a para. diff --git a/xcm/src/v0/traits.rs b/xcm/src/v0/traits.rs index 0b1bc19cf297..ace93ef64ff5 100644 --- a/xcm/src/v0/traits.rs +++ b/xcm/src/v0/traits.rs @@ -143,7 +143,11 @@ pub trait ExecuteXcm { /// Execute some XCM `message` from `origin` using no more than `weight_limit` weight. The weight limit is /// a basic hard-limit and the implementation may place further restrictions or requirements on weight and /// other aspects. - fn execute_xcm(origin: MultiLocation, message: Xcm, weight_limit: Weight) -> Outcome { + fn execute_xcm( + origin: MultiLocation, + message: Xcm, + weight_limit: Weight, + ) -> Outcome { log::debug!( target: "xcm::execute_xcm", "origin: {:?}, message: {:?}, weight_limit: {:?}", diff --git a/xcm/src/v1/mod.rs b/xcm/src/v1/mod.rs index 02d62de59995..7703425149a4 100644 --- a/xcm/src/v1/mod.rs +++ b/xcm/src/v1/mod.rs @@ -249,7 +249,11 @@ pub enum Xcm { /// /// Errors: #[codec(index = 6)] - Transact { origin_type: OriginKind, require_weight_at_most: u64, call: DoubleEncoded }, + Transact { + origin_type: OriginKind, + require_weight_at_most: u64, + call: DoubleEncoded, + }, /// A message to notify about a new incoming HRMP channel. This message is meant to be sent by the /// relay-chain to a para. diff --git a/xcm/src/v1/order.rs b/xcm/src/v1/order.rs index 23e923e9d47c..3076e2d43c36 100644 --- a/xcm/src/v1/order.rs +++ b/xcm/src/v1/order.rs @@ -224,8 +224,10 @@ impl TryFrom> for Order { OldOrder::QueryHolding { query_id, dest, assets } => QueryHolding { query_id, dest: dest.try_into()?, assets: assets.try_into()? }, OldOrder::BuyExecution { fees, weight, debt, halt_on_error, xcm } => { - let instructions = - xcm.into_iter().map(Xcm::::try_from).collect::>()?; + let instructions = xcm + .into_iter() + .map(Xcm::::try_from) + .collect::>()?; BuyExecution { fees: fees.try_into()?, weight, debt, halt_on_error, instructions } }, }) diff --git a/xcm/xcm-executor/src/lib.rs b/xcm/xcm-executor/src/lib.rs index ba3900559cee..3f459c4630f3 100644 --- a/xcm/xcm-executor/src/lib.rs +++ b/xcm/xcm-executor/src/lib.rs @@ -269,7 +269,10 @@ impl XcmExecutor { } /// Process a single XCM instruction, mutating the state of the XCM virtual machine. - fn process_instruction(&mut self, instr: Instruction) -> Result<(), XcmError> { + fn process_instruction( + &mut self, + instr: Instruction, + ) -> Result<(), XcmError> { match instr { WithdrawAsset(assets) => { // Take `assets` from the origin account (on-chain) and place in holding. diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index befb11a3faf1..c305411abc34 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -118,10 +118,9 @@ mod tests { fn dmp() { MockNet::reset(); - let remark = - parachain::RuntimeCall::System(frame_system::Call::::remark_with_event { - remark: vec![1, 2, 3], - }); + let remark = parachain::RuntimeCall::System( + frame_system::Call::::remark_with_event { remark: vec![1, 2, 3] }, + ); Relay::execute_with(|| { assert_ok!(RelayChainPalletXcm::send_xcm( Here, @@ -173,10 +172,9 @@ mod tests { fn xcmp() { MockNet::reset(); - let remark = - parachain::RuntimeCall::System(frame_system::Call::::remark_with_event { - remark: vec![1, 2, 3], - }); + let remark = parachain::RuntimeCall::System( + frame_system::Call::::remark_with_event { remark: vec![1, 2, 3] }, + ); ParaA::execute_with(|| { assert_ok!(ParachainPalletXcm::send_xcm( Here, From 16700839d3f9a32e4e3e182015322376971f62eb Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 25 Aug 2022 15:50:12 +0200 Subject: [PATCH 15/37] small fixes --- runtime/common/src/claims.rs | 4 +-- runtime/test-runtime/src/lib.rs | 2 +- runtime/test-runtime/src/xcm_config.rs | 4 +-- xcm/pallet-xcm/src/tests.rs | 31 ++++++++++--------- xcm/xcm-builder/src/mock.rs | 2 +- xcm/xcm-executor/integration-tests/src/lib.rs | 12 +++---- xcm/xcm-simulator/example/src/lib.rs | 27 +++++++++------- 7 files changed, 44 insertions(+), 38 deletions(-) diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index 4886be0bedd4..85824968610d 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -1546,9 +1546,9 @@ mod benchmarking { Preclaims::::insert(&account, eth_address); assert_eq!(Claims::::get(eth_address), Some(VALUE.into())); - let call = super::Call::::attest { statement: StatementKind::Regular.to_text().to_vec() }; + let call = super::RuntimeCall::::attest { statement: StatementKind::Regular.to_text().to_vec() }; // We have to copy the validate statement here because of trait issues... :( - let validate = |who: &T::AccountId, call: &super::Call| -> DispatchResult { + let validate = |who: &T::AccountId, call: &super::RuntimeCall| -> DispatchResult { if let Call::attest{ statement: attested_statement } = call { let signer = Preclaims::::get(who).ok_or("signer has no claim")?; if let Some(s) = Signing::::get(signer) { diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index ec3bcd9a4f72..fe444dd388d8 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -544,7 +544,7 @@ impl pallet_xcm::Config for Runtime { type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin; type LocationInverter = xcm_config::InvertNothing; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; - type Weigher = xcm_builder::FixedWeightBounds; + type Weigher = xcm_builder::FixedWeightBounds; type XcmRouter = xcm_config::DoNothingRouter; type XcmExecuteFilter = Everything; type XcmExecutor = xcm_executor::XcmExecutor; diff --git a/runtime/test-runtime/src/xcm_config.rs b/runtime/test-runtime/src/xcm_config.rs index 2faf3ffd0606..e6565dafa8fa 100644 --- a/runtime/test-runtime/src/xcm_config.rs +++ b/runtime/test-runtime/src/xcm_config.rs @@ -78,7 +78,7 @@ impl InvertLocation for InvertNothing { pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = super::Call; + type RuntimeCall = super::RuntimeCall; type XcmSender = DoNothingRouter; type AssetTransactor = DummyAssetTransactor; type OriginConverter = pallet_xcm::XcmPassthrough; @@ -86,7 +86,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = (); type LocationInverter = InvertNothing; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = DummyWeightTrader; type ResponseHandler = super::Xcm; type AssetTrap = super::Xcm; diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs index 8ede7f11ae22..ea3dfc24343c 100644 --- a/xcm/pallet-xcm/src/tests.rs +++ b/xcm/pallet-xcm/src/tests.rs @@ -84,12 +84,12 @@ fn report_outcome_notify_works() { assert_eq!( last_events(2), vec![ - Event::TestNotifier(pallet_test_notifier::Event::ResponseReceived( + RuntimeEvent::TestNotifier(pallet_test_notifier::Event::ResponseReceived( Parachain(PARA_ID).into(), 0, Response::ExecutionResult(None), )), - Event::XcmPallet(crate::Event::Notified(0, 4, 2)), + RuntimeEvent::XcmPallet(crate::Event::Notified(0, 4, 2)), ] ); assert_eq!(crate::Queries::::iter().collect::>(), vec![]); @@ -139,7 +139,10 @@ fn report_outcome_works() { assert_eq!(r, Outcome::Complete(1_000)); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::ResponseReady(0, Response::ExecutionResult(None),)) + RuntimeEvent::XcmPallet(crate::Event::ResponseReady( + 0, + Response::ExecutionResult(None), + )) ); let response = Some((Response::ExecutionResult(None), 1)); @@ -180,7 +183,7 @@ fn send_works() { ); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Sent(sender, RelayLocation::get(), message)) + RuntimeEvent::XcmPallet(crate::Event::Sent(sender, RelayLocation::get(), message)) ); }); } @@ -252,7 +255,7 @@ fn teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -296,7 +299,7 @@ fn limmited_teleport_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -338,7 +341,7 @@ fn unlimmited_teleport_assets_works() { ); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -386,7 +389,7 @@ fn reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -435,7 +438,7 @@ fn limited_reserve_transfer_assets_works() { let _check_v0_ok: xcm::v0::Xcm<()> = versioned_sent.try_into().unwrap(); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -482,7 +485,7 @@ fn unlimited_reserve_transfer_assets_works() { ); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -515,7 +518,7 @@ fn execute_withdraw_to_deposit_works() { assert_eq!(Balances::total_balance(&BOB), SEND_AMOUNT); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete(weight))) ); }); } @@ -551,8 +554,8 @@ fn trapped_assets_can_be_claimed() { assert_eq!( last_events(2), vec![ - Event::XcmPallet(crate::Event::AssetsTrapped(hash.clone(), source, vma)), - Event::XcmPallet(crate::Event::Attempted(Outcome::Complete( + RuntimeEvent::XcmPallet(crate::Event::AssetsTrapped(hash.clone(), source, vma)), + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Complete( 5 * BaseXcmWeight::get() ))) ] @@ -590,7 +593,7 @@ fn trapped_assets_can_be_claimed() { )); assert_eq!( last_event(), - Event::XcmPallet(crate::Event::Attempted(Outcome::Incomplete( + RuntimeEvent::XcmPallet(crate::Event::Attempted(Outcome::Incomplete( BaseXcmWeight::get(), XcmError::UnknownClaim ))) diff --git a/xcm/xcm-builder/src/mock.rs b/xcm/xcm-builder/src/mock.rs index 131d09f71eec..95137f3bb975 100644 --- a/xcm/xcm-builder/src/mock.rs +++ b/xcm/xcm-builder/src/mock.rs @@ -274,7 +274,7 @@ pub type TestBarrier = ( pub struct TestConfig; impl Config for TestConfig { - type Call = TestCall; + type RuntimeCall = TestCall; type XcmSender = TestSendXcm; type AssetTransactor = TestAssetTransactor; type OriginConverter = TestOriginConverter; diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index a6673aca7a92..3012ba43b64b 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -66,9 +66,9 @@ fn basic_buy_fees_message_executes() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::Attempted(Outcome::Complete( - _ - ))), + polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::Event::Attempted( + Outcome::Complete(_) + )), ))); }); } @@ -77,7 +77,7 @@ fn basic_buy_fees_message_executes() { fn query_response_fires() { use pallet_test_notifier::Event::*; use pallet_xcm::QueryStatus; - use polkadot_test_runtime::Event::TestNotifier; + use polkadot_test_runtime::RuntimeEvent::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() @@ -146,7 +146,7 @@ fn query_response_fires() { .inspect_state(|| { assert!(polkadot_test_runtime::System::events().iter().any(|r| matches!( r.event, - polkadot_test_runtime::Event::Xcm(pallet_xcm::Event::ResponseReady( + polkadot_test_runtime::RuntimeEvent::Xcm(pallet_xcm::Event::ResponseReady( q, Response::ExecutionResult(None), )) if q == query_id, @@ -164,7 +164,7 @@ fn query_response_fires() { #[test] fn query_response_elicits_handler() { use pallet_test_notifier::Event::*; - use polkadot_test_runtime::Event::TestNotifier; + use polkadot_test_runtime::RuntimeEvent::TestNotifier; sp_tracing::try_init_simple(); let mut client = TestClientBuilder::new() diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs index c305411abc34..1782a69e8de6 100644 --- a/xcm/xcm-simulator/example/src/lib.rs +++ b/xcm/xcm-simulator/example/src/lib.rs @@ -134,10 +134,11 @@ mod tests { }); ParaA::execute_with(|| { - use parachain::{Event, System}; - assert!(System::events() - .iter() - .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); + use parachain::{RuntimeEvent, System}; + assert!(System::events().iter().any(|r| matches!( + r.event, + RuntimeEvent::System(frame_system::Event::Remarked { .. }) + ))); }); } @@ -161,10 +162,11 @@ mod tests { }); Relay::execute_with(|| { - use relay_chain::{Event, System}; - assert!(System::events() - .iter() - .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); + use relay_chain::{RuntimeEvent, System}; + assert!(System::events().iter().any(|r| matches!( + r.event, + RuntimeEvent::System(frame_system::Event::Remarked { .. }) + ))); }); } @@ -188,10 +190,11 @@ mod tests { }); ParaB::execute_with(|| { - use parachain::{Event, System}; - assert!(System::events() - .iter() - .any(|r| matches!(r.event, Event::System(frame_system::Event::Remarked { .. })))); + use parachain::{RuntimeEvent, System}; + assert!(System::events().iter().any(|r| matches!( + r.event, + RuntimeEvent::System(frame_system::Event::Remarked { .. }) + ))); }); } From a2756b51c5515c31dc774d2ed272ab217dca7bbd Mon Sep 17 00:00:00 2001 From: Szegoo Date: Fri, 26 Aug 2022 12:38:45 +0200 Subject: [PATCH 16/37] commit --- runtime/parachains/src/hrmp/tests.rs | 2 +- runtime/parachains/src/mock.rs | 2 +- xcm/pallet-xcm/src/tests.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs index 463c5eb39385..d339e2874c5c 100644 --- a/runtime/parachains/src/hrmp/tests.rs +++ b/runtime/parachains/src/hrmp/tests.rs @@ -16,7 +16,7 @@ use super::*; use crate::mock::{ - new_test_ext, Configuration, Event as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, + new_test_ext, Configuration, RuntimeEvent as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, System, Test, }; use frame_support::{assert_noop, assert_ok, traits::Currency as _}; diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 916ee0be70d1..c9cd5d6a52f1 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -455,7 +455,7 @@ pub struct MockGenesisConfig { pub paras: crate::paras::GenesisConfig, } -pub fn assert_last_event(generic_event: Event) { +pub fn assert_last_event(generic_event: RuntimeEvent) { let events = frame_system::Pallet::::events(); let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record diff --git a/xcm/pallet-xcm/src/tests.rs b/xcm/pallet-xcm/src/tests.rs index ea3dfc24343c..d47ea209a633 100644 --- a/xcm/pallet-xcm/src/tests.rs +++ b/xcm/pallet-xcm/src/tests.rs @@ -49,7 +49,7 @@ fn report_outcome_notify_works() { query_id: 0, response: Default::default(), }; - let notify = Call::TestNotifier(call); + let notify = RuntimeCall::TestNotifier(call); new_test_ext_with_balances(balances).execute_with(|| { XcmPallet::report_outcome_notify(&mut message, Parachain(PARA_ID).into(), notify, 100) .unwrap(); From 1cac5219ede10699a57e66f8d3ed16cbf0271a78 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sat, 27 Aug 2022 09:01:54 +0200 Subject: [PATCH 17/37] fix --- runtime/common/src/crowdloan/mod.rs | 4 ++-- runtime/common/src/integration_tests.rs | 6 +++--- xcm/pallet-xcm-benchmarks/src/fungible/mock.rs | 2 +- xcm/pallet-xcm-benchmarks/src/generic/mock.rs | 2 +- xcm/pallet-xcm/src/mock.rs | 6 +++--- xcm/xcm-simulator/example/src/parachain.rs | 14 +++++++------- xcm/xcm-simulator/fuzzer/src/parachain.rs | 14 +++++++------- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs index 8b4bab260efb..e0ea31c7c512 100644 --- a/runtime/common/src/crowdloan/mod.rs +++ b/runtime/common/src/crowdloan/mod.rs @@ -1129,8 +1129,8 @@ mod tests { } } - fn last_event() -> Event { - System::events().pop().expect("Event expected").event + fn last_event() -> RuntimeEvent { + System::events().pop().expect("RuntimeEvent expected").event } #[test] diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs index aab98333721c..21cd9dd93ced 100644 --- a/runtime/common/src/integration_tests.rs +++ b/runtime/common/src/integration_tests.rs @@ -342,11 +342,11 @@ fn run_to_session(n: u32) { run_to_block(block_number); } -fn last_event() -> Event { - System::events().pop().expect("Event expected").event +fn last_event() -> RuntimeEvent { + System::events().pop().expect("RuntimeEvent expected").event } -fn contains_event(event: Event) -> bool { +fn contains_event(event: RuntimeEvent) -> bool { System::events().iter().any(|x| x.event == event) } diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs index 9abdc7896152..419404097e28 100644 --- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs @@ -136,7 +136,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = xcm_builder::LocationInverter; type Barrier = AllowUnpaidExecutionFrom; - type Weigher = xcm_builder::FixedWeightBounds; + type Weigher = xcm_builder::FixedWeightBounds; type Trader = xcm_builder::FixedRateOfFungible; type ResponseHandler = DevNull; type AssetTrap = (); diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs index de4f341a2d42..30d92fc5d6ba 100644 --- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs +++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs @@ -107,7 +107,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = (); type LocationInverter = xcm_builder::LocationInverter; type Barrier = AllowUnpaidExecutionFrom; - type Weigher = xcm_builder::FixedWeightBounds; + type Weigher = xcm_builder::FixedWeightBounds; type Trader = xcm_builder::FixedRateOfFungible; type ResponseHandler = DevNull; type AssetTrap = TestAssetTrap; diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs index e75bd5a39337..7f89329aa76e 100644 --- a/xcm/pallet-xcm/src/mock.rs +++ b/xcm/pallet-xcm/src/mock.rs @@ -298,11 +298,11 @@ impl pallet_test_notifier::Config for Test { type RuntimeCall = RuntimeCall; } -pub(crate) fn last_event() -> Event { - System::events().pop().expect("Event expected").event +pub(crate) fn last_event() -> RuntimeEvent { + System::events().pop().expect("RuntimeEvent expected").event } -pub(crate) fn last_events(n: usize) -> Vec { +pub(crate) fn last_events(n: usize) -> Vec { System::events().into_iter().map(|e| e.event).rev().take(n).rev().collect() } diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index c54c3ab6827c..cf102b96466f 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -141,7 +141,7 @@ impl Config for XcmConfig { type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = FixedRateOfFungible; type ResponseHandler = (); type AssetTrap = (); @@ -175,7 +175,7 @@ pub mod mock_msg_queue { #[pallet::storage] #[pallet::getter(fn received_dmp)] /// A queue of received DMP messages - pub(super) type ReceivedDmp = StorageValue<_, Vec>, ValueQuery>; + pub(super) type ReceivedDmp = StorageValue<_, Vec>, ValueQuery>; impl Get for Pallet { fn get() -> ParaId { @@ -215,11 +215,11 @@ pub mod mock_msg_queue { fn handle_xcmp_message( sender: ParaId, _sent_at: RelayBlockNumber, - xcm: VersionedXcm, + xcm: VersionedXcm, max_weight: Weight, ) -> Result { let hash = Encode::using_encoded(&xcm, T::Hashing::hash); - let (result, event) = match Xcm::::try_from(xcm) { + let (result, event) = match Xcm::::try_from(xcm) { Ok(xcm) => { let location = (1, Parachain(sender.into())); match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { @@ -249,7 +249,7 @@ pub mod mock_msg_queue { let mut remaining_fragments = &data_ref[..]; while !remaining_fragments.is_empty() { - if let Ok(xcm) = VersionedXcm::::decode(&mut remaining_fragments) { + if let Ok(xcm) = VersionedXcm::::decode(&mut remaining_fragments) { let _ = Self::handle_xcmp_message(sender, sent_at, xcm, max_weight); } else { debug_assert!(false, "Invalid incoming XCMP message data"); @@ -268,7 +268,7 @@ pub mod mock_msg_queue { for (_i, (_sent_at, data)) in iter.enumerate() { let id = sp_io::hashing::blake2_256(&data[..]); let maybe_msg = - VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); + VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); match maybe_msg { Err(_) => { Self::deposit_event(Event::InvalidFormat(id)); @@ -304,7 +304,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Nothing; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index 318bd0ad5b8a..c8f8d0ca809a 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -141,7 +141,7 @@ impl Config for XcmConfig { type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = FixedRateOfFungible; type ResponseHandler = (); type AssetTrap = (); @@ -175,7 +175,7 @@ pub mod mock_msg_queue { #[pallet::storage] #[pallet::getter(fn received_dmp)] /// A queue of received DMP messages - pub(super) type ReceivedDmp = StorageValue<_, Vec>, ValueQuery>; + pub(super) type ReceivedDmp = StorageValue<_, Vec>, ValueQuery>; impl Get for Pallet { fn get() -> ParaId { @@ -215,11 +215,11 @@ pub mod mock_msg_queue { fn handle_xcmp_message( sender: ParaId, _sent_at: RelayBlockNumber, - xcm: VersionedXcm, + xcm: VersionedXcm, max_weight: Weight, ) -> Result { let hash = Encode::using_encoded(&xcm, T::Hashing::hash); - let (result, event) = match Xcm::::try_from(xcm) { + let (result, event) = match Xcm::::try_from(xcm) { Ok(xcm) => { let location = MultiLocation::new(1, X1(Parachain(sender.into()))); match T::XcmExecutor::execute_xcm(location, xcm, max_weight) { @@ -249,7 +249,7 @@ pub mod mock_msg_queue { let mut remaining_fragments = &data_ref[..]; while !remaining_fragments.is_empty() { - if let Ok(xcm) = VersionedXcm::::decode(&mut remaining_fragments) { + if let Ok(xcm) = VersionedXcm::::decode(&mut remaining_fragments) { let _ = Self::handle_xcmp_message(sender, sent_at, xcm, max_weight); } else { debug_assert!(false, "Invalid incoming XCMP message data"); @@ -268,7 +268,7 @@ pub mod mock_msg_queue { for (_i, (_sent_at, data)) in iter.enumerate() { let id = sp_io::hashing::blake2_256(&data[..]); let maybe_msg = - VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); + VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); match maybe_msg { Err(_) => { Self::deposit_event(Event::InvalidFormat(id)); @@ -304,7 +304,7 @@ impl pallet_xcm::Config for Runtime { type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Nothing; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; type Origin = Origin; type RuntimeCall = RuntimeCall; From 3d1306dca53aad0b5ddbea0c4f9f62f2ca937223 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sat, 27 Aug 2022 09:02:29 +0200 Subject: [PATCH 18/37] fmt --- runtime/parachains/src/hrmp/tests.rs | 4 ++-- xcm/xcm-simulator/example/src/parachain.rs | 8 +++++--- xcm/xcm-simulator/fuzzer/src/parachain.rs | 8 +++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/runtime/parachains/src/hrmp/tests.rs b/runtime/parachains/src/hrmp/tests.rs index d339e2874c5c..22824601b521 100644 --- a/runtime/parachains/src/hrmp/tests.rs +++ b/runtime/parachains/src/hrmp/tests.rs @@ -16,8 +16,8 @@ use super::*; use crate::mock::{ - new_test_ext, Configuration, RuntimeEvent as MockEvent, Hrmp, MockGenesisConfig, Paras, ParasShared, - System, Test, + new_test_ext, Configuration, Hrmp, MockGenesisConfig, Paras, ParasShared, + RuntimeEvent as MockEvent, System, Test, }; use frame_support::{assert_noop, assert_ok, traits::Currency as _}; use primitives::v2::BlockNumber; diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index cf102b96466f..368719d825d1 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -249,7 +249,9 @@ pub mod mock_msg_queue { let mut remaining_fragments = &data_ref[..]; while !remaining_fragments.is_empty() { - if let Ok(xcm) = VersionedXcm::::decode(&mut remaining_fragments) { + if let Ok(xcm) = + VersionedXcm::::decode(&mut remaining_fragments) + { let _ = Self::handle_xcmp_message(sender, sent_at, xcm, max_weight); } else { debug_assert!(false, "Invalid incoming XCMP message data"); @@ -267,8 +269,8 @@ pub mod mock_msg_queue { ) -> Weight { for (_i, (_sent_at, data)) in iter.enumerate() { let id = sp_io::hashing::blake2_256(&data[..]); - let maybe_msg = - VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); + let maybe_msg = VersionedXcm::::decode(&mut &data[..]) + .map(Xcm::::try_from); match maybe_msg { Err(_) => { Self::deposit_event(Event::InvalidFormat(id)); diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index c8f8d0ca809a..2e6dfd2c790e 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -249,7 +249,9 @@ pub mod mock_msg_queue { let mut remaining_fragments = &data_ref[..]; while !remaining_fragments.is_empty() { - if let Ok(xcm) = VersionedXcm::::decode(&mut remaining_fragments) { + if let Ok(xcm) = + VersionedXcm::::decode(&mut remaining_fragments) + { let _ = Self::handle_xcmp_message(sender, sent_at, xcm, max_weight); } else { debug_assert!(false, "Invalid incoming XCMP message data"); @@ -267,8 +269,8 @@ pub mod mock_msg_queue { ) -> Weight { for (_i, (_sent_at, data)) in iter.enumerate() { let id = sp_io::hashing::blake2_256(&data[..]); - let maybe_msg = - VersionedXcm::::decode(&mut &data[..]).map(Xcm::::try_from); + let maybe_msg = VersionedXcm::::decode(&mut &data[..]) + .map(Xcm::::try_from); match maybe_msg { Err(_) => { Self::deposit_event(Event::InvalidFormat(id)); From 37d2b2dbfec7c1c126a16ae92e4c0814e8f19314 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sat, 27 Aug 2022 14:21:54 +0200 Subject: [PATCH 19/37] commit --- xcm/xcm-simulator/example/src/parachain.rs | 2 +- xcm/xcm-simulator/fuzzer/src/parachain.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs index 368719d825d1..5bf62831bfc7 100644 --- a/xcm/xcm-simulator/example/src/parachain.rs +++ b/xcm/xcm-simulator/example/src/parachain.rs @@ -157,7 +157,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { type RuntimeEvent: From> + IsType<::RuntimeEvent>; - type XcmExecutor: ExecuteXcm; + type XcmExecutor: ExecuteXcm; } #[pallet::call] diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs index 2e6dfd2c790e..608a5fa59cf5 100644 --- a/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -157,7 +157,7 @@ pub mod mock_msg_queue { #[pallet::config] pub trait Config: frame_system::Config { type RuntimeEvent: From> + IsType<::RuntimeEvent>; - type XcmExecutor: ExecuteXcm; + type XcmExecutor: ExecuteXcm; } #[pallet::call] From afd2386baf227d60d03c1bddad8a746f10a809d9 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sun, 28 Aug 2022 09:12:55 +0200 Subject: [PATCH 20/37] error fixes --- runtime/polkadot/src/lib.rs | 9 +++------ runtime/westend/src/tests.rs | 6 +++--- utils/staking-miner/src/main.rs | 2 +- utils/staking-miner/src/monitor.rs | 2 +- xcm/pallet-xcm/src/lib.rs | 6 +++--- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index eda3f369f10a..0af0dece5364 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -161,7 +161,6 @@ impl Contains for BaseFilter { RuntimeCall::ImOnline(_) | RuntimeCall::Utility(_) | RuntimeCall::Claims(_) | - RuntimeCall::Vesting(_) | RuntimeCall::Identity(_) | RuntimeCall::Proxy(_) | RuntimeCall::Multisig(_) | @@ -1172,8 +1171,6 @@ impl InstanceFilter for ProxyType { RuntimeCall::ChildBounties(..) | RuntimeCall::Tips(..) | RuntimeCall::Claims(..) | - RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) | - RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` RuntimeCall::Utility(..) | RuntimeCall::Identity(..) | @@ -2255,9 +2252,9 @@ mod test { #[test] fn call_size() { assert!( - core::mem::size_of::() <= 230, - "size of Call is more than 230 bytes: some calls have too big arguments, use Box to \ - reduce the size of Call. + core::mem::size_of::() <= 230, + "size of RuntimeCall is more than 230 bytes: some calls have too big arguments, use Box to \ + reduce the size of RuntimeCall. If the limit is too strong, maybe consider increase the limit", ); } diff --git a/runtime/westend/src/tests.rs b/runtime/westend/src/tests.rs index 32a8e42e0043..b1a2fe389047 100644 --- a/runtime/westend/src/tests.rs +++ b/runtime/westend/src/tests.rs @@ -45,9 +45,9 @@ fn sample_size_is_sensible() { #[test] fn call_size() { assert!( - core::mem::size_of::() <= 230, - "size of Call is more than 230 bytes: some calls have too big arguments, use Box to reduce \ - the size of Call. + core::mem::size_of::() <= 230, + "size of RuntimeCall is more than 230 bytes: some calls have too big arguments, use Box to reduce \ + the size of RuntimeCall. If the limit is too strong, maybe consider increase the limit to 300.", ); } diff --git a/utils/staking-miner/src/main.rs b/utils/staking-miner/src/main.rs index 43b3d51b1a06..7a6a0b71dbcb 100644 --- a/utils/staking-miner/src/main.rs +++ b/utils/staking-miner/src/main.rs @@ -94,7 +94,7 @@ macro_rules! construct_runtime_prelude { let crate::signer::Signer { account, pair, .. } = signer; let local_call = EPMCall::::submit { raw_solution: Box::new(raw_solution) }; - let call: RuntimeCall = as std::convert::TryInto>::try_into(local_call) + let call: RuntimeCall = as std::convert::TryInto>::try_into(local_call) .expect("election provider pallet must exist in the runtime, thus \ inner call can be converted, qed." ); diff --git a/utils/staking-miner/src/monitor.rs b/utils/staking-miner/src/monitor.rs index 0553693a84ef..676440d018fd 100644 --- a/utils/staking-miner/src/monitor.rs +++ b/utils/staking-miner/src/monitor.rs @@ -377,7 +377,7 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! { ); let events = match rpc.get_storage_and_decode::< - Vec::Hash>>, + Vec::Hash>>, >(&key, Some(hash)) .await { Ok(rp) => rp.unwrap_or_default(), diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs index b233fd22c1c0..92abb9da13c5 100644 --- a/xcm/pallet-xcm/src/lib.rs +++ b/xcm/pallet-xcm/src/lib.rs @@ -1210,10 +1210,10 @@ pub mod pallet { } impl WrapVersion for Pallet { - fn wrap_version( + fn wrap_version( dest: &MultiLocation, - xcm: impl Into>, - ) -> Result, ()> { + xcm: impl Into>, + ) -> Result, ()> { SupportedVersion::::get(XCM_VERSION, LatestVersionedMultiLocation(dest)) .or_else(|| { Self::note_unknown_version(dest); From 28d87c23ba670b9fb3eaea856b4c79596e53c20e Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sun, 28 Aug 2022 16:20:11 +0200 Subject: [PATCH 21/37] fix --- node/test/service/src/lib.rs | 4 ++-- xcm/xcm-executor/integration-tests/src/lib.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/node/test/service/src/lib.rs b/node/test/service/src/lib.rs index cd8345ca96c2..4a9db5618371 100644 --- a/node/test/service/src/lib.rs +++ b/node/test/service/src/lib.rs @@ -288,7 +288,7 @@ impl PolkadotTestNode { /// Send an extrinsic to this node. pub async fn send_extrinsic( &self, - function: impl Into, + function: impl Into, caller: Sr25519Keyring, ) -> Result { let extrinsic = construct_extrinsic(&*self.client, function, caller, 0); @@ -345,7 +345,7 @@ impl PolkadotTestNode { /// Construct an extrinsic that can be applied to the test runtime. pub fn construct_extrinsic( client: &Client, - function: impl Into, + function: impl Into, caller: Sr25519Keyring, nonce: u32, ) -> UncheckedExtrinsic { diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index 3012ba43b64b..f437239496a4 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -44,7 +44,7 @@ fn basic_buy_fees_message_executes() { let execute = construct_extrinsic( &client, - polkadot_test_runtime::Call::Xcm(pallet_xcm::Call::execute { + polkadot_test_runtime::RuntimeCall::Xcm(pallet_xcm::Call::execute { message: Box::new(VersionedXcm::from(msg)), max_weight: 1_000_000_000, }), @@ -88,7 +88,7 @@ fn query_response_fires() { let execute = construct_extrinsic( &client, - polkadot_test_runtime::Call::TestNotifier(pallet_test_notifier::Call::prepare_new_query {}), + polkadot_test_runtime::RuntimeCall::TestNotifier(pallet_test_notifier::Call::prepare_new_query {}), sp_keyring::Sr25519Keyring::Alice, 0, ); @@ -124,7 +124,7 @@ fn query_response_fires() { let execute = construct_extrinsic( &client, - polkadot_test_runtime::Call::Xcm(pallet_xcm::Call::execute { + polkadot_test_runtime::RuntimeCall::Xcm(pallet_xcm::Call::execute { message: msg, max_weight: 1_000_000_000, }), @@ -175,7 +175,7 @@ fn query_response_elicits_handler() { let execute = construct_extrinsic( &client, - polkadot_test_runtime::Call::TestNotifier( + polkadot_test_runtime::RuntimeCall::TestNotifier( pallet_test_notifier::Call::prepare_new_notify_query {}, ), sp_keyring::Sr25519Keyring::Alice, @@ -212,7 +212,7 @@ fn query_response_elicits_handler() { let execute = construct_extrinsic( &client, - polkadot_test_runtime::Call::Xcm(pallet_xcm::Call::execute { + polkadot_test_runtime::RuntimeCall::Xcm(pallet_xcm::Call::execute { message: Box::new(VersionedXcm::from(msg)), max_weight: 1_000_000_000, }), From 595752f1b5b2b2f0c928ae970c0cfd14ab95ec81 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Sun, 28 Aug 2022 16:58:33 +0200 Subject: [PATCH 22/37] small fix in test --- runtime/kusama/src/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/kusama/src/tests.rs b/runtime/kusama/src/tests.rs index 34ca6333fd29..c1fa774be474 100644 --- a/runtime/kusama/src/tests.rs +++ b/runtime/kusama/src/tests.rs @@ -173,5 +173,5 @@ fn era_payout_should_give_sensible_results() { #[test] fn call_size() { - Call::assert_size_under(230); + RuntimeCall::assert_size_under(230); } From b1f2122cebfd8bac88df43ba0eab19bf1afd944d Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:31:16 +0200 Subject: [PATCH 23/37] Update lib.rs --- runtime/polkadot/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index ddf56fb6571c..efbb5b16c191 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1149,7 +1149,6 @@ impl InstanceFilter for ProxyType { match self { ProxyType::Any => true, ProxyType::NonTransfer => matches!( - c, RuntimeCall::System(..) | RuntimeCall::Vesting(..) | RuntimeCall::Babe(..) | From 1b3b37c0b5569ae38200d998061272eab33a390e Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:34:48 +0200 Subject: [PATCH 24/37] Update lib.rs --- runtime/polkadot/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index efbb5b16c191..ddf56fb6571c 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1149,6 +1149,7 @@ impl InstanceFilter for ProxyType { match self { ProxyType::Any => true, ProxyType::NonTransfer => matches!( + c, RuntimeCall::System(..) | RuntimeCall::Vesting(..) | RuntimeCall::Babe(..) | From acf1cca5acad01d7def266cb1a7d10831ea02b10 Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:41:14 +0200 Subject: [PATCH 25/37] Update lib.rs --- runtime/polkadot/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index ddf56fb6571c..bd3b7b52e324 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -148,7 +148,6 @@ impl Contains for BaseFilter { RuntimeCall::PhragmenElection(_) | RuntimeCall::System(_) | RuntimeCall::Scheduler(_) | - RuntimeCall::Vesting(_) | RuntimeCall::Preimage(_) | RuntimeCall::Indices(_) | RuntimeCall::Babe(_) | @@ -161,6 +160,7 @@ impl Contains for BaseFilter { RuntimeCall::ImOnline(_) | RuntimeCall::Utility(_) | RuntimeCall::Claims(_) | + RuntimeCall::Vesting(_) | RuntimeCall::Identity(_) | RuntimeCall::Proxy(_) | RuntimeCall::Multisig(_) | @@ -1151,7 +1151,7 @@ impl InstanceFilter for ProxyType { ProxyType::NonTransfer => matches!( c, RuntimeCall::System(..) | - RuntimeCall::Vesting(..) | + RuntimeCall::Scheduler(..) | RuntimeCall::Babe(..) | RuntimeCall::Timestamp(..) | RuntimeCall::Indices(pallet_indices::Call::claim{..}) | @@ -1174,6 +1174,8 @@ impl InstanceFilter for ProxyType { RuntimeCall::ChildBounties(..) | RuntimeCall::Tips(..) | RuntimeCall::Claims(..) | + RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` RuntimeCall::Utility(..) | RuntimeCall::Identity(..) | From 9746310d3ae9fcb247fd60f25f4dcd553e866c91 Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:49:45 +0200 Subject: [PATCH 26/37] Update lib.rs --- runtime/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 9b2338b79382..48fdb00fa09e 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1045,7 +1045,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Vesting(pallet_vesting::Call::vest {..}) | RuntimeCall::Vesting(pallet_vesting::Call::vest_other {..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - RuntimeCall::Vesting(..) | + Call::Scheduler(..) | RuntimeCall::Proxy(..) | RuntimeCall::Multisig(..) | RuntimeCall::Gilt(..) | From 334e3dc3433b3efcefd83baf74615f32d9ace64b Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:51:41 +0200 Subject: [PATCH 27/37] Update lib.rs --- runtime/rococo/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 8a8e383cc5d6..8888ef2d303d 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -834,7 +834,6 @@ impl InstanceFilter for ProxyType { RuntimeCall::Crowdloan { .. } | RuntimeCall::Registrar { .. } | RuntimeCall::Multisig(..) | - RuntimeCall::Slots { .. } ), } } From 8c0346b0fdf49763b6aa4b7ee7f98de23bf35505 Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:54:38 +0200 Subject: [PATCH 28/37] Update lib.rs --- runtime/westend/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 53f054af8e30..45aca4cf832a 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -795,7 +795,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) | RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - RuntimeCall::Vesting(..) | + RuntimeCall::Scheduler(..) | // Specifically omitting Sudo pallet RuntimeCall::Proxy(..) | RuntimeCall::Multisig(..) | From bb203a995e90bdcbc4a01fa597c6e366c6e0bc9a Mon Sep 17 00:00:00 2001 From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> Date: Mon, 5 Sep 2022 20:55:32 +0200 Subject: [PATCH 29/37] Update lib.rs --- runtime/kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 48fdb00fa09e..5a76ef956fe7 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1045,7 +1045,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Vesting(pallet_vesting::Call::vest {..}) | RuntimeCall::Vesting(pallet_vesting::Call::vest_other {..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - Call::Scheduler(..) | + RuntimeCall::Scheduler(..) | RuntimeCall::Proxy(..) | RuntimeCall::Multisig(..) | RuntimeCall::Gilt(..) | From 7792686998a1ff8125f6470d64906bf0c5d223a0 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Mon, 5 Sep 2022 21:31:00 +0200 Subject: [PATCH 30/37] remove RuntimeCall from pallet_grandpa --- runtime/kusama/src/lib.rs | 1 - runtime/polkadot/src/lib.rs | 1 - runtime/rococo/src/lib.rs | 1 - runtime/test-runtime/src/lib.rs | 1 - runtime/westend/src/lib.rs | 1 - 5 files changed, 5 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 5a76ef956fe7..af7f6ce13a5a 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -753,7 +753,6 @@ impl pallet_im_online::Config for Runtime { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; type KeyOwnerProof = >::Proof; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index bd3b7b52e324..18f426ea9453 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -931,7 +931,6 @@ impl pallet_im_online::Config for Runtime { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; type KeyOwnerProof = >::Proof; diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 8888ef2d303d..2aaa7c029ebb 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -523,7 +523,6 @@ parameter_types! { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; type KeyOwnerProofSystem = Historical; diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index 7031cf0a7c47..76759e7ca34d 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -363,7 +363,6 @@ impl pallet_staking::Config for Runtime { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; type KeyOwnerProofSystem = (); diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 45aca4cf832a..a658099059a0 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -556,7 +556,6 @@ impl pallet_im_online::Config for Runtime { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type RuntimeCall = RuntimeCall; type KeyOwnerProofSystem = Historical; From ca46f1944c8c143b13892edbe75d4fb84da113ea Mon Sep 17 00:00:00 2001 From: Szegoo Date: Tue, 6 Sep 2022 09:38:33 +0200 Subject: [PATCH 31/37] last fix --- runtime/rococo/src/lib.rs | 1 + xcm/xcm-executor/integration-tests/src/lib.rs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index c8e9468d9d19..193448db68f4 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -833,6 +833,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Crowdloan { .. } | RuntimeCall::Registrar { .. } | RuntimeCall::Multisig(..) | + RuntimeCall::Slots { .. } ), } } diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs index aecb9619945d..6d263fe46245 100644 --- a/xcm/xcm-executor/integration-tests/src/lib.rs +++ b/xcm/xcm-executor/integration-tests/src/lib.rs @@ -89,7 +89,9 @@ fn query_response_fires() { let execute = construct_extrinsic( &client, - polkadot_test_runtime::RuntimeCall::TestNotifier(pallet_test_notifier::Call::prepare_new_query {}), + polkadot_test_runtime::RuntimeCall::TestNotifier( + pallet_test_notifier::Call::prepare_new_query {}, + ), sp_keyring::Sr25519Keyring::Alice, 0, ); From 7a501b8141a85ff881dc23ee452f67171c12bddd Mon Sep 17 00:00:00 2001 From: Szegoo Date: Tue, 6 Sep 2022 11:15:27 +0200 Subject: [PATCH 32/37] commit --- runtime/polkadot/src/lib.rs | 94 ++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index ef8fe80008c8..4cbd0933103a 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -136,55 +136,55 @@ pub fn native_version() -> NativeVersion { } pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(call: &RuntimeCall) -> bool { +impl Contains for BaseFilter { + fn contains(call: &Call) -> bool { match call { // These modules are all allowed to be called by transactions: - RuntimeCall::Democracy(_) | - RuntimeCall::Council(_) | - RuntimeCall::TechnicalCommittee(_) | - RuntimeCall::TechnicalMembership(_) | - RuntimeCall::Treasury(_) | - RuntimeCall::PhragmenElection(_) | - RuntimeCall::System(_) | - RuntimeCall::Scheduler(_) | - RuntimeCall::Preimage(_) | - RuntimeCall::Indices(_) | - RuntimeCall::Babe(_) | - RuntimeCall::Timestamp(_) | - RuntimeCall::Balances(_) | - RuntimeCall::Authorship(_) | - RuntimeCall::Staking(_) | - RuntimeCall::Session(_) | - RuntimeCall::Grandpa(_) | - RuntimeCall::ImOnline(_) | - RuntimeCall::Utility(_) | - RuntimeCall::Claims(_) | - RuntimeCall::Vesting(_) | - RuntimeCall::Identity(_) | - RuntimeCall::Proxy(_) | - RuntimeCall::Multisig(_) | - RuntimeCall::Bounties(_) | - RuntimeCall::ChildBounties(_) | - RuntimeCall::Tips(_) | - RuntimeCall::ElectionProviderMultiPhase(_) | - RuntimeCall::Configuration(_) | - RuntimeCall::ParasShared(_) | - RuntimeCall::ParaInclusion(_) | - RuntimeCall::Paras(_) | - RuntimeCall::Initializer(_) | - RuntimeCall::ParaInherent(_) | - RuntimeCall::ParasDisputes(_) | - RuntimeCall::Dmp(_) | - RuntimeCall::Ump(_) | - RuntimeCall::Hrmp(_) | - RuntimeCall::Slots(_) | - RuntimeCall::Registrar(_) | - RuntimeCall::Auctions(_) | - RuntimeCall::Crowdloan(_) | - RuntimeCall::VoterList(_) | - RuntimeCall::XcmPallet(_) | - RuntimeCall::NominationPools(_) => true, + Call::Democracy(_) | + Call::Council(_) | + Call::TechnicalCommittee(_) | + Call::TechnicalMembership(_) | + Call::Treasury(_) | + Call::PhragmenElection(_) | + Call::System(_) | + Call::Scheduler(_) | + Call::Preimage(_) | + Call::Indices(_) | + Call::Babe(_) | + Call::Timestamp(_) | + Call::Balances(_) | + Call::Authorship(_) | + Call::Staking(_) | + Call::Session(_) | + Call::Grandpa(_) | + Call::ImOnline(_) | + Call::Utility(_) | + Call::Claims(_) | + Call::Vesting(_) | + Call::Identity(_) | + Call::Proxy(_) | + Call::Multisig(_) | + Call::Bounties(_) | + Call::ChildBounties(_) | + Call::Tips(_) | + Call::ElectionProviderMultiPhase(_) | + Call::Configuration(_) | + Call::ParasShared(_) | + Call::ParaInclusion(_) | + Call::Paras(_) | + Call::Initializer(_) | + Call::ParaInherent(_) | + Call::ParasDisputes(_) | + Call::Dmp(_) | + Call::Ump(_) | + Call::Hrmp(_) | + Call::Slots(_) | + Call::Registrar(_) | + Call::Auctions(_) | + Call::Crowdloan(_) | + Call::VoterList(_) | + Call::XcmPallet(_) | + Call::NominationPools(_) => true, // All pallets are allowed, but exhaustive match is defensive // in the case of adding new pallets. } From 15b47e8193a85ce553635070cab85c367c9f9bc4 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Thu, 8 Sep 2022 11:19:44 +0200 Subject: [PATCH 33/37] rename --- runtime/polkadot/src/lib.rs | 94 ++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 4bea5595c65c..2b1695525f87 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -136,55 +136,55 @@ pub fn native_version() -> NativeVersion { } pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(call: &Call) -> bool { +impl Contains for BaseFilter { + fn contains(call: &RuntimeCall) -> bool { match call { // These modules are all allowed to be called by transactions: - Call::Democracy(_) | - Call::Council(_) | - Call::TechnicalCommittee(_) | - Call::TechnicalMembership(_) | - Call::Treasury(_) | - Call::PhragmenElection(_) | - Call::System(_) | - Call::Scheduler(_) | - Call::Preimage(_) | - Call::Indices(_) | - Call::Babe(_) | - Call::Timestamp(_) | - Call::Balances(_) | - Call::Authorship(_) | - Call::Staking(_) | - Call::Session(_) | - Call::Grandpa(_) | - Call::ImOnline(_) | - Call::Utility(_) | - Call::Claims(_) | - Call::Vesting(_) | - Call::Identity(_) | - Call::Proxy(_) | - Call::Multisig(_) | - Call::Bounties(_) | - Call::ChildBounties(_) | - Call::Tips(_) | - Call::ElectionProviderMultiPhase(_) | - Call::Configuration(_) | - Call::ParasShared(_) | - Call::ParaInclusion(_) | - Call::Paras(_) | - Call::Initializer(_) | - Call::ParaInherent(_) | - Call::ParasDisputes(_) | - Call::Dmp(_) | - Call::Ump(_) | - Call::Hrmp(_) | - Call::Slots(_) | - Call::Registrar(_) | - Call::Auctions(_) | - Call::Crowdloan(_) | - Call::VoterList(_) | - Call::XcmPallet(_) | - Call::NominationPools(_) => true, + RuntimeCall::Democracy(_) | + RuntimeCall::Council(_) | + RuntimeCall::TechnicalCommittee(_) | + RuntimeCall::TechnicalMembership(_) | + RuntimeCall::Treasury(_) | + RuntimeCall::PhragmenElection(_) | + RuntimeCall::System(_) | + RuntimeCall::Scheduler(_) | + RuntimeCall::Preimage(_) | + RuntimeCall::Indices(_) | + RuntimeCall::Babe(_) | + RuntimeCall::Timestamp(_) | + RuntimeCall::Balances(_) | + RuntimeCall::Authorship(_) | + RuntimeCall::Staking(_) | + RuntimeCall::Session(_) | + RuntimeCall::Grandpa(_) | + RuntimeCall::ImOnline(_) | + RuntimeCall::Utility(_) | + RuntimeCall::Claims(_) | + RuntimeCall::Vesting(_) | + RuntimeCall::Identity(_) | + RuntimeCall::Proxy(_) | + RuntimeCall::Multisig(_) | + RuntimeCall::Bounties(_) | + RuntimeCall::ChildBounties(_) | + RuntimeCall::Tips(_) | + RuntimeCall::ElectionProviderMultiPhase(_) | + RuntimeCall::Configuration(_) | + RuntimeCall::ParasShared(_) | + RuntimeCall::ParaInclusion(_) | + RuntimeCall::Paras(_) | + RuntimeCall::Initializer(_) | + RuntimeCall::ParaInherent(_) | + RuntimeCall::ParasDisputes(_) | + RuntimeCall::Dmp(_) | + RuntimeCall::Ump(_) | + RuntimeCall::Hrmp(_) | + RuntimeCall::Slots(_) | + RuntimeCall::Registrar(_) | + RuntimeCall::Auctions(_) | + RuntimeCall::Crowdloan(_) | + RuntimeCall::VoterList(_) | + RuntimeCall::XcmPallet(_) | + RuntimeCall::NominationPools(_) => true, // All pallets are allowed, but exhaustive match is defensive // in the case of adding new pallets. } From d29b550840a7cfbc2d92ffb724ec25e4aa9c41e5 Mon Sep 17 00:00:00 2001 From: Szegoo Date: Fri, 9 Sep 2022 10:30:27 +0200 Subject: [PATCH 34/37] merge fix --- runtime/rococo/src/lib.rs | 185 +++++++++++++++++++------------------- 1 file changed, 92 insertions(+), 93 deletions(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 8d76542cdc8c..886516ca54f0 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -206,10 +206,10 @@ impl PrivilegeCmp for OriginPrivilegeCmp { } impl pallet_scheduler::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Origin = Origin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = ScheduleOrigin; type MaxScheduledPerBlock = MaxScheduledPerBlock; @@ -398,8 +398,8 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type Proposal = Call; - type Event = Event; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type VoteLockingPeriod = EnactmentPeriod; @@ -459,8 +459,8 @@ parameter_types! { type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; - type Event = Event; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -487,7 +487,7 @@ parameter_types! { const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); impl pallet_elections_phragmen::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ChangeMembers = Council; type InitializeMembers = Council; @@ -515,8 +515,8 @@ parameter_types! { type TechnicalCollective = pallet_collective::Instance2; impl pallet_collective::Config for Runtime { type Origin = Origin; - type Proposal = Call; - type Event = Event; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type MotionDuration = TechnicalMotionDuration; type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; @@ -530,7 +530,7 @@ type MoreThanHalfCouncil = EitherOfDiverse< >; impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; type SwapOrigin = MoreThanHalfCouncil; @@ -571,7 +571,7 @@ impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = ApproveOrigin; type RejectOrigin = MoreThanHalfCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -606,7 +606,7 @@ impl pallet_bounties::Config for Runtime { type BountyValueMinimum = BountyValueMinimum; type ChildBountyManager = ChildBounties; type DataDepositPerByte = DataDepositPerByte; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } @@ -617,7 +617,7 @@ parameter_types! { } impl pallet_child_bounties::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxActiveChildBountyCount = MaxActiveChildBountyCount; type ChildBountyValueMinimum = ChildBountyValueMinimum; type WeightInfo = weights::pallet_child_bounties::WeightInfo; @@ -630,12 +630,12 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = weights::pallet_tips::WeightInfo; } impl pallet_offences::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = (); } @@ -650,7 +650,7 @@ parameter_types! { impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorSet = Historical; type NextSessionRotation = Babe; type ReportUnresponsiveness = Offences; @@ -662,8 +662,7 @@ impl pallet_im_online::Config for Runtime { } impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; type KeyOwnerProof = >::Proof; @@ -689,14 +688,14 @@ impl pallet_grandpa::Config for Runtime { /// format of the chain. impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: ::Index, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { use sp_runtime::traits::StaticLookup; // take the biggest period possible. let period = @@ -740,10 +739,10 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { type Extrinsic = UncheckedExtrinsic; - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; } parameter_types! { @@ -751,7 +750,7 @@ parameter_types! { } impl claims::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = @@ -800,8 +799,8 @@ parameter_types! { } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; @@ -817,9 +816,9 @@ parameter_types! { } impl pallet_recovery::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ConfigDepositBase = ConfigDepositBase; type FriendDepositFactor = FriendDepositFactor; @@ -840,7 +839,7 @@ parameter_types! { } impl pallet_society::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Randomness = pallet_babe::RandomnessFromOneEpochAgo; type CandidateDeposit = CandidateDeposit; @@ -863,7 +862,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = ConvertInto; type MinVestedTransfer = MinVestedTransfer; @@ -910,83 +909,83 @@ impl Default for ProxyType { Self::Any } } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::NonTransfer => matches!( c, - Call::System(..) | - Call::Babe(..) | - Call::Timestamp(..) | - Call::Indices(pallet_indices::Call::claim {..}) | - Call::Indices(pallet_indices::Call::free {..}) | - Call::Indices(pallet_indices::Call::freeze {..}) | + RuntimeCall::System(..) | + RuntimeCall::Babe(..) | + RuntimeCall::Timestamp(..) | + RuntimeCall::Indices(pallet_indices::Call::claim {..}) | + RuntimeCall::Indices(pallet_indices::Call::free {..}) | + RuntimeCall::Indices(pallet_indices::Call::freeze {..}) | // Specifically omitting Indices `transfer`, `force_transfer` // Specifically omitting the entire Balances pallet - Call::Authorship(..) | - Call::Session(..) | - Call::Grandpa(..) | - Call::ImOnline(..) | - Call::Democracy(..) | - Call::Council(..) | - Call::TechnicalCommittee(..) | - Call::PhragmenElection(..) | - Call::TechnicalMembership(..) | - Call::Treasury(..) | - Call::Bounties(..) | - Call::ChildBounties(..) | - Call::Tips(..) | - Call::Claims(..) | - Call::Utility(..) | - Call::Identity(..) | - Call::Society(..) | - Call::Recovery(pallet_recovery::Call::as_recovered {..}) | - Call::Recovery(pallet_recovery::Call::vouch_recovery {..}) | - Call::Recovery(pallet_recovery::Call::claim_recovery {..}) | - Call::Recovery(pallet_recovery::Call::close_recovery {..}) | - Call::Recovery(pallet_recovery::Call::remove_recovery {..}) | - Call::Recovery(pallet_recovery::Call::cancel_recovered {..}) | + RuntimeCall::Authorship(..) | + RuntimeCall::Session(..) | + RuntimeCall::Grandpa(..) | + RuntimeCall::ImOnline(..) | + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | + RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::TechnicalMembership(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Bounties(..) | + RuntimeCall::ChildBounties(..) | + RuntimeCall::Tips(..) | + RuntimeCall::Claims(..) | + RuntimeCall::Utility(..) | + RuntimeCall::Identity(..) | + RuntimeCall::Society(..) | + RuntimeCall::Recovery(pallet_recovery::Call::as_recovered {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::claim_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::close_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::remove_recovery {..}) | + RuntimeCall::Recovery(pallet_recovery::Call::cancel_recovered {..}) | // Specifically omitting Recovery `create_recovery`, `initiate_recovery` - Call::Vesting(pallet_vesting::Call::vest {..}) | - Call::Vesting(pallet_vesting::Call::vest_other {..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest {..}) | + RuntimeCall::Vesting(pallet_vesting::Call::vest_other {..}) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` - Call::Scheduler(..) | - Call::Proxy(..) | - Call::Multisig(..) | - Call::Gilt(..) | - Call::Registrar(paras_registrar::Call::register {..}) | - Call::Registrar(paras_registrar::Call::deregister {..}) | + RuntimeCall::Scheduler(..) | + RuntimeCall::Proxy(..) | + RuntimeCall::Multisig(..) | + RuntimeCall::Gilt(..) | + RuntimeCall::Registrar(paras_registrar::Call::register {..}) | + RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) | // Specifically omitting Registrar `swap` - Call::Registrar(paras_registrar::Call::reserve {..}) | - Call::Crowdloan(..) | - Call::Slots(..) | - Call::Auctions(..) // Specifically omitting the entire XCM Pallet + RuntimeCall::Registrar(paras_registrar::Call::reserve {..}) | + RuntimeCall::Crowdloan(..) | + RuntimeCall::Slots(..) | + RuntimeCall::Auctions(..) // Specifically omitting the entire XCM Pallet ), ProxyType::Governance => matches!( c, - Call::Democracy(..) | - Call::Council(..) | Call::TechnicalCommittee(..) | - Call::PhragmenElection(..) | - Call::Treasury(..) | Call::Bounties(..) | - Call::Tips(..) | Call::Utility(..) | - Call::ChildBounties(..) + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::Treasury(..) | RuntimeCall::Bounties(..) | + RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | + RuntimeCall::ChildBounties(..) ), ProxyType::IdentityJudgement => matches!( c, - Call::Identity(pallet_identity::Call::provide_judgement { .. }) | Call::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) }, ProxyType::Auction => matches!( c, - Call::Auctions { .. } | - Call::Crowdloan { .. } | - Call::Registrar { .. } | - Call::Multisig(..) | Call::Slots { .. } + RuntimeCall::Auctions { .. } | + RuntimeCall::Crowdloan { .. } | + RuntimeCall::Registrar { .. } | + RuntimeCall::Multisig(..) | RuntimeCall::Slots { .. } ), - ProxyType::Society => matches!(c, Call::Society(..)), + ProxyType::Society => matches!(c, RuntimeCall::Society(..)), } } fn is_superset(&self, o: &Self) -> bool { @@ -1111,7 +1110,7 @@ parameter_types! { } impl slots::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type Registrar = Registrar; type LeasePeriod = LeasePeriod; @@ -1130,7 +1129,7 @@ parameter_types! { } impl crowdloan::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = CrowdloanId; type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -1155,7 +1154,7 @@ type AuctionInitiate = EitherOfDiverse< >; impl auctions::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Leaser = Slots; type Registrar = Registrar; type EndingPeriod = EndingPeriod; @@ -1177,7 +1176,7 @@ parameter_types! { } impl pallet_gilt::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; type AdminOrigin = MoreThanHalfCouncil; @@ -1422,7 +1421,7 @@ pub type SignedExtra = ( ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -1432,7 +1431,7 @@ pub type Executive = frame_executive::Executive< AllPalletsWithSystem, >; /// The payload being signed in transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; #[cfg(feature = "runtime-benchmarks")] #[macro_use] @@ -1926,7 +1925,7 @@ sp_api::impl_runtime_apis! { } impl pallet_xcm_benchmarks::generic::Config for Runtime { - type Call = Call; + type RuntimeCall = RuntimeCall; fn worst_case_response() -> (u64, Response) { (0u64, Response::Version(Default::default())) From 1d578a3d7a831b47b1c7d2afb35a976e63eac6c4 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Mon, 12 Sep 2022 22:04:34 +0000 Subject: [PATCH 35/37] update lockfile for {"substrate"} --- Cargo.lock | 410 ++++++++++++++++++++++++++++------------------------- 1 file changed, 215 insertions(+), 195 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2332e67b6f55..0a8faa0fc414 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -423,7 +423,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "beefy-primitives", @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "beefy-primitives", "sp-api", @@ -488,7 +488,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -1983,7 +1983,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", ] @@ -2001,7 +2001,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -2024,7 +2024,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "Inflector", "chrono", @@ -2075,7 +2075,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2086,7 +2086,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2102,7 +2102,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -2131,7 +2131,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "bitflags", "frame-metadata", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "Inflector", "cfg-expr", @@ -2176,7 +2176,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro2", "quote", @@ -2198,7 +2198,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2221,7 +2221,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -2232,7 +2232,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "log", @@ -2249,7 +2249,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "sp-api", @@ -2273,7 +2273,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "parity-scale-codec", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "chrono", "frame-election-provider-support", @@ -4231,9 +4231,9 @@ dependencies = [ [[package]] name = "memory_units" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "merlin" @@ -4591,6 +4591,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.4.0" @@ -4627,7 +4638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ "autocfg", - "num-bigint", + "num-bigint 0.2.6", "num-integer", "num-traits", ] @@ -4639,6 +4650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", + "num-bigint 0.4.3", "num-integer", "num-traits", ] @@ -4811,7 +4823,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -4825,7 +4837,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -4841,7 +4853,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -4856,7 +4868,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -4880,7 +4892,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4900,7 +4912,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4919,7 +4931,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -4934,7 +4946,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "beefy-primitives", "frame-support", @@ -4950,7 +4962,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4973,7 +4985,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -4991,7 +5003,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5010,7 +5022,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5027,7 +5039,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5043,7 +5055,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5066,7 +5078,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5079,7 +5091,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5097,7 +5109,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5112,7 +5124,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5135,7 +5147,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5151,7 +5163,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5171,7 +5183,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5188,7 +5200,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5205,7 +5217,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5223,7 +5235,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5238,7 +5250,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5253,7 +5265,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -5270,7 +5282,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5289,7 +5301,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "sp-api", @@ -5299,7 +5311,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -5316,7 +5328,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5339,7 +5351,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5355,7 +5367,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5370,7 +5382,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5385,7 +5397,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5401,7 +5413,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -5422,7 +5434,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5438,7 +5450,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -5452,7 +5464,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5475,7 +5487,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5486,7 +5498,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "sp-arithmetic", @@ -5495,7 +5507,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -5509,7 +5521,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5527,7 +5539,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5546,7 +5558,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-support", "frame-system", @@ -5562,7 +5574,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5577,7 +5589,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5588,7 +5600,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5605,7 +5617,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5621,7 +5633,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5772,9 +5784,9 @@ dependencies = [ [[package]] name = "parity-wasm" -version = "0.42.2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" +checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" @@ -8085,7 +8097,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8433,7 +8445,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "sp-core", @@ -8444,7 +8456,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures", @@ -8471,7 +8483,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "futures-timer", @@ -8494,7 +8506,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8510,7 +8522,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8527,7 +8539,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8538,7 +8550,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "chrono", "clap", @@ -8577,7 +8589,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "fnv", "futures", @@ -8605,7 +8617,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "hash-db", "kvdb", @@ -8630,7 +8642,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures", @@ -8654,14 +8666,14 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "fork-tree", "futures", "log", "merlin", - "num-bigint", + "num-bigint 0.2.6", "num-rational 0.2.4", "num-traits", "parity-scale-codec", @@ -8696,7 +8708,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "jsonrpsee", @@ -8718,7 +8730,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8731,7 +8743,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures", @@ -8756,7 +8768,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "lazy_static", "lru 0.7.8", @@ -8783,7 +8795,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "environmental", "parity-scale-codec", @@ -8799,7 +8811,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "parity-scale-codec", @@ -8814,14 +8826,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "cfg-if 1.0.0", "libc", "log", "once_cell", "parity-scale-codec", - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", "rustix", "sc-allocator", "sc-executor-common", @@ -8834,7 +8846,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ahash", "async-trait", @@ -8875,7 +8887,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "finality-grandpa", "futures", @@ -8896,7 +8908,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ansi_term", "futures", @@ -8913,7 +8925,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "hex", @@ -8928,7 +8940,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "asynchronous-codec", @@ -8977,7 +8989,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "bitflags", @@ -9000,7 +9012,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ahash", "futures", @@ -9018,7 +9030,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "hex", @@ -9039,7 +9051,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "fork-tree", "futures", @@ -9067,7 +9079,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "bytes", "fnv", @@ -9097,7 +9109,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "libp2p", @@ -9110,7 +9122,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9119,7 +9131,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "hash-db", @@ -9149,7 +9161,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "jsonrpsee", @@ -9172,7 +9184,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "jsonrpsee", @@ -9185,7 +9197,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "directories", @@ -9252,7 +9264,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "parity-scale-codec", @@ -9266,7 +9278,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9285,7 +9297,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "libc", @@ -9304,7 +9316,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "chrono", "futures", @@ -9322,7 +9334,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ansi_term", "atty", @@ -9353,7 +9365,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9364,7 +9376,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "futures-timer", @@ -9390,7 +9402,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "log", @@ -9403,7 +9415,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "futures-timer", @@ -9888,7 +9900,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "hash-db", "log", @@ -9906,7 +9918,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "blake2", "proc-macro-crate", @@ -9918,7 +9930,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -9931,7 +9943,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "integer-sqrt", "num-traits", @@ -9946,7 +9958,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -9959,7 +9971,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "parity-scale-codec", @@ -9971,7 +9983,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "sp-api", @@ -9983,7 +9995,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "log", @@ -10001,7 +10013,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures", @@ -10020,7 +10032,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "merlin", @@ -10043,7 +10055,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -10057,7 +10069,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -10070,7 +10082,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "base58", "bitflags", @@ -10116,7 +10128,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "blake2", "byteorder", @@ -10130,7 +10142,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro2", "quote", @@ -10141,7 +10153,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10150,7 +10162,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro2", "quote", @@ -10160,7 +10172,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "environmental", "parity-scale-codec", @@ -10171,7 +10183,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "finality-grandpa", "log", @@ -10189,7 +10201,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10203,7 +10215,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "bytes", "futures", @@ -10229,7 +10241,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "lazy_static", "sp-core", @@ -10240,7 +10252,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures", @@ -10257,7 +10269,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "thiserror", "zstd", @@ -10266,7 +10278,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "parity-scale-codec", @@ -10281,7 +10293,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -10295,7 +10307,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "sp-api", "sp-core", @@ -10305,7 +10317,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "backtrace", "lazy_static", @@ -10315,7 +10327,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "rustc-hash", "serde", @@ -10325,7 +10337,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "either", "hash256-std-hasher", @@ -10347,7 +10359,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10365,7 +10377,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "Inflector", "proc-macro-crate", @@ -10377,7 +10389,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "parity-scale-codec", @@ -10391,7 +10403,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -10405,7 +10417,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "scale-info", @@ -10416,7 +10428,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "hash-db", "log", @@ -10438,12 +10450,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10456,7 +10468,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "log", "sp-core", @@ -10469,7 +10481,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures-timer", @@ -10485,7 +10497,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "sp-std", @@ -10497,7 +10509,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "sp-api", "sp-runtime", @@ -10506,7 +10518,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "log", @@ -10522,7 +10534,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ahash", "hash-db", @@ -10545,11 +10557,11 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", "scale-info", "serde", "sp-core-hashing-proc-macro", @@ -10562,7 +10574,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10573,7 +10585,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "impl-trait-for-tuples", "log", @@ -10591,9 +10603,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.18.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb8b72a924ccfe7882d0e26144c114503760a4d1248bb5cd06c8ab2d55404cc" +checksum = "b0837b5d62f42082c9d56cd946495ae273a3c68083b637b9153341d5e465146d" dependencies = [ "Inflector", "num-format", @@ -10747,7 +10759,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "platforms", ] @@ -10755,7 +10767,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10776,7 +10788,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures-util", "hyper", @@ -10789,7 +10801,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "jsonrpsee", "log", @@ -10810,7 +10822,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "async-trait", "futures", @@ -10836,7 +10848,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10846,7 +10858,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10857,7 +10869,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "ansi_term", "build-helper", @@ -11571,7 +11583,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e20209240e7a5e7b32b91e9fcbe0e78a7397c8d5" +source = "git+https://github.com/paritytech/substrate?branch=master#5527263978a763bafc78d60955c662c20f465d18" dependencies = [ "clap", "frame-try-runtime", @@ -11938,11 +11950,11 @@ dependencies = [ [[package]] name = "wasm-instrument" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "8bca81f5279342b38b17d9acbf007a46ddeb73144e2bd5f0a21bfa9fc5d4ab3e" dependencies = [ - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", ] [[package]] @@ -11962,27 +11974,35 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.9.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" +checksum = "fc13b3c219ca9aafeec59150d80d89851df02e0061bc357b4d66fc55a8d38787" dependencies = [ - "downcast-rs", - "libc", - "libm", - "memory_units", - "num-rational 0.2.4", - "num-traits", - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", "wasmi-validation", + "wasmi_core", ] [[package]] name = "wasmi-validation" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", +] + +[[package]] +name = "wasmi_core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a088e8c4c59c6f2b9eae169bf86328adccc477c00b56d3661e3e9fb397b184" +dependencies = [ + "downcast-rs", + "libm", + "memory_units", + "num-rational 0.4.0", + "num-traits", ] [[package]] From e0211942f47b3a208894cd8b08a067b8cac6ab9a Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 12 Sep 2022 18:19:42 -0400 Subject: [PATCH 36/37] cargo +nightly fmt --- runtime/rococo/src/lib.rs | 29 +++++++++++++++++------------ runtime/rococo/src/xcm_config.rs | 11 +++++++---- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index cec1011bdff1..4ac03b638cd1 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -962,18 +962,21 @@ impl InstanceFilter for ProxyType { RuntimeCall::Slots(..) | RuntimeCall::Auctions(..) // Specifically omitting the entire XCM Pallet ), - ProxyType::Governance => matches!( - c, - RuntimeCall::Democracy(..) | - RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | - RuntimeCall::PhragmenElection(..) | - RuntimeCall::Treasury(..) | RuntimeCall::Bounties(..) | - RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | - RuntimeCall::ChildBounties(..) - ), + ProxyType::Governance => + matches!( + c, + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::PhragmenElection(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Bounties(..) | + RuntimeCall::Tips(..) | RuntimeCall::Utility(..) | + RuntimeCall::ChildBounties(..) + ), ProxyType::IdentityJudgement => matches!( c, - RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | RuntimeCall::Utility(..) + RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }) | + RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) @@ -983,7 +986,8 @@ impl InstanceFilter for ProxyType { RuntimeCall::Auctions { .. } | RuntimeCall::Crowdloan { .. } | RuntimeCall::Registrar { .. } | - RuntimeCall::Multisig(..) | RuntimeCall::Slots { .. } + RuntimeCall::Multisig(..) | + RuntimeCall::Slots { .. } ), ProxyType::Society => matches!(c, RuntimeCall::Society(..)), } @@ -1421,7 +1425,8 @@ pub type SignedExtra = ( ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs index 52ca847b685b..df594ec95715 100644 --- a/runtime/rococo/src/xcm_config.rs +++ b/runtime/rococo/src/xcm_config.rs @@ -17,8 +17,8 @@ //! XCM configuration for Rococo. use super::{ - parachains_origin, AccountId, Balances, RuntimeCall, CouncilCollective, RuntimeEvent, Origin, ParaId, - Runtime, WeightToFee, XcmPallet, + parachains_origin, AccountId, Balances, CouncilCollective, Origin, ParaId, Runtime, + RuntimeCall, RuntimeEvent, WeightToFee, XcmPallet, }; use frame_support::{match_types, parameter_types, traits::Everything}; use runtime_common::{xcm_sender, ToAuthor}; @@ -153,8 +153,11 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = TrustedTeleporters; type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = - WeightInfoBounds, RuntimeCall, MaxInstructions>; + type Weigher = WeightInfoBounds< + crate::weights::xcm::RococoXcmWeight, + RuntimeCall, + MaxInstructions, + >; // The weight trader piggybacks on the existing transaction-fee conversion logic. type Trader = UsingComponents>; type ResponseHandler = XcmPallet; From 50d9a7c1932905277ada25a874116d9bd264dfca Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 12 Sep 2022 18:27:10 -0400 Subject: [PATCH 37/37] fix --- runtime/common/src/claims.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index 92f35f884e71..8c8ff4b35f87 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -1546,9 +1546,9 @@ mod benchmarking { Preclaims::::insert(&account, eth_address); assert_eq!(Claims::::get(eth_address), Some(VALUE.into())); - let call = super::RuntimeCall::::attest { statement: StatementKind::Regular.to_text().to_vec() }; + let call = super::Call::::attest { statement: StatementKind::Regular.to_text().to_vec() }; // We have to copy the validate statement here because of trait issues... :( - let validate = |who: &T::AccountId, call: &super::RuntimeCall| -> DispatchResult { + let validate = |who: &T::AccountId, call: &super::Call| -> DispatchResult { if let Call::attest{ statement: attested_statement } = call { let signer = Preclaims::::get(who).ok_or("signer has no claim")?; if let Some(s) = Signing::::get(signer) {