Update Substrate/Polkadot/Cumulus dependencies + weights v2 (#1850)

* cargo update

* weights v2

* clippy

* no spellcheck for weights.rs

* fix proof_size component in MAXIMUM_BLOCK_WEIGHT  constants

* "fix" proof_size in select_delivery_transaction_limits_works

* spellcheck

bridges/bin/millau/node/src/chain_spec.rs

@@ -202,7 +202,7 @@ fn testnet_genesis(
 			balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 50)).collect(),
 		},
 		aura: AuraConfig { authorities: Vec::new() },
-		beefy: BeefyConfig { authorities: Vec::new() },
+		beefy: BeefyConfig { authorities: Vec::new(), genesis_block: Some(0) },
 		grandpa: GrandpaConfig { authorities: Vec::new() },
 		sudo: SudoConfig { key: Some(root_key) },
 		session: SessionConfig {

bridges/bin/millau/node/src/cli.rs

@@ -28,6 +28,7 @@ pub struct Cli {
 
 /// Possible subcommands of the main binary.
 #[derive(Debug, Parser)]
+#[allow(clippy::large_enum_variant)]
 pub enum Subcommand {
 	/// Key management CLI utilities
 	#[clap(subcommand)]

bridges/bin/millau/node/src/service.rs

@@ -125,7 +125,7 @@ pub fn new_partial(
 
 	let (grandpa_block_import, grandpa_link) = sc_finality_grandpa::block_import(
 		client.clone(),
-		&(client.clone() as Arc<_>),
+		&client,
 		select_chain.clone(),
 		telemetry.as_ref().map(|x| x.handle()),
 	)?;

bridges/bin/millau/runtime/src/lib.rs

@@ -61,7 +61,9 @@ pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
 	parameter_types,
-	traits::{ConstU32, ConstU8, Currency, ExistenceRequirement, Imbalance, KeyOwnerProofSystem},
+	traits::{
+		ConstU32, ConstU64, ConstU8, Currency, ExistenceRequirement, Imbalance, KeyOwnerProofSystem,
+	},
 	weights::{
 		constants::WEIGHT_REF_TIME_PER_SECOND, ConstantMultiplier, IdentityFee, RuntimeDbWeight,
 		Weight,
@@ -240,6 +242,7 @@ impl pallet_grandpa::Config for Runtime {
 	// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
 	type WeightInfo = ();
 	type MaxAuthorities = ConstU32<10>;
+	type MaxSetIdSessionEntries = ConstU64<0>;
 }
 
 /// MMR helper types.
@@ -752,6 +755,12 @@ impl_runtime_apis! {
 		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {
 			TransactionPayment::query_fee_details(uxt, len)
 		}
+		fn query_weight_to_fee(weight: Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {
@@ -767,6 +776,10 @@ impl_runtime_apis! {
 	}
 
 	impl sp_beefy::BeefyApi<Block> for Runtime {
+		fn beefy_genesis() -> Option<BlockNumber> {
+			Beefy::genesis_block()
+		}
+
 		fn validator_set() -> Option<ValidatorSet<BeefyId>> {
 			Beefy::validator_set()
 		}

bridges/bin/rialto-parachain/runtime/src/lib.rs

@@ -735,6 +735,12 @@ impl_runtime_apis! {
 		) -> pallet_transaction_payment::FeeDetails<Balance> {
 			TransactionPayment::query_fee_details(uxt, len)
 		}
+		fn query_weight_to_fee(weight: Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl bp_millau::MillauFinalityApi<Block> for Runtime {

bridges/bin/rialto/node/src/chain_spec.rs

@@ -213,7 +213,7 @@ fn testnet_genesis(
 			authorities: Vec::new(),
 			epoch_config: Some(rialto_runtime::BABE_GENESIS_EPOCH_CONFIG),
 		},
-		beefy: BeefyConfig { authorities: Vec::new() },
+		beefy: BeefyConfig { authorities: Vec::new(), genesis_block: Some(0) },
 		grandpa: GrandpaConfig { authorities: Vec::new() },
 		sudo: SudoConfig { key: Some(root_key) },
 		session: SessionConfig {

bridges/bin/rialto/node/src/cli.rs

@@ -28,6 +28,7 @@ pub struct Cli {
 
 /// Possible subcommands of the main binary.
 #[derive(Debug, Parser)]
+#[allow(clippy::large_enum_variant)]
 pub enum Subcommand {
 	/// Key management CLI utilities
 	#[clap(subcommand)]

bridges/bin/rialto/runtime/src/lib.rs

@@ -57,7 +57,9 @@ pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
 	parameter_types,
-	traits::{ConstU32, ConstU8, Currency, ExistenceRequirement, Imbalance, KeyOwnerProofSystem},
+	traits::{
+		ConstU32, ConstU64, ConstU8, Currency, ExistenceRequirement, Imbalance, KeyOwnerProofSystem,
+	},
 	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, IdentityFee, RuntimeDbWeight, Weight},
 	StorageValue,
 };
@@ -263,6 +265,7 @@ impl pallet_grandpa::Config for Runtime {
 	type HandleEquivocation = ();
 	// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
 	type WeightInfo = ();
+	type MaxSetIdSessionEntries = ConstU64<0>;
 }
 
 impl pallet_mmr::Config for Runtime {
@@ -626,6 +629,10 @@ impl_runtime_apis! {
 	}
 
 	impl sp_beefy::BeefyApi<Block> for Runtime {
+		fn beefy_genesis() -> Option<BlockNumber> {
+			Beefy::genesis_block()
+		}
+
 		fn validator_set() -> Option<ValidatorSet<BeefyId>> {
 			Beefy::validator_set()
 		}
@@ -864,6 +871,12 @@ impl_runtime_apis! {
 		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {
 			TransactionPayment::query_fee_details(uxt, len)
 		}
+		fn query_weight_to_fee(weight: Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl sp_session::SessionKeys<Block> for Runtime {

bridges/modules/grandpa/src/weights.rs

@@ -14,13 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights for `pallet_bridge_grandpa`
+//! Autogenerated weights for pallet_bridge_grandpa
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-12-21, STEPS: 50, REPEAT: 20
+//! DATE: 2023-02-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! LOW RANGE: [], HIGH RANGE: []
+//! WORST CASE MAP SIZE: `1000000`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled
+//! HOSTNAME: `covid`, CPU: `11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz`
-//! CHAIN: Some("dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/release/millau-bridge-node
@@ -48,7 +48,7 @@ use frame_support::{
 };
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for `pallet_bridge_grandpa`.
+/// Weight functions needed for pallet_bridge_grandpa.
 pub trait WeightInfo {
 	fn submit_finality_proof(p: u32, v: u32) -> Weight;
 }
@@ -58,22 +58,110 @@ pub trait WeightInfo {
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
+	/// Storage: BridgeRialtoGrandpa PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa RequestCount (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added: 499,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa BestFinalized (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added:
+	/// 531, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa CurrentAuthoritySet (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(40970),
+	/// added: 41465, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHashesPointer (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4),
+	/// added: 499, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHashes (max_values: None, max_size: Some(36), added:
+	/// 2511, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:0 w:2)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// The range of component `p` is `[51, 102]`.
+	///
+	/// The range of component `v` is `[50, 100]`.
 	fn submit_finality_proof(p: u32, v: u32) -> Weight {
-		Weight::from_ref_time(192_130_822 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(Weight::from_ref_time(39_781_096 as u64).saturating_mul(p as u64))
+		//  Measured:  `2524 + p * (40 ±0)`
-			.saturating_add(Weight::from_ref_time(1_365_108 as u64).saturating_mul(v as u64))
+		//  Estimated: `46001`
-			.saturating_add(T::DbWeight::get().reads(6 as u64))
+		// Minimum execution time: 2_282_140 nanoseconds.
-			.saturating_add(T::DbWeight::get().writes(6 as u64))
+		Weight::from_parts(142_496_714, 46001)
+			// Standard Error: 32_796
+			.saturating_add(Weight::from_ref_time(40_232_935).saturating_mul(p.into()))
+			// Standard Error: 33_574
+			.saturating_add(Weight::from_ref_time(1_185_407).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	/// Storage: BridgeRialtoGrandpa PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa RequestCount (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added: 499,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa BestFinalized (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added:
+	/// 531, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa CurrentAuthoritySet (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(40970),
+	/// added: 41465, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHashesPointer (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4),
+	/// added: 499, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHashes (max_values: None, max_size: Some(36), added:
+	/// 2511, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:0 w:2)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// The range of component `p` is `[51, 102]`.
+	///
+	/// The range of component `v` is `[50, 100]`.
 	fn submit_finality_proof(p: u32, v: u32) -> Weight {
-		Weight::from_ref_time(192_130_822 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(Weight::from_ref_time(39_781_096 as u64).saturating_mul(p as u64))
+		//  Measured:  `2524 + p * (40 ±0)`
-			.saturating_add(Weight::from_ref_time(1_365_108 as u64).saturating_mul(v as u64))
+		//  Estimated: `46001`
-			.saturating_add(RocksDbWeight::get().reads(6 as u64))
+		// Minimum execution time: 2_282_140 nanoseconds.
-			.saturating_add(RocksDbWeight::get().writes(6 as u64))
+		Weight::from_parts(142_496_714, 46001)
+			// Standard Error: 32_796
+			.saturating_add(Weight::from_ref_time(40_232_935).saturating_mul(p.into()))
+			// Standard Error: 33_574
+			.saturating_add(Weight::from_ref_time(1_185_407).saturating_mul(v.into()))
+			.saturating_add(RocksDbWeight::get().reads(6_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 }

bridges/modules/messages/src/weights.rs

@@ -14,13 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights for `pallet_bridge_messages`
+//! Autogenerated weights for pallet_bridge_messages
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-12, STEPS: 50, REPEAT: 20
+//! DATE: 2023-02-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! LOW RANGE: [], HIGH RANGE: []
+//! WORST CASE MAP SIZE: `1000000`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled
+//! HOSTNAME: `covid`, CPU: `11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz`
-//! CHAIN: Some("dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/release/millau-bridge-node
@@ -48,7 +48,7 @@ use frame_support::{
 };
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for `pallet_bridge_messages`.
+/// Weight functions needed for pallet_bridge_messages.
 pub trait WeightInfo {
 	fn receive_single_message_proof() -> Weight;
 	fn receive_two_messages_proof() -> Weight;
@@ -65,88 +65,436 @@ pub trait WeightInfo {
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
+	///
+	/// Storage: Balances TotalIssuance (r:1 w:1)
+	///
+	/// Proof: Balances TotalIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode:
+	/// MaxEncodedLen)
 	fn receive_single_message_proof() -> Weight {
-		Weight::from_ref_time(95_401_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `693`
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		//  Estimated: `55198`
+		// Minimum execution time: 47_968 nanoseconds.
+		Weight::from_parts(48_937_000, 55198)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
+	///
+	/// Storage: Balances TotalIssuance (r:1 w:1)
+	///
+	/// Proof: Balances TotalIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode:
+	/// MaxEncodedLen)
 	fn receive_two_messages_proof() -> Weight {
-		Weight::from_ref_time(127_794_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `693`
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		//  Estimated: `55198`
+		// Minimum execution time: 63_831 nanoseconds.
+		Weight::from_parts(85_093_000, 55198)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
+	///
+	/// Storage: Balances TotalIssuance (r:1 w:1)
+	///
+	/// Proof: Balances TotalIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode:
+	/// MaxEncodedLen)
 	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
-		Weight::from_ref_time(105_698_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `693`
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		//  Estimated: `55198`
+		// Minimum execution time: 53_775 nanoseconds.
+		Weight::from_parts(55_113_000, 55198)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_1_kb() -> Weight {
-		Weight::from_ref_time(92_963_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
+		//  Measured:  `618`
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+		//  Estimated: `54695`
+		// Minimum execution time: 54_314 nanoseconds.
+		Weight::from_parts(55_804_000, 54695)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_16_kb() -> Weight {
-		Weight::from_ref_time(158_449_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
+		//  Measured:  `618`
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
+		//  Estimated: `54695`
+		// Minimum execution time: 103_050 nanoseconds.
+		Weight::from_parts(106_715_000, 54695)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: None, max_size: Some(44), added:
+	/// 2519, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
 	fn receive_delivery_proof_for_single_message() -> Weight {
-		Weight::from_ref_time(72_085_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `579`
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		//  Estimated: `8094`
+		// Minimum execution time: 42_111 nanoseconds.
+		Weight::from_parts(43_168_000, 8094)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: None, max_size: Some(44), added:
+	/// 2519, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
 	fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight {
-		Weight::from_ref_time(70_889_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `596`
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		//  Estimated: `8094`
+		// Minimum execution time: 40_094 nanoseconds.
+		Weight::from_parts(41_140_000, 8094)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: None, max_size: Some(44), added:
+	/// 2519, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRelayers RelayerRewards (r:2 w:2)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
 	fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight {
-		Weight::from_ref_time(78_211_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(5 as u64))
+		//  Measured:  `596`
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
+		//  Estimated: `10629`
+		// Minimum execution time: 42_498 nanoseconds.
+		Weight::from_parts(43_494_000, 10629)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
+	///
+	/// Storage: Balances TotalIssuance (r:1 w:1)
+	///
+	/// Proof: Balances TotalIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode:
+	/// MaxEncodedLen)
 	fn receive_single_message_proof() -> Weight {
-		Weight::from_ref_time(95_401_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `693`
-			.saturating_add(RocksDbWeight::get().writes(2 as u64))
+		//  Estimated: `55198`
+		// Minimum execution time: 47_968 nanoseconds.
+		Weight::from_parts(48_937_000, 55198)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
+	///
+	/// Storage: Balances TotalIssuance (r:1 w:1)
+	///
+	/// Proof: Balances TotalIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode:
+	/// MaxEncodedLen)
 	fn receive_two_messages_proof() -> Weight {
-		Weight::from_ref_time(127_794_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `693`
-			.saturating_add(RocksDbWeight::get().writes(2 as u64))
+		//  Estimated: `55198`
+		// Minimum execution time: 63_831 nanoseconds.
+		Weight::from_parts(85_093_000, 55198)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
+	///
+	/// Storage: Balances TotalIssuance (r:1 w:1)
+	///
+	/// Proof: Balances TotalIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode:
+	/// MaxEncodedLen)
 	fn receive_single_message_proof_with_outbound_lane_state() -> Weight {
-		Weight::from_ref_time(105_698_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `693`
-			.saturating_add(RocksDbWeight::get().writes(2 as u64))
+		//  Estimated: `55198`
+		// Minimum execution time: 53_775 nanoseconds.
+		Weight::from_parts(55_113_000, 55198)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_1_kb() -> Weight {
-		Weight::from_ref_time(92_963_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(3 as u64))
+		//  Measured:  `618`
-			.saturating_add(RocksDbWeight::get().writes(1 as u64))
+		//  Estimated: `54695`
+		// Minimum execution time: 54_314 nanoseconds.
+		Weight::from_parts(55_804_000, 54695)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages InboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages InboundLanes (max_values: None, max_size: Some(49180), added:
+	/// 51655, mode: MaxEncodedLen)
 	fn receive_single_message_proof_16_kb() -> Weight {
-		Weight::from_ref_time(158_449_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(3 as u64))
+		//  Measured:  `618`
-			.saturating_add(RocksDbWeight::get().writes(1 as u64))
+		//  Estimated: `54695`
+		// Minimum execution time: 103_050 nanoseconds.
+		Weight::from_parts(106_715_000, 54695)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: None, max_size: Some(44), added:
+	/// 2519, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
 	fn receive_delivery_proof_for_single_message() -> Weight {
-		Weight::from_ref_time(72_085_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `579`
-			.saturating_add(RocksDbWeight::get().writes(2 as u64))
+		//  Estimated: `8094`
+		// Minimum execution time: 42_111 nanoseconds.
+		Weight::from_parts(43_168_000, 8094)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: None, max_size: Some(44), added:
+	/// 2519, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
 	fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight {
-		Weight::from_ref_time(70_889_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `596`
-			.saturating_add(RocksDbWeight::get().writes(2 as u64))
+		//  Estimated: `8094`
+		// Minimum execution time: 40_094 nanoseconds.
+		Weight::from_parts(41_140_000, 8094)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: BridgeRialtoMessages PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2),
+	/// added: 497, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoMessages OutboundLanes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoMessages OutboundLanes (max_values: None, max_size: Some(44), added:
+	/// 2519, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRelayers RelayerRewards (r:2 w:2)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
 	fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight {
-		Weight::from_ref_time(78_211_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(5 as u64))
+		//  Measured:  `596`
-			.saturating_add(RocksDbWeight::get().writes(3 as u64))
+		//  Estimated: `10629`
+		// Minimum execution time: 42_498 nanoseconds.
+		Weight::from_parts(43_494_000, 10629)
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 }

bridges/modules/parachains/src/weights.rs

@@ -14,13 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights for `pallet_bridge_parachains`
+//! Autogenerated weights for pallet_bridge_parachains
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-12-21, STEPS: 50, REPEAT: 20
+//! DATE: 2023-02-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! LOW RANGE: [], HIGH RANGE: []
+//! WORST CASE MAP SIZE: `1000000`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled
+//! HOSTNAME: `covid`, CPU: `11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz`
-//! CHAIN: Some("dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/release/millau-bridge-node
@@ -48,7 +48,7 @@ use frame_support::{
 };
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for `pallet_bridge_parachains`.
+/// Weight functions needed for pallet_bridge_parachains.
 pub trait WeightInfo {
 	fn submit_parachain_heads_with_n_parachains(p: u32) -> Weight;
 	fn submit_parachain_heads_with_1kb_proof() -> Weight;
@@ -60,38 +60,214 @@ pub trait WeightInfo {
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
-	fn submit_parachain_heads_with_n_parachains(_p: u32) -> Weight {
+	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
-		Weight::from_ref_time(52_445_014 as u64)
+	///
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ParasInfo (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: None, max_size: Some(64),
+	/// added: 2539, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: None, max_size: Some(196),
+	/// added: 2671, mode: MaxEncodedLen)
+	///
+	/// The range of component `p` is `[1, 2]`.
+	fn submit_parachain_heads_with_n_parachains(p: u32) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `366`
+		//  Estimated: `8113`
+		// Minimum execution time: 35_348 nanoseconds.
+		Weight::from_parts(36_906_961, 8113)
+			// Standard Error: 136_143
+			.saturating_add(Weight::from_ref_time(148_169).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
+	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ParasInfo (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: None, max_size: Some(64),
+	/// added: 2539, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: None, max_size: Some(196),
+	/// added: 2671, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
-		Weight::from_ref_time(55_253_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `366`
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
+		//  Estimated: `8113`
+		// Minimum execution time: 43_295 nanoseconds.
+		Weight::from_parts(48_018_000, 8113)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
+	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ParasInfo (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: None, max_size: Some(64),
+	/// added: 2539, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: None, max_size: Some(196),
+	/// added: 2671, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
-		Weight::from_ref_time(98_772_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
+		//  Measured:  `366`
-			.saturating_add(T::DbWeight::get().writes(3 as u64))
+		//  Estimated: `8113`
+		// Minimum execution time: 86_112 nanoseconds.
+		Weight::from_parts(88_901_000, 8113)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	fn submit_parachain_heads_with_n_parachains(_p: u32) -> Weight {
+	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
-		Weight::from_ref_time(52_445_014 as u64)
+	///
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
-			.saturating_add(RocksDbWeight::get().writes(3 as u64))
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ParasInfo (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: None, max_size: Some(64),
+	/// added: 2539, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: None, max_size: Some(196),
+	/// added: 2671, mode: MaxEncodedLen)
+	///
+	/// The range of component `p` is `[1, 2]`.
+	fn submit_parachain_heads_with_n_parachains(p: u32) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `366`
+		//  Estimated: `8113`
+		// Minimum execution time: 35_348 nanoseconds.
+		Weight::from_parts(36_906_961, 8113)
+			// Standard Error: 136_143
+			.saturating_add(Weight::from_ref_time(148_169).saturating_mul(p.into()))
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
+	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ParasInfo (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: None, max_size: Some(64),
+	/// added: 2539, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: None, max_size: Some(196),
+	/// added: 2671, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
-		Weight::from_ref_time(55_253_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `366`
-			.saturating_add(RocksDbWeight::get().writes(3 as u64))
+		//  Estimated: `8113`
+		// Minimum execution time: 43_295 nanoseconds.
+		Weight::from_parts(48_018_000, 8113)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
+	/// Storage: BridgeRialtoParachains PalletOperatingMode (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoParachains PalletOperatingMode (max_values: Some(1), max_size: Some(1),
+	/// added: 496, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoGrandpa ImportedHeaders (r:1 w:0)
+	///
+	/// Proof: BridgeRialtoGrandpa ImportedHeaders (max_values: None, max_size: Some(68), added:
+	/// 2543, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ParasInfo (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ParasInfo (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHashes (r:1 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHashes (max_values: None, max_size: Some(64),
+	/// added: 2539, mode: MaxEncodedLen)
+	///
+	/// Storage: BridgeRialtoParachains ImportedParaHeads (r:0 w:1)
+	///
+	/// Proof: BridgeRialtoParachains ImportedParaHeads (max_values: None, max_size: Some(196),
+	/// added: 2671, mode: MaxEncodedLen)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
-		Weight::from_ref_time(98_772_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
+		//  Measured:  `366`
-			.saturating_add(RocksDbWeight::get().writes(3 as u64))
+		//  Estimated: `8113`
+		// Minimum execution time: 86_112 nanoseconds.
+		Weight::from_parts(88_901_000, 8113)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 }

bridges/modules/relayers/src/weights.rs

@@ -14,13 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Autogenerated weights for `pallet_bridge_relayers`
+//! Autogenerated weights for pallet_bridge_relayers
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-12-21, STEPS: 50, REPEAT: 20
+//! DATE: 2023-02-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! LOW RANGE: [], HIGH RANGE: []
+//! WORST CASE MAP SIZE: `1000000`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled
+//! HOSTNAME: `covid`, CPU: `11th Gen Intel(R) Core(TM) i7-11800H @ 2.30GHz`
-//! CHAIN: Some("dev"), DB CACHE: 1024
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/release/millau-bridge-node
@@ -48,7 +48,7 @@ use frame_support::{
 };
 use sp_std::marker::PhantomData;
 
-/// Weight functions needed for `pallet_bridge_relayers`.
+/// Weight functions needed for pallet_bridge_relayers.
 pub trait WeightInfo {
 	fn claim_rewards() -> Weight;
 }
@@ -58,18 +58,44 @@ pub trait WeightInfo {
 /// Those weights are test only and must never be used in production.
 pub struct BridgeWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
+	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: System Account (r:1 w:1)
+	///
+	/// Proof: System Account (max_values: None, max_size: Some(96), added: 2571, mode:
+	/// MaxEncodedLen)
 	fn claim_rewards() -> Weight {
-		Weight::from_ref_time(64_832_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
+		//  Measured:  `534`
-			.saturating_add(T::DbWeight::get().writes(2 as u64))
+		//  Estimated: `5106`
+		// Minimum execution time: 48_239 nanoseconds.
+		Weight::from_parts(50_579_000, 5106)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
+	/// Storage: BridgeRelayers RelayerRewards (r:1 w:1)
+	///
+	/// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(60), added: 2535,
+	/// mode: MaxEncodedLen)
+	///
+	/// Storage: System Account (r:1 w:1)
+	///
+	/// Proof: System Account (max_values: None, max_size: Some(96), added: 2571, mode:
+	/// MaxEncodedLen)
 	fn claim_rewards() -> Weight {
-		Weight::from_ref_time(64_832_000 as u64)
+		// Proof Size summary in bytes:
-			.saturating_add(RocksDbWeight::get().reads(2 as u64))
+		//  Measured:  `534`
-			.saturating_add(RocksDbWeight::get().writes(2 as u64))
+		//  Estimated: `5106`
+		// Minimum execution time: 48_239 nanoseconds.
+		Weight::from_parts(50_579_000, 5106)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 }

bridges/primitives/beefy/Cargo.toml

@@ -17,7 +17,7 @@ bp-runtime = { path = "../runtime", default-features = false }
 
 # Substrate Dependencies
 
-beefy-merkle-tree = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+binary-merkle-tree = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-beefy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

bridges/primitives/beefy/src/lib.rs

@@ -19,7 +19,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(missing_docs)]
 
-pub use beefy_merkle_tree::{merkle_root, Keccak256 as BeefyKeccak256};
+pub use binary_merkle_tree::merkle_root;
 pub use pallet_beefy_mmr::BeefyEcdsaToEthereum;
 pub use pallet_mmr::{
 	primitives::{DataOrHash as MmrDataOrHash, Proof as MmrProof},

bridges/primitives/chain-millau/src/lib.rs

@@ -59,10 +59,10 @@ pub const TX_EXTRA_BYTES: u32 = 103;
 /// Maximum weight of single Millau block.
 ///
 /// This represents 0.5 seconds of compute assuming a target block time of six seconds.
-// TODO: https://github.com/paritytech/parity-bridges-common/issues/1543 - remove `set_proof_size`
+///
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND)
+/// Max PoV size is set to max value, since it isn't important for relay/standalone chains.
-	.set_proof_size(1_000)
+pub const MAXIMUM_BLOCK_WEIGHT: Weight =
-	.saturating_div(2);
+	Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), u64::MAX);
 
 /// Represents the portion of a block that will be used by Normal extrinsics.
 pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);

bridges/primitives/chain-rialto-parachain/src/lib.rs

@@ -54,10 +54,10 @@ pub const TX_EXTRA_BYTES: u32 = 104;
 /// Maximal weight of single RialtoParachain block.
 ///
 /// This represents two seconds of compute assuming a target block time of six seconds.
-// TODO: https://github.com/paritytech/parity-bridges-common/issues/1543 - remove `set_proof_size`
+///
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND)
+/// Max PoV size is set to `5Mb` as all Cumulus-based parachains do.
-	.set_proof_size(1_000)
+pub const MAXIMUM_BLOCK_WEIGHT: Weight =
-	.saturating_mul(2);
+	Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), 5 * 1024 * 1024);
 
 /// Represents the portion of a block that will be used by Normal extrinsics.
 pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);

bridges/primitives/chain-rialto/src/lib.rs

@@ -48,10 +48,10 @@ pub const TX_EXTRA_BYTES: u32 = 104;
 /// Maximal weight of single Rialto block.
 ///
 /// This represents two seconds of compute assuming a target block time of six seconds.
-// TODO: https://github.com/paritytech/parity-bridges-common/issues/1543 - remove `set_proof_size`
+///
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND)
+/// Max PoV size is set to max value, since it isn't important for relay/standalone chains.
-	.set_proof_size(1_000)
+pub const MAXIMUM_BLOCK_WEIGHT: Weight =
-	.saturating_mul(2);
+	Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX);
 
 /// Represents the portion of a block that will be used by Normal extrinsics.
 pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);

bridges/primitives/polkadot-core/src/lib.rs

@@ -71,10 +71,8 @@ const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// All Polkadot-like chains allow 2 seconds of compute with a 6-second average block time.
 ///
 /// This is a copy-paste from the Polkadot repo's `polkadot-runtime-common` crate.
-// TODO: https://github.com/paritytech/parity-bridges-common/issues/1543 - remove `set_proof_size`
+pub const MAXIMUM_BLOCK_WEIGHT: Weight =
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND)
+	Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX);
-	.set_proof_size(1_000)
-	.saturating_mul(2);
 
 /// All Polkadot-like chains assume that an on-initialize consumes 1 percent of the weight on
 /// average, hence a single extrinsic will not be allowed to consume more than

bridges/relays/lib-substrate-relay/src/messages_lane.rs

@@ -501,8 +501,12 @@ mod tests {
 			//
 			// Any significant change in this values should attract additional attention.
 			//
-			// TODO: https://github.com/paritytech/parity-bridges-common/issues/1543 - remove `set_proof_size`
+			// TODO: https://github.com/paritytech/parity-bridges-common/issues/1543 - the `proof_size`
-			(1024, Weight::from_ref_time(216_600_684_000).set_proof_size(217)),
+			// component is too large here!
+			(
+				1024,
+				Weight::from_ref_time(216_600_106_667).set_proof_size(7_993_589_098_607_472_367)
+			),
 		);
 	}
 }