From 2375a6299697fd2f82df4656e0e8e1794034ce1f Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Fri, 24 Mar 2023 13:48:56 +0200 Subject: [PATCH 1/4] inherent disputes: remove per block initializer and disputes timeout event (#6937) * Limit disputes weight and remove initializer code Signed-off-by: Andrei Sandu * const Signed-off-by: Andrei Sandu * remove timeout test Signed-off-by: Andrei Sandu * review feedback #1 Signed-off-by: Andrei Sandu * Remove the new weight limiting for disputes Signed-off-by: Andrei Sandu * cargo lock Signed-off-by: Andrei Sandu * Remove dispute_conclusion_by_time_out_period Signed-off-by: Andrei Sandu * Enable migrations Signed-off-by: Andrei Sandu * Update guide Signed-off-by: Andrei Sandu * Fix comment Signed-off-by: Andrei Sandu * More guide fixes Signed-off-by: Andrei Sandu * Also migrate pending configs Signed-off-by: Andrei Sandu * fix build Signed-off-by: Andrei Sandu * fix test Signed-off-by: Andrei Sandu --------- Signed-off-by: Andrei Sandu --- .../implementers-guide/src/disputes-flow.md | 1 - .../src/protocol-disputes.md | 2 +- .../src/runtime/disputes.md | 2 +- .../implementers-guide/src/types/runtime.md | 2 - runtime/kusama/src/lib.rs | 1 + runtime/parachains/src/configuration.rs | 19 -- .../parachains/src/configuration/migration.rs | 193 ++++++++++-------- runtime/parachains/src/configuration/tests.rs | 6 - runtime/parachains/src/disputes.rs | 27 +-- runtime/parachains/src/disputes/tests.rs | 125 ------------ runtime/polkadot/src/lib.rs | 1 + runtime/rococo/src/lib.rs | 2 +- runtime/westend/src/lib.rs | 1 + 13 files changed, 116 insertions(+), 266 deletions(-) diff --git a/roadmap/implementers-guide/src/disputes-flow.md b/roadmap/implementers-guide/src/disputes-flow.md index 053bcfd3f2a4..a325b2ce7272 100644 --- a/roadmap/implementers-guide/src/disputes-flow.md +++ b/roadmap/implementers-guide/src/disputes-flow.md @@ -8,7 +8,6 @@ stateDiagram-v2 [*] --> WaitForDisputeVote: backing Vote received WaitForBackingVote --> Open: negative Vote received WaitForDisputeVote --> Open: backing Vote received - Open --> Concluded: Timeout without supermajority Open --> Concluded: Incoming Vote via Gossip Open --> Open: No ⅔ supermajority Open --> [*] diff --git a/roadmap/implementers-guide/src/protocol-disputes.md b/roadmap/implementers-guide/src/protocol-disputes.md index 76791ac16a4e..ebbc534f1992 100644 --- a/roadmap/implementers-guide/src/protocol-disputes.md +++ b/roadmap/implementers-guide/src/protocol-disputes.md @@ -62,6 +62,6 @@ Validators are rewarded for providing statements to the chain as well as for par ## Dispute Conclusion -Disputes, roughly, are over when one side reaches a ⅔ supermajority. They may also conclude after a timeout, without either side witnessing supermajority, which will only happen if the majority of validators are unable to vote for some reason. Furthermore, disputes on-chain will stay open for some fixed amount of time even after concluding, to accept new votes. +Disputes, roughly, are over when one side reaches a ⅔ supermajority. They may also never conclude without either side witnessing supermajority, which will only happen if the majority of validators are unable to vote for some reason. Furthermore, disputes on-chain will stay open for some fixed amount of time even after concluding, to accept new votes. Late votes, after the dispute already reached a ⅔ supermajority, must be rewarded (albeit a smaller amount) as well. diff --git a/roadmap/implementers-guide/src/runtime/disputes.md b/roadmap/implementers-guide/src/runtime/disputes.md index b775bfbfcf0e..1d3e3f62dc01 100644 --- a/roadmap/implementers-guide/src/runtime/disputes.md +++ b/roadmap/implementers-guide/src/runtime/disputes.md @@ -56,7 +56,7 @@ Frozen: Option, ## Block Initialization -1. Iterate through all disputes. If any have not concluded and started more than `config.dispute_conclusion_by_timeout_period` blocks ago, set them to `Concluded` and mildly punish all validators associated, as they have failed to distribute available data. +This is currently a `no op`. ## Routines diff --git a/roadmap/implementers-guide/src/types/runtime.md b/roadmap/implementers-guide/src/types/runtime.md index d3d00d5163b3..e3fc3f0a6527 100644 --- a/roadmap/implementers-guide/src/types/runtime.md +++ b/roadmap/implementers-guide/src/types/runtime.md @@ -44,8 +44,6 @@ struct HostConfiguration { pub dispute_post_conclusion_acceptance_period: BlockNumber, /// The maximum number of dispute spam slots pub dispute_max_spam_slots: u32, - /// How long it takes for a dispute to conclude by time-out, if no supermajority is reached. - pub dispute_conclusion_by_time_out_period: BlockNumber, /// The amount of consensus slots that must pass between submitting an assignment and /// submitting an approval vote before a validator is considered a no-show. /// Must be at least 1. diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 626e439eb48c..d046b552b415 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -1481,6 +1481,7 @@ pub type Migrations = ( Runtime, NominationPoolsMigrationV4OldPallet, >, + parachains_configuration::migration::v5::MigrateToV5, ); /// Unchecked extrinsic type as expected by this runtime. diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs index baeb31ef501a..0e8420f51374 100644 --- a/runtime/parachains/src/configuration.rs +++ b/runtime/parachains/src/configuration.rs @@ -193,8 +193,6 @@ pub struct HostConfiguration { pub dispute_period: SessionIndex, /// How long after dispute conclusion to accept statements. pub dispute_post_conclusion_acceptance_period: BlockNumber, - /// How long it takes for a dispute to conclude by time-out, if no supermajority is reached. - pub dispute_conclusion_by_time_out_period: BlockNumber, /// The amount of consensus slots that must pass between submitting an assignment and /// submitting an approval vote before a validator is considered a no-show. /// @@ -262,7 +260,6 @@ impl> Default for HostConfiguration, - new: T::BlockNumber, - ) -> DispatchResult { - ensure_root(origin)?; - Self::schedule_config_update(|config| { - config.dispute_conclusion_by_time_out_period = new; - }) - } - /// Set the no show slots, in number of number of consensus slots. /// Must be at least 1. #[pallet::call_index(18)] diff --git a/runtime/parachains/src/configuration/migration.rs b/runtime/parachains/src/configuration/migration.rs index 7b2092cfc2c1..f38450a70d40 100644 --- a/runtime/parachains/src/configuration/migration.rs +++ b/runtime/parachains/src/configuration/migration.rs @@ -16,9 +16,10 @@ //! A module that is responsible for migration of storage. -use crate::configuration::{self, ActiveConfig, Config, Pallet, MAX_POV_SIZE}; +use crate::configuration::{self, ActiveConfig, Config, Pallet, PendingConfigs, MAX_POV_SIZE}; use frame_support::{pallet_prelude::*, traits::StorageVersion, weights::Weight}; use frame_system::pallet_prelude::BlockNumberFor; +use sp_std::vec::Vec; /// The current storage version. /// @@ -26,9 +27,10 @@ use frame_system::pallet_prelude::BlockNumberFor; /// v1-v2: /// v2-v3: /// v3-v4: -pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); +/// v4-v5: +pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(5); -pub mod v4 { +pub mod v5 { use super::*; use frame_support::{traits::OnRuntimeUpgrade, weights::constants::WEIGHT_REF_TIME_PER_MILLIS}; use primitives::{Balance, SessionIndex}; @@ -37,7 +39,7 @@ pub mod v4 { // Copied over from configuration.rs @ de9e147695b9f1be8bd44e07861a31e483c8343a and removed // all the comments, and changed the Weight struct to OldWeight - #[derive(parity_scale_codec::Encode, parity_scale_codec::Decode, Debug)] + #[derive(parity_scale_codec::Encode, parity_scale_codec::Decode, Debug, Clone)] pub struct OldHostConfiguration { pub max_code_size: u32, pub max_head_data_size: u32, @@ -71,7 +73,6 @@ pub mod v4 { pub max_validators: Option, pub dispute_period: SessionIndex, pub dispute_post_conclusion_acceptance_period: BlockNumber, - pub dispute_max_spam_slots: u32, pub dispute_conclusion_by_time_out_period: BlockNumber, pub no_show_slots: u32, pub n_delay_tranches: u32, @@ -104,7 +105,6 @@ pub mod v4 { max_validators: None, dispute_period: 6, dispute_post_conclusion_acceptance_period: 100.into(), - dispute_max_spam_slots: 2, dispute_conclusion_by_time_out_period: 200.into(), n_delay_tranches: Default::default(), zeroth_delay_tranche_width: Default::default(), @@ -137,8 +137,8 @@ pub mod v4 { } } - pub struct MigrateToV4(sp_std::marker::PhantomData); - impl OnRuntimeUpgrade for MigrateToV4 { + pub struct MigrateToV5(sp_std::marker::PhantomData); + impl OnRuntimeUpgrade for MigrateToV5 { #[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result, &'static str> { log::trace!(target: crate::configuration::LOG_TARGET, "Running pre_upgrade()"); @@ -148,15 +148,15 @@ pub mod v4 { } fn on_runtime_upgrade() -> Weight { - if StorageVersion::get::>() == 3 { - let weight_consumed = migrate_to_v4::(); + if StorageVersion::get::>() == 4 { + let weight_consumed = migrate_to_v5::(); - log::info!(target: configuration::LOG_TARGET, "MigrateToV4 executed successfully"); + log::info!(target: configuration::LOG_TARGET, "MigrateToV5 executed successfully"); STORAGE_VERSION.put::>(); weight_consumed } else { - log::warn!(target: configuration::LOG_TARGET, "MigrateToV4 should be removed."); + log::warn!(target: configuration::LOG_TARGET, "MigrateToV5 should be removed."); T::DbWeight::get().reads(1) } } @@ -166,7 +166,7 @@ pub mod v4 { log::trace!(target: crate::configuration::LOG_TARGET, "Running post_upgrade()"); ensure!( StorageVersion::get::>() == STORAGE_VERSION, - "Storage version should be 4 after the migration" + "Storage version should be 5 after the migration" ); Ok(()) @@ -174,14 +174,14 @@ pub mod v4 { } } -fn migrate_to_v4() -> Weight { +fn migrate_to_v5() -> Weight { // Unusual formatting is justified: // - make it easier to verify that fields assign what they supposed to assign. // - this code is transient and will be removed after all migrations are done. // - this code is important enough to optimize for legibility sacrificing consistency. #[rustfmt::skip] let translate = - |pre: v4::OldHostConfiguration>| -> + |pre: v5::OldHostConfiguration>| -> configuration::HostConfiguration> { super::HostConfiguration { @@ -217,7 +217,6 @@ max_validators_per_core : pre.max_validators_per_core, max_validators : pre.max_validators, dispute_period : pre.dispute_period, dispute_post_conclusion_acceptance_period: pre.dispute_post_conclusion_acceptance_period, -dispute_conclusion_by_time_out_period : pre.dispute_conclusion_by_time_out_period, no_show_slots : pre.no_show_slots, n_delay_tranches : pre.n_delay_tranches, zeroth_delay_tranche_width : pre.zeroth_delay_tranche_width, @@ -238,11 +237,27 @@ minimum_validation_upgrade_delay : pre.minimum_validation_upgrade_delay, // to be unlikely to be caused by this. So we just log. Maybe it'll work out still? log::error!( target: configuration::LOG_TARGET, - "unexpected error when performing translation of the configuration type during storage upgrade to v4." + "unexpected error when performing translation of the active configuration during storage upgrade to v5." ); } - T::DbWeight::get().reads_writes(1, 1) + if let Err(_) = PendingConfigs::::translate(|pre| { + pre.map( + |v: Vec<(primitives::SessionIndex, v5::OldHostConfiguration>)>| { + v.into_iter() + .map(|(session, config)| (session, translate(config))) + .collect::>() + }, + ) + }) { + log::error!( + target: configuration::LOG_TARGET, + "unexpected error when performing translation of the pending configuration during storage upgrade to v5." + ); + } + + let num_configs = (PendingConfigs::::get().len() + 1) as u64; + T::DbWeight::get().reads_writes(num_configs, num_configs) } #[cfg(test)] @@ -251,10 +266,9 @@ mod tests { use crate::mock::{new_test_ext, Test}; #[test] - fn v3_deserialized_from_actual_data() { + fn v4_deserialized_from_actual_data() { // Example how to get new `raw_config`: - // We'll obtain the raw_config hes for block - // 15,772,152 (0xf89d3ab5312c5f70d396dc59612f0aa65806c798346f9db4b35278baed2e0e53) on Kusama. + // We'll obtain the raw_config at a specified a block // Steps: // 1. Go to Polkadot.js -> Developer -> Chain state -> Storage: https://polkadot.js.org/apps/#/chainstate // 2. Set these parameters: @@ -265,37 +279,35 @@ mod tests { // 3. Go to Polkadot.js -> Developer -> Chain state -> Raw storage // 3.1 Enter the encoded storage key and you get the raw config. - // Fetched at Kusama 15,772,152 (0xf89d3ab5312c5f70d396dc59612f0aa65806c798346f9db4b35278baed2e0e53) - // // This exceeds the maximal line width length, but that's fine, since this is not code and // doesn't need to be read and also leaving it as one line allows to easily copy it. - let raw_config = hex_literal::hex!["0000a000005000000a00000000c8000000c800000a0000000a000000100e0000580200000000500000c800000700e8764817020040011e00000000000000005039278c0400000000000000000000005039278c0400000000000000000000e8030000009001001e00000000000000009001008070000000000000000000000a0000000a0000000a00000001000000010500000001c8000000060000005802000002000000580200000200000059000000000000001e000000280000000700c817a80402004001000200000014000000"]; + let raw_config = hex_literal::hex!["0000a000005000000a00000000c8000000c800000a0000000a000000100e0000580200000000500000c800000700e8764817020040011e00000000000000005039278c0400000000000000000000005039278c0400000000000000000000e8030000009001001e00000000000000009001008070000000000000000000000a0000000a0000000a00000001000000010500000001c80000000600000058020000580200000200000059000000000000001e000000280000000700c817a80402004001010200000014000000"]; - let v3 = v4::OldHostConfiguration::::decode(&mut &raw_config[..]) + let v4 = v5::OldHostConfiguration::::decode(&mut &raw_config[..]) .unwrap(); // We check only a sample of the values here. If we missed any fields or messed up data types // that would skew all the fields coming after. - assert_eq!(v3.max_code_size, 10_485_760); - assert_eq!(v3.validation_upgrade_cooldown, 3600); - assert_eq!(v3.max_pov_size, 5_242_880); - assert_eq!(v3.hrmp_channel_max_message_size, 102_400); - assert_eq!(v3.n_delay_tranches, 89); - assert_eq!(v3.ump_max_individual_weight, Weight::from_parts(20_000_000_000, 5_242_880)); - assert_eq!(v3.minimum_validation_upgrade_delay, 20); + assert_eq!(v4.max_code_size, 10_485_760); + assert_eq!(v4.validation_upgrade_cooldown, 3600); + assert_eq!(v4.max_pov_size, 5_242_880); + assert_eq!(v4.hrmp_channel_max_message_size, 102_400); + assert_eq!(v4.n_delay_tranches, 89); + assert_eq!(v4.ump_max_individual_weight, Weight::from_parts(20_000_000_000, 5_242_880)); + assert_eq!(v4.minimum_validation_upgrade_delay, 20); } #[test] - fn test_migrate_to_v4() { - // Host configuration has lots of fields. However, in this migration we add only a couple of - // fields. The most important part to check are a couple of the last fields. We also pick + fn test_migrate_to_v5() { + // Host configuration has lots of fields. However, in this migration we only remove one field. + // The most important part to check are a couple of the last fields. We also pick // extra fields to check arbitrarily, e.g. depending on their position (i.e. the middle) and // also their type. // // We specify only the picked fields and the rest should be provided by the `Default` // implementation. That implementation is copied over between the two types and should work // fine. - let v3 = v4::OldHostConfiguration:: { + let v4 = v5::OldHostConfiguration:: { ump_max_individual_weight: Weight::from_parts(0x71616e6f6e0au64, 0x71616e6f6e0au64), needed_approvals: 69, thread_availability_period: 55, @@ -306,63 +318,72 @@ mod tests { ..Default::default() }; + let mut pending_configs = Vec::new(); + pending_configs.push((100, v4.clone())); + pending_configs.push((300, v4.clone())); + new_test_ext(Default::default()).execute_with(|| { - // Implant the v3 version in the state. + // Implant the v4 version in the state. frame_support::storage::unhashed::put_raw( &configuration::ActiveConfig::::hashed_key(), - &v3.encode(), + &v4.encode(), + ); + frame_support::storage::unhashed::put_raw( + &configuration::PendingConfigs::::hashed_key(), + &pending_configs.encode(), ); - migrate_to_v4::(); - - let v4 = configuration::ActiveConfig::::get(); + migrate_to_v5::(); - #[rustfmt::skip] - { - assert_eq!(v3.max_code_size , v4.max_code_size); - assert_eq!(v3.max_head_data_size , v4.max_head_data_size); - assert_eq!(v3.max_upward_queue_count , v4.max_upward_queue_count); - assert_eq!(v3.max_upward_queue_size , v4.max_upward_queue_size); - assert_eq!(v3.max_upward_message_size , v4.max_upward_message_size); - assert_eq!(v3.max_upward_message_num_per_candidate , v4.max_upward_message_num_per_candidate); - assert_eq!(v3.hrmp_max_message_num_per_candidate , v4.hrmp_max_message_num_per_candidate); - assert_eq!(v3.validation_upgrade_cooldown , v4.validation_upgrade_cooldown); - assert_eq!(v3.validation_upgrade_delay , v4.validation_upgrade_delay); - assert_eq!(v3.max_pov_size , v4.max_pov_size); - assert_eq!(v3.max_downward_message_size , v4.max_downward_message_size); - assert_eq!(v3.ump_service_total_weight , v4.ump_service_total_weight); - assert_eq!(v3.hrmp_max_parachain_outbound_channels , v4.hrmp_max_parachain_outbound_channels); - assert_eq!(v3.hrmp_max_parathread_outbound_channels , v4.hrmp_max_parathread_outbound_channels); - assert_eq!(v3.hrmp_sender_deposit , v4.hrmp_sender_deposit); - assert_eq!(v3.hrmp_recipient_deposit , v4.hrmp_recipient_deposit); - assert_eq!(v3.hrmp_channel_max_capacity , v4.hrmp_channel_max_capacity); - assert_eq!(v3.hrmp_channel_max_total_size , v4.hrmp_channel_max_total_size); - assert_eq!(v3.hrmp_max_parachain_inbound_channels , v4.hrmp_max_parachain_inbound_channels); - assert_eq!(v3.hrmp_max_parathread_inbound_channels , v4.hrmp_max_parathread_inbound_channels); - assert_eq!(v3.hrmp_channel_max_message_size , v4.hrmp_channel_max_message_size); - assert_eq!(v3.code_retention_period , v4.code_retention_period); - assert_eq!(v3.parathread_cores , v4.parathread_cores); - assert_eq!(v3.parathread_retries , v4.parathread_retries); - assert_eq!(v3.group_rotation_frequency , v4.group_rotation_frequency); - assert_eq!(v3.chain_availability_period , v4.chain_availability_period); - assert_eq!(v3.thread_availability_period , v4.thread_availability_period); - assert_eq!(v3.scheduling_lookahead , v4.scheduling_lookahead); - assert_eq!(v3.max_validators_per_core , v4.max_validators_per_core); - assert_eq!(v3.max_validators , v4.max_validators); - assert_eq!(v3.dispute_period , v4.dispute_period); - assert_eq!(v3.dispute_post_conclusion_acceptance_period, v4.dispute_post_conclusion_acceptance_period); - assert_eq!(v3.dispute_conclusion_by_time_out_period , v4.dispute_conclusion_by_time_out_period); - assert_eq!(v3.no_show_slots , v4.no_show_slots); - assert_eq!(v3.n_delay_tranches , v4.n_delay_tranches); - assert_eq!(v3.zeroth_delay_tranche_width , v4.zeroth_delay_tranche_width); - assert_eq!(v3.needed_approvals , v4.needed_approvals); - assert_eq!(v3.relay_vrf_modulo_samples , v4.relay_vrf_modulo_samples); - assert_eq!(v3.ump_max_individual_weight , v4.ump_max_individual_weight); - assert_eq!(v3.pvf_checking_enabled , v4.pvf_checking_enabled); - assert_eq!(v3.pvf_voting_ttl , v4.pvf_voting_ttl); - assert_eq!(v3.minimum_validation_upgrade_delay , v4.minimum_validation_upgrade_delay); + let v5 = configuration::ActiveConfig::::get(); + let mut configs_to_check = configuration::PendingConfigs::::get(); + configs_to_check.push((0, v5.clone())); - }; // ; makes this a statement. `rustfmt::skip` cannot be put on an expression. + for (_, v4) in configs_to_check { + #[rustfmt::skip] + { + assert_eq!(v4.max_code_size , v5.max_code_size); + assert_eq!(v4.max_head_data_size , v5.max_head_data_size); + assert_eq!(v4.max_upward_queue_count , v5.max_upward_queue_count); + assert_eq!(v4.max_upward_queue_size , v5.max_upward_queue_size); + assert_eq!(v4.max_upward_message_size , v5.max_upward_message_size); + assert_eq!(v4.max_upward_message_num_per_candidate , v5.max_upward_message_num_per_candidate); + assert_eq!(v4.hrmp_max_message_num_per_candidate , v5.hrmp_max_message_num_per_candidate); + assert_eq!(v4.validation_upgrade_cooldown , v5.validation_upgrade_cooldown); + assert_eq!(v4.validation_upgrade_delay , v5.validation_upgrade_delay); + assert_eq!(v4.max_pov_size , v5.max_pov_size); + assert_eq!(v4.max_downward_message_size , v5.max_downward_message_size); + assert_eq!(v4.ump_service_total_weight , v5.ump_service_total_weight); + assert_eq!(v4.hrmp_max_parachain_outbound_channels , v5.hrmp_max_parachain_outbound_channels); + assert_eq!(v4.hrmp_max_parathread_outbound_channels , v5.hrmp_max_parathread_outbound_channels); + assert_eq!(v4.hrmp_sender_deposit , v5.hrmp_sender_deposit); + assert_eq!(v4.hrmp_recipient_deposit , v5.hrmp_recipient_deposit); + assert_eq!(v4.hrmp_channel_max_capacity , v5.hrmp_channel_max_capacity); + assert_eq!(v4.hrmp_channel_max_total_size , v5.hrmp_channel_max_total_size); + assert_eq!(v4.hrmp_max_parachain_inbound_channels , v5.hrmp_max_parachain_inbound_channels); + assert_eq!(v4.hrmp_max_parathread_inbound_channels , v5.hrmp_max_parathread_inbound_channels); + assert_eq!(v4.hrmp_channel_max_message_size , v5.hrmp_channel_max_message_size); + assert_eq!(v4.code_retention_period , v5.code_retention_period); + assert_eq!(v4.parathread_cores , v5.parathread_cores); + assert_eq!(v4.parathread_retries , v5.parathread_retries); + assert_eq!(v4.group_rotation_frequency , v5.group_rotation_frequency); + assert_eq!(v4.chain_availability_period , v5.chain_availability_period); + assert_eq!(v4.thread_availability_period , v5.thread_availability_period); + assert_eq!(v4.scheduling_lookahead , v5.scheduling_lookahead); + assert_eq!(v4.max_validators_per_core , v5.max_validators_per_core); + assert_eq!(v4.max_validators , v5.max_validators); + assert_eq!(v4.dispute_period , v5.dispute_period); + assert_eq!(v4.no_show_slots , v5.no_show_slots); + assert_eq!(v4.n_delay_tranches , v5.n_delay_tranches); + assert_eq!(v4.zeroth_delay_tranche_width , v5.zeroth_delay_tranche_width); + assert_eq!(v4.needed_approvals , v5.needed_approvals); + assert_eq!(v4.relay_vrf_modulo_samples , v5.relay_vrf_modulo_samples); + assert_eq!(v4.ump_max_individual_weight , v5.ump_max_individual_weight); + assert_eq!(v4.pvf_checking_enabled , v5.pvf_checking_enabled); + assert_eq!(v4.pvf_voting_ttl , v5.pvf_voting_ttl); + assert_eq!(v4.minimum_validation_upgrade_delay , v5.minimum_validation_upgrade_delay); + }; // ; makes this a statement. `rustfmt::skip` cannot be put on an expression. + } }); } } diff --git a/runtime/parachains/src/configuration/tests.rs b/runtime/parachains/src/configuration/tests.rs index 2d89aebc19d3..eb29200a12c7 100644 --- a/runtime/parachains/src/configuration/tests.rs +++ b/runtime/parachains/src/configuration/tests.rs @@ -297,7 +297,6 @@ fn setting_pending_config_members() { max_validators: None, dispute_period: 239, dispute_post_conclusion_acceptance_period: 10, - dispute_conclusion_by_time_out_period: 512, no_show_slots: 240, n_delay_tranches: 241, zeroth_delay_tranche_width: 242, @@ -389,11 +388,6 @@ fn setting_pending_config_members() { new_config.dispute_post_conclusion_acceptance_period, ) .unwrap(); - Configuration::set_dispute_conclusion_by_time_out_period( - RuntimeOrigin::root(), - new_config.dispute_conclusion_by_time_out_period, - ) - .unwrap(); Configuration::set_no_show_slots(RuntimeOrigin::root(), new_config.no_show_slots).unwrap(); Configuration::set_n_delay_tranches(RuntimeOrigin::root(), new_config.n_delay_tranches) .unwrap(); diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index a0e4ff9e7a96..6350361816f6 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -18,7 +18,7 @@ use crate::{configuration, initializer::SessionChangeNotification, session_info}; use bitvec::{bitvec, order::Lsb0 as BitOrderLsb0}; -use frame_support::{ensure, traits::Get, weights::Weight}; +use frame_support::{ensure, weights::Weight}; use frame_system::pallet_prelude::*; use parity_scale_codec::{Decode, Encode}; use primitives::{ @@ -503,9 +503,6 @@ pub mod pallet { /// A dispute has concluded for or against a candidate. /// `\[para id, candidate hash, dispute result\]` DisputeConcluded(CandidateHash, DisputeResult), - /// A dispute has timed out due to insufficient participation. - /// `\[para id, candidate hash\]` - DisputeTimedOut(CandidateHash), /// A dispute has concluded with supermajority against a candidate. /// Block authors should no longer build on top of this head and should /// instead revert the block at the given height. This should be the @@ -911,26 +908,8 @@ impl StatementSetFilter { impl Pallet { /// Called by the initializer to initialize the disputes module. - pub(crate) fn initializer_initialize(now: T::BlockNumber) -> Weight { - let config = >::config(); - - let mut weight = Weight::zero(); - for (session_index, candidate_hash, mut dispute) in >::iter() { - weight += T::DbWeight::get().reads_writes(1, 0); - - if dispute.concluded_at.is_none() && - dispute.start + config.dispute_conclusion_by_time_out_period < now - { - Self::deposit_event(Event::DisputeTimedOut(candidate_hash)); - - dispute.concluded_at = Some(now); - >::insert(session_index, candidate_hash, &dispute); - - weight += T::DbWeight::get().writes(1); - } - } - - weight + pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight { + Weight::zero() } /// Called by the initializer to finalize the disputes pallet. diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs index b12814fd72be..afbfa4bc603f 100644 --- a/runtime/parachains/src/disputes/tests.rs +++ b/runtime/parachains/src/disputes/tests.rs @@ -329,131 +329,6 @@ fn test_import_backing_votes() { ); } -// Test that dispute timeout is handled correctly. -#[test] -fn test_dispute_timeout() { - let dispute_conclusion_by_time_out_period = 3; - let start = 10; - - let mock_genesis_config = MockGenesisConfig { - configuration: crate::configuration::GenesisConfig { - config: HostConfiguration { - dispute_conclusion_by_time_out_period, - ..Default::default() - }, - ..Default::default() - }, - ..Default::default() - }; - - new_test_ext(mock_genesis_config).execute_with(|| { - // We need 7 validators for the byzantine threshold to be 2 - let v0 = ::Pair::generate().0; - let v1 = ::Pair::generate().0; - let v2 = ::Pair::generate().0; - let v3 = ::Pair::generate().0; - let v4 = ::Pair::generate().0; - let v5 = ::Pair::generate().0; - let v6 = ::Pair::generate().0; - - run_to_block(start, |b| { - // a new session at each block - Some(( - true, - b, - vec![ - (&0, v0.public()), - (&1, v1.public()), - (&2, v2.public()), - (&3, v3.public()), - (&4, v4.public()), - (&5, v5.public()), - (&6, v6.public()), - ], - Some(vec![ - (&0, v0.public()), - (&1, v1.public()), - (&2, v2.public()), - (&3, v3.public()), - (&4, v4.public()), - (&5, v5.public()), - (&6, v6.public()), - ]), - )) - }); - - let candidate_hash = CandidateHash(sp_core::H256::repeat_byte(1)); - let inclusion_parent = sp_core::H256::repeat_byte(0xff); - - // v0 and v1 vote for 3, v2 against. We need f+1 votes (3) so that the dispute is - // confirmed. Otherwise It will be filtered out. - let session = start - 1; - let stmts = vec![DisputeStatementSet { - candidate_hash: candidate_hash.clone(), - session, - statements: vec![ - ( - DisputeStatement::Valid(ValidDisputeStatementKind::BackingValid( - inclusion_parent, - )), - ValidatorIndex(0), - v0.sign(&CompactStatement::Valid(candidate_hash).signing_payload( - &SigningContext { session_index: start - 1, parent_hash: inclusion_parent }, - )), - ), - ( - DisputeStatement::Valid(ValidDisputeStatementKind::Explicit), - ValidatorIndex(1), - v1.sign( - &ExplicitDisputeStatement { - valid: true, - candidate_hash: candidate_hash.clone(), - session: start - 1, - } - .signing_payload(), - ), - ), - ( - DisputeStatement::Invalid(InvalidDisputeStatementKind::Explicit), - ValidatorIndex(6), - v2.sign( - &ExplicitDisputeStatement { - valid: false, - candidate_hash: candidate_hash.clone(), - session: start - 1, - } - .signing_payload(), - ), - ), - ], - }]; - - let stmts = filter_dispute_set(stmts); - - assert_ok!( - Pallet::::process_checked_multi_dispute_data(&stmts), - vec![(9, candidate_hash.clone())], - ); - - // Run to timeout period - run_to_block(start + dispute_conclusion_by_time_out_period, |_| None); - assert!(>::get(&session, &candidate_hash) - .expect("dispute should exist") - .concluded_at - .is_none()); - - // Run to timeout + 1 in order to executive on_finalize(timeout) - run_to_block(start + dispute_conclusion_by_time_out_period + 1, |_| None); - assert_eq!( - >::get(&session, &candidate_hash) - .expect("dispute should exist") - .concluded_at - .expect("dispute should have concluded"), - start + dispute_conclusion_by_time_out_period + 1 - ); - }); -} - // Test pruning works #[test] fn test_initializer_on_new_session() { diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index cf1bb606fcac..3b307e2d2da1 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1418,6 +1418,7 @@ pub type Migrations = ( Runtime, NominationPoolsMigrationV4OldPallet, >, + parachains_configuration::migration::v5::MigrateToV5, ); /// Unchecked extrinsic type as expected by this runtime. diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 2405af9cc1da..5a42349dbda3 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -1494,7 +1494,7 @@ pub type UncheckedExtrinsic = /// All migrations that will run on the next runtime upgrade. /// /// Should be cleared after every release. -pub type Migrations = (); +pub type Migrations = parachains_configuration::migration::v5::MigrateToV5; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 37695dbcc633..59ca4c0bc931 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -1214,6 +1214,7 @@ pub type Migrations = ( Runtime, NominationPoolsMigrationV4OldPallet, >, + parachains_configuration::migration::v5::MigrateToV5, ); /// Unchecked extrinsic type as expected by this runtime. From 27ddd270c3979fd2a5e2ac6fb3c9d474962c9260 Mon Sep 17 00:00:00 2001 From: Davide Galassi Date: Fri, 24 Mar 2023 15:43:21 +0100 Subject: [PATCH 2/4] Companion for #13683 (#6944) * Companion for #13683 * Wraps trait is not required * update lockfile for {"substrate"} --------- Co-authored-by: parity-processbot <> --- Cargo.lock | 366 +++++++++--------- node/core/backing/src/tests.rs | 2 +- node/core/dispute-coordinator/src/tests.rs | 14 +- node/core/provisioner/src/tests.rs | 2 +- node/core/pvf-checker/src/tests.rs | 2 +- .../bitfield-distribution/src/tests.rs | 2 +- .../dispute-distribution/src/tests/mock.rs | 2 +- node/network/gossip-support/src/lib.rs | 2 +- .../statement-distribution/src/tests.rs | 2 +- node/primitives/src/disputes/mod.rs | 34 +- node/subsystem-test-helpers/src/mock.rs | 2 +- node/subsystem-util/src/lib.rs | 17 +- node/subsystem-util/src/runtime/mod.rs | 2 +- primitives/src/v4/signed.rs | 26 +- 14 files changed, 228 insertions(+), 247 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 048a76afb9ff..ac3e9acc1f92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "hash-db", "log", @@ -2364,7 +2364,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", ] @@ -2387,7 +2387,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-support-procedural", @@ -2412,7 +2412,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "Inflector", "array-bytes", @@ -2459,7 +2459,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2470,7 +2470,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2487,7 +2487,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "log", @@ -2532,7 +2532,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "bitflags", "environmental", @@ -2565,7 +2565,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "Inflector", "cfg-expr", @@ -2580,7 +2580,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2592,7 +2592,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro2", "quote", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -2626,7 +2626,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -2637,7 +2637,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "log", @@ -2655,7 +2655,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -2670,7 +2670,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "sp-api", @@ -2679,7 +2679,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "parity-scale-codec", @@ -2861,7 +2861,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "chrono", "frame-election-provider-support", @@ -4653,7 +4653,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "log", @@ -4672,7 +4672,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "anyhow", "jsonrpsee", @@ -5234,7 +5234,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5249,7 +5249,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5265,7 +5265,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5279,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5303,7 +5303,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5323,7 +5323,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5342,7 +5342,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5357,7 +5357,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5376,7 +5376,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5400,7 +5400,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5418,7 +5418,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5437,7 +5437,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5454,7 +5454,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5471,7 +5471,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5489,7 +5489,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5512,7 +5512,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5525,7 +5525,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5543,7 +5543,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5561,7 +5561,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5584,7 +5584,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5600,7 +5600,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5620,7 +5620,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5637,7 +5637,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5654,7 +5654,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5671,7 +5671,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5687,7 +5687,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5703,7 +5703,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5720,7 +5720,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5740,7 +5740,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -5751,7 +5751,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5768,7 +5768,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5792,7 +5792,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5809,7 +5809,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5824,7 +5824,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5842,7 +5842,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5857,7 +5857,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5876,7 +5876,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5893,7 +5893,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5914,7 +5914,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5930,7 +5930,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -5944,7 +5944,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5967,7 +5967,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5978,7 +5978,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "log", "sp-arithmetic", @@ -5987,7 +5987,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "sp-api", @@ -5996,7 +5996,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6013,7 +6013,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -6027,7 +6027,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6045,7 +6045,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6064,7 +6064,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-support", "frame-system", @@ -6080,7 +6080,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6096,7 +6096,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6108,7 +6108,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6125,7 +6125,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6140,7 +6140,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6156,7 +6156,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -6171,7 +6171,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -9122,7 +9122,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "log", "sp-core", @@ -9133,7 +9133,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures", @@ -9161,7 +9161,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "futures-timer", @@ -9184,7 +9184,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9199,7 +9199,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9218,7 +9218,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9229,7 +9229,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "chrono", @@ -9269,7 +9269,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "fnv", "futures", @@ -9295,7 +9295,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "hash-db", "kvdb", @@ -9321,7 +9321,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures", @@ -9346,7 +9346,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "fork-tree", @@ -9385,7 +9385,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "jsonrpsee", @@ -9407,7 +9407,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "async-trait", @@ -9442,7 +9442,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "jsonrpsee", @@ -9461,7 +9461,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9474,7 +9474,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ahash 0.8.2", "array-bytes", @@ -9514,7 +9514,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "finality-grandpa", "futures", @@ -9534,7 +9534,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures", @@ -9557,7 +9557,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -9581,7 +9581,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -9594,7 +9594,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "log", "sc-allocator", @@ -9607,7 +9607,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "anyhow", "cfg-if", @@ -9625,7 +9625,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ansi_term", "futures", @@ -9641,7 +9641,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "async-trait", @@ -9656,7 +9656,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "async-channel", @@ -9700,7 +9700,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "cid", "futures", @@ -9720,7 +9720,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "async-trait", @@ -9748,7 +9748,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ahash 0.8.2", "futures", @@ -9767,7 +9767,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "futures", @@ -9789,7 +9789,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "async-trait", @@ -9823,7 +9823,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "futures", @@ -9843,7 +9843,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "bytes", @@ -9874,7 +9874,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "libp2p", @@ -9887,7 +9887,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9896,7 +9896,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "jsonrpsee", @@ -9926,7 +9926,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9945,7 +9945,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "http", "jsonrpsee", @@ -9960,7 +9960,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "futures", @@ -9986,7 +9986,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "directories", @@ -10052,7 +10052,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "log", "parity-scale-codec", @@ -10063,7 +10063,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "clap 4.0.15", "fs4", @@ -10079,7 +10079,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10098,7 +10098,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "libc", @@ -10117,7 +10117,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "chrono", "futures", @@ -10136,7 +10136,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ansi_term", "atty", @@ -10167,7 +10167,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10178,7 +10178,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures", @@ -10205,7 +10205,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures", @@ -10219,7 +10219,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-channel", "futures", @@ -10758,7 +10758,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "hash-db", "log", @@ -10776,7 +10776,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "Inflector", "blake2", @@ -10790,7 +10790,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -10803,7 +10803,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "integer-sqrt", "num-traits", @@ -10817,7 +10817,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -10830,7 +10830,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "sp-api", @@ -10842,7 +10842,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "log", @@ -10860,7 +10860,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures", @@ -10875,7 +10875,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "parity-scale-codec", @@ -10893,7 +10893,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "merlin", @@ -10916,7 +10916,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "lazy_static", "parity-scale-codec", @@ -10935,7 +10935,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "finality-grandpa", "log", @@ -10953,7 +10953,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -10965,7 +10965,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -10978,7 +10978,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "base58", @@ -11021,7 +11021,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "blake2b_simd", "byteorder", @@ -11035,7 +11035,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro2", "quote", @@ -11046,7 +11046,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11055,7 +11055,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro2", "quote", @@ -11065,7 +11065,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "environmental", "parity-scale-codec", @@ -11076,7 +11076,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11091,7 +11091,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "bytes", "ed25519", @@ -11116,7 +11116,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "lazy_static", "sp-core", @@ -11127,7 +11127,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "merlin", @@ -11143,7 +11143,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "thiserror", "zstd", @@ -11152,7 +11152,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11170,7 +11170,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -11184,7 +11184,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "sp-api", "sp-core", @@ -11194,7 +11194,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "backtrace", "lazy_static", @@ -11204,7 +11204,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "rustc-hash", "serde", @@ -11214,7 +11214,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "either", "hash256-std-hasher", @@ -11236,7 +11236,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11254,7 +11254,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "Inflector", "proc-macro-crate", @@ -11266,7 +11266,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -11280,7 +11280,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -11292,7 +11292,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "hash-db", "log", @@ -11312,12 +11312,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11330,7 +11330,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "futures-timer", @@ -11345,7 +11345,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "sp-std", @@ -11357,7 +11357,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "sp-api", "sp-runtime", @@ -11366,7 +11366,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "log", @@ -11382,7 +11382,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ahash 0.8.2", "hash-db", @@ -11405,7 +11405,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11422,7 +11422,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11433,7 +11433,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11447,7 +11447,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -11677,7 +11677,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "platforms", ] @@ -11685,7 +11685,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11704,7 +11704,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "hyper", "log", @@ -11716,7 +11716,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "jsonrpsee", @@ -11729,7 +11729,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "jsonrpsee", "log", @@ -11748,7 +11748,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "array-bytes", "async-trait", @@ -11774,7 +11774,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11784,7 +11784,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11795,7 +11795,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "ansi_term", "build-helper", @@ -12624,7 +12624,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#988f6add941b57ceb2af00ab815b3727f03fc1fb" +source = "git+https://github.com/paritytech/substrate?branch=master#bf395c8308c481a9774373e0b0b14bd7a2e4b8d2" dependencies = [ "async-trait", "clap 4.0.15", diff --git a/node/core/backing/src/tests.rs b/node/core/backing/src/tests.rs index 631d66e3d776..47734fd28aa1 100644 --- a/node/core/backing/src/tests.rs +++ b/node/core/backing/src/tests.rs @@ -34,7 +34,7 @@ use polkadot_primitives::{ CandidateDescriptor, CollatorId, GroupRotationInfo, HeadData, PersistedValidationData, PvfExecTimeoutKind, ScheduledCore, }; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_keyring::Sr25519Keyring; use sp_keystore::Keystore; use sp_tracing as _; diff --git a/node/core/dispute-coordinator/src/tests.rs b/node/core/dispute-coordinator/src/tests.rs index 5504fc7228f1..8d72ed79100d 100644 --- a/node/core/dispute-coordinator/src/tests.rs +++ b/node/core/dispute-coordinator/src/tests.rs @@ -45,7 +45,7 @@ use polkadot_node_subsystem::{ use polkadot_node_subsystem_util::TimeoutExt; use sc_keystore::LocalKeystore; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_core::{sr25519::Pair, testing::TaskExecutor, Pair as PairT}; use sp_keyring::Sr25519Keyring; use sp_keystore::{Keystore, KeystorePtr}; @@ -562,18 +562,18 @@ impl TestState { let validator_id = self.validators[index.0 as usize].public(); let payload = ApprovalVote(candidate_hash).signing_payload(session); - let signature = - Keystore::sign_with(&*keystore, ValidatorId::ID, &validator_id.into(), &payload[..]) - .ok() - .flatten() - .unwrap(); + let signature = keystore + .sr25519_sign(ValidatorId::ID, &validator_id, &payload) + .ok() + .flatten() + .unwrap(); SignedDisputeStatement::new_unchecked_from_trusted_source( DisputeStatement::Valid(ValidDisputeStatementKind::ApprovalChecking), candidate_hash, session, validator_id.into(), - signature.try_into().unwrap(), + signature.into(), ) } diff --git a/node/core/provisioner/src/tests.rs b/node/core/provisioner/src/tests.rs index 96502b027789..a15608305a1a 100644 --- a/node/core/provisioner/src/tests.rs +++ b/node/core/provisioner/src/tests.rs @@ -57,7 +57,7 @@ pub fn scheduled_core(id: u32) -> ScheduledCore { mod select_availability_bitfields { use super::{super::*, default_bitvec, occupied_core}; use polkadot_primitives::{ScheduledCore, SigningContext, ValidatorId, ValidatorIndex}; - use sp_application_crypto::AppKey; + use sp_application_crypto::AppCrypto; use sp_keystore::{testing::MemoryKeystore, Keystore, KeystorePtr}; use std::sync::Arc; diff --git a/node/core/pvf-checker/src/tests.rs b/node/core/pvf-checker/src/tests.rs index 38c5e35026db..b06285facc44 100644 --- a/node/core/pvf-checker/src/tests.rs +++ b/node/core/pvf-checker/src/tests.rs @@ -29,7 +29,7 @@ use polkadot_primitives::{ BlockNumber, Hash, Header, PvfCheckStatement, SessionIndex, ValidationCode, ValidationCodeHash, ValidatorId, }; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_core::testing::TaskExecutor; use sp_keyring::Sr25519Keyring; use sp_keystore::Keystore; diff --git a/node/network/bitfield-distribution/src/tests.rs b/node/network/bitfield-distribution/src/tests.rs index 95ffe197357b..0ee9f98346ea 100644 --- a/node/network/bitfield-distribution/src/tests.rs +++ b/node/network/bitfield-distribution/src/tests.rs @@ -33,7 +33,7 @@ use polkadot_node_subsystem_test_helpers::make_subsystem_context; use polkadot_node_subsystem_util::TimeoutExt; use polkadot_primitives::{AvailabilityBitfield, Signed, ValidatorIndex}; use rand_chacha::ChaCha12Rng; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_authority_discovery::AuthorityPair as AuthorityDiscoveryPair; use sp_core::Pair as PairT; use sp_keyring::Sr25519Keyring; diff --git a/node/network/dispute-distribution/src/tests/mock.rs b/node/network/dispute-distribution/src/tests/mock.rs index 52d3e213ac05..1a160db52a76 100644 --- a/node/network/dispute-distribution/src/tests/mock.rs +++ b/node/network/dispute-distribution/src/tests/mock.rs @@ -28,7 +28,7 @@ use lazy_static::lazy_static; use polkadot_node_network_protocol::{authority_discovery::AuthorityDiscovery, PeerId}; use sc_keystore::LocalKeystore; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_keyring::Sr25519Keyring; use sp_keystore::{Keystore, KeystorePtr}; diff --git a/node/network/gossip-support/src/lib.rs b/node/network/gossip-support/src/lib.rs index 5224730c14ec..9878f7e99ec3 100644 --- a/node/network/gossip-support/src/lib.rs +++ b/node/network/gossip-support/src/lib.rs @@ -36,7 +36,7 @@ use rand::{seq::SliceRandom as _, SeedableRng}; use rand_chacha::ChaCha20Rng; use sc_network::Multiaddr; -use sp_application_crypto::{AppKey, ByteArray}; +use sp_application_crypto::{AppCrypto, ByteArray}; use sp_keystore::{Keystore, KeystorePtr}; use polkadot_node_network_protocol::{ diff --git a/node/network/statement-distribution/src/tests.rs b/node/network/statement-distribution/src/tests.rs index 107d59d6582d..f93d0932b306 100644 --- a/node/network/statement-distribution/src/tests.rs +++ b/node/network/statement-distribution/src/tests.rs @@ -42,7 +42,7 @@ use polkadot_primitives_test_helpers::{ dummy_committed_candidate_receipt, dummy_hash, AlwaysZeroRng, }; use sc_keystore::LocalKeystore; -use sp_application_crypto::{sr25519::Pair, AppKey, Pair as TraitPair}; +use sp_application_crypto::{sr25519::Pair, AppCrypto, Pair as TraitPair}; use sp_authority_discovery::AuthorityPair; use sp_keyring::Sr25519Keyring; use sp_keystore::{Keystore, KeystorePtr}; diff --git a/node/primitives/src/disputes/mod.rs b/node/primitives/src/disputes/mod.rs index c47d1f561119..554b96428133 100644 --- a/node/primitives/src/disputes/mod.rs +++ b/node/primitives/src/disputes/mod.rs @@ -21,8 +21,8 @@ use std::collections::{ use parity_scale_codec::{Decode, Encode}; -use sp_application_crypto::AppKey; -use sp_keystore::{Error as KeystoreError, Keystore, KeystorePtr}; +use sp_application_crypto::AppCrypto; +use sp_keystore::{Error as KeystoreError, KeystorePtr}; use super::{Statement, UncheckedSignedFullStatement}; use polkadot_primitives::{ @@ -221,26 +221,16 @@ impl SignedDisputeStatement { }; let data = dispute_statement.payload_data(candidate_hash, session_index); - let signature = Keystore::sign_with( - &**keystore, - ValidatorId::ID, - &validator_public.clone().into(), - &data, - )?; - - let signature = match signature { - Some(sig) => - sig.try_into().map_err(|_| KeystoreError::KeyNotSupported(ValidatorId::ID))?, - None => return Ok(None), - }; - - Ok(Some(Self { - dispute_statement, - candidate_hash, - validator_public, - validator_signature: signature, - session_index, - })) + let signature = keystore + .sr25519_sign(ValidatorId::ID, validator_public.as_ref(), &data)? + .map(|sig| Self { + dispute_statement, + candidate_hash, + validator_public, + validator_signature: sig.into(), + session_index, + }); + Ok(signature) } /// Access the underlying dispute statement diff --git a/node/subsystem-test-helpers/src/mock.rs b/node/subsystem-test-helpers/src/mock.rs index 96efe63b16d2..77e55b708351 100644 --- a/node/subsystem-test-helpers/src/mock.rs +++ b/node/subsystem-test-helpers/src/mock.rs @@ -17,7 +17,7 @@ use std::sync::Arc; use sc_keystore::LocalKeystore; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_keyring::Sr25519Keyring; use sp_keystore::{Keystore, KeystorePtr}; diff --git a/node/subsystem-util/src/lib.rs b/node/subsystem-util/src/lib.rs index f2f1e83655e9..d4c04a32a89d 100644 --- a/node/subsystem-util/src/lib.rs +++ b/node/subsystem-util/src/lib.rs @@ -49,9 +49,9 @@ use polkadot_primitives::{ ValidatorSignature, }; pub use rand; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_core::ByteArray; -use sp_keystore::{Error as KeystoreError, Keystore, KeystorePtr}; +use sp_keystore::{Error as KeystoreError, KeystorePtr}; use std::time::Duration; use thiserror::Error; @@ -276,7 +276,7 @@ pub fn signing_key_and_index( keystore: &KeystorePtr, ) -> Option<(ValidatorId, ValidatorIndex)> { for (i, v) in validators.iter().enumerate() { - if Keystore::has_keys(&**keystore, &[(v.to_raw_vec(), ValidatorId::ID)]) { + if keystore.has_keys(&[(v.to_raw_vec(), ValidatorId::ID)]) { return Some((v.clone(), ValidatorIndex(i as _))) } } @@ -292,13 +292,10 @@ pub fn sign( key: &ValidatorId, data: &[u8], ) -> Result, KeystoreError> { - let signature = Keystore::sign_with(&**keystore, ValidatorId::ID, &key.into(), &data)?; - - match signature { - Some(sig) => - Ok(Some(sig.try_into().map_err(|_| KeystoreError::KeyNotSupported(ValidatorId::ID))?)), - None => Ok(None), - } + let signature = keystore + .sr25519_sign(ValidatorId::ID, key.as_ref(), data)? + .map(|sig| sig.into()); + Ok(signature) } /// Find the validator group the given validator index belongs to. diff --git a/node/subsystem-util/src/runtime/mod.rs b/node/subsystem-util/src/runtime/mod.rs index b0642d6551cc..14e32e92f584 100644 --- a/node/subsystem-util/src/runtime/mod.rs +++ b/node/subsystem-util/src/runtime/mod.rs @@ -21,7 +21,7 @@ use std::num::NonZeroUsize; use lru::LruCache; use parity_scale_codec::Encode; -use sp_application_crypto::AppKey; +use sp_application_crypto::AppCrypto; use sp_core::crypto::ByteArray; use sp_keystore::{Keystore, KeystorePtr}; diff --git a/primitives/src/v4/signed.rs b/primitives/src/v4/signed.rs index c57abb2e0173..bb83641d882b 100644 --- a/primitives/src/v4/signed.rs +++ b/primitives/src/v4/signed.rs @@ -18,9 +18,9 @@ use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; #[cfg(feature = "std")] -use application_crypto::AppKey; +use application_crypto::AppCrypto; #[cfg(feature = "std")] -use sp_keystore::{Error as KeystoreError, Keystore, KeystorePtr}; +use sp_keystore::{Error as KeystoreError, KeystorePtr}; use sp_std::prelude::Vec; use primitives::RuntimeDebug; @@ -252,20 +252,14 @@ impl, RealPayload: Encode> UncheckedSigned Result, KeystoreError> { let data = Self::payload_data(&payload, context); - let signature = Keystore::sign_with(&**keystore, ValidatorId::ID, &key.into(), &data)?; - - let signature = match signature { - Some(sig) => - sig.try_into().map_err(|_| KeystoreError::KeyNotSupported(ValidatorId::ID))?, - None => return Ok(None), - }; - - Ok(Some(Self { - payload, - validator_index, - signature, - real_payload: std::marker::PhantomData, - })) + let signature = + keystore.sr25519_sign(ValidatorId::ID, key.as_ref(), &data)?.map(|sig| Self { + payload, + validator_index, + signature: sig.into(), + real_payload: std::marker::PhantomData, + }); + Ok(signature) } /// Validate the payload given the context and public key From bc7dcf2136eedae65064e8d6772be9a987dd0820 Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Fri, 24 Mar 2023 19:19:37 +0200 Subject: [PATCH 3/4] Subsystem channel tweaks (#6905) * subsystem tweaks for higher scale Signed-off-by: Andrei Sandu * Adjust queue sizes Signed-off-by: Andrei Sandu * Orchestra 0.0.5 Signed-off-by: Andrei Sandu * cargo lock Signed-off-by: Andrei Sandu --------- Signed-off-by: Andrei Sandu --- Cargo.lock | 8 ++++---- node/network/bridge/src/rx/mod.rs | 2 +- node/overseer/Cargo.toml | 2 +- node/overseer/src/lib.rs | 8 ++++---- node/subsystem-types/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac3e9acc1f92..7a3dd48db4ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5149,9 +5149,9 @@ dependencies = [ [[package]] name = "orchestra" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee" +checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015" dependencies = [ "async-trait", "dyn-clonable", @@ -5166,9 +5166,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.4" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f" +checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" dependencies = [ "expander 0.0.6", "itertools", diff --git a/node/network/bridge/src/rx/mod.rs b/node/network/bridge/src/rx/mod.rs index a6bfec77ce10..5253ada28c00 100644 --- a/node/network/bridge/src/rx/mod.rs +++ b/node/network/bridge/src/rx/mod.rs @@ -652,7 +652,7 @@ where ) .remote_handle(); - ctx.spawn("network-bridge-in-network-worker", Box::pin(task))?; + ctx.spawn_blocking("network-bridge-in-network-worker", Box::pin(task))?; futures::pin_mut!(network_event_handler); let orchestra_signal_handler = run_incoming_orchestra_signals( diff --git a/node/overseer/Cargo.toml b/node/overseer/Cargo.toml index 5d26c0b6e2bf..70a22bdcdd0a 100644 --- a/node/overseer/Cargo.toml +++ b/node/overseer/Cargo.toml @@ -15,7 +15,7 @@ polkadot-node-primitives = { path = "../primitives" } polkadot-node-subsystem-types = { path = "../subsystem-types" } polkadot-node-metrics = { path = "../metrics" } polkadot-primitives = { path = "../../primitives" } -orchestra = "0.0.4" +orchestra = "0.0.5" gum = { package = "tracing-gum", path = "../gum" } lru = "0.9" sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs index 810f08af4857..7fe0fe3652b1 100644 --- a/node/overseer/src/lib.rs +++ b/node/overseer/src/lib.rs @@ -529,7 +529,7 @@ pub struct Overseer { ])] availability_store: AvailabilityStore, - #[subsystem(NetworkBridgeRxMessage, sends: [ + #[subsystem(blocking, NetworkBridgeRxMessage, sends: [ BitfieldDistributionMessage, StatementDistributionMessage, ApprovalDistributionMessage, @@ -540,7 +540,7 @@ pub struct Overseer { ])] network_bridge_rx: NetworkBridgeRx, - #[subsystem(NetworkBridgeTxMessage, sends: [])] + #[subsystem(blocking, NetworkBridgeTxMessage, sends: [])] network_bridge_tx: NetworkBridgeTx, #[subsystem(blocking, ChainApiMessage, sends: [])] @@ -559,7 +559,7 @@ pub struct Overseer { ])] collator_protocol: CollatorProtocol, - #[subsystem(ApprovalDistributionMessage, sends: [ + #[subsystem(blocking, message_capacity: 64000, ApprovalDistributionMessage, sends: [ NetworkBridgeTxMessage, ApprovalVotingMessage, ])] @@ -584,7 +584,7 @@ pub struct Overseer { ])] gossip_support: GossipSupport, - #[subsystem(blocking, DisputeCoordinatorMessage, sends: [ + #[subsystem(blocking, message_capacity: 32000, DisputeCoordinatorMessage, sends: [ RuntimeApiMessage, ChainApiMessage, DisputeDistributionMessage, diff --git a/node/subsystem-types/Cargo.toml b/node/subsystem-types/Cargo.toml index 22528503ccc4..31bf34cd2124 100644 --- a/node/subsystem-types/Cargo.toml +++ b/node/subsystem-types/Cargo.toml @@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" } polkadot-node-network-protocol = { path = "../network/protocol" } polkadot-statement-table = { path = "../../statement-table" } polkadot-node-jaeger = { path = "../jaeger" } -orchestra = "0.0.4" +orchestra = "0.0.5" sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } From 03ed7770919f8857d150cb8d6314cb04d0a9f024 Mon Sep 17 00:00:00 2001 From: Mira Ressel Date: Fri, 24 Mar 2023 22:08:25 +0100 Subject: [PATCH 4/4] bump timestamp script to v0.2 (#6954) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6ebde20a866..c46f8bf59aaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,7 +202,7 @@ include: - scripts/ci/gitlab/pipeline/zombienet.yml # timestamp handler - project: parity/infrastructure/ci_cd/shared - ref: v0.1 + ref: v0.2 file: /common/timestamp.yml #### stage: .post