From e3496c7bf908f99bb6285223b012e39ae061bf35 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 25 Nov 2020 11:43:12 +0100 Subject: [PATCH 1/6] rename Trait -> Config --- runtime/common/src/claims.rs | 54 ++++----- runtime/common/src/crowdfund.rs | 56 ++++----- runtime/common/src/impls.rs | 32 +++--- runtime/common/src/lib.rs | 6 +- runtime/common/src/paras_registrar.rs | 58 +++++----- runtime/common/src/paras_sudo_wrapper.rs | 8 +- runtime/common/src/purchase.rs | 50 ++++----- runtime/common/src/slots.rs | 34 +++--- runtime/kusama/Cargo.toml | 106 +++++++++--------- runtime/kusama/src/lib.rs | 66 +++++------ runtime/kusama/src/weights/frame_system.rs | 2 +- runtime/kusama/src/weights/pallet_balances.rs | 2 +- .../kusama/src/weights/pallet_collective.rs | 2 +- .../kusama/src/weights/pallet_democracy.rs | 2 +- .../src/weights/pallet_elections_phragmen.rs | 2 +- runtime/kusama/src/weights/pallet_identity.rs | 2 +- .../kusama/src/weights/pallet_im_online.rs | 2 +- runtime/kusama/src/weights/pallet_indices.rs | 2 +- runtime/kusama/src/weights/pallet_multisig.rs | 2 +- runtime/kusama/src/weights/pallet_proxy.rs | 2 +- .../kusama/src/weights/pallet_scheduler.rs | 2 +- runtime/kusama/src/weights/pallet_session.rs | 2 +- runtime/kusama/src/weights/pallet_staking.rs | 2 +- .../kusama/src/weights/pallet_timestamp.rs | 2 +- runtime/kusama/src/weights/pallet_treasury.rs | 2 +- runtime/kusama/src/weights/pallet_utility.rs | 2 +- runtime/kusama/src/weights/pallet_vesting.rs | 2 +- runtime/parachains/Cargo.toml | 58 +++++----- runtime/parachains/src/configuration.rs | 14 +-- runtime/parachains/src/dmp.rs | 8 +- runtime/parachains/src/hrmp.rs | 20 ++-- runtime/parachains/src/inclusion.rs | 34 +++--- runtime/parachains/src/inclusion_inherent.rs | 10 +- runtime/parachains/src/initializer.rs | 30 ++--- runtime/parachains/src/lib.rs | 10 +- runtime/parachains/src/mock.rs | 18 +-- runtime/parachains/src/origin.rs | 4 +- runtime/parachains/src/paras.rs | 16 +-- runtime/parachains/src/runtime_api_impl/v1.rs | 38 +++---- runtime/parachains/src/scheduler.rs | 10 +- runtime/parachains/src/ump.rs | 16 +-- runtime/parachains/src/util.rs | 4 +- runtime/polkadot/src/lib.rs | 62 +++++----- runtime/polkadot/src/weights/frame_system.rs | 2 +- .../polkadot/src/weights/pallet_balances.rs | 2 +- .../polkadot/src/weights/pallet_collective.rs | 2 +- .../polkadot/src/weights/pallet_democracy.rs | 2 +- .../src/weights/pallet_elections_phragmen.rs | 2 +- .../polkadot/src/weights/pallet_identity.rs | 2 +- .../polkadot/src/weights/pallet_im_online.rs | 2 +- .../polkadot/src/weights/pallet_indices.rs | 2 +- .../polkadot/src/weights/pallet_multisig.rs | 2 +- runtime/polkadot/src/weights/pallet_proxy.rs | 2 +- .../polkadot/src/weights/pallet_scheduler.rs | 2 +- .../polkadot/src/weights/pallet_session.rs | 2 +- .../polkadot/src/weights/pallet_staking.rs | 2 +- .../polkadot/src/weights/pallet_timestamp.rs | 2 +- .../polkadot/src/weights/pallet_treasury.rs | 2 +- .../polkadot/src/weights/pallet_utility.rs | 2 +- .../polkadot/src/weights/pallet_vesting.rs | 2 +- runtime/rococo/src/lib.rs | 56 ++++----- runtime/test-runtime/src/lib.rs | 54 ++++----- runtime/westend/src/lib.rs | 52 ++++----- runtime/westend/src/weights/frame_system.rs | 2 +- .../westend/src/weights/pallet_balances.rs | 2 +- .../westend/src/weights/pallet_identity.rs | 2 +- .../westend/src/weights/pallet_im_online.rs | 2 +- runtime/westend/src/weights/pallet_indices.rs | 2 +- .../westend/src/weights/pallet_multisig.rs | 2 +- runtime/westend/src/weights/pallet_proxy.rs | 2 +- .../westend/src/weights/pallet_scheduler.rs | 2 +- runtime/westend/src/weights/pallet_session.rs | 2 +- runtime/westend/src/weights/pallet_staking.rs | 2 +- .../westend/src/weights/pallet_timestamp.rs | 2 +- runtime/westend/src/weights/pallet_utility.rs | 2 +- runtime/westend/src/weights/pallet_vesting.rs | 2 +- 76 files changed, 539 insertions(+), 539 deletions(-) diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs index fbcd7a3af242..176c1cd4bdab 100644 --- a/runtime/common/src/claims.rs +++ b/runtime/common/src/claims.rs @@ -37,13 +37,13 @@ use sp_runtime::{ }; use primitives::v1::ValidityError; -type CurrencyOf = <::VestingSchedule as VestingSchedule<::AccountId>>::Currency; -type BalanceOf = as Currency<::AccountId>>::Balance; +type CurrencyOf = <::VestingSchedule as VestingSchedule<::AccountId>>::Currency; +type BalanceOf = as Currency<::AccountId>>::Balance; /// Configuration trait. -pub trait Trait: frame_system::Trait { +pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + Into<::Event>; + type Event: From> + Into<::Event>; type VestingSchedule: VestingSchedule; type Prefix: Get<&'static [u8]>; type MoveClaimOrigin: EnsureOrigin; @@ -130,7 +130,7 @@ impl sp_std::fmt::Debug for EcdsaSignature { decl_event!( pub enum Event where Balance = BalanceOf, - AccountId = ::AccountId + AccountId = ::AccountId { /// Someone claimed some DOTs. [who, ethereum_address, amount] Claimed(AccountId, EthereumAddress, Balance), @@ -138,7 +138,7 @@ decl_event!( ); decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// Invalid Ethereum signature. InvalidEthereumSignature, /// Ethereum address has no claim. @@ -159,7 +159,7 @@ decl_storage! { // A macro for the Storage trait, and its implementation, for this module. // This allows for type-safe usage of the Substrate storage database, so you can // keep things around between blocks. - trait Store for Module as Claims { + trait Store for Module as Claims { Claims get(fn claims) build(|config: &GenesisConfig| { config.claims.iter().map(|(a, b, _, _)| (a.clone(), b.clone())).collect::>() }): map hasher(identity) EthereumAddress => Option>; @@ -194,7 +194,7 @@ decl_storage! { } decl_module! { - pub struct Module for enum Call where origin: T::Origin { + pub struct Module for enum Call where origin: T::Origin { type Error = Error; /// The Prefix that is used in signed Ethereum messages for this network @@ -426,7 +426,7 @@ fn to_ascii_hex(data: &[u8]) -> Vec { r } -impl Module { +impl Module { // Constructs the message that Ethereum RPC's `personal_sign` and `eth_sign` would sign. fn ethereum_signable_message(what: &[u8], extra: &[u8]) -> Vec { let prefix = T::Prefix::get(); @@ -487,7 +487,7 @@ impl Module { } } -impl sp_runtime::traits::ValidateUnsigned for Module { +impl sp_runtime::traits::ValidateUnsigned for Module { type Call = Call; fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity { @@ -538,11 +538,11 @@ impl sp_runtime::traits::ValidateUnsigned for Module { /// Validate `attest` calls prior to execution. Needed to avoid a DoS attack since they are /// otherwise free to place on chain. #[derive(Encode, Decode, Clone, Eq, PartialEq)] -pub struct PrevalidateAttests(sp_std::marker::PhantomData) where - ::Call: IsSubType>; +pub struct PrevalidateAttests(sp_std::marker::PhantomData) where + ::Call: IsSubType>; -impl Debug for PrevalidateAttests where - ::Call: IsSubType> +impl Debug for PrevalidateAttests where + ::Call: IsSubType> { #[cfg(feature = "std")] fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { @@ -555,8 +555,8 @@ impl Debug for PrevalidateAttests where } } -impl PrevalidateAttests where - ::Call: IsSubType> +impl PrevalidateAttests where + ::Call: IsSubType> { /// Create new `SignedExtension` to check runtime version. pub fn new() -> Self { @@ -564,11 +564,11 @@ impl PrevalidateAttests where } } -impl SignedExtension for PrevalidateAttests where - ::Call: IsSubType> +impl SignedExtension for PrevalidateAttests where + ::Call: IsSubType> { type AccountId = T::AccountId; - type Call = ::Call; + type Call = ::Call; type AdditionalSigned = (); type Pre = (); const IDENTIFIER: &'static str = "PrevalidateAttests"; @@ -615,7 +615,7 @@ mod secp_utils { res.0.copy_from_slice(&keccak_256(&public(secret).serialize()[1..65])[12..]); res } - pub fn sig(secret: &secp256k1::SecretKey, what: &[u8], extra: &[u8]) -> EcdsaSignature { + pub fn sig(secret: &secp256k1::SecretKey, what: &[u8], extra: &[u8]) -> EcdsaSignature { let msg = keccak_256(&>::ethereum_signable_message(&to_ascii_hex(what)[..], extra)); let (sig, recovery_id) = secp256k1::sign(&secp256k1::Message::parse(&msg), secret); let mut r = [0u8; 65]; @@ -665,7 +665,7 @@ mod tests { pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } - impl frame_system::Trait for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Call = Call; @@ -697,7 +697,7 @@ mod tests { pub const ExistentialDeposit: u64 = 1; } - impl pallet_balances::Trait for Test { + impl pallet_balances::Config for Test { type Balance = u64; type Event = (); type DustRemoval = (); @@ -711,7 +711,7 @@ mod tests { pub const MinVestedTransfer: u64 = 0; } - impl pallet_vesting::Trait for Test { + impl pallet_vesting::Config for Test { type Event = (); type Currency = Balances; type BlockNumberToBalance = Identity; @@ -726,7 +726,7 @@ mod tests { pub const Six: u64 = 6; } - impl Trait for Test { + impl Config for Test { type Event = (); type VestingSchedule = Vesting; type Prefix = Prefix; @@ -1048,7 +1048,7 @@ mod tests { fn claiming_while_vested_doesnt_work() { new_test_ext().execute_with(|| { // A user is already vested - assert_ok!(::VestingSchedule::add_vesting_schedule(&69, total_claims(), 100, 10)); + assert_ok!(::VestingSchedule::add_vesting_schedule(&69, total_claims(), 100, 10)); CurrencyOf::::make_free_balance_be(&69, total_claims()); assert_eq!(Balances::free_balance(69), total_claims()); assert_ok!(Claims::mint_claim(Origin::root(), eth(&bob()), 200, Some((50, 10, 1)), None)); @@ -1181,7 +1181,7 @@ mod benchmarking { const MAX_CLAIMS: u32 = 10_000; const VALUE: u32 = 1_000_000; - fn create_claim(input: u32) -> DispatchResult { + fn create_claim(input: u32) -> DispatchResult { let secret_key = secp256k1::SecretKey::parse(&keccak_256(&input.encode())).unwrap(); let eth_address = eth(&secret_key); let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into())); @@ -1189,7 +1189,7 @@ mod benchmarking { Ok(()) } - fn create_claim_attest(input: u32) -> DispatchResult { + fn create_claim_attest(input: u32) -> DispatchResult { let secret_key = secp256k1::SecretKey::parse(&keccak_256(&input.encode())).unwrap(); let eth_address = eth(&secret_key); let vesting = Some((100_000u32.into(), 1_000u32.into(), 100u32.into())); diff --git a/runtime/common/src/crowdfund.rs b/runtime/common/src/crowdfund.rs index 6e8985b1afbc..1c0895bc0c8c 100644 --- a/runtime/common/src/crowdfund.rs +++ b/runtime/common/src/crowdfund.rs @@ -82,13 +82,13 @@ use sp_std::vec::Vec; use primitives::v1::{Id as ParaId, HeadData}; pub type BalanceOf = - <::Currency as Currency<::AccountId>>::Balance; + <::Currency as Currency<::AccountId>>::Balance; #[allow(dead_code)] pub type NegativeImbalanceOf = - <::Currency as Currency<::AccountId>>::NegativeImbalance; + <::Currency as Currency<::AccountId>>::NegativeImbalance; -pub trait Trait: slots::Trait { - type Event: From> + Into<::Event>; +pub trait Config: slots::Config { + type Event: From> + Into<::Event>; /// ModuleID for the crowdfund module. An appropriate value could be ```ModuleId(*b"py/cfund")``` type ModuleId: Get; @@ -164,7 +164,7 @@ pub struct FundInfo { } decl_storage! { - trait Store for Module as Crowdfund { + trait Store for Module as Crowdfund { /// Info on all of the funds. Funds get(fn funds): map hasher(twox_64_concat) FundIndex @@ -184,7 +184,7 @@ decl_storage! { decl_event! { pub enum Event where - ::AccountId, + ::AccountId, Balance = BalanceOf, { /// Create a new crowdfunding campaign. [fund_index] @@ -205,7 +205,7 @@ decl_event! { } decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// Last slot must be greater than first slot. LastSlotBeforeFirstSlot, /// The last slot cannot be more then 3 slots after the first slot. @@ -251,7 +251,7 @@ decl_error! { } decl_module! { - pub struct Module for enum Call where origin: T::Origin { + pub struct Module for enum Call where origin: T::Origin { type Error = Error; const ModuleId: ModuleId = T::ModuleId::get(); @@ -528,7 +528,7 @@ decl_module! { } } -impl Module { +impl Module { /// The account ID of the fund pot. /// /// This actually does computation. If you need to keep using it, then make sure you cache the @@ -599,7 +599,7 @@ mod tests { pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } - impl frame_system::Trait for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Call = (); @@ -629,7 +629,7 @@ mod tests { parameter_types! { pub const ExistentialDeposit: u64 = 1; } - impl pallet_balances::Trait for Test { + impl pallet_balances::Config for Test { type Balance = u64; type Event = (); type DustRemoval = (); @@ -667,7 +667,7 @@ mod tests { fn min_len() -> usize { 0 } fn max_len() -> usize { 0 } } - impl pallet_treasury::Trait for Test { + impl pallet_treasury::Config for Test { type Currency = pallet_balances::Module; type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; @@ -749,7 +749,7 @@ mod tests { pub const LeasePeriod: u64 = 10; pub const EndingPeriod: u64 = 3; } - impl slots::Trait for Test { + impl slots::Config for Test { type Event = (); type Currency = Balances; type Parachains = TestParachains; @@ -763,7 +763,7 @@ mod tests { pub const RetirementPeriod: u64 = 5; pub const CrowdfundModuleId: ModuleId = ModuleId(*b"py/cfund"); } - impl Trait for Test { + impl Config for Test { type Event = (); type SubmissionDeposit = SubmissionDeposit; type MinContribution = MinContribution; @@ -936,7 +936,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into() )); @@ -947,7 +947,7 @@ mod tests { assert_eq!( fund.deploy_data, Some(DeployData { - code_hash: ::Hash::default(), + code_hash: ::Hash::default(), code_size: 0, initial_head_data: vec![0].into(), }), @@ -966,7 +966,7 @@ mod tests { assert_noop!(Crowdfund::fix_deploy_data( Origin::signed(2), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into()), Error::::InvalidOrigin @@ -976,7 +976,7 @@ mod tests { assert_noop!(Crowdfund::fix_deploy_data( Origin::signed(1), 1, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into()), Error::::InvalidFundIndex @@ -986,7 +986,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -994,7 +994,7 @@ mod tests { assert_noop!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![1].into()), Error::::ExistingDeployData @@ -1014,7 +1014,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -1060,7 +1060,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -1088,7 +1088,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -1131,7 +1131,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -1273,7 +1273,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -1302,7 +1302,7 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); @@ -1341,14 +1341,14 @@ mod tests { assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(1), 0, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); assert_ok!(Crowdfund::fix_deploy_data( Origin::signed(2), 1, - ::Hash::default(), + ::Hash::default(), 0, vec![0].into(), )); diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 72d4f6ce895b..64b881f6d4fd 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -23,12 +23,12 @@ use crate::NegativeImbalance; pub struct ToAuthor(sp_std::marker::PhantomData); impl OnUnbalanced> for ToAuthor where - R: pallet_balances::Trait + pallet_authorship::Trait, - ::AccountId: From, - ::AccountId: Into, - ::Event: From::AccountId, - ::Balance, + R: pallet_balances::Config + pallet_authorship::Config, + ::AccountId: From, + ::AccountId: Into, + ::Event: From::AccountId, + ::Balance, pallet_balances::DefaultInstance> >, { @@ -43,13 +43,13 @@ where pub struct DealWithFees(sp_std::marker::PhantomData); impl OnUnbalanced> for DealWithFees where - R: pallet_balances::Trait + pallet_treasury::Trait + pallet_authorship::Trait, + R: pallet_balances::Config + pallet_treasury::Config + pallet_authorship::Config, pallet_treasury::Module: OnUnbalanced>, - ::AccountId: From, - ::AccountId: Into, - ::Event: From::AccountId, - ::Balance, + ::AccountId: From, + ::AccountId: Into, + ::Event: From::AccountId, + ::Balance, pallet_balances::DefaultInstance> >, { @@ -97,7 +97,7 @@ mod tests { pub const AvailableBlockRatio: Perbill = Perbill::one(); } - impl frame_system::Trait for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Index = u64; @@ -125,7 +125,7 @@ mod tests { type SystemWeightInfo = (); } - impl pallet_balances::Trait for Test { + impl pallet_balances::Config for Test { type Balance = u64; type Event = (); type DustRemoval = (); @@ -151,7 +151,7 @@ mod tests { pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry"); } - impl pallet_treasury::Trait for Test { + impl pallet_treasury::Config for Test { type Currency = pallet_balances::Module; type ApproveOrigin = frame_system::EnsureRoot; type RejectOrigin = frame_system::EnsureRoot; @@ -185,7 +185,7 @@ mod tests { Some(Default::default()) } } - impl pallet_authorship::Trait for Test { + impl pallet_authorship::Config for Test { type FindAuthor = OneAuthor; type UncleGenerations = (); type FilterUncle = (); diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index ed0aad5950e9..3f867579eb34 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -47,7 +47,7 @@ pub use pallet_balances::Call as BalancesCall; /// Implementations of some helper traits passed into runtime modules as associated types. pub use impls::ToAuthor; -pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; +pub type NegativeImbalance = as Currency<::AccountId>>::NegativeImbalance; /// The sequence of bytes a valid wasm module binary always starts with. Apart from that it's also a /// valid wasm module. @@ -106,7 +106,7 @@ impl sp_runtime::BoundToRuntimeAppPublic for ParachainSessionKeyPlaceholder +impl pallet_session::OneSessionHandler for ParachainSessionKeyPlaceholder { type Key = ValidatorId; @@ -154,7 +154,7 @@ mod multiplier_tests { pub const AvailableBlockRatio: Perbill = Perbill::one(); } - impl frame_system::Trait for Runtime { + impl frame_system::Config for Runtime { type BaseCallFilter = (); type Origin = Origin; type Index = u64; diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 474402d61f09..ed3ccc5f5ed7 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -39,15 +39,15 @@ use runtime_parachains::{ }; type BalanceOf = - <::Currency as Currency<::AccountId>>::Balance; + <::Currency as Currency<::AccountId>>::Balance; -pub trait Trait: paras::Trait + dmp::Trait + ump::Trait + hrmp::Trait { +pub trait Config: paras::Config + dmp::Config + ump::Config + hrmp::Config { /// 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 /// same type, we just can't express that to the Rust type system without writing a `where` /// clause everywhere. - type Origin: From<::Origin> - + Into::Origin>>; + type Origin: From<::Origin> + + Into::Origin>>; /// The system's currency for parathread payment. type Currency: ReservableCurrency; @@ -57,7 +57,7 @@ pub trait Trait: paras::Trait + dmp::Trait + ump::Trait + hrmp::Trait { } decl_storage! { - trait Store for Module as Registrar { + trait Store for Module as Registrar { /// Whether parathreads are enabled or not. ParathreadsRegistrationEnabled: bool; @@ -73,7 +73,7 @@ decl_storage! { } decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// Parachain already exists. ParaAlreadyExists, /// Invalid parachain ID. @@ -92,7 +92,7 @@ decl_error! { } decl_module! { - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; /// Register a parathread with given code for immediate use. @@ -117,7 +117,7 @@ decl_module! { ensure!(outgoing.binary_search(&id).is_err(), Error::::ParaAlreadyExists); - ::Currency::reserve(&who, T::ParathreadDeposit::get())?; + ::Currency::reserve(&who, T::ParathreadDeposit::get())?; >::insert(id, who); Paras::insert(id, false); @@ -142,7 +142,7 @@ decl_module! { /// governance intervention). #[weight = 0] fn deregister_parathread(origin) -> DispatchResult { - let id = ensure_parachain(::Origin::from(origin))?; + let id = ensure_parachain(::Origin::from(origin))?; ensure!(ParathreadsRegistrationEnabled::get(), Error::::ParathreadsRegistrationDisabled); @@ -151,7 +151,7 @@ decl_module! { ensure!(!is_parachain, Error::::InvalidThreadId); let debtor = >::take(id); - let _ = ::Currency::unreserve(&debtor, T::ParathreadDeposit::get()); + let _ = ::Currency::unreserve(&debtor, T::ParathreadDeposit::get()); runtime_parachains::schedule_para_cleanup::(id); @@ -187,7 +187,7 @@ decl_module! { /// and the auction deposit are switched. #[weight = 0] fn swap(origin, other: ParaId) { - let id = ensure_parachain(::Origin::from(origin))?; + let id = ensure_parachain(::Origin::from(origin))?; if PendingSwap::get(other) == Some(id) { // Remove intention to swap. @@ -211,7 +211,7 @@ decl_module! { } } -impl Module { +impl Module { /// Register a parachain with given code. Must be called by root. /// Fails if given ID is already used. pub fn register_parachain( @@ -306,7 +306,7 @@ mod tests { pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } - impl frame_system::Trait for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Call = Call; @@ -345,7 +345,7 @@ mod tests { pub const ExistentialDeposit: Balance = 1; } - impl pallet_balances::Trait for Test { + impl pallet_balances::Config for Test { type Balance = u128; type DustRemoval = (); type Event = (); @@ -371,7 +371,7 @@ mod tests { pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE; } - impl pallet_session::Trait for Test { + impl pallet_session::Config for Test { type SessionManager = (); type Keys = UintAuthorityId; type ShouldEndSession = pallet_session::PeriodicSessions; @@ -395,7 +395,7 @@ mod tests { pub const StakingUnsignedPriority: u64 = u64::max_value() / 2; } - impl pallet_staking::Trait for Test { + impl pallet_staking::Config for Test { type RewardRemainder = (); type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote; type Event = (); @@ -420,24 +420,24 @@ mod tests { type WeightInfo = (); } - impl pallet_timestamp::Trait for Test { + impl pallet_timestamp::Config for Test { type Moment = u64; type OnTimestampSet = (); type MinimumPeriod = MinimumPeriod; type WeightInfo = (); } - impl dmp::Trait for Test {} + impl dmp::Config for Test {} - impl ump::Trait for Test { + impl ump::Config for Test { type UmpSink = (); } - impl hrmp::Trait for Test { + impl hrmp::Config for Test { type Origin = Origin; } - impl pallet_session::historical::Trait for Test { + impl pallet_session::historical::Config for Test { type FullIdentification = pallet_staking::Exposure; type FullIdentificationOf = pallet_staking::ExposureOf; } @@ -467,13 +467,13 @@ mod tests { pub type ReporterId = app::Public; } - impl paras::Trait for Test { + impl paras::Config for Test { type Origin = Origin; } - impl configuration::Trait for Test { } + impl configuration::Config for Test { } - impl inclusion::Trait for Test { + impl inclusion::Config for Test { type Event = (); } @@ -485,11 +485,11 @@ mod tests { } } - impl initializer::Trait for Test { + impl initializer::Config for Test { type Randomness = TestRandomness; } - impl scheduler::Trait for Test { } + impl scheduler::Config for Test { } type Extrinsic = TestXt; @@ -499,8 +499,8 @@ mod tests { fn create_transaction>( call: Call, _public: test_keys::ReporterId, - _account: ::AccountId, - nonce: ::Index, + _account: ::AccountId, + nonce: ::Index, ) -> Option<(Call, ::SignaturePayload)> { Some((call, (nonce, ()))) } @@ -517,7 +517,7 @@ mod tests { pub const MaxRetries: u32 = 3; } - impl Trait for Test { + impl Config for Test { type Origin = Origin; type Currency = pallet_balances::Module; type ParathreadDeposit = ParathreadDeposit; diff --git a/runtime/common/src/paras_sudo_wrapper.rs b/runtime/common/src/paras_sudo_wrapper.rs index fcaf598d6422..1ff03a36407a 100644 --- a/runtime/common/src/paras_sudo_wrapper.rs +++ b/runtime/common/src/paras_sudo_wrapper.rs @@ -30,13 +30,13 @@ use runtime_parachains::{ use primitives::v1::Id as ParaId; /// The module's configuration trait. -pub trait Trait: - configuration::Trait + paras::Trait + dmp::Trait + ump::Trait + hrmp::Trait +pub trait Config: + configuration::Config + paras::Config + dmp::Config + ump::Config + hrmp::Config { } decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// The specified parachain or parathread is not registered. ParaDoesntExist, /// A DMP message couldn't be sent because it exceeds the maximum size allowed for a downward @@ -49,7 +49,7 @@ decl_error! { decl_module! { /// A sudo wrapper to call into v1 paras module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; /// Schedule a para to be initialized at the start of the next session. diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs index 5969bc8b0fff..7a29b4641a33 100644 --- a/runtime/common/src/purchase.rs +++ b/runtime/common/src/purchase.rs @@ -28,9 +28,9 @@ use sp_core::sr25519; use sp_std::prelude::*; /// Configuration trait. -pub trait Trait: frame_system::Trait { +pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + Into<::Event>; + type Event: From> + Into<::Event>; /// Balances Pallet type Currency: Currency; /// Vesting Pallet @@ -47,7 +47,7 @@ pub trait Trait: frame_system::Trait { type MaxUnlocked: Get>; } -type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; +type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; /// The kind of a statement an account needs to make for a claim to be valid. #[derive(Encode, Decode, Clone, Copy, Eq, PartialEq, RuntimeDebug)] @@ -103,9 +103,9 @@ pub struct AccountStatus { decl_event!( pub enum Event where - AccountId = ::AccountId, + AccountId = ::AccountId, Balance = BalanceOf, - BlockNumber = ::BlockNumber, + BlockNumber = ::BlockNumber, { /// A [new] account was created. AccountCreated(AccountId), @@ -125,7 +125,7 @@ decl_event!( ); decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// Account is not currently valid to use. InvalidAccount, /// Account used in the purchase already exists. @@ -146,7 +146,7 @@ decl_error! { } decl_storage! { - trait Store for Module as Purchase { + trait Store for Module as Purchase { // A map of all participants in the DOT purchase process. Accounts: map hasher(blake2_128_concat) T::AccountId => AccountStatus>; // The account that will be used to payout participants of the DOT purchase process. @@ -159,7 +159,7 @@ decl_storage! { } decl_module! { - pub struct Module for enum Call where origin: T::Origin { + pub struct Module for enum Call where origin: T::Origin { type Error = Error; /// The maximum statement length for the statement users to sign when creating an account. @@ -340,7 +340,7 @@ decl_module! { } } -impl Module { +impl Module { fn verify_signature(who: &T::AccountId, signature: &[u8]) -> Result<(), DispatchError> { // sr25519 always expects a 64 byte signature. ensure!(signature.len() == 64, Error::::InvalidSignature); @@ -374,7 +374,7 @@ fn account_to_bytes(account: &AccountId) -> Result<[u8; 32], Dispatch /// WARNING: Executing this function will clear all storage used by this pallet. /// Be sure this is what you want... pub fn remove_pallet() -> frame_support::weights::Weight - where T: frame_system::Trait + where T: frame_system::Config { use frame_support::migration::remove_storage_prefix; remove_storage_prefix(b"Purchase", b"Accounts", b""); @@ -428,7 +428,7 @@ mod tests { pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } - impl frame_system::Trait for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Call = Call; @@ -460,7 +460,7 @@ mod tests { pub const ExistentialDeposit: u64 = 1; } - impl pallet_balances::Trait for Test { + impl pallet_balances::Config for Test { type Balance = u64; type Event = (); type DustRemoval = (); @@ -474,7 +474,7 @@ mod tests { pub const MinVestedTransfer: u64 = 0; } - impl pallet_vesting::Trait for Test { + impl pallet_vesting::Config for Test { type Event = (); type Currency = Balances; type BlockNumberToBalance = Identity; @@ -494,7 +494,7 @@ mod tests { pub const ConfigurationOrigin: AccountId = AccountId32::from([2u8; 32]); } - impl Trait for Test { + impl Config for Test { type Event = (); type Currency = Balances; type VestingSchedule = Vesting; @@ -692,7 +692,7 @@ mod tests { ); // Account with vesting - assert_ok!(::VestingSchedule::add_vesting_schedule( + assert_ok!(::VestingSchedule::add_vesting_schedule( &alice(), 100, 1, @@ -933,13 +933,13 @@ mod tests { bob(), )); // Payment is made. - assert_eq!(::Currency::free_balance(&payment_account()), 99_650); - assert_eq!(::Currency::free_balance(&alice()), 100); + assert_eq!(::Currency::free_balance(&payment_account()), 99_650); + assert_eq!(::Currency::free_balance(&alice()), 100); // 10% of the 50 units is unlocked automatically for Alice - assert_eq!(::VestingSchedule::vesting_balance(&alice()), Some(45)); - assert_eq!(::Currency::free_balance(&bob()), 250); + assert_eq!(::VestingSchedule::vesting_balance(&alice()), Some(45)); + assert_eq!(::Currency::free_balance(&bob()), 250); // A max of 10 units is unlocked automatically for Bob - assert_eq!(::VestingSchedule::vesting_balance(&bob()), Some(140)); + assert_eq!(::VestingSchedule::vesting_balance(&bob()), Some(140)); // Status is completed. assert_eq!( Accounts::::get(alice()), @@ -966,13 +966,13 @@ mod tests { let vest_call = Call::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)); - assert_eq!(::VestingSchedule::vesting_balance(&bob()), Some(140)); + assert_eq!(::VestingSchedule::vesting_balance(&alice()), Some(45)); + assert_eq!(::VestingSchedule::vesting_balance(&bob()), Some(140)); System::set_block_number(101); assert_ok!(vest_call.clone().dispatch(Origin::signed(alice()))); assert_ok!(vest_call.clone().dispatch(Origin::signed(bob()))); - assert_eq!(::VestingSchedule::vesting_balance(&alice()), None); - assert_eq!(::VestingSchedule::vesting_balance(&bob()), None); + assert_eq!(::VestingSchedule::vesting_balance(&alice()), None); + assert_eq!(::VestingSchedule::vesting_balance(&bob()), None); }); } @@ -985,7 +985,7 @@ mod tests { alice(), ), BadOrigin); // Account with Existing Vesting Schedule - assert_ok!(::VestingSchedule::add_vesting_schedule( + assert_ok!(::VestingSchedule::add_vesting_schedule( &bob(), 100, 1, 50, )); assert_noop!(Purchase::payout( diff --git a/runtime/common/src/slots.rs b/runtime/common/src/slots.rs index 16dfb04aa77f..ec51aa539bfa 100644 --- a/runtime/common/src/slots.rs +++ b/runtime/common/src/slots.rs @@ -34,12 +34,12 @@ use primitives::v1::{ use frame_system::{ensure_signed, ensure_root}; use crate::slot_range::{SlotRange, SLOT_RANGE_COUNT}; -type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; +type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; /// The module's configuration trait. -pub trait Trait: frame_system::Trait { +pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + Into<::Event>; + type Event: From> + Into<::Event>; /// The currency type used for bidding. type Currency: ReservableCurrency; @@ -161,18 +161,18 @@ pub enum IncomingParachain { Deploy { code: ValidationCode, initial_head_data: HeadData }, } -type LeasePeriodOf = ::BlockNumber; +type LeasePeriodOf = ::BlockNumber; // Winning data type. This encodes the top bidders of each range together with their bid. type WinningData = - [Option<(Bidder<::AccountId>, BalanceOf)>; SLOT_RANGE_COUNT]; + [Option<(Bidder<::AccountId>, BalanceOf)>; SLOT_RANGE_COUNT]; // Winners data type. This encodes each of the final winners of a parachain auction, the parachain // index assigned to them, their winning bid and the range that they won. type WinnersData = - Vec<(Option::AccountId>>, ParaId, BalanceOf, SlotRange)>; + Vec<(Option::AccountId>>, ParaId, BalanceOf, SlotRange)>; // This module's storage items. decl_storage! { - trait Store for Module as Slots { + trait Store for Module as Slots { /// The number of auctions that have been started so far. pub AuctionCounter get(fn auction_counter): AuctionIndex; @@ -245,7 +245,7 @@ fn swap_ordered_existence(ids: &mut [T], one: T, oth ids.sort(); } -impl SwapAux for Module { +impl SwapAux for Module { fn ensure_can_swap(one: ParaId, other: ParaId) -> Result<(), &'static str> { if >::contains_key(one) || >::contains_key(other) { Err("can't swap an undeployed parachain")? @@ -262,8 +262,8 @@ impl SwapAux for Module { decl_event!( pub enum Event where - AccountId = ::AccountId, - BlockNumber = ::BlockNumber, + AccountId = ::AccountId, + BlockNumber = ::BlockNumber, LeasePeriod = LeasePeriodOf, ParaId = ParaId, Balance = BalanceOf, @@ -292,7 +292,7 @@ decl_event!( ); decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// This auction is already in progress. AuctionInProgress, /// The lease period is in the past. @@ -323,7 +323,7 @@ decl_error! { } decl_module! { - pub struct Module for enum Call where origin: T::Origin { + pub struct Module for enum Call where origin: T::Origin { type Error = Error; fn deposit_event() = default; @@ -520,7 +520,7 @@ decl_module! { .ok_or(Error::::ParaNotOnboarding)?; if let IncomingParachain::Fixed{code_hash, code_size, initial_head_data} = details { ensure!(code.0.len() as u32 == code_size, Error::::InvalidCode); - ensure!(::Hashing::hash(&code.0) == code_hash, Error::::InvalidCode); + ensure!(::Hashing::hash(&code.0) == code_hash, Error::::InvalidCode); if starts > Self::lease_period_index() { // Hasn't yet begun. Replace the on-boarding entry with the new information. @@ -542,7 +542,7 @@ decl_module! { } } -impl Module { +impl Module { /// Deposit currently held for a particular parachain that we administer. fn deposit_held(para_id: &ParaId) -> BalanceOf { >::get(para_id).into_iter().max().unwrap_or_else(Zero::zero) @@ -968,7 +968,7 @@ mod tests { pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } - impl frame_system::Trait for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Call = (); @@ -1000,7 +1000,7 @@ mod tests { pub const ExistentialDeposit: u64 = 1; } - impl pallet_balances::Trait for Test { + impl pallet_balances::Config for Test { type Balance = u64; type Event = (); type DustRemoval = (); @@ -1074,7 +1074,7 @@ mod tests { pub const EndingPeriod: BlockNumber = 3; } - impl Trait for Test { + impl Config for Test { type Event = (); type Currency = Balances; type Parachains = TestParachains; diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 17ccfca08056..f16e2636bd16 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,59 +15,59 @@ serde_derive = { version = "1.0.117", optional = true } static_assertions = "1.1.0" smallvec = "1.5.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } hex-literal = { version = "0.3.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -77,8 +77,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.3.1" libsecp256k1 = "0.3.5" tiny-keccak = "2.0.2" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } separator = "0.4.1" serde_json = "1.0.59" diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index c30bf59a6a9d..9dc0a025ab88 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -127,7 +127,7 @@ parameter_types! { pub const Version: RuntimeVersion = VERSION; } -impl frame_system::Trait for Runtime { +impl frame_system::Config for Runtime { type BaseCallFilter = BaseFilter; type Origin = Origin; type Call = Call; @@ -159,7 +159,7 @@ parameter_types! { pub const MaxScheduledPerBlock: u32 = 50; } -impl pallet_scheduler::Trait for Runtime { +impl pallet_scheduler::Config for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; @@ -175,7 +175,7 @@ parameter_types! { pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; } -impl pallet_babe::Trait for Runtime { +impl pallet_babe::Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; @@ -204,7 +204,7 @@ parameter_types! { pub const IndexDeposit: Balance = 1 * DOLLARS; } -impl pallet_indices::Trait for Runtime { +impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; @@ -217,7 +217,7 @@ parameter_types! { pub const MaxLocks: u32 = 50; } -impl pallet_balances::Trait for Runtime { +impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); type Event = Event; @@ -231,7 +231,7 @@ parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; } -impl pallet_transaction_payment::Trait for Runtime { +impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter>; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; @@ -241,7 +241,7 @@ impl pallet_transaction_payment::Trait for Runtime { parameter_types! { pub const MinimumPeriod: u64 = SLOT_DURATION / 2; } -impl pallet_timestamp::Trait for Runtime { +impl pallet_timestamp::Config for Runtime { type Moment = u64; type OnTimestampSet = Babe; type MinimumPeriod = MinimumPeriod; @@ -253,7 +253,7 @@ parameter_types! { } // TODO: substrate#2986 implement this properly -impl pallet_authorship::Trait for Runtime { +impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; type FilterUncle = (); @@ -279,7 +279,7 @@ parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } -impl pallet_session::Trait for Runtime { +impl pallet_session::Config for Runtime { type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; @@ -292,7 +292,7 @@ impl pallet_session::Trait for Runtime { type WeightInfo = weights::pallet_session::WeightInfo; } -impl pallet_session::historical::Trait for Runtime { +impl pallet_session::historical::Config for Runtime { type FullIdentification = pallet_staking::Exposure; type FullIdentificationOf = pallet_staking::ExposureOf; } @@ -337,7 +337,7 @@ type SlashCancelOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective> >; -impl pallet_staking::Trait for Runtime { +impl pallet_staking::Config for Runtime { type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; @@ -379,7 +379,7 @@ parameter_types! { pub const MaxProposals: u32 = 100; } -impl pallet_democracy::Trait for Runtime { +impl pallet_democracy::Config for Runtime { type Proposal = Call; type Event = Event; type Currency = Balances; @@ -435,7 +435,7 @@ parameter_types! { } type CouncilCollective = pallet_collective::Instance1; -impl pallet_collective::Trait for Runtime { +impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; type Event = Event; @@ -458,7 +458,7 @@ parameter_types! { // Make sure that there are no more than MaxMembers members elected via phragmen. const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); -impl pallet_elections_phragmen::Trait for Runtime { +impl pallet_elections_phragmen::Config for Runtime { type Event = Event; type Currency = Balances; type ChangeMembers = Council; @@ -483,7 +483,7 @@ parameter_types! { } type TechnicalCollective = pallet_collective::Instance2; -impl pallet_collective::Trait for Runtime { +impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; type Event = Event; @@ -494,7 +494,7 @@ impl pallet_collective::Trait for Runtime { type WeightInfo = weights::pallet_collective::WeightInfo; } -impl pallet_membership::Trait for Runtime { +impl pallet_membership::Config for Runtime { type Event = Event; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; @@ -530,7 +530,7 @@ type ApproveOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast<_3, _5, AccountId, CouncilCollective> >; -impl pallet_treasury::Trait for Runtime { +impl pallet_treasury::Config for Runtime { type ModuleId = TreasuryModuleId; type Currency = Balances; type ApproveOrigin = ApproveOrigin; @@ -560,14 +560,14 @@ parameter_types! { pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); } -impl pallet_offences::Trait for Runtime { +impl pallet_offences::Config for Runtime { type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; type WeightSoftLimit = OffencesWeightSoftLimit; } -impl pallet_authority_discovery::Trait for Runtime {} +impl pallet_authority_discovery::Config for Runtime {} parameter_types! { pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _; @@ -579,7 +579,7 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); } -impl pallet_im_online::Trait for Runtime { +impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; type Event = Event; type ReportUnresponsiveness = Offences; @@ -588,7 +588,7 @@ impl pallet_im_online::Trait for Runtime { type WeightInfo = weights::pallet_im_online::WeightInfo; } -impl pallet_grandpa::Trait for Runtime { +impl pallet_grandpa::Config for Runtime { type Event = Event; type Call = Call; @@ -616,7 +616,7 @@ impl frame_system::offchain::CreateSignedTransaction for R call: Call, public: ::Signer, account: AccountId, - nonce: ::Index, + nonce: ::Index, ) -> Option<(Call, ::SignaturePayload)> { // take the biggest period possible. let period = BlockHashCount::get() @@ -666,7 +666,7 @@ parameter_types! { pub Prefix: &'static [u8] = b"Pay KSMs to the Kusama account:"; } -impl claims::Trait for Runtime { +impl claims::Config for Runtime { type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; @@ -683,7 +683,7 @@ parameter_types! { pub const MaxRegistrars: u32 = 20; } -impl pallet_identity::Trait for Runtime { +impl pallet_identity::Config for Runtime { type Event = Event; type Currency = Balances; type Slashed = Treasury; @@ -698,7 +698,7 @@ impl pallet_identity::Trait for Runtime { type WeightInfo = weights::pallet_identity::WeightInfo; } -impl pallet_utility::Trait for Runtime { +impl pallet_utility::Config for Runtime { type Event = Event; type Call = Call; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -712,7 +712,7 @@ parameter_types! { pub const MaxSignatories: u16 = 100; } -impl pallet_multisig::Trait for Runtime { +impl pallet_multisig::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -729,7 +729,7 @@ parameter_types! { pub const RecoveryDeposit: Balance = 5 * DOLLARS; } -impl pallet_recovery::Trait for Runtime { +impl pallet_recovery::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -750,7 +750,7 @@ parameter_types! { pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie"); } -impl pallet_society::Trait for Runtime { +impl pallet_society::Config for Runtime { type Event = Event; type Currency = Balances; type Randomness = RandomnessCollectiveFlip; @@ -771,7 +771,7 @@ parameter_types! { pub const MinVestedTransfer: Balance = 100 * DOLLARS; } -impl pallet_vesting::Trait for Runtime { +impl pallet_vesting::Config for Runtime { type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; @@ -874,7 +874,7 @@ impl InstanceFilter for ProxyType { } } -impl pallet_proxy::Trait for Runtime { +impl pallet_proxy::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -1248,9 +1248,9 @@ sp_api::impl_runtime_apis! { use pallet_offences_benchmarking::Module as OffencesBench; use frame_system_benchmarking::Module as SystemBench; - impl pallet_session_benchmarking::Trait for Runtime {} - impl pallet_offences_benchmarking::Trait for Runtime {} - impl frame_system_benchmarking::Trait for Runtime {} + impl pallet_session_benchmarking::Config for Runtime {} + impl pallet_offences_benchmarking::Config for Runtime {} + impl frame_system_benchmarking::Config for Runtime {} let whitelist: Vec = vec![ // Block Number diff --git a/runtime/kusama/src/weights/frame_system.rs b/runtime/kusama/src/weights/frame_system.rs index 07afa8ebca03..b44c68542e73 100644 --- a/runtime/kusama/src/weights/frame_system.rs +++ b/runtime/kusama/src/weights/frame_system.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for frame_system. pub struct WeightInfo(PhantomData); -impl frame_system::WeightInfo for WeightInfo { +impl frame_system::WeightInfo for WeightInfo { fn remark(_b: u32, ) -> Weight { (1_815_000 as Weight) } diff --git a/runtime/kusama/src/weights/pallet_balances.rs b/runtime/kusama/src/weights/pallet_balances.rs index bd848cf7efb2..4ee5687e7ee0 100644 --- a/runtime/kusama/src/weights/pallet_balances.rs +++ b/runtime/kusama/src/weights/pallet_balances.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_balances. pub struct WeightInfo(PhantomData); -impl pallet_balances::WeightInfo for WeightInfo { +impl pallet_balances::WeightInfo for WeightInfo { fn transfer() -> Weight { (91_625_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_collective.rs b/runtime/kusama/src/weights/pallet_collective.rs index df8751e61b18..5ee9f949f4ec 100644 --- a/runtime/kusama/src/weights/pallet_collective.rs +++ b/runtime/kusama/src/weights/pallet_collective.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_collective. pub struct WeightInfo(PhantomData); -impl pallet_collective::WeightInfo for WeightInfo { +impl pallet_collective::WeightInfo for WeightInfo { fn set_members(m: u32, n: u32, p: u32, ) -> Weight { (0 as Weight) .saturating_add((20_744_000 as Weight).saturating_mul(m as Weight)) diff --git a/runtime/kusama/src/weights/pallet_democracy.rs b/runtime/kusama/src/weights/pallet_democracy.rs index e9731066bcae..7f12bc755913 100644 --- a/runtime/kusama/src/weights/pallet_democracy.rs +++ b/runtime/kusama/src/weights/pallet_democracy.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_democracy. pub struct WeightInfo(PhantomData); -impl pallet_democracy::WeightInfo for WeightInfo { +impl pallet_democracy::WeightInfo for WeightInfo { fn propose() -> Weight { (73_769_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_elections_phragmen.rs b/runtime/kusama/src/weights/pallet_elections_phragmen.rs index 1c21081690e3..38d37ea631fd 100644 --- a/runtime/kusama/src/weights/pallet_elections_phragmen.rs +++ b/runtime/kusama/src/weights/pallet_elections_phragmen.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_elections_phragmen. pub struct WeightInfo(PhantomData); -impl pallet_elections_phragmen::WeightInfo for WeightInfo { +impl pallet_elections_phragmen::WeightInfo for WeightInfo { fn vote(v: u32, ) -> Weight { (83_050_000 as Weight) .saturating_add((124_000 as Weight).saturating_mul(v as Weight)) diff --git a/runtime/kusama/src/weights/pallet_identity.rs b/runtime/kusama/src/weights/pallet_identity.rs index 1dec703d1cf8..09e63ae50121 100644 --- a/runtime/kusama/src/weights/pallet_identity.rs +++ b/runtime/kusama/src/weights/pallet_identity.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_identity. pub struct WeightInfo(PhantomData); -impl pallet_identity::WeightInfo for WeightInfo { +impl pallet_identity::WeightInfo for WeightInfo { fn add_registrar(r: u32, ) -> Weight { (26_618_000 as Weight) .saturating_add((318_000 as Weight).saturating_mul(r as Weight)) diff --git a/runtime/kusama/src/weights/pallet_im_online.rs b/runtime/kusama/src/weights/pallet_im_online.rs index 2a30792adffe..53073f641eec 100644 --- a/runtime/kusama/src/weights/pallet_im_online.rs +++ b/runtime/kusama/src/weights/pallet_im_online.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_im_online. pub struct WeightInfo(PhantomData); -impl pallet_im_online::WeightInfo for WeightInfo { +impl pallet_im_online::WeightInfo for WeightInfo { fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight { (108_140_000 as Weight) .saturating_add((217_000 as Weight).saturating_mul(k as Weight)) diff --git a/runtime/kusama/src/weights/pallet_indices.rs b/runtime/kusama/src/weights/pallet_indices.rs index b85495d8c4d2..07773fe8b4c7 100644 --- a/runtime/kusama/src/weights/pallet_indices.rs +++ b/runtime/kusama/src/weights/pallet_indices.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_indices. pub struct WeightInfo(PhantomData); -impl pallet_indices::WeightInfo for WeightInfo { +impl pallet_indices::WeightInfo for WeightInfo { fn claim() -> Weight { (51_086_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_multisig.rs b/runtime/kusama/src/weights/pallet_multisig.rs index f6c5aff1ce8d..14def1b77b4f 100644 --- a/runtime/kusama/src/weights/pallet_multisig.rs +++ b/runtime/kusama/src/weights/pallet_multisig.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_multisig. pub struct WeightInfo(PhantomData); -impl pallet_multisig::WeightInfo for WeightInfo { +impl pallet_multisig::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32, ) -> Weight { (12_168_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) diff --git a/runtime/kusama/src/weights/pallet_proxy.rs b/runtime/kusama/src/weights/pallet_proxy.rs index abb41ccfeccf..5a520577e37b 100644 --- a/runtime/kusama/src/weights/pallet_proxy.rs +++ b/runtime/kusama/src/weights/pallet_proxy.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_proxy. pub struct WeightInfo(PhantomData); -impl pallet_proxy::WeightInfo for WeightInfo { +impl pallet_proxy::WeightInfo for WeightInfo { fn proxy(p: u32, ) -> Weight { (30_797_000 as Weight) .saturating_add((182_000 as Weight).saturating_mul(p as Weight)) diff --git a/runtime/kusama/src/weights/pallet_scheduler.rs b/runtime/kusama/src/weights/pallet_scheduler.rs index ad35dcc2beff..4ecddb8d5ed3 100644 --- a/runtime/kusama/src/weights/pallet_scheduler.rs +++ b/runtime/kusama/src/weights/pallet_scheduler.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_scheduler. pub struct WeightInfo(PhantomData); -impl pallet_scheduler::WeightInfo for WeightInfo { +impl pallet_scheduler::WeightInfo for WeightInfo { fn schedule(s: u32, ) -> Weight { (33_450_000 as Weight) .saturating_add((48_000 as Weight).saturating_mul(s as Weight)) diff --git a/runtime/kusama/src/weights/pallet_session.rs b/runtime/kusama/src/weights/pallet_session.rs index 94c1120409f0..5c2d95a53eb9 100644 --- a/runtime/kusama/src/weights/pallet_session.rs +++ b/runtime/kusama/src/weights/pallet_session.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_session. pub struct WeightInfo(PhantomData); -impl pallet_session::WeightInfo for WeightInfo { +impl pallet_session::WeightInfo for WeightInfo { fn set_keys() -> Weight { (89_426_000 as Weight) .saturating_add(T::DbWeight::get().reads(7 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_staking.rs b/runtime/kusama/src/weights/pallet_staking.rs index 0c3fa15e1415..43316a42362b 100644 --- a/runtime/kusama/src/weights/pallet_staking.rs +++ b/runtime/kusama/src/weights/pallet_staking.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_staking. pub struct WeightInfo(PhantomData); -impl pallet_staking::WeightInfo for WeightInfo { +impl pallet_staking::WeightInfo for WeightInfo { fn bond() -> Weight { (91_974_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_timestamp.rs b/runtime/kusama/src/weights/pallet_timestamp.rs index 316312ecc557..61a54a44e5e8 100644 --- a/runtime/kusama/src/weights/pallet_timestamp.rs +++ b/runtime/kusama/src/weights/pallet_timestamp.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_timestamp. pub struct WeightInfo(PhantomData); -impl pallet_timestamp::WeightInfo for WeightInfo { +impl pallet_timestamp::WeightInfo for WeightInfo { fn set() -> Weight { (10_514_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_treasury.rs b/runtime/kusama/src/weights/pallet_treasury.rs index 57b00385de15..a9a85c2ff5dd 100644 --- a/runtime/kusama/src/weights/pallet_treasury.rs +++ b/runtime/kusama/src/weights/pallet_treasury.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_treasury. pub struct WeightInfo(PhantomData); -impl pallet_treasury::WeightInfo for WeightInfo { +impl pallet_treasury::WeightInfo for WeightInfo { fn propose_spend() -> Weight { (52_217_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/kusama/src/weights/pallet_utility.rs b/runtime/kusama/src/weights/pallet_utility.rs index e28d168c7a7c..d4201cd2cf9d 100644 --- a/runtime/kusama/src/weights/pallet_utility.rs +++ b/runtime/kusama/src/weights/pallet_utility.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_utility. pub struct WeightInfo(PhantomData); -impl pallet_utility::WeightInfo for WeightInfo { +impl pallet_utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { (18_717_000 as Weight) .saturating_add((1_995_000 as Weight).saturating_mul(c as Weight)) diff --git a/runtime/kusama/src/weights/pallet_vesting.rs b/runtime/kusama/src/weights/pallet_vesting.rs index 1940c2efc268..59ffb2f97527 100644 --- a/runtime/kusama/src/weights/pallet_vesting.rs +++ b/runtime/kusama/src/weights/pallet_vesting.rs @@ -43,7 +43,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_vesting. pub struct WeightInfo(PhantomData); -impl pallet_vesting::WeightInfo for WeightInfo { +impl pallet_vesting::WeightInfo for WeightInfo { fn vest_locked(l: u32, ) -> Weight { (54_477_000 as Weight) .saturating_add((129_000 as Weight).saturating_mul(l as Weight)) diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index 5200a897e607..b94153ac2183 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,27 +12,27 @@ rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.117", features = [ "derive" ], optional = true } derive_more = "0.99.11" -sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sp-keystore = { git = "https://github.com/paritytech/substrate", optional = true , branch = "gui-rename-trait-to-config" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } xcm = { package = "xcm", path = "../../xcm", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -44,17 +44,17 @@ rand_chacha = { version = "0.2.2", default-features = false } [dev-dependencies] futures = "0.3.8" hex-literal = "0.3.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } serde_json = "1.0.59" libsecp256k1 = "0.3.5" -sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"} +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } [features] diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs index 98cb403c9a1a..eab32d503b52 100644 --- a/runtime/parachains/src/configuration.rs +++ b/runtime/parachains/src/configuration.rs @@ -114,24 +114,24 @@ pub struct HostConfiguration { pub hrmp_max_message_num_per_candidate: u32, } -pub trait Trait: frame_system::Trait { } +pub trait Config: frame_system::Config { } decl_storage! { - trait Store for Module as Configuration { + trait Store for Module as Configuration { /// The active configuration for the current session. - Config get(fn config) config(): HostConfiguration; + HostConfig get(fn config) config(): HostConfiguration; /// Pending configuration (if any) for the next session. PendingConfig: Option>; } } decl_error! { - pub enum Error for Module { } + pub enum Error for Module { } } decl_module! { /// The parachains configuration module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; /// Set the validation upgrade frequency. @@ -428,7 +428,7 @@ decl_module! { } } -impl Module { +impl Module { /// Called by the initializer to initialize the configuration module. pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { 0 @@ -440,7 +440,7 @@ impl Module { /// Called by the initializer to note that a new session has started. pub(crate) fn initializer_on_new_session(_validators: &[ValidatorId], _queued: &[ValidatorId]) { if let Some(pending) = ::PendingConfig::take() { - ::Config::set(pending); + ::HostConfig::set(pending); } } diff --git a/runtime/parachains/src/dmp.rs b/runtime/parachains/src/dmp.rs index 004308c0d701..49fb2f8a5732 100644 --- a/runtime/parachains/src/dmp.rs +++ b/runtime/parachains/src/dmp.rs @@ -62,10 +62,10 @@ impl fmt::Debug for ProcessedDownwardMessagesAcceptanceErr { } } -pub trait Trait: frame_system::Trait + configuration::Trait {} +pub trait Config: frame_system::Config + configuration::Config {} decl_storage! { - trait Store for Module as Dmp { + trait Store for Module as Dmp { /// Paras that are to be cleaned up at the end of the session. /// The entries are sorted ascending by the para id. OutgoingParas: Vec; @@ -85,11 +85,11 @@ decl_storage! { decl_module! { /// The DMP module. - pub struct Module for enum Call where origin: ::Origin { } + pub struct Module for enum Call where origin: ::Origin { } } /// Routines and getters related to downward message passing. -impl Module { +impl Module { /// Block initialization logic, called by initializer. pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { 0 diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs index 33614704664f..9ce7220e2d4b 100644 --- a/runtime/parachains/src/hrmp.rs +++ b/runtime/parachains/src/hrmp.rs @@ -207,14 +207,14 @@ impl fmt::Debug for OutboundHrmpAcceptanceErr { } } -pub trait Trait: frame_system::Trait + configuration::Trait + paras::Trait + dmp::Trait { +pub trait Config: frame_system::Config + configuration::Config + paras::Config + dmp::Config { type Origin: From - + From<::Origin> - + Into::Origin>>; + + From<::Origin> + + Into::Origin>>; } decl_storage! { - trait Store for Module as Hrmp { + trait Store for Module as Hrmp { /// Paras that are to be cleaned up at the end of the session. /// The entries are sorted ascending by the para id. OutgoingParas: Vec; @@ -286,7 +286,7 @@ decl_storage! { } decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// The sender tried to open a channel to themselves. OpenHrmpChannelToSelf, /// The recipient is not a valid para. @@ -322,7 +322,7 @@ decl_error! { decl_module! { /// The HRMP module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; #[weight = 0] @@ -332,7 +332,7 @@ decl_module! { proposed_max_capacity: u32, proposed_max_message_size: u32, ) -> DispatchResult { - let origin = ensure_parachain(::Origin::from(origin))?; + let origin = ensure_parachain(::Origin::from(origin))?; Self::init_open_channel( origin, recipient, @@ -344,14 +344,14 @@ decl_module! { #[weight = 0] fn hrmp_accept_open_channel(origin, sender: ParaId) -> DispatchResult { - let origin = ensure_parachain(::Origin::from(origin))?; + let origin = ensure_parachain(::Origin::from(origin))?; Self::accept_open_channel(origin, sender)?; Ok(()) } #[weight = 0] fn hrmp_close_channel(origin, channel_id: HrmpChannelId) -> DispatchResult { - let origin = ensure_parachain(::Origin::from(origin))?; + let origin = ensure_parachain(::Origin::from(origin))?; Self::close_channel(origin, channel_id)?; Ok(()) } @@ -359,7 +359,7 @@ decl_module! { } /// Routines and getters related to HRMP. -impl Module { +impl Module { /// Block initialization logic, called by initializer. pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { 0 diff --git a/runtime/parachains/src/inclusion.rs b/runtime/parachains/src/inclusion.rs index 8bca04f4f407..982bf3c72361 100644 --- a/runtime/parachains/src/inclusion.rs +++ b/runtime/parachains/src/inclusion.rs @@ -85,19 +85,19 @@ impl CandidatePendingAvailability { } } -pub trait Trait: - frame_system::Trait - + paras::Trait - + dmp::Trait - + ump::Trait - + hrmp::Trait - + configuration::Trait +pub trait Config: + frame_system::Config + + paras::Config + + dmp::Config + + ump::Config + + hrmp::Config + + configuration::Config { - type Event: From> + Into<::Event>; + type Event: From> + Into<::Event>; } decl_storage! { - trait Store for Module as ParaInclusion { + trait Store for Module as ParaInclusion { /// The latest bitfield for each validator, referred to by their index in the validator set. AvailabilityBitfields: map hasher(twox_64_concat) ValidatorIndex => Option>; @@ -119,7 +119,7 @@ decl_storage! { } decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// Availability bitfield has unexpected size. WrongBitfieldSize, /// Multiple bitfields submitted by same validator or validators out of order by index. @@ -170,7 +170,7 @@ decl_error! { } decl_event! { - pub enum Event where ::Hash { + pub enum Event where ::Hash { /// A candidate was backed. [candidate, head_data] CandidateBacked(CandidateReceipt, HeadData), /// A candidate was included. [candidate, head_data] @@ -182,8 +182,8 @@ decl_event! { decl_module! { /// The parachain-candidate inclusion module. - pub struct Module - for enum Call where origin: ::Origin + pub struct Module + for enum Call where origin: ::Origin { type Error = Error; @@ -193,7 +193,7 @@ decl_module! { const LOG_TARGET: &str = "parachains_runtime_inclusion"; -impl Module { +impl Module { /// Block initialization logic, called by initializer. pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { 0 } @@ -733,7 +733,7 @@ enum AcceptanceCheckErr { impl AcceptanceCheckErr { /// Returns the same error so that it can be threaded through a needle of `DispatchError` and /// ultimately returned from a `Dispatchable`. - fn strip_into_dispatch_err(self) -> Error { + fn strip_into_dispatch_err(self) -> Error { use AcceptanceCheckErr::*; match self { HeadDataTooLarge => Error::::HeadDataTooLarge, @@ -748,13 +748,13 @@ impl AcceptanceCheckErr { } /// A collection of data required for checking a candidate. -struct CandidateCheckContext { +struct CandidateCheckContext { config: configuration::HostConfiguration, now: T::BlockNumber, relay_parent_number: T::BlockNumber, } -impl CandidateCheckContext { +impl CandidateCheckContext { fn new() -> Self { let now = >::block_number(); Self { diff --git a/runtime/parachains/src/inclusion_inherent.rs b/runtime/parachains/src/inclusion_inherent.rs index b6cbf94133d9..bb25f5c80f69 100644 --- a/runtime/parachains/src/inclusion_inherent.rs +++ b/runtime/parachains/src/inclusion_inherent.rs @@ -39,10 +39,10 @@ use crate::{ }; use inherents::{InherentIdentifier, InherentData, MakeFatalError, ProvideInherent}; -pub trait Trait: inclusion::Trait + scheduler::Trait {} +pub trait Config: inclusion::Config + scheduler::Config {} decl_storage! { - trait Store for Module as ParaInclusionInherent { + trait Store for Module as ParaInclusionInherent { /// Whether the inclusion inherent was included within this block. /// /// The `Option<()>` is effectively a bool, but it never hits storage in the `None` variant @@ -54,7 +54,7 @@ decl_storage! { } decl_error! { - pub enum Error for Module { + pub enum Error for Module { /// Inclusion inherent called more than once per block. TooManyInclusionInherents, } @@ -62,7 +62,7 @@ decl_error! { decl_module! { /// The inclusion inherent module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; fn on_initialize() -> Weight { @@ -127,7 +127,7 @@ decl_module! { } } -impl ProvideInherent for Module { +impl ProvideInherent for Module { type Call = Call; type Error = MakeFatalError<()>; const INHERENT_IDENTIFIER: InherentIdentifier = INCLUSION_INHERENT_IDENTIFIER; diff --git a/runtime/parachains/src/initializer.rs b/runtime/parachains/src/initializer.rs index ea9348d79fa8..838308a9348f 100644 --- a/runtime/parachains/src/initializer.rs +++ b/runtime/parachains/src/initializer.rs @@ -57,22 +57,22 @@ struct BufferedSessionChange { session_index: sp_staking::SessionIndex, } -pub trait Trait: - frame_system::Trait - + configuration::Trait - + paras::Trait - + scheduler::Trait - + inclusion::Trait - + dmp::Trait - + ump::Trait - + hrmp::Trait +pub trait Config: + frame_system::Config + + configuration::Config + + paras::Config + + scheduler::Config + + inclusion::Config + + dmp::Config + + ump::Config + + hrmp::Config { /// A randomness beacon. type Randomness: Randomness; } decl_storage! { - trait Store for Module as Initializer { + trait Store for Module as Initializer { /// Whether the parachains modules have been initialized within this block. /// /// Semantically a bool, but this guarantees it should never hit the trie, @@ -94,12 +94,12 @@ decl_storage! { } decl_error! { - pub enum Error for Module { } + pub enum Error for Module { } } decl_module! { /// The initializer module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; fn on_initialize(now: T::BlockNumber) -> Weight { @@ -155,7 +155,7 @@ decl_module! { } } -impl Module { +impl Module { fn apply_new_session( session_index: sp_staking::SessionIndex, validators: Vec, @@ -220,11 +220,11 @@ impl Module { } } -impl sp_runtime::BoundToRuntimeAppPublic for Module { +impl sp_runtime::BoundToRuntimeAppPublic for Module { type Public = ValidatorId; } -impl pallet_session::OneSessionHandler for Module { +impl pallet_session::OneSessionHandler for Module { type Key = ValidatorId; fn on_genesis_session<'a, I: 'a>(_validators: I) diff --git a/runtime/parachains/src/lib.rs b/runtime/parachains/src/lib.rs index 3691b41c365c..ec52f6789784 100644 --- a/runtime/parachains/src/lib.rs +++ b/runtime/parachains/src/lib.rs @@ -44,7 +44,7 @@ mod mock; pub use origin::{Origin, ensure_parachain}; /// Schedule a para to be initialized at the start of the next session with the given genesis data. -pub fn schedule_para_initialize( +pub fn schedule_para_initialize( id: primitives::v1::Id, genesis: paras::ParaGenesisArgs, ) { @@ -54,10 +54,10 @@ pub fn schedule_para_initialize( /// Schedule a para to be cleaned up at the start of the next session. pub fn schedule_para_cleanup(id: primitives::v1::Id) where - T: paras::Trait - + dmp::Trait - + ump::Trait - + hrmp::Trait, + T: paras::Config + + dmp::Config + + ump::Config + + hrmp::Config, { >::schedule_para_cleanup(id); >::schedule_para_cleanup(id); diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index edb84e2a1245..ae5d0e03b5f9 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -70,7 +70,7 @@ parameter_types! { pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); } -impl frame_system::Trait for Test { +impl frame_system::Config for Test { type BaseCallFilter = (); type Origin = Origin; type Call = Call; @@ -98,29 +98,29 @@ impl frame_system::Trait for Test { type SystemWeightInfo = (); } -impl crate::initializer::Trait for Test { +impl crate::initializer::Config for Test { type Randomness = TestRandomness; } -impl crate::configuration::Trait for Test { } +impl crate::configuration::Config for Test { } -impl crate::paras::Trait for Test { +impl crate::paras::Config for Test { type Origin = Origin; } -impl crate::dmp::Trait for Test { } +impl crate::dmp::Config for Test { } -impl crate::ump::Trait for Test { +impl crate::ump::Config for Test { type UmpSink = crate::ump::mock_sink::MockUmpSink; } -impl crate::hrmp::Trait for Test { +impl crate::hrmp::Config for Test { type Origin = Origin; } -impl crate::scheduler::Trait for Test { } +impl crate::scheduler::Config for Test { } -impl crate::inclusion::Trait for Test { +impl crate::inclusion::Config for Test { type Event = TestEvent; } diff --git a/runtime/parachains/src/origin.rs b/runtime/parachains/src/origin.rs index b8444181de58..f238b91fba9d 100644 --- a/runtime/parachains/src/origin.rs +++ b/runtime/parachains/src/origin.rs @@ -40,7 +40,7 @@ pub fn ensure_parachain(o: OuterOrigin) -> result::Result for enum Call where origin: ::Origin {} + pub struct Module for enum Call where origin: ::Origin {} } impl From for Origin { diff --git a/runtime/parachains/src/paras.rs b/runtime/parachains/src/paras.rs index 66782d7c12ba..7a9375b029b7 100644 --- a/runtime/parachains/src/paras.rs +++ b/runtime/parachains/src/paras.rs @@ -45,11 +45,11 @@ use serde::{Serialize, Deserialize}; pub use crate::Origin; -pub trait Trait: frame_system::Trait + configuration::Trait { +pub trait Config: frame_system::Config + configuration::Config { /// The outer origin type. type Origin: From - + From<::Origin> - + Into::Origin>>; + + From<::Origin> + + Into::Origin>>; } // the two key times necessary to track for every code replacement. @@ -177,7 +177,7 @@ pub struct ParaGenesisArgs { } decl_storage! { - trait Store for Module as Paras { + trait Store for Module as Paras { /// All parachains. Ordered ascending by ParaId. Parathreads are not included. Parachains get(fn parachains): Vec; /// All parathreads. @@ -224,7 +224,7 @@ decl_storage! { } #[cfg(feature = "std")] -fn build(config: &GenesisConfig) { +fn build(config: &GenesisConfig) { let mut parachains: Vec<_> = config.paras .iter() .filter(|(_, args)| args.parachain) @@ -244,17 +244,17 @@ fn build(config: &GenesisConfig) { } decl_error! { - pub enum Error for Module { } + pub enum Error for Module { } } decl_module! { /// The parachains configuration module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; } } -impl Module { +impl Module { /// Called by the initializer to initialize the configuration module. pub(crate) fn initializer_initialize(now: T::BlockNumber) -> Weight { Self::prune_old_code(now) diff --git a/runtime/parachains/src/runtime_api_impl/v1.rs b/runtime/parachains/src/runtime_api_impl/v1.rs index 2f49f4af8c7e..6a0a8e05797a 100644 --- a/runtime/parachains/src/runtime_api_impl/v1.rs +++ b/runtime/parachains/src/runtime_api_impl/v1.rs @@ -31,12 +31,12 @@ use frame_support::debug; use crate::{initializer, inclusion, scheduler, configuration, paras, dmp, hrmp}; /// Implementation for the `validators` function of the runtime API. -pub fn validators() -> Vec { +pub fn validators() -> Vec { >::validators() } /// Implementation for the `validator_groups` function of the runtime API. -pub fn validator_groups() -> ( +pub fn validator_groups() -> ( Vec>, GroupRotationInfo, ) { @@ -47,7 +47,7 @@ pub fn validator_groups() -> ( } /// Implementation for the `availability_cores` function of the runtime API. -pub fn availability_cores() -> Vec> { +pub fn availability_cores() -> Vec> { let cores = >::availability_cores(); let parachains = >::parachains(); let config = >::config(); @@ -163,24 +163,24 @@ pub fn availability_cores() -> Vec( +fn with_assumption( para_id: ParaId, assumption: OccupiedCoreAssumption, build: F, ) -> Option where - Trait: inclusion::Trait, + Config: inclusion::Config, F: FnOnce() -> Option, { match assumption { OccupiedCoreAssumption::Included => { - >::force_enact(para_id); + >::force_enact(para_id); build() } OccupiedCoreAssumption::TimedOut => { build() } OccupiedCoreAssumption::Free => { - if >::pending_availability(para_id).is_some() { + if >::pending_availability(para_id).is_some() { None } else { build() @@ -190,7 +190,7 @@ fn with_assumption( } /// Implementation for the `full_validation_data` function of the runtime API. -pub fn full_validation_data( +pub fn full_validation_data( para_id: ParaId, assumption: OccupiedCoreAssumption, ) @@ -207,7 +207,7 @@ pub fn full_validation_data( } /// Implementation for the `persisted_validation_data` function of the runtime API. -pub fn persisted_validation_data( +pub fn persisted_validation_data( para_id: ParaId, assumption: OccupiedCoreAssumption, ) -> Option> { @@ -219,7 +219,7 @@ pub fn persisted_validation_data( } /// Implementation for the `check_validation_outputs` function of the runtime API. -pub fn check_validation_outputs( +pub fn check_validation_outputs( para_id: ParaId, outputs: primitives::v1::ValidationOutputs, ) -> bool { @@ -227,7 +227,7 @@ pub fn check_validation_outputs( } /// Implementation for the `session_index_for_child` function of the runtime API. -pub fn session_index_for_child() -> SessionIndex { +pub fn session_index_for_child() -> SessionIndex { // Just returns the session index from `inclusion`. Runtime APIs follow // initialization so the initializer will have applied any pending session change // which is expected at the child of the block whose context the runtime API was invoked @@ -239,7 +239,7 @@ pub fn session_index_for_child() -> SessionIndex { } /// Implementation for the `validation_code` function of the runtime API. -pub fn validation_code( +pub fn validation_code( para_id: ParaId, assumption: OccupiedCoreAssumption, ) -> Option { @@ -251,7 +251,7 @@ pub fn validation_code( } /// Implementation for the `historical_validation_code` function of the runtime API. -pub fn historical_validation_code( +pub fn historical_validation_code( para_id: ParaId, context_height: T::BlockNumber, ) -> Option { @@ -259,7 +259,7 @@ pub fn historical_validation_code( } /// Implementation for the `candidate_pending_availability` function of the runtime API. -pub fn candidate_pending_availability(para_id: ParaId) +pub fn candidate_pending_availability(para_id: ParaId) -> Option> { >::candidate_pending_availability(para_id) @@ -270,8 +270,8 @@ pub fn candidate_pending_availability(para_id: ParaId) // this means it can run in a different session than other runtime APIs at the same block. pub fn candidate_events(extract_event: F) -> Vec> where - T: initializer::Trait, - F: Fn(::Event) -> Option>, + T: initializer::Config, + F: Fn(::Event) -> Option>, { use inclusion::Event as RawEvent; @@ -294,7 +294,7 @@ where // https://github.com/paritytech/polkadot/issues/1461 pub fn validator_discovery(validators: Vec) -> Vec> where - T: initializer::Trait + pallet_authority_discovery::Trait, + T: initializer::Config + pallet_authority_discovery::Config, { // FIXME: the mapping might be invalid if a session change happens in between the calls // use SessionInfo from https://github.com/paritytech/polkadot/pull/1691 @@ -310,14 +310,14 @@ where } /// Implementation for the `dmq_contents` function of the runtime API. -pub fn dmq_contents( +pub fn dmq_contents( recipient: ParaId, ) -> Vec> { >::dmq_contents(recipient) } /// Implementation for the `inbound_hrmp_channels_contents` function of the runtime API. -pub fn inbound_hrmp_channels_contents( +pub fn inbound_hrmp_channels_contents( recipient: ParaId, ) -> BTreeMap>> { >::inbound_hrmp_channels_contents(recipient) diff --git a/runtime/parachains/src/scheduler.rs b/runtime/parachains/src/scheduler.rs index 5d06f179fe1d..8f4b0d55ef2c 100644 --- a/runtime/parachains/src/scheduler.rs +++ b/runtime/parachains/src/scheduler.rs @@ -153,10 +153,10 @@ impl CoreAssignment { } } -pub trait Trait: frame_system::Trait + configuration::Trait + paras::Trait { } +pub trait Config: frame_system::Config + configuration::Config + paras::Config { } decl_storage! { - trait Store for Module as ParaScheduler { + trait Store for Module as ParaScheduler { /// All the validator groups. One for each core. /// /// Bound: The number of cores is the sum of the numbers of parachains and parathread multiplexers. @@ -190,17 +190,17 @@ decl_storage! { } decl_error! { - pub enum Error for Module { } + pub enum Error for Module { } } decl_module! { /// The scheduler module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; } } -impl Module { +impl Module { /// Called by the initializer to initialize the scheduler module. pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { Self::schedule(Vec::new()); diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs index 03d52ebb2cd6..f18ad250b92d 100644 --- a/runtime/parachains/src/ump.rs +++ b/runtime/parachains/src/ump.rs @@ -105,13 +105,13 @@ impl fmt::Debug for AcceptanceCheckErr { } } -pub trait Trait: frame_system::Trait + configuration::Trait { +pub trait Config: frame_system::Config + configuration::Config { /// A place where all received upward messages are funneled. type UmpSink: UmpSink; } decl_storage! { - trait Store for Module as Ump { + trait Store for Module as Ump { /// Paras that are to be cleaned up at the end of the session. /// The entries are sorted ascending by the para id. OutgoingParas: Vec; @@ -152,12 +152,12 @@ decl_storage! { decl_module! { /// The UMP module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { } } /// Routines related to the upward message passing. -impl Module { +impl Module { /// Block initialization logic, called by initializer. pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { 0 @@ -365,7 +365,7 @@ impl QueueCache { /// /// - `upward_message` a dequeued message or `None` if the queue _was_ empty. /// - `became_empty` is true if the queue _became_ empty. - fn dequeue(&mut self, para: ParaId) -> (Option, bool) { + fn dequeue(&mut self, para: ParaId) -> (Option, bool) { let cache_entry = self.0.entry(para).or_insert_with(|| { let queue = as Store>::RelayDispatchQueues::get(¶); let (count, total_size) = as Store>::RelayDispatchQueueSize::get(¶); @@ -386,7 +386,7 @@ impl QueueCache { } /// Flushes the updated queues into the storage. - fn flush(self) { + fn flush(self) { // NOTE we use an explicit method here instead of Drop impl because it has unwanted semantics // within runtime. It is dangerous to use because of double-panics and flushing on a panic // is not necessary as well. @@ -427,7 +427,7 @@ struct NeedsDispatchCursor { } impl NeedsDispatchCursor { - fn new() -> Self { + fn new() -> Self { let needs_dispatch: Vec = as Store>::NeedsDispatch::get(); let start_with = as Store>::NextDispatchRoundStartWith::get(); @@ -481,7 +481,7 @@ impl NeedsDispatchCursor { } /// Flushes the dispatcher state into the persistent storage. - fn flush(self) { + fn flush(self) { let next_one = self.peek(); as Store>::NextDispatchRoundStartWith::set(next_one); as Store>::NeedsDispatch::put(self.needs_dispatch); diff --git a/runtime/parachains/src/util.rs b/runtime/parachains/src/util.rs index d73f824c45f0..151222cbec16 100644 --- a/runtime/parachains/src/util.rs +++ b/runtime/parachains/src/util.rs @@ -25,7 +25,7 @@ use crate::{configuration, paras, dmp, hrmp}; /// Make the persisted validation data for a particular parachain. /// /// This ties together the storage of several modules. -pub fn make_persisted_validation_data( +pub fn make_persisted_validation_data( para_id: ParaId, ) -> Option> { let config = >::config(); @@ -43,7 +43,7 @@ pub fn make_persisted_validation_data( /// Make the transient validation data for a particular parachain. /// /// This ties together the storage of several modules. -pub fn make_transient_validation_data( +pub fn make_transient_validation_data( para_id: ParaId, ) -> Option> { let config = >::config(); diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 8d9e9897a63f..03bf9680a7c2 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -140,7 +140,7 @@ parameter_types! { pub const Version: RuntimeVersion = VERSION; } -impl frame_system::Trait for Runtime { +impl frame_system::Config for Runtime { type BaseCallFilter = BaseFilter; type Origin = Origin; type Call = Call; @@ -172,7 +172,7 @@ parameter_types! { pub const MaxScheduledPerBlock: u32 = 50; } -impl pallet_scheduler::Trait for Runtime { +impl pallet_scheduler::Config for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; @@ -188,7 +188,7 @@ parameter_types! { pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; } -impl pallet_babe::Trait for Runtime { +impl pallet_babe::Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; @@ -217,7 +217,7 @@ parameter_types! { pub const IndexDeposit: Balance = 10 * DOLLARS; } -impl pallet_indices::Trait for Runtime { +impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; @@ -230,7 +230,7 @@ parameter_types! { pub const MaxLocks: u32 = 50; } -impl pallet_balances::Trait for Runtime { +impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); type Event = Event; @@ -244,7 +244,7 @@ parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; } -impl pallet_transaction_payment::Trait for Runtime { +impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter>; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; @@ -254,7 +254,7 @@ impl pallet_transaction_payment::Trait for Runtime { parameter_types! { pub const MinimumPeriod: u64 = SLOT_DURATION / 2; } -impl pallet_timestamp::Trait for Runtime { +impl pallet_timestamp::Config for Runtime { type Moment = u64; type OnTimestampSet = Babe; type MinimumPeriod = MinimumPeriod; @@ -266,7 +266,7 @@ parameter_types! { } // TODO: substrate#2986 implement this properly -impl pallet_authorship::Trait for Runtime { +impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; type FilterUncle = (); @@ -287,7 +287,7 @@ parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } -impl pallet_session::Trait for Runtime { +impl pallet_session::Config for Runtime { type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; @@ -300,7 +300,7 @@ impl pallet_session::Trait for Runtime { type WeightInfo = weights::pallet_session::WeightInfo; } -impl pallet_session::historical::Trait for Runtime { +impl pallet_session::historical::Config for Runtime { type FullIdentification = pallet_staking::Exposure; type FullIdentificationOf = pallet_staking::ExposureOf; } @@ -344,7 +344,7 @@ type SlashCancelOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective> >; -impl pallet_staking::Trait for Runtime { +impl pallet_staking::Config for Runtime { type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; @@ -382,7 +382,7 @@ parameter_types! { pub const MaxRegistrars: u32 = 20; } -impl pallet_identity::Trait for Runtime { +impl pallet_identity::Config for Runtime { type Event = Event; type Currency = Balances; type BasicDeposit = BasicDeposit; @@ -411,7 +411,7 @@ parameter_types! { pub const MaxProposals: u32 = 100; } -impl pallet_democracy::Trait for Runtime { +impl pallet_democracy::Config for Runtime { type Proposal = Call; type Event = Event; type Currency = Balances; @@ -480,7 +480,7 @@ parameter_types! { } type CouncilCollective = pallet_collective::Instance1; -impl pallet_collective::Trait for Runtime { +impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; type Event = Event; @@ -504,7 +504,7 @@ parameter_types! { // Make sure that there are no more than `MaxMembers` members elected via phragmen. const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get()); -impl pallet_elections_phragmen::Trait for Runtime { +impl pallet_elections_phragmen::Config for Runtime { type Event = Event; type ModuleId = ElectionsPhragmenModuleId; type Currency = Balances; @@ -529,7 +529,7 @@ parameter_types! { } type TechnicalCollective = pallet_collective::Instance2; -impl pallet_collective::Trait for Runtime { +impl pallet_collective::Config for Runtime { type Origin = Origin; type Proposal = Call; type Event = Event; @@ -540,7 +540,7 @@ impl pallet_collective::Trait for Runtime { type WeightInfo = weights::pallet_collective::WeightInfo; } -impl pallet_membership::Trait for Runtime { +impl pallet_membership::Config for Runtime { type Event = Event; type AddOrigin = MoreThanHalfCouncil; type RemoveOrigin = MoreThanHalfCouncil; @@ -576,7 +576,7 @@ type ApproveOrigin = EnsureOneOf< pallet_collective::EnsureProportionAtLeast<_3, _5, AccountId, CouncilCollective> >; -impl pallet_treasury::Trait for Runtime { +impl pallet_treasury::Config for Runtime { type ModuleId = TreasuryModuleId; type Currency = Balances; type ApproveOrigin = ApproveOrigin; @@ -606,14 +606,14 @@ parameter_types! { pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); } -impl pallet_offences::Trait for Runtime { +impl pallet_offences::Config for Runtime { type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; type WeightSoftLimit = OffencesWeightSoftLimit; } -impl pallet_authority_discovery::Trait for Runtime {} +impl pallet_authority_discovery::Config for Runtime {} parameter_types! { pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _; @@ -625,7 +625,7 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); } -impl pallet_im_online::Trait for Runtime { +impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; type Event = Event; type SessionDuration = SessionDuration; @@ -634,7 +634,7 @@ impl pallet_im_online::Trait for Runtime { type WeightInfo = weights::pallet_im_online::WeightInfo; } -impl pallet_grandpa::Trait for Runtime { +impl pallet_grandpa::Config for Runtime { type Event = Event; type Call = Call; @@ -662,7 +662,7 @@ impl frame_system::offchain::CreateSignedTransaction for R call: Call, public: ::Signer, account: AccountId, - nonce: ::Index, + nonce: ::Index, ) -> Option<(Call, ::SignaturePayload)> { // take the biggest period possible. let period = BlockHashCount::get() @@ -717,7 +717,7 @@ parameter_types! { pub Prefix: &'static [u8] = b"Pay DOTs to the Polkadot account:"; } -impl claims::Trait for Runtime { +impl claims::Config for Runtime { type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; @@ -729,7 +729,7 @@ parameter_types! { pub const MinVestedTransfer: Balance = 100 * DOLLARS; } -impl pallet_vesting::Trait for Runtime { +impl pallet_vesting::Config for Runtime { type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; @@ -737,7 +737,7 @@ impl pallet_vesting::Trait for Runtime { type WeightInfo = weights::pallet_vesting::WeightInfo; } -impl pallet_utility::Trait for Runtime { +impl pallet_utility::Config for Runtime { type Event = Event; type Call = Call; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -751,7 +751,7 @@ parameter_types! { pub const MaxSignatories: u16 = 100; } -impl pallet_multisig::Trait for Runtime { +impl pallet_multisig::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -879,7 +879,7 @@ impl InstanceFilter for ProxyType { } } -impl pallet_proxy::Trait for Runtime { +impl pallet_proxy::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -1243,9 +1243,9 @@ sp_api::impl_runtime_apis! { use pallet_offences_benchmarking::Module as OffencesBench; use frame_system_benchmarking::Module as SystemBench; - impl pallet_session_benchmarking::Trait for Runtime {} - impl pallet_offences_benchmarking::Trait for Runtime {} - impl frame_system_benchmarking::Trait for Runtime {} + impl pallet_session_benchmarking::Config for Runtime {} + impl pallet_offences_benchmarking::Config for Runtime {} + impl frame_system_benchmarking::Config for Runtime {} let whitelist: Vec = vec![ // Block Number diff --git a/runtime/polkadot/src/weights/frame_system.rs b/runtime/polkadot/src/weights/frame_system.rs index 5dce4a881096..87537327d821 100644 --- a/runtime/polkadot/src/weights/frame_system.rs +++ b/runtime/polkadot/src/weights/frame_system.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for frame_system. pub struct WeightInfo(PhantomData); -impl frame_system::WeightInfo for WeightInfo { +impl frame_system::WeightInfo for WeightInfo { fn remark(_b: u32, ) -> Weight { (1_851_000 as Weight) } diff --git a/runtime/polkadot/src/weights/pallet_balances.rs b/runtime/polkadot/src/weights/pallet_balances.rs index 9c044bb43de6..20ef0a7f271d 100644 --- a/runtime/polkadot/src/weights/pallet_balances.rs +++ b/runtime/polkadot/src/weights/pallet_balances.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_balances. pub struct WeightInfo(PhantomData); -impl pallet_balances::WeightInfo for WeightInfo { +impl pallet_balances::WeightInfo for WeightInfo { fn transfer() -> Weight { (90_334_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_collective.rs b/runtime/polkadot/src/weights/pallet_collective.rs index 9aea29368e6b..acd43e0e920f 100644 --- a/runtime/polkadot/src/weights/pallet_collective.rs +++ b/runtime/polkadot/src/weights/pallet_collective.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_collective. pub struct WeightInfo(PhantomData); -impl pallet_collective::WeightInfo for WeightInfo { +impl pallet_collective::WeightInfo for WeightInfo { fn set_members(m: u32, n: u32, p: u32, ) -> Weight { (0 as Weight) .saturating_add((20_942_000 as Weight).saturating_mul(m as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_democracy.rs b/runtime/polkadot/src/weights/pallet_democracy.rs index af491a66b307..963ac269dd3d 100644 --- a/runtime/polkadot/src/weights/pallet_democracy.rs +++ b/runtime/polkadot/src/weights/pallet_democracy.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_democracy. pub struct WeightInfo(PhantomData); -impl pallet_democracy::WeightInfo for WeightInfo { +impl pallet_democracy::WeightInfo for WeightInfo { fn propose() -> Weight { (73_078_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_elections_phragmen.rs b/runtime/polkadot/src/weights/pallet_elections_phragmen.rs index 4204d1d58def..e5316b349287 100644 --- a/runtime/polkadot/src/weights/pallet_elections_phragmen.rs +++ b/runtime/polkadot/src/weights/pallet_elections_phragmen.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_elections_phragmen. pub struct WeightInfo(PhantomData); -impl pallet_elections_phragmen::WeightInfo for WeightInfo { +impl pallet_elections_phragmen::WeightInfo for WeightInfo { fn vote(v: u32, ) -> Weight { (85_361_000 as Weight) .saturating_add((113_000 as Weight).saturating_mul(v as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_identity.rs b/runtime/polkadot/src/weights/pallet_identity.rs index 604502983204..5fa965c6d7ed 100644 --- a/runtime/polkadot/src/weights/pallet_identity.rs +++ b/runtime/polkadot/src/weights/pallet_identity.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_identity. pub struct WeightInfo(PhantomData); -impl pallet_identity::WeightInfo for WeightInfo { +impl pallet_identity::WeightInfo for WeightInfo { fn add_registrar(r: u32, ) -> Weight { (26_935_000 as Weight) .saturating_add((309_000 as Weight).saturating_mul(r as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_im_online.rs b/runtime/polkadot/src/weights/pallet_im_online.rs index 0b7c6dc6a028..e8dfb1b85ff8 100644 --- a/runtime/polkadot/src/weights/pallet_im_online.rs +++ b/runtime/polkadot/src/weights/pallet_im_online.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_im_online. pub struct WeightInfo(PhantomData); -impl pallet_im_online::WeightInfo for WeightInfo { +impl pallet_im_online::WeightInfo for WeightInfo { fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight { (107_274_000 as Weight) .saturating_add((218_000 as Weight).saturating_mul(k as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_indices.rs b/runtime/polkadot/src/weights/pallet_indices.rs index ced1cf26cd3a..1e7149497eb1 100644 --- a/runtime/polkadot/src/weights/pallet_indices.rs +++ b/runtime/polkadot/src/weights/pallet_indices.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_indices. pub struct WeightInfo(PhantomData); -impl pallet_indices::WeightInfo for WeightInfo { +impl pallet_indices::WeightInfo for WeightInfo { fn claim() -> Weight { (50_502_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_multisig.rs b/runtime/polkadot/src/weights/pallet_multisig.rs index 1dc0f9a2a922..a18dd7f57a9b 100644 --- a/runtime/polkadot/src/weights/pallet_multisig.rs +++ b/runtime/polkadot/src/weights/pallet_multisig.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_multisig. pub struct WeightInfo(PhantomData); -impl pallet_multisig::WeightInfo for WeightInfo { +impl pallet_multisig::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32, ) -> Weight { (12_023_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_proxy.rs b/runtime/polkadot/src/weights/pallet_proxy.rs index 559d408ce305..466c380f9be9 100644 --- a/runtime/polkadot/src/weights/pallet_proxy.rs +++ b/runtime/polkadot/src/weights/pallet_proxy.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_proxy. pub struct WeightInfo(PhantomData); -impl pallet_proxy::WeightInfo for WeightInfo { +impl pallet_proxy::WeightInfo for WeightInfo { fn proxy(p: u32, ) -> Weight { (30_511_000 as Weight) .saturating_add((189_000 as Weight).saturating_mul(p as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_scheduler.rs b/runtime/polkadot/src/weights/pallet_scheduler.rs index 4fe23eeb4a8b..a8395ee2d44e 100644 --- a/runtime/polkadot/src/weights/pallet_scheduler.rs +++ b/runtime/polkadot/src/weights/pallet_scheduler.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_scheduler. pub struct WeightInfo(PhantomData); -impl pallet_scheduler::WeightInfo for WeightInfo { +impl pallet_scheduler::WeightInfo for WeightInfo { fn schedule(s: u32, ) -> Weight { (33_070_000 as Weight) .saturating_add((43_000 as Weight).saturating_mul(s as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_session.rs b/runtime/polkadot/src/weights/pallet_session.rs index da9d9fd4ccba..b8084ef7bc1b 100644 --- a/runtime/polkadot/src/weights/pallet_session.rs +++ b/runtime/polkadot/src/weights/pallet_session.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_session. pub struct WeightInfo(PhantomData); -impl pallet_session::WeightInfo for WeightInfo { +impl pallet_session::WeightInfo for WeightInfo { fn set_keys() -> Weight { (93_498_000 as Weight) .saturating_add(T::DbWeight::get().reads(7 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_staking.rs b/runtime/polkadot/src/weights/pallet_staking.rs index cd0d026f49a0..be296fb924a1 100644 --- a/runtime/polkadot/src/weights/pallet_staking.rs +++ b/runtime/polkadot/src/weights/pallet_staking.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_staking. pub struct WeightInfo(PhantomData); -impl pallet_staking::WeightInfo for WeightInfo { +impl pallet_staking::WeightInfo for WeightInfo { fn bond() -> Weight { (92_188_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_timestamp.rs b/runtime/polkadot/src/weights/pallet_timestamp.rs index 23be1ccc4b63..0f3642e76812 100644 --- a/runtime/polkadot/src/weights/pallet_timestamp.rs +++ b/runtime/polkadot/src/weights/pallet_timestamp.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_timestamp. pub struct WeightInfo(PhantomData); -impl pallet_timestamp::WeightInfo for WeightInfo { +impl pallet_timestamp::WeightInfo for WeightInfo { fn set() -> Weight { (10_868_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_treasury.rs b/runtime/polkadot/src/weights/pallet_treasury.rs index aa9c30c21bc6..f6fe477e10b6 100644 --- a/runtime/polkadot/src/weights/pallet_treasury.rs +++ b/runtime/polkadot/src/weights/pallet_treasury.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_treasury. pub struct WeightInfo(PhantomData); -impl pallet_treasury::WeightInfo for WeightInfo { +impl pallet_treasury::WeightInfo for WeightInfo { fn propose_spend() -> Weight { (52_150_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_utility.rs b/runtime/polkadot/src/weights/pallet_utility.rs index c32407cfa9ae..2f4285810665 100644 --- a/runtime/polkadot/src/weights/pallet_utility.rs +++ b/runtime/polkadot/src/weights/pallet_utility.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_utility. pub struct WeightInfo(PhantomData); -impl pallet_utility::WeightInfo for WeightInfo { +impl pallet_utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { (18_624_000 as Weight) .saturating_add((1_986_000 as Weight).saturating_mul(c as Weight)) diff --git a/runtime/polkadot/src/weights/pallet_vesting.rs b/runtime/polkadot/src/weights/pallet_vesting.rs index 3129f6f5ef36..e3f859d7e449 100644 --- a/runtime/polkadot/src/weights/pallet_vesting.rs +++ b/runtime/polkadot/src/weights/pallet_vesting.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_vesting. pub struct WeightInfo(PhantomData); -impl pallet_vesting::WeightInfo for WeightInfo { +impl pallet_vesting::WeightInfo for WeightInfo { fn vest_locked(l: u32, ) -> Weight { (53_484_000 as Weight) .saturating_add((134_000 as Weight).saturating_mul(l as Weight)) diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 07e3e0c43338..1f08c24d33c3 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -209,7 +209,7 @@ parameter_types! { pub const Version: RuntimeVersion = VERSION; } -impl frame_system::Trait for Runtime { +impl frame_system::Config for Runtime { type BaseCallFilter = BaseFilter; type Origin = Origin; type Call = Call; @@ -254,7 +254,7 @@ impl frame_system::offchain::CreateSignedTransaction for R call: Call, public: ::Signer, account: AccountId, - nonce: ::Index, + nonce: ::Index, ) -> Option<(Call, ::SignaturePayload)> { // take the biggest period possible. let period = BlockHashCount::get() @@ -293,7 +293,7 @@ impl frame_system::offchain::SigningTypes for Runtime { type Signature = Signature; } -impl pallet_session::historical::Trait for Runtime { +impl pallet_session::historical::Config for Runtime { type FullIdentification = pallet_staking::Exposure; type FullIdentificationOf = pallet_staking::ExposureOf; } @@ -333,7 +333,7 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); } -impl pallet_im_online::Trait for Runtime { +impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; type Event = Event; type ReportUnresponsiveness = Offences; @@ -342,7 +342,7 @@ impl pallet_im_online::Trait for Runtime { type WeightInfo = (); } -impl pallet_staking::Trait for Runtime { +impl pallet_staking::Config for Runtime { type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = frame_support::traits::U128CurrencyToVote; @@ -373,7 +373,7 @@ parameter_types! { pub const MaxLocks: u32 = 50; } -impl pallet_balances::Trait for Runtime { +impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); type Event = Event; @@ -400,19 +400,19 @@ parameter_types! { pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); } -impl pallet_offences::Trait for Runtime { +impl pallet_offences::Config for Runtime { type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; type WeightSoftLimit = OffencesWeightSoftLimit; } -impl pallet_authority_discovery::Trait for Runtime {} +impl pallet_authority_discovery::Config for Runtime {} parameter_types! { pub const MinimumPeriod: u64 = SLOT_DURATION / 2; } -impl pallet_timestamp::Trait for Runtime { +impl pallet_timestamp::Config for Runtime { type Moment = u64; type OnTimestampSet = Babe; type MinimumPeriod = MinimumPeriod; @@ -423,7 +423,7 @@ parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; } -impl pallet_transaction_payment::Trait for Runtime { +impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter>; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; @@ -434,7 +434,7 @@ parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } -impl pallet_session::Trait for Runtime { +impl pallet_session::Config for Runtime { type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; @@ -452,7 +452,7 @@ parameter_types! { pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; } -impl pallet_babe::Trait for Runtime { +impl pallet_babe::Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; @@ -481,7 +481,7 @@ parameter_types! { pub const IndexDeposit: Balance = 1 * DOLLARS; } -impl pallet_indices::Trait for Runtime { +impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; @@ -493,7 +493,7 @@ parameter_types! { pub const AttestationPeriod: BlockNumber = 50; } -impl pallet_grandpa::Trait for Runtime { +impl pallet_grandpa::Config for Runtime { type Event = Event; type Call = Call; @@ -517,52 +517,52 @@ parameter_types! { } // TODO: substrate#2986 implement this properly -impl pallet_authorship::Trait for Runtime { +impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; type FilterUncle = (); type EventHandler = (Staking, ImOnline); } -impl parachains_origin::Trait for Runtime {} +impl parachains_origin::Config for Runtime {} -impl parachains_configuration::Trait for Runtime {} +impl parachains_configuration::Config for Runtime {} -impl parachains_inclusion::Trait for Runtime { +impl parachains_inclusion::Config for Runtime { type Event = Event; } -impl parachains_paras::Trait for Runtime { +impl parachains_paras::Config for Runtime { type Origin = Origin; } -impl parachains_ump::Trait for Runtime { +impl parachains_ump::Config for Runtime { type UmpSink = (); // TODO: #1873 To be handled by the XCM receiver. } -impl parachains_dmp::Trait for Runtime {} +impl parachains_dmp::Config for Runtime {} -impl parachains_hrmp::Trait for Runtime { +impl parachains_hrmp::Config for Runtime { type Origin = Origin; } -impl parachains_inclusion_inherent::Trait for Runtime {} +impl parachains_inclusion_inherent::Config for Runtime {} -impl parachains_scheduler::Trait for Runtime {} +impl parachains_scheduler::Config for Runtime {} -impl parachains_initializer::Trait for Runtime { +impl parachains_initializer::Config for Runtime { type Randomness = Babe; } -impl paras_sudo_wrapper::Trait for Runtime {} +impl paras_sudo_wrapper::Config for Runtime {} -impl paras_registrar::Trait for Runtime { +impl paras_registrar::Config for Runtime { type Currency = Balances; type ParathreadDeposit = ParathreadDeposit; type Origin = Origin; } -impl pallet_sudo::Trait for Runtime { +impl pallet_sudo::Config for Runtime { type Event = Event; type Call = Call; } diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs index fffcd892e6fc..6fee2ea73c36 100644 --- a/runtime/test-runtime/src/lib.rs +++ b/runtime/test-runtime/src/lib.rs @@ -122,7 +122,7 @@ parameter_types! { pub const Version: RuntimeVersion = VERSION; } -impl frame_system::Trait for Runtime { +impl frame_system::Config for Runtime { type BaseCallFilter = (); type Origin = Origin; type Call = Call; @@ -162,7 +162,7 @@ parameter_types! { pub storage ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; } -impl pallet_babe::Trait for Runtime { +impl pallet_babe::Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; @@ -190,7 +190,7 @@ parameter_types! { pub storage IndexDeposit: Balance = 1 * DOLLARS; } -impl pallet_indices::Trait for Runtime { +impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; @@ -203,7 +203,7 @@ parameter_types! { pub storage MaxLocks: u32 = 50; } -impl pallet_balances::Trait for Runtime { +impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); type Event = Event; @@ -217,7 +217,7 @@ parameter_types! { pub storage TransactionByteFee: Balance = 10 * MILLICENTS; } -impl pallet_transaction_payment::Trait for Runtime { +impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; @@ -228,7 +228,7 @@ parameter_types! { pub storage SlotDuration: u64 = SLOT_DURATION; pub storage MinimumPeriod: u64 = SlotDuration::get() / 2; } -impl pallet_timestamp::Trait for Runtime { +impl pallet_timestamp::Config for Runtime { type Moment = u64; type OnTimestampSet = Babe; type MinimumPeriod = MinimumPeriod; @@ -240,7 +240,7 @@ parameter_types! { } // TODO: substrate#2986 implement this properly -impl pallet_authorship::Trait for Runtime { +impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; type FilterUncle = (); @@ -265,7 +265,7 @@ parameter_types! { pub storage DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } -impl pallet_session::Trait for Runtime { +impl pallet_session::Config for Runtime { type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; @@ -278,7 +278,7 @@ impl pallet_session::Trait for Runtime { type WeightInfo = (); } -impl pallet_session::historical::Trait for Runtime { +impl pallet_session::historical::Config for Runtime { type FullIdentification = pallet_staking::Exposure; type FullIdentificationOf = pallet_staking::ExposureOf; } @@ -309,7 +309,7 @@ parameter_types! { pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000); } -impl pallet_staking::Trait for Runtime { +impl pallet_staking::Config for Runtime { type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = frame_support::traits::U128CurrencyToVote; @@ -336,7 +336,7 @@ impl pallet_staking::Trait for Runtime { } -impl pallet_grandpa::Trait for Runtime { +impl pallet_grandpa::Config for Runtime { type Event = Event; type Call = Call; @@ -362,7 +362,7 @@ impl frame_system::offchain::CreateSignedTransaction for R call: Call, public: ::Signer, account: AccountId, - nonce: ::Index, + nonce: ::Index, ) -> Option<(Call, ::SignaturePayload)> { let period = BlockHashCount::get() .checked_next_power_of_two() @@ -403,14 +403,14 @@ parameter_types! { pub storage OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); } -impl pallet_offences::Trait for Runtime { +impl pallet_offences::Config for Runtime { type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; type WeightSoftLimit = OffencesWeightSoftLimit; } -impl pallet_authority_discovery::Trait for Runtime {} +impl pallet_authority_discovery::Config for Runtime {} parameter_types! { pub storage LeasePeriod: BlockNumber = 100_000; @@ -421,7 +421,7 @@ parameter_types! { pub Prefix: &'static [u8] = b"Pay KSMs to the Kusama account:"; } -impl claims::Trait for Runtime { +impl claims::Config for Runtime { type Event = Event; type VestingSchedule = Vesting; type Prefix = Prefix; @@ -432,7 +432,7 @@ parameter_types! { pub storage MinVestedTransfer: Balance = 100 * DOLLARS; } -impl pallet_vesting::Trait for Runtime { +impl pallet_vesting::Config for Runtime { type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; @@ -440,40 +440,40 @@ impl pallet_vesting::Trait for Runtime { type WeightInfo = (); } -impl pallet_sudo::Trait for Runtime { +impl pallet_sudo::Config for Runtime { type Event = Event; type Call = Call; } -impl parachains_configuration::Trait for Runtime {} +impl parachains_configuration::Config for Runtime {} -impl parachains_inclusion::Trait for Runtime { +impl parachains_inclusion::Config for Runtime { type Event = Event; } -impl parachains_inclusion_inherent::Trait for Runtime {} +impl parachains_inclusion_inherent::Config for Runtime {} -impl parachains_initializer::Trait for Runtime { +impl parachains_initializer::Config for Runtime { type Randomness = RandomnessCollectiveFlip; } -impl parachains_paras::Trait for Runtime { +impl parachains_paras::Config for Runtime { type Origin = Origin; } -impl parachains_dmp::Trait for Runtime {} +impl parachains_dmp::Config for Runtime {} -impl parachains_ump::Trait for Runtime { +impl parachains_ump::Config for Runtime { type UmpSink = (); } -impl parachains_hrmp::Trait for Runtime { +impl parachains_hrmp::Config for Runtime { type Origin = Origin; } -impl parachains_scheduler::Trait for Runtime {} +impl parachains_scheduler::Config for Runtime {} -impl paras_sudo_wrapper::Trait for Runtime {} +impl paras_sudo_wrapper::Config for Runtime {} construct_runtime! { pub enum Runtime where diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 08e0ab6a28c9..42879acce6ed 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -118,7 +118,7 @@ parameter_types! { pub const Version: RuntimeVersion = VERSION; } -impl frame_system::Trait for Runtime { +impl frame_system::Config for Runtime { type BaseCallFilter = BaseFilter; type Origin = Origin; type Call = Call; @@ -150,7 +150,7 @@ parameter_types! { pub const MaxScheduledPerBlock: u32 = 50; } -impl pallet_scheduler::Trait for Runtime { +impl pallet_scheduler::Config for Runtime { type Event = Event; type Origin = Origin; type PalletsOrigin = OriginCaller; @@ -166,7 +166,7 @@ parameter_types! { pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; } -impl pallet_babe::Trait for Runtime { +impl pallet_babe::Config for Runtime { type EpochDuration = EpochDuration; type ExpectedBlockTime = ExpectedBlockTime; @@ -195,7 +195,7 @@ parameter_types! { pub const IndexDeposit: Balance = 1 * DOLLARS; } -impl pallet_indices::Trait for Runtime { +impl pallet_indices::Config for Runtime { type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; @@ -208,7 +208,7 @@ parameter_types! { pub const MaxLocks: u32 = 50; } -impl pallet_balances::Trait for Runtime { +impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); type Event = Event; @@ -222,7 +222,7 @@ parameter_types! { pub const TransactionByteFee: Balance = 10 * MILLICENTS; } -impl pallet_transaction_payment::Trait for Runtime { +impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter>; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; @@ -232,7 +232,7 @@ impl pallet_transaction_payment::Trait for Runtime { parameter_types! { pub const MinimumPeriod: u64 = SLOT_DURATION / 2; } -impl pallet_timestamp::Trait for Runtime { +impl pallet_timestamp::Config for Runtime { type Moment = u64; type OnTimestampSet = Babe; type MinimumPeriod = MinimumPeriod; @@ -244,7 +244,7 @@ parameter_types! { } // TODO: substrate#2986 implement this properly -impl pallet_authorship::Trait for Runtime { +impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex; type UncleGenerations = UncleGenerations; type FilterUncle = (); @@ -270,7 +270,7 @@ parameter_types! { pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); } -impl pallet_session::Trait for Runtime { +impl pallet_session::Config for Runtime { type Event = Event; type ValidatorId = AccountId; type ValidatorIdOf = pallet_staking::StashOf; @@ -283,7 +283,7 @@ impl pallet_session::Trait for Runtime { type WeightInfo = weights::pallet_session::WeightInfo; } -impl pallet_session::historical::Trait for Runtime { +impl pallet_session::historical::Config for Runtime { type FullIdentification = pallet_staking::Exposure; type FullIdentificationOf = pallet_staking::ExposureOf; } @@ -317,7 +317,7 @@ parameter_types! { .saturating_sub(ExtrinsicBaseWeight::get()); } -impl pallet_staking::Trait for Runtime { +impl pallet_staking::Config for Runtime { type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = CurrencyToVote; @@ -359,14 +359,14 @@ parameter_types! { pub OffencesWeightSoftLimit: Weight = Perbill::from_percent(60) * MaximumBlockWeight::get(); } -impl pallet_offences::Trait for Runtime { +impl pallet_offences::Config for Runtime { type Event = Event; type IdentificationTuple = pallet_session::historical::IdentificationTuple; type OnOffenceHandler = Staking; type WeightSoftLimit = OffencesWeightSoftLimit; } -impl pallet_authority_discovery::Trait for Runtime {} +impl pallet_authority_discovery::Config for Runtime {} parameter_types! { pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _; @@ -377,7 +377,7 @@ parameter_types! { pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); } -impl pallet_im_online::Trait for Runtime { +impl pallet_im_online::Config for Runtime { type AuthorityId = ImOnlineId; type Event = Event; type ReportUnresponsiveness = Offences; @@ -386,7 +386,7 @@ impl pallet_im_online::Trait for Runtime { type WeightInfo = weights::pallet_im_online::WeightInfo; } -impl pallet_grandpa::Trait for Runtime { +impl pallet_grandpa::Config for Runtime { type Event = Event; type Call = Call; @@ -414,7 +414,7 @@ impl frame_system::offchain::CreateSignedTransaction for R call: Call, public: ::Signer, account: AccountId, - nonce: ::Index, + nonce: ::Index, ) -> Option<(Call, ::SignaturePayload)> { // take the biggest period possible. let period = BlockHashCount::get() @@ -470,7 +470,7 @@ parameter_types! { pub const MaxRegistrars: u32 = 20; } -impl pallet_identity::Trait for Runtime { +impl pallet_identity::Config for Runtime { type Event = Event; type Currency = Balances; type Slashed = (); @@ -485,7 +485,7 @@ impl pallet_identity::Trait for Runtime { type WeightInfo = weights::pallet_identity::WeightInfo; } -impl pallet_utility::Trait for Runtime { +impl pallet_utility::Config for Runtime { type Event = Event; type Call = Call; type WeightInfo = weights::pallet_utility::WeightInfo; @@ -499,7 +499,7 @@ parameter_types! { pub const MaxSignatories: u16 = 100; } -impl pallet_multisig::Trait for Runtime { +impl pallet_multisig::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -516,7 +516,7 @@ parameter_types! { pub const RecoveryDeposit: Balance = 5 * DOLLARS; } -impl pallet_recovery::Trait for Runtime { +impl pallet_recovery::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -530,7 +530,7 @@ parameter_types! { pub const MinVestedTransfer: Balance = 100 * DOLLARS; } -impl pallet_vesting::Trait for Runtime { +impl pallet_vesting::Config for Runtime { type Event = Event; type Currency = Balances; type BlockNumberToBalance = ConvertInto; @@ -538,7 +538,7 @@ impl pallet_vesting::Trait for Runtime { type WeightInfo = weights::pallet_vesting::WeightInfo; } -impl pallet_sudo::Trait for Runtime { +impl pallet_sudo::Config for Runtime { type Event = Event; type Call = Call; } @@ -628,7 +628,7 @@ impl InstanceFilter for ProxyType { } } -impl pallet_proxy::Trait for Runtime { +impl pallet_proxy::Config for Runtime { type Event = Event; type Call = Call; type Currency = Balances; @@ -992,9 +992,9 @@ sp_api::impl_runtime_apis! { use pallet_offences_benchmarking::Module as OffencesBench; use frame_system_benchmarking::Module as SystemBench; - impl pallet_session_benchmarking::Trait for Runtime {} - impl pallet_offences_benchmarking::Trait for Runtime {} - impl frame_system_benchmarking::Trait for Runtime {} + impl pallet_session_benchmarking::Config for Runtime {} + impl pallet_offences_benchmarking::Config for Runtime {} + impl frame_system_benchmarking::Config for Runtime {} let whitelist: Vec = vec![ // Block Number diff --git a/runtime/westend/src/weights/frame_system.rs b/runtime/westend/src/weights/frame_system.rs index 5fc9a8392c5c..a3f5ee5b891d 100644 --- a/runtime/westend/src/weights/frame_system.rs +++ b/runtime/westend/src/weights/frame_system.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for frame_system. pub struct WeightInfo(PhantomData); -impl frame_system::WeightInfo for WeightInfo { +impl frame_system::WeightInfo for WeightInfo { fn remark(_b: u32, ) -> Weight { (1_859_000 as Weight) } diff --git a/runtime/westend/src/weights/pallet_balances.rs b/runtime/westend/src/weights/pallet_balances.rs index cf8648078b46..c3aedc45e7e9 100644 --- a/runtime/westend/src/weights/pallet_balances.rs +++ b/runtime/westend/src/weights/pallet_balances.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_balances. pub struct WeightInfo(PhantomData); -impl pallet_balances::WeightInfo for WeightInfo { +impl pallet_balances::WeightInfo for WeightInfo { fn transfer() -> Weight { (92_296_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/westend/src/weights/pallet_identity.rs b/runtime/westend/src/weights/pallet_identity.rs index bef0a65c10d1..9747999ebc21 100644 --- a/runtime/westend/src/weights/pallet_identity.rs +++ b/runtime/westend/src/weights/pallet_identity.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_identity. pub struct WeightInfo(PhantomData); -impl pallet_identity::WeightInfo for WeightInfo { +impl pallet_identity::WeightInfo for WeightInfo { fn add_registrar(r: u32, ) -> Weight { (26_425_000 as Weight) .saturating_add((296_000 as Weight).saturating_mul(r as Weight)) diff --git a/runtime/westend/src/weights/pallet_im_online.rs b/runtime/westend/src/weights/pallet_im_online.rs index c60a0e0d4e0e..aa61f58ffa28 100644 --- a/runtime/westend/src/weights/pallet_im_online.rs +++ b/runtime/westend/src/weights/pallet_im_online.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_im_online. pub struct WeightInfo(PhantomData); -impl pallet_im_online::WeightInfo for WeightInfo { +impl pallet_im_online::WeightInfo for WeightInfo { fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight { (108_057_000 as Weight) .saturating_add((217_000 as Weight).saturating_mul(k as Weight)) diff --git a/runtime/westend/src/weights/pallet_indices.rs b/runtime/westend/src/weights/pallet_indices.rs index 4b15b1e81426..a4638dfa8213 100644 --- a/runtime/westend/src/weights/pallet_indices.rs +++ b/runtime/westend/src/weights/pallet_indices.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_indices. pub struct WeightInfo(PhantomData); -impl pallet_indices::WeightInfo for WeightInfo { +impl pallet_indices::WeightInfo for WeightInfo { fn claim() -> Weight { (51_356_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) diff --git a/runtime/westend/src/weights/pallet_multisig.rs b/runtime/westend/src/weights/pallet_multisig.rs index 9aed4e08ca6b..781c200034e3 100644 --- a/runtime/westend/src/weights/pallet_multisig.rs +++ b/runtime/westend/src/weights/pallet_multisig.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_multisig. pub struct WeightInfo(PhantomData); -impl pallet_multisig::WeightInfo for WeightInfo { +impl pallet_multisig::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32, ) -> Weight { (12_253_000 as Weight) .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) diff --git a/runtime/westend/src/weights/pallet_proxy.rs b/runtime/westend/src/weights/pallet_proxy.rs index 4df538a2c5d6..dfcf34db3ea4 100644 --- a/runtime/westend/src/weights/pallet_proxy.rs +++ b/runtime/westend/src/weights/pallet_proxy.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_proxy. pub struct WeightInfo(PhantomData); -impl pallet_proxy::WeightInfo for WeightInfo { +impl pallet_proxy::WeightInfo for WeightInfo { fn proxy(p: u32, ) -> Weight { (29_891_000 as Weight) .saturating_add((182_000 as Weight).saturating_mul(p as Weight)) diff --git a/runtime/westend/src/weights/pallet_scheduler.rs b/runtime/westend/src/weights/pallet_scheduler.rs index e64bf47ed913..e72370710b4b 100644 --- a/runtime/westend/src/weights/pallet_scheduler.rs +++ b/runtime/westend/src/weights/pallet_scheduler.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_scheduler. pub struct WeightInfo(PhantomData); -impl pallet_scheduler::WeightInfo for WeightInfo { +impl pallet_scheduler::WeightInfo for WeightInfo { fn schedule(s: u32, ) -> Weight { (33_042_000 as Weight) .saturating_add((43_000 as Weight).saturating_mul(s as Weight)) diff --git a/runtime/westend/src/weights/pallet_session.rs b/runtime/westend/src/weights/pallet_session.rs index a3c757227b48..3a5d99ab65d6 100644 --- a/runtime/westend/src/weights/pallet_session.rs +++ b/runtime/westend/src/weights/pallet_session.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_session. pub struct WeightInfo(PhantomData); -impl pallet_session::WeightInfo for WeightInfo { +impl pallet_session::WeightInfo for WeightInfo { fn set_keys() -> Weight { (89_357_000 as Weight) .saturating_add(T::DbWeight::get().reads(7 as Weight)) diff --git a/runtime/westend/src/weights/pallet_staking.rs b/runtime/westend/src/weights/pallet_staking.rs index 4fb60345bbbd..5ee9fc92ae6e 100644 --- a/runtime/westend/src/weights/pallet_staking.rs +++ b/runtime/westend/src/weights/pallet_staking.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_staking. pub struct WeightInfo(PhantomData); -impl pallet_staking::WeightInfo for WeightInfo { +impl pallet_staking::WeightInfo for WeightInfo { fn bond() -> Weight { (92_588_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) diff --git a/runtime/westend/src/weights/pallet_timestamp.rs b/runtime/westend/src/weights/pallet_timestamp.rs index 3340e6753d5f..edc53ac47b87 100644 --- a/runtime/westend/src/weights/pallet_timestamp.rs +++ b/runtime/westend/src/weights/pallet_timestamp.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_timestamp. pub struct WeightInfo(PhantomData); -impl pallet_timestamp::WeightInfo for WeightInfo { +impl pallet_timestamp::WeightInfo for WeightInfo { fn set() -> Weight { (9_830_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) diff --git a/runtime/westend/src/weights/pallet_utility.rs b/runtime/westend/src/weights/pallet_utility.rs index 6280c8b11fa6..9b9f149766f3 100644 --- a/runtime/westend/src/weights/pallet_utility.rs +++ b/runtime/westend/src/weights/pallet_utility.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_utility. pub struct WeightInfo(PhantomData); -impl pallet_utility::WeightInfo for WeightInfo { +impl pallet_utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { (18_268_000 as Weight) .saturating_add((1_504_000 as Weight).saturating_mul(c as Weight)) diff --git a/runtime/westend/src/weights/pallet_vesting.rs b/runtime/westend/src/weights/pallet_vesting.rs index 3ed631be832d..c18845df3331 100644 --- a/runtime/westend/src/weights/pallet_vesting.rs +++ b/runtime/westend/src/weights/pallet_vesting.rs @@ -41,7 +41,7 @@ use sp_std::marker::PhantomData; /// Weight functions for pallet_vesting. pub struct WeightInfo(PhantomData); -impl pallet_vesting::WeightInfo for WeightInfo { +impl pallet_vesting::WeightInfo for WeightInfo { fn vest_locked(l: u32, ) -> Weight { (52_570_000 as Weight) .saturating_add((130_000 as Weight).saturating_mul(l as Weight)) From d53147c6a6831f389b1590d4289cc52189ce7954 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 25 Nov 2020 17:03:36 +0100 Subject: [PATCH 2/6] revert diener changes --- runtime/kusama/Cargo.toml | 106 +++++++++++++++++----------------- runtime/parachains/Cargo.toml | 58 +++++++++---------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index f16e2636bd16..17ccfca08056 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -15,59 +15,59 @@ serde_derive = { version = "1.0.117", optional = true } static_assertions = "1.1.0" smallvec = "1.5.0" -authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-babe = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-indices = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-nicks = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-recovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-society = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" } +frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } -pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } hex-literal = { version = "0.3.1", optional = true } runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false } @@ -77,8 +77,8 @@ primitives = { package = "polkadot-primitives", path = "../../primitives", defau hex-literal = "0.3.1" libsecp256k1 = "0.3.5" tiny-keccak = "2.0.2" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } separator = "0.4.1" serde_json = "1.0.59" diff --git a/runtime/parachains/Cargo.toml b/runtime/parachains/Cargo.toml index b94153ac2183..5200a897e607 100644 --- a/runtime/parachains/Cargo.toml +++ b/runtime/parachains/Cargo.toml @@ -12,27 +12,27 @@ rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.117", features = [ "derive" ], optional = true } derive_more = "0.99.11" -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sp-keystore = { git = "https://github.com/paritytech/substrate", optional = true , branch = "gui-rename-trait-to-config" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-system = {git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "gui-rename-trait-to-config" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } xcm = { package = "xcm", path = "../../xcm", default-features = false } primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false } @@ -44,17 +44,17 @@ rand_chacha = { version = "0.2.2", default-features = false } [dev-dependencies] futures = "0.3.8" hex-literal = "0.3.1" -keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master" } serde_json = "1.0.59" libsecp256k1 = "0.3.5" -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "gui-rename-trait-to-config" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "gui-rename-trait-to-config" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master"} [features] From 3fbb7088e5999eddc32ba8f1363f396c47543c33 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Mon, 30 Nov 2020 13:50:00 +0100 Subject: [PATCH 3/6] rename HostConfig to ActiveConfig as more meaningful --- runtime/parachains/src/configuration.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs index b22d55d09ff3..159caadabb6f 100644 --- a/runtime/parachains/src/configuration.rs +++ b/runtime/parachains/src/configuration.rs @@ -135,7 +135,7 @@ pub trait Config: frame_system::Config { } decl_storage! { trait Store for Module as Configuration { /// The active configuration for the current session. - HostConfig get(fn config) config(): HostConfiguration; + ActiveConfig get(fn config) config(): HostConfiguration; /// Pending configuration (if any) for the next session. PendingConfig: Option>; } @@ -518,7 +518,7 @@ impl Module { /// Called by the initializer to note that a new session has started. pub(crate) fn initializer_on_new_session(_validators: &[ValidatorId], _queued: &[ValidatorId]) { if let Some(pending) = ::PendingConfig::take() { - ::HostConfig::set(pending); + ::ActiveConfig::set(pending); } } From 6574dca44c484921723ca55ecebacb1769259b1b Mon Sep 17 00:00:00 2001 From: thiolliere Date: Mon, 30 Nov 2020 14:12:37 +0100 Subject: [PATCH 4/6] fix merge --- runtime/common/src/paras_registrar.rs | 4 ++-- runtime/parachains/src/mock.rs | 4 ++-- runtime/parachains/src/session_info.rs | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs index 7144786d0257..177ec3180a15 100644 --- a/runtime/common/src/paras_registrar.rs +++ b/runtime/common/src/paras_registrar.rs @@ -477,13 +477,13 @@ mod tests { type Event = (); } - impl session_info::AuthorityDiscoveryTrait for Test { + impl session_info::AuthorityDiscoveryConfig for Test { fn authorities() -> Vec { Vec::new() } } - impl session_info::Trait for Test { } + impl session_info::Config for Test { } pub struct TestRandomness; diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 136bbc47def4..0934493c15bd 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -124,9 +124,9 @@ impl crate::inclusion::Config for Test { type Event = TestEvent; } -impl crate::session_info::Trait for Test { } +impl crate::session_info::Config for Test { } -impl crate::session_info::AuthorityDiscoveryTrait for Test { +impl crate::session_info::AuthorityDiscoveryConfig for Test { fn authorities() -> Vec { Vec::new() } diff --git a/runtime/parachains/src/session_info.rs b/runtime/parachains/src/session_info.rs index 2a183c909f0b..c3faec7eeb16 100644 --- a/runtime/parachains/src/session_info.rs +++ b/runtime/parachains/src/session_info.rs @@ -27,17 +27,17 @@ use frame_support::{ use crate::{configuration, paras, scheduler}; use sp_std::{cmp, vec::Vec}; -pub trait Trait: - frame_system::Trait - + configuration::Trait - + paras::Trait - + scheduler::Trait - + AuthorityDiscoveryTrait +pub trait Config: + frame_system::Config + + configuration::Config + + paras::Config + + scheduler::Config + + AuthorityDiscoveryConfig { } decl_storage! { - trait Store for Module as ParaSessionInfo { + trait Store for Module as ParaSessionInfo { /// The earliest session for which previous session info is stored. EarliestStoredSession get(fn earliest_stored_session): SessionIndex; /// Session information in a rolling window. @@ -48,30 +48,30 @@ decl_storage! { } decl_error! { - pub enum Error for Module { } + pub enum Error for Module { } } decl_module! { /// The session info module. - pub struct Module for enum Call where origin: ::Origin { + pub struct Module for enum Call where origin: ::Origin { type Error = Error; } } /// An abstraction for the authority discovery pallet /// to help with mock testing. -pub trait AuthorityDiscoveryTrait { +pub trait AuthorityDiscoveryConfig { /// Retrieve authority identifiers of the current and next authority set. fn authorities() -> Vec; } -impl AuthorityDiscoveryTrait for T { +impl AuthorityDiscoveryConfig for T { fn authorities() -> Vec { >::authorities() } } -impl Module { +impl Module { /// Handle an incoming session change. pub(crate) fn initializer_on_new_session( notification: &crate::initializer::SessionChangeNotification @@ -82,7 +82,7 @@ impl Module { let n_parachains = >::parachains().len() as u32; let validators = notification.validators.clone(); - let discovery_keys = ::authorities(); + let discovery_keys = ::authorities(); // FIXME: once we store these keys: https://github.com/paritytech/polkadot/issues/1975 let approval_keys = Default::default(); let validator_groups = >::validator_groups(); From f46a1e10286f51908b382c9046eb8dbc057560f9 Mon Sep 17 00:00:00 2001 From: parity-processbot <> Date: Mon, 30 Nov 2020 14:35:13 +0000 Subject: [PATCH 5/6] "Update Substrate" --- Cargo.lock | 649 ++++++++++++++++++++++++++--------------------------- 1 file changed, 314 insertions(+), 335 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a53fea791ac..b09cce2d9413 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -100,17 +100,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alga" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" -dependencies = [ - "approx", - "num-complex", - "num-traits 0.2.12", -] - [[package]] name = "ansi_term" version = "0.11.0" @@ -321,7 +310,7 @@ dependencies = [ "futures-io", "rustls", "webpki", - "webpki-roots", + "webpki-roots 0.20.0", ] [[package]] @@ -495,17 +484,6 @@ dependencies = [ "constant_time_eq", ] -[[package]] -name = "blake2s_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.7.3" @@ -525,7 +503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "block-padding 0.2.1", - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -534,7 +512,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -543,7 +521,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f337a3e6da609650eb74e02bc9fac7b735049f7623ab12f2e4c719316fcc7e80" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -575,12 +553,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "bs58" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" - [[package]] name = "bs58" version = "0.4.0" @@ -821,9 +793,9 @@ dependencies = [ [[package]] name = "console_log" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7871d2947441b0fdd8e2bd1ce2a2f75304f896582c0d572162d48290683c48" +checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" dependencies = [ "log", "web-sys", @@ -1028,7 +1000,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", "subtle 2.2.3", ] @@ -1126,7 +1098,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -1139,6 +1111,15 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "directories" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-sys" version = "0.3.5" @@ -1480,7 +1461,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", ] @@ -1488,7 +1469,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -1506,7 +1487,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "chrono", "frame-benchmarking", @@ -1528,7 +1509,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -1544,7 +1525,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "serde", @@ -1555,7 +1536,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "bitflags", "frame-metadata", @@ -1580,7 +1561,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.24", @@ -1591,7 +1572,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1603,7 +1584,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -1613,7 +1594,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "impl-trait-for-tuples 0.1.3", @@ -1629,7 +1610,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -1643,7 +1624,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -1878,9 +1859,18 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac746a5f3bbfdadd6106868134545e684693d54d9d44f6e9588a7d54af0bf980" +checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd" +dependencies = [ + "typenum", +] + +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", "version_check", @@ -2771,9 +2761,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c2b4c99f8798be90746fc226acf95d3e6cff0655883634cc30dab1f64f438b" +checksum = "24966e73cc5624a6cf14b025365f67cb6da436b4d6337ed84d198063ba74451d" dependencies = [ "atomic", "bytes 0.5.6", @@ -2800,7 +2790,6 @@ dependencies = [ "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", - "multihash", "parity-multiaddr", "parking_lot 0.11.1", "pin-project 1.0.2", @@ -2810,12 +2799,13 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8186060d6bd415e4e928e6cb44c4fe7e7a7dd53437bd936ce7e5f421e45a51" +checksum = "28d92fab5df60c9705e05750d9ecee6a5af15aed1e3fa86e09fd3dd07ec5dc8e" dependencies = [ "asn1_der", - "bs58 0.4.0", + "bs58", + "bytes 0.5.6", "ed25519-dalek", "either", "fnv", @@ -2837,16 +2827,16 @@ dependencies = [ "sha2 0.9.1", "smallvec 1.5.0", "thiserror", - "unsigned-varint 0.5.1", + "unsigned-varint", "void", "zeroize", ] [[package]] name = "libp2p-core-derive" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213" +checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156" dependencies = [ "quote 1.0.7", "syn 1.0.48", @@ -2854,9 +2844,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aea69349e70a58ef9ecd21ac12c5eaa36255ac6986828079d26393f9e618cb" +checksum = "5a579d7dd506d0620ba88ccc1754436b7de35ed6c884234f9a226bbfce382640" dependencies = [ "flate2", "futures 0.3.8", @@ -2865,9 +2855,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0baeff71fb5cb1fe1604f74a712a44b66a8c5900f4022411a1d550f09d6bb776" +checksum = "15dea5933f570844d7b5222b12b58f7bd52e9ca38cd65a1bd4f35341f053f012" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -2876,9 +2866,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0f925a45f310b678e70faf71a10023b829d02eb9cc2628a63de928936f3ade" +checksum = "23070a0838bd9a8adb27e6eba477eeb650c498f9d139383dd0135d20a8170253" dependencies = [ "cuckoofilter", "fnv", @@ -2894,9 +2884,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efeb65567174974f551a91f9f5719445b6695cad56f6a7a47a27111f37efb6b8" +checksum = "65e8f3aa0906fbad435dac23c177eef3cdfaaf62609791bd7f54f8553edcfdf9" dependencies = [ "base64 0.13.0", "byteorder", @@ -2914,15 +2904,15 @@ dependencies = [ "rand 0.7.3", "sha2 0.9.1", "smallvec 1.5.0", - "unsigned-varint 0.5.1", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e074124669840484de564901d47f2d0892e73f6d8ee7c37e9c2644af1b217bf4" +checksum = "802fb973a7e0dde3fb9a2113a62bad90338ebe01983b706e1d576d0c2af93cda" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -2936,9 +2926,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a2653b2e3254a3bbeb66bfc3f0dca7d6cba6aa2a96791db114003dec1b5394" +checksum = "6506b7b7982f7626fc96a91bc61be4b1fe7ae9ac23824f0ecefcce21cb39238c" dependencies = [ "arrayvec 0.5.2", "bytes 0.5.6", @@ -2949,23 +2939,22 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "multihash", "prost", "prost-build", "rand 0.7.3", "sha2 0.9.1", "smallvec 1.5.0", "uint", - "unsigned-varint 0.5.1", + "unsigned-varint", "void", "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786b068098794322239f8f04df88a52daeb7863b2e77501c4d85d32e0a8f2d26" +checksum = "4458ec36b5ab2662fb4d5c8bb9b6e1591da0ab6efe8881c7a7670ef033bc8937" dependencies = [ "async-std", "data-encoding", @@ -2985,9 +2974,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed764eab613a8fb6b7dcf6c796f55a06fef2270e528329903e25cd3311b99663" +checksum = "ae2132b14045009b0f8e577a06e1459592ef0a89dedc58f3d4baf4eac956837b" dependencies = [ "bytes 0.5.6", "futures 0.3.8", @@ -2998,14 +2987,14 @@ dependencies = [ "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.5.0", - "unsigned-varint 0.5.1", + "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb441fb015ec16690099c5d910fcba271d357763b3dcb784db7b27bbb0b68372" +checksum = "b9610a524bef4db383cd96b4ec3ec4722eafa72c7242fa89990b74166760583d" dependencies = [ "bytes 0.5.6", "curve25519-dalek 3.0.0", @@ -3025,9 +3014,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e5c50936cfdbe96a514e8992f304fa44cd3a681b6f779505f1ae62b3474705" +checksum = "659adf89356e04f65398bb74ee791b269e63da9e41b37f8dc19eaacd12487bfe" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -3040,9 +3029,9 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21026557c335d3639591f247b19b7536195772034ec7e9c463137227f95eaaa1" +checksum = "96dfe26270c91d4ff095030d1fcadd602f3fd84968ebd592829916d0715798a6" dependencies = [ "bytes 0.5.6", "futures 0.3.8", @@ -3051,7 +3040,7 @@ dependencies = [ "log", "prost", "prost-build", - "unsigned-varint 0.5.1", + "unsigned-varint", "void", ] @@ -3071,9 +3060,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd9a1e0e6563dec1c9e702f7e68bdaa43da62a84536aa06372d3fed3e25d4ca" +checksum = "1e952dcc9d2d7e7e45ae8bfcff255723091bd43e3e9a7741a0af8a17fe55b3ed" dependencies = [ "async-trait", "bytes 0.5.6", @@ -3085,15 +3074,15 @@ dependencies = [ "minicbor", "rand 0.7.3", "smallvec 1.5.0", - "unsigned-varint 0.5.1", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-swarm" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565f0e06674b4033c978471e4083d5aaa8e03cef0719a0ec0905aaeaad39a919" +checksum = "a6ecee54e85513a7301eb4681b3a6aac5b6d11f60d43097cf7624fd4450d7dfe" dependencies = [ "either", "futures 0.3.8", @@ -3107,9 +3096,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33f3dce259c0d3127af5167f45c275b6c047320efdd0e40fde947482487af0a3" +checksum = "bc28c9ad6dc43f4c3950411cf808639d90307a076330e7996e5e94e70279bde0" dependencies = [ "async-std", "futures 0.3.8", @@ -3123,9 +3112,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0aba04370a00d8d0236e350bc862926c1b42542a169aa6a481e660e5b990fe" +checksum = "9d821208d4b9af4b293a56dde470edd9f9fac8bb94a51f4f5327cc29a471b3f3" dependencies = [ "async-std", "futures 0.3.8", @@ -3135,9 +3124,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c703816f4170477a375b49c56d349e535ce68388f81ba1d9a3c8e2517effa82" +checksum = "1e6ef400b231ba78e866b860445480ca21ee447e03034138c6d57cf2969d6bf4" dependencies = [ "futures 0.3.8", "js-sys", @@ -3149,9 +3138,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5e7268a959748040a0cf7456ad655be55b87f0ceda03bdb5b53674726b28f7" +checksum = "a5736e2fccdcea6e728bbaf903bddc113be223313ce2c756ad9fe43b5a2b0f06" dependencies = [ "async-tls", "either", @@ -3164,14 +3153,14 @@ dependencies = [ "soketto", "url 2.1.1", "webpki", - "webpki-roots", + "webpki-roots 0.21.0", ] [[package]] name = "libp2p-yamux" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0798cbb58535162c40858493d09af06eac42a26e4966e58de0df701f559348" +checksum = "3be7ac000fa3e42ac09a6e658e48de34ac8ef9fff64a4e6e6b08dcc8f4b0e5f6" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -3237,11 +3226,10 @@ dependencies = [ [[package]] name = "linregress" -version = "0.1.7" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9290cf6f928576eeb9c096c6fad9d8d452a0a1a70a2bbffa6e36064eedc0aac9" +checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724" dependencies = [ - "failure", "nalgebra", "statrs", ] @@ -3509,17 +3497,29 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" [[package]] name = "multihash" -version = "0.11.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6" +checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe" dependencies = [ - "blake2b_simd", - "blake2s_simd", "digest 0.9.0", - "sha-1 0.9.2", + "generic-array 0.14.4", + "multihash-derive", "sha2 0.9.1", - "sha3", - "unsigned-varint 0.5.1", + "unsigned-varint", +] + +[[package]] +name = "multihash-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a" +dependencies = [ + "proc-macro-crate", + "proc-macro-error", + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", + "synstructure", ] [[package]] @@ -3530,32 +3530,33 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" [[package]] name = "multistream-select" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75" +checksum = "46e19fd46149acdd3600780ebaa09f6ae4e7f2ddbafec64aab54cf75aafd1746" dependencies = [ "bytes 0.5.6", "futures 0.3.8", "log", "pin-project 1.0.2", "smallvec 1.5.0", - "unsigned-varint 0.5.1", + "unsigned-varint", ] [[package]] name = "nalgebra" -version = "0.18.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" +checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486" dependencies = [ - "alga", "approx", - "generic-array 0.12.3", + "generic-array 0.13.2", "matrixmultiply", "num-complex", "num-rational", "num-traits 0.2.12", - "rand 0.6.5", + "rand 0.7.3", + "rand_distr", + "simba", "typenum", ] @@ -3770,7 +3771,7 @@ checksum = "7a1250cdd103eef6bd542b5ae82989f931fc00a41a27f60377338241594410f3" [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -3786,7 +3787,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -3801,7 +3802,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3826,7 +3827,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3840,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3856,7 +3857,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3871,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3886,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3907,7 +3908,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3923,7 +3924,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3943,7 +3944,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3960,7 +3961,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -3974,7 +3975,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3990,7 +3991,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4004,7 +4005,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4019,7 +4020,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4040,7 +4041,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4056,7 +4057,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4069,7 +4070,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "enumflags2", "frame-support", @@ -4084,7 +4085,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4099,7 +4100,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4119,7 +4120,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4135,7 +4136,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4149,7 +4150,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4171,7 +4172,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -4182,7 +4183,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4196,7 +4197,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4214,7 +4215,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4231,7 +4232,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4249,7 +4250,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "parity-scale-codec", @@ -4262,7 +4263,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4277,7 +4278,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4293,7 +4294,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4321,19 +4322,19 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d477bda9666bc37e5ac9e7e7ee3684f745ec33e6e86a5b48640e0407acda26" +checksum = "2f51a30667591b14f96068b2d12f1306d07a41ebd98239d194356d4d9707ac16" dependencies = [ "arrayref", - "bs58 0.4.0", + "bs58", "byteorder", "data-encoding", "multihash", "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.5.1", + "unsigned-varint", "url 2.1.1", ] @@ -4443,7 +4444,7 @@ dependencies = [ "mio", "mio-extras", "rand 0.7.3", - "sha-1 0.8.2", + "sha-1", "slab", "url 2.1.1", ] @@ -4632,7 +4633,7 @@ checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" dependencies = [ "maplit", "pest", - "sha-1 0.8.2", + "sha-1", ] [[package]] @@ -5806,18 +5807,18 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ "toml", ] [[package]] name = "proc-macro-error" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.24", @@ -5828,14 +5829,12 @@ dependencies = [ [[package]] name = "proc-macro-error-attr" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.48", - "syn-mid", "version_check", ] @@ -6015,19 +6014,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi 0.0.3", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.6.5" @@ -6105,6 +6091,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_distr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2" +dependencies = [ + "rand 0.7.3", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -6424,9 +6419,9 @@ dependencies = [ [[package]] name = "rpassword" -version = "4.0.5" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" +checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" dependencies = [ "libc", "winapi 0.3.9", @@ -6549,10 +6544,9 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-trait", - "bytes 0.5.6", "derive_more", "either", "futures 0.3.8", @@ -6564,7 +6558,6 @@ dependencies = [ "prost-build", "rand 0.7.3", "sc-client-api", - "sc-keystore", "sc-network", "serde_json", "sp-api", @@ -6579,7 +6572,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6602,7 +6595,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6619,7 +6612,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -6640,7 +6633,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6651,7 +6644,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6696,7 +6689,7 @@ dependencies = [ [[package]] name = "sc-cli-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6707,20 +6700,18 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "fnv", "futures 0.3.8", "hash-db", - "hex-literal", "kvdb", "lazy_static", "log", "parity-scale-codec", "parking_lot 0.10.2", "sc-executor", - "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", @@ -6728,7 +6719,6 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", - "sp-keyring", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -6744,7 +6734,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "blake2-rfc", "hash-db", @@ -6774,7 +6764,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6785,7 +6775,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "fork-tree", @@ -6830,7 +6820,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -6854,7 +6844,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6867,7 +6857,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6887,12 +6877,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-trie", + "thiserror", ] [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "sc-client-api", @@ -6906,7 +6897,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "lazy_static", @@ -6935,24 +6926,23 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", - "log", "parity-scale-codec", "parity-wasm 0.41.0", "sp-allocator", "sp-core", - "sp-runtime-interface", "sp-serializer", "sp-wasm-interface", + "thiserror", "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -6967,7 +6957,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -6985,7 +6975,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "finality-grandpa", @@ -7022,7 +7012,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "finality-grandpa", @@ -7046,7 +7036,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "ansi_term 0.12.1", "futures 0.3.8", @@ -7064,7 +7054,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-trait", "derive_more", @@ -7084,7 +7074,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "lazy_static", @@ -7103,12 +7093,12 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-std", "async-trait", "bitflags", - "bs58 0.3.1", + "bs58", "bytes 0.5.6", "derive_more", "either", @@ -7127,7 +7117,7 @@ dependencies = [ "lru", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.10.2", + "parking_lot 0.11.1", "pin-project 0.4.23", "prost", "prost-build", @@ -7139,7 +7129,7 @@ dependencies = [ "serde_json", "slog", "slog_derive", - "smallvec 0.6.13", + "smallvec 1.5.0", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -7148,7 +7138,7 @@ dependencies = [ "sp-utils", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.4.0", + "unsigned-varint", "void", "wasm-timer", "zeroize", @@ -7157,7 +7147,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7172,7 +7162,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "bytes 0.5.6", "fnv", @@ -7199,7 +7189,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "libp2p", @@ -7212,7 +7202,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7221,7 +7211,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "hash-db", @@ -7254,7 +7244,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -7278,7 +7268,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7296,10 +7286,9 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ - "derive_more", - "directories", + "directories 3.0.1", "exit-future", "futures 0.1.29", "futures 0.3.8", @@ -7352,6 +7341,7 @@ dependencies = [ "sp-version", "substrate-prometheus-endpoint", "tempfile", + "thiserror", "tracing", "tracing-futures", "wasm-timer", @@ -7360,7 +7350,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -7369,12 +7359,13 @@ dependencies = [ "parking_lot 0.10.2", "sc-client-api", "sp-core", + "thiserror", ] [[package]] name = "sc-sync-state-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7388,12 +7379,13 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-runtime", + "thiserror", ] [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7414,7 +7406,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "erased-serde", "log", @@ -7433,7 +7425,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -7448,15 +7440,15 @@ dependencies = [ "sp-runtime", "sp-transaction-pool", "sp-utils", + "thiserror", "wasm-timer", ] [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ - "derive_more", "futures 0.3.8", "futures-diagnose", "intervalier", @@ -7474,6 +7466,7 @@ dependencies = [ "sp-transaction-pool", "sp-utils", "substrate-prometheus-endpoint", + "thiserror", "wasm-timer", ] @@ -7684,19 +7677,6 @@ dependencies = [ "opaque-debug 0.2.3", ] -[[package]] -name = "sha-1" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpuid-bool", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - [[package]] name = "sha2" version = "0.8.2" @@ -7795,6 +7775,18 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852" +[[package]] +name = "simba" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2" +dependencies = [ + "approx", + "num-complex", + "num-traits 0.2.12", + "paste", +] + [[package]] name = "slab" version = "0.4.2" @@ -7903,13 +7895,13 @@ dependencies = [ "httparse", "log", "rand 0.7.3", - "sha-1 0.8.2", + "sha-1", ] [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "log", @@ -7921,7 +7913,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "parity-scale-codec", @@ -7931,12 +7923,13 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-version", + "thiserror", ] [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7948,7 +7941,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "serde", @@ -7960,7 +7953,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7973,7 +7966,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -7985,7 +7978,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7996,7 +7989,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -8008,13 +8001,14 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ + "futures 0.3.8", "log", "lru", "parity-scale-codec", "parking_lot 0.10.2", - "sp-block-builder", + "sp-api", "sp-consensus", "sp-database", "sp-runtime", @@ -8025,7 +8019,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "serde", "serde_json", @@ -8034,7 +8028,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -8060,7 +8054,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "merlin", "parity-scale-codec", @@ -8080,7 +8074,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8089,7 +8083,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8101,7 +8095,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "base58", "blake2-rfc", @@ -8145,7 +8139,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8154,7 +8148,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -8164,7 +8158,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "environmental", "parity-scale-codec", @@ -8175,7 +8169,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "finality-grandpa", "log", @@ -8192,7 +8186,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", @@ -8204,7 +8198,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "hash-db", @@ -8228,7 +8222,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "lazy_static", "sp-core", @@ -8239,7 +8233,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-trait", "derive_more", @@ -8255,7 +8249,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "serde", @@ -8267,7 +8261,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -8278,7 +8272,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "sp-api", "sp-core", @@ -8288,16 +8282,15 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "backtrace", - "log", ] [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "serde", "sp-core", @@ -8306,7 +8299,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "either", "hash256-std-hasher", @@ -8320,7 +8313,6 @@ dependencies = [ "sp-application-crypto", "sp-arithmetic", "sp-core", - "sp-inherents", "sp-io", "sp-std", ] @@ -8328,7 +8320,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "primitive-types", @@ -8344,7 +8336,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "Inflector", "proc-macro-crate", @@ -8356,7 +8348,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "serde", "serde_json", @@ -8365,7 +8357,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -8378,7 +8370,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8388,7 +8380,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "log", @@ -8410,12 +8402,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8428,7 +8420,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "sp-core", @@ -8441,7 +8433,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8455,7 +8447,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -8468,7 +8460,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -8478,12 +8470,13 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-runtime", + "thiserror", ] [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "memory-db", @@ -8497,7 +8490,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-core", @@ -8509,7 +8502,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8521,7 +8514,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8549,11 +8542,11 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "statrs" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10102ac8d55e35db2b3fafc26f81ba8647da2e15879ab686a67e6d19af2685e8" +checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382" dependencies = [ - "rand 0.5.6", + "rand 0.7.3", ] [[package]] @@ -8562,7 +8555,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -8572,7 +8565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c80e15f898d8d8f25db24c253ea615cc14acf418ff307822995814e7d42cfa89" dependencies = [ "block-cipher 0.8.0", - "generic-array 0.14.2", + "generic-array 0.14.4", ] [[package]] @@ -8663,7 +8656,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "chrono", "console_error_panic_hook", @@ -8689,7 +8682,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "platforms", ] @@ -8697,7 +8690,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.8", @@ -8720,7 +8713,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-std", "derive_more", @@ -8734,7 +8727,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.1.29", "futures 0.3.8", @@ -8761,7 +8754,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "substrate-test-utils-derive", @@ -8771,7 +8764,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "quote 1.0.7", @@ -8828,17 +8821,6 @@ dependencies = [ "unicode-xid 0.2.1", ] -[[package]] -name = "syn-mid" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", - "syn 1.0.48", -] - [[package]] name = "synstructure" version = "0.12.4" @@ -9554,22 +9536,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ - "generic-array 0.14.2", + "generic-array 0.14.4", "subtle 2.2.3", ] -[[package]] -name = "unsigned-varint" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "669d776983b692a906c881fcd0cfb34271a48e197e4d6cb8df32b05bfc3d3fa5" -dependencies = [ - "bytes 0.5.6", - "futures-io", - "futures-util", - "futures_codec", -] - [[package]] name = "unsigned-varint" version = "0.5.1" @@ -9877,7 +9847,7 @@ dependencies = [ "cranelift-entity", "cranelift-frontend", "cranelift-wasm", - "directories", + "directories 2.0.2", "errno", "file-per-thread-logger", "indexmap", @@ -10024,6 +9994,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" +dependencies = [ + "webpki", +] + [[package]] name = "wepoll-sys-stjepang" version = "1.0.6" From aa05b437ed2c5ed72838416200709641323a6710 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Mon, 30 Nov 2020 15:55:03 +0100 Subject: [PATCH 6/6] cargo update -p sp-io --- Cargo.lock | 272 ++++++++++++++++++++++++++--------------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 940935f5ff94..b09cce2d9413 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1461,7 +1461,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", ] @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "chrono", "frame-benchmarking", @@ -1509,7 +1509,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -1525,7 +1525,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "serde", @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "bitflags", "frame-metadata", @@ -1561,7 +1561,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.24", @@ -1572,7 +1572,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1584,7 +1584,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -1594,7 +1594,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "impl-trait-for-tuples 0.1.3", @@ -1610,7 +1610,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -1624,7 +1624,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -3771,7 +3771,7 @@ checksum = "7a1250cdd103eef6bd542b5ae82989f931fc00a41a27f60377338241594410f3" [[package]] name = "pallet-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -3787,7 +3787,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -3802,7 +3802,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3827,7 +3827,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3841,7 +3841,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3857,7 +3857,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3872,7 +3872,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3887,7 +3887,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3908,7 +3908,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3924,7 +3924,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3944,7 +3944,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3961,7 +3961,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -3975,7 +3975,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -3991,7 +3991,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4005,7 +4005,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4020,7 +4020,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4041,7 +4041,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4057,7 +4057,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4070,7 +4070,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "enumflags2", "frame-support", @@ -4085,7 +4085,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4100,7 +4100,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4120,7 +4120,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4150,7 +4150,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4172,7 +4172,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -4183,7 +4183,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "frame-system", @@ -4232,7 +4232,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4250,7 +4250,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-support", "parity-scale-codec", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4278,7 +4278,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-benchmarking", "frame-support", @@ -4294,7 +4294,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6544,7 +6544,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-trait", "derive_more", @@ -6572,7 +6572,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6595,7 +6595,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6612,7 +6612,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -6633,7 +6633,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6644,7 +6644,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "ansi_term 0.12.1", "atty", @@ -6689,7 +6689,7 @@ dependencies = [ [[package]] name = "sc-cli-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -6700,7 +6700,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "fnv", @@ -6734,7 +6734,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "blake2-rfc", "hash-db", @@ -6764,7 +6764,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "sc-client-api", "sp-blockchain", @@ -6775,7 +6775,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "fork-tree", @@ -6820,7 +6820,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -6844,7 +6844,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6857,7 +6857,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6883,7 +6883,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "sc-client-api", @@ -6897,7 +6897,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "lazy_static", @@ -6926,7 +6926,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "parity-scale-codec", @@ -6942,7 +6942,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -6957,7 +6957,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -6975,7 +6975,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "finality-grandpa", @@ -7012,7 +7012,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "finality-grandpa", @@ -7036,7 +7036,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "ansi_term 0.12.1", "futures 0.3.8", @@ -7054,7 +7054,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-trait", "derive_more", @@ -7074,7 +7074,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "lazy_static", @@ -7093,7 +7093,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-std", "async-trait", @@ -7147,7 +7147,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7162,7 +7162,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "bytes 0.5.6", "fnv", @@ -7189,7 +7189,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "libp2p", @@ -7202,7 +7202,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7211,7 +7211,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "hash-db", @@ -7244,7 +7244,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -7268,7 +7268,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7286,7 +7286,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "directories 3.0.1", "exit-future", @@ -7350,7 +7350,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -7365,7 +7365,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7385,7 +7385,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7406,7 +7406,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "erased-serde", "log", @@ -7425,7 +7425,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -7447,7 +7447,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-diagnose", @@ -7901,7 +7901,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "log", @@ -7913,7 +7913,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "parity-scale-codec", @@ -7929,7 +7929,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7941,7 +7941,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "serde", @@ -7953,7 +7953,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7966,7 +7966,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -7978,7 +7978,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7989,7 +7989,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -8001,7 +8001,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "log", @@ -8019,7 +8019,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "serde", "serde_json", @@ -8028,7 +8028,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -8054,7 +8054,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "merlin", "parity-scale-codec", @@ -8074,7 +8074,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8083,7 +8083,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8095,7 +8095,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "base58", "blake2-rfc", @@ -8139,7 +8139,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -8148,7 +8148,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -8158,7 +8158,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "environmental", "parity-scale-codec", @@ -8169,7 +8169,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "finality-grandpa", "log", @@ -8186,7 +8186,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", @@ -8198,7 +8198,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "hash-db", @@ -8222,7 +8222,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "lazy_static", "sp-core", @@ -8233,7 +8233,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-trait", "derive_more", @@ -8249,7 +8249,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "serde", @@ -8261,7 +8261,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.24", @@ -8272,7 +8272,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "sp-api", "sp-core", @@ -8282,7 +8282,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "backtrace", ] @@ -8290,7 +8290,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "serde", "sp-core", @@ -8299,7 +8299,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "either", "hash256-std-hasher", @@ -8320,7 +8320,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "primitive-types", @@ -8336,7 +8336,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "Inflector", "proc-macro-crate", @@ -8348,7 +8348,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "serde", "serde_json", @@ -8357,7 +8357,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-api", @@ -8370,7 +8370,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8380,7 +8380,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "log", @@ -8402,12 +8402,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8420,7 +8420,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "sp-core", @@ -8433,7 +8433,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8447,7 +8447,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "log", "parity-scale-codec", @@ -8460,7 +8460,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "derive_more", "futures 0.3.8", @@ -8476,7 +8476,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "hash-db", "memory-db", @@ -8490,7 +8490,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "futures-core", @@ -8502,7 +8502,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8514,7 +8514,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "impl-trait-for-tuples 0.1.3", "parity-scale-codec", @@ -8656,7 +8656,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "chrono", "console_error_panic_hook", @@ -8682,7 +8682,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "platforms", ] @@ -8690,7 +8690,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.8", @@ -8713,7 +8713,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "async-std", "derive_more", @@ -8727,7 +8727,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.1.29", "futures 0.3.8", @@ -8754,7 +8754,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "futures 0.3.8", "substrate-test-utils-derive", @@ -8764,7 +8764,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#779c801d31ff31a9dba9d11326c01c4780b4d589" +source = "git+https://github.com/paritytech/substrate#237874bb15bbac174b6cb8d594053b5512f32ca2" dependencies = [ "proc-macro-crate", "quote 1.0.7",