More clean up

Author: bkontur

runtimes/bulletin-polkadot/src/lib.rs

@@ -642,7 +642,7 @@ mod benches {
 		[pallet_relayer_set, RelayerSet]
 
 		[pallet_bridge_grandpa, BridgePolkadotGrandpa]
-		// [pallet_bridge_parachains, BridgeParachainsBench::<Runtime, bridge_config::WithPolkadotBridgeParachainsInstance>]
+		[pallet_bridge_parachains, PolkadotParachains]
 		// [pallet_bridge_messages, BridgeMessagesBench::<Runtime, bridge_config::WithPeoplePolkadotMessagesInstance>]
 	);
 
@@ -651,11 +651,43 @@ mod benches {
 
 	pub use frame_support::traits::{StorageInfoTrait, WhitelistedStorageKeys};
 	pub use pallet_bridge_messages::benchmarking::Pallet as BridgeMessagesBench;
-	pub use pallet_bridge_parachains::benchmarking::Pallet as BridgeParachainsBench;
 	pub use sp_storage::TrackedStorageKey;
 
 	impl frame_system_benchmarking::Config for Runtime {}
 	impl frame_benchmarking::baseline::Config for Runtime {}
+
+	use bridge_runtime_common::parachains_benchmarking::prepare_parachain_heads_proof;
+	use pallet_bridge_parachains::benchmarking::Config as BridgeParachainsConfig;
+
+	impl BridgeParachainsConfig<bridge_config::WithPolkadotBridgeParachainsInstance> for Runtime {
+		fn parachains() -> Vec<bp_polkadot_core::parachains::ParaId> {
+			use bp_runtime::Parachain;
+			vec![bp_polkadot_core::parachains::ParaId(
+				bridge_config::bp_people_polkadot::PeoplePolkadot::PARACHAIN_ID,
+			)]
+		}
+
+		fn prepare_parachain_heads_proof(
+			parachains: &[bp_polkadot_core::parachains::ParaId],
+			parachain_head_size: u32,
+			proof_params: bp_runtime::UnverifiedStorageProofParams,
+		) -> (
+			bp_parachains::RelayBlockNumber,
+			bp_parachains::RelayBlockHash,
+			bp_polkadot_core::parachains::ParaHeadsProof,
+			Vec<(bp_polkadot_core::parachains::ParaId, bp_polkadot_core::parachains::ParaHash)>,
+		) {
+			prepare_parachain_heads_proof::<
+				Runtime,
+				bridge_config::WithPolkadotBridgeParachainsInstance,
+			>(parachains, parachain_head_size, proof_params)
+		}
+	}
+
+	pub type PolkadotParachains = pallet_bridge_parachains::benchmarking::Pallet<
+		Runtime,
+		bridge_config::WithPolkadotBridgeParachainsInstance,
+	>;
 }
 
 #[cfg(feature = "runtime-benchmarks")]

runtimes/bulletin-polkadot/src/polkadot_bridge_config.rs

@@ -157,6 +157,11 @@ parameter_types! {
 		1,
 		[GlobalConsensus(PolkadotGlobalConsensusNetwork::get())]
 	);
+	/// Location of the PeoplePolkadot parachain, relative to this runtime.
+	pub PeoplePolkadotLocation: Location = Location::new(1, [
+		GlobalConsensus(BridgedNetwork::get()),
+		Parachain(bp_people_polkadot::PEOPLE_POLKADOT_PARACHAIN_ID),
+	]);
 
 	/// A number of Polkadot mandatory headers that are accepted for free at every
 	/// **this chain** block.
@@ -213,7 +218,7 @@ impl pallet_bridge_grandpa::Config<WithPolkadotBridgeGrandpaInstance> for Runtim
 pub type WithPolkadotBridgeParachainsInstance = ();
 impl pallet_bridge_parachains::Config<WithPolkadotBridgeParachainsInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = crate::weights::bridge_polkadot_parachains::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::pallet_bridge_parachains::WeightInfo<Runtime>;
 
 	type BridgesGrandpaPalletInstance = WithPolkadotBridgeGrandpaInstance;
 	type ParasPalletName = AtPolkadotParasPalletName;
@@ -430,7 +435,7 @@ where
 pub type ToBridgeHaulBlobExporter = HaulBlobExporter<
 	XcmBlobHauler<Runtime, WithPeoplePolkadotMessagesInstance>,
 	PolkadotGlobalConsensusNetworkLocation,
-	AlwaysV4,
+	AlwaysV5,
 	(),
 >;
 
@@ -494,32 +499,6 @@ pub type ToBridgeHaulBlobExporter = HaulBlobExporter<
 // 			true
 // 		}
 // 	}
-//
-// 	use bridge_runtime_common::parachains_benchmarking::prepare_parachain_heads_proof;
-// 	use pallet_bridge_parachains::benchmarking::Config as BridgeParachainsConfig;
-// 	impl BridgeParachainsConfig<WithPolkadotBridgeParachainsInstance> for Runtime {
-// 		fn parachains() -> Vec<bp_polkadot::parachains::ParaId> {
-// 			use bp_runtime::Parachain;
-// 			vec![bp_polkadot::parachains::ParaId(BridgeHubPolkadotOrPolkadot::PARACHAIN_ID)]
-// 		}
-//
-// 		fn prepare_parachain_heads_proof(
-// 			parachains: &[bp_polkadot::parachains::ParaId],
-// 			parachain_head_size: u32,
-// 			proof_size: bp_runtime::StorageProofSize,
-// 		) -> (
-// 			pallet_bridge_parachains::RelayBlockNumber,
-// 			pallet_bridge_parachains::RelayBlockHash,
-// 			bp_polkadot::parachains::ParaHeadsProof,
-// 			Vec<(bp_polkadot::parachains::ParaId, bp_polkadot::parachains::ParaHash)>,
-// 		) {
-// 			prepare_parachain_heads_proof::<Runtime, WithPolkadotBridgeParachainsInstance>(
-// 				parachains,
-// 				parachain_head_size,
-// 				proof_size,
-// 			)
-// 		}
-// 	}
 // }
 //
 // #[cfg(test)]

runtimes/bulletin-polkadot/src/weights/mod.rs

@@ -7,9 +7,9 @@ use ::pallet_bridge_relayers::WeightInfo as _;
 use frame_support::weights::Weight;
 
 pub mod bridge_polkadot_messages;
-pub mod bridge_polkadot_parachains;
 pub mod bridge_polkadot_relayers;
 pub mod pallet_bridge_grandpa;
+pub mod pallet_bridge_parachains;
 pub mod pallet_relayer_set;
 pub mod pallet_timestamp;
 pub mod pallet_transaction_storage;
@@ -25,7 +25,7 @@ impl GrandpaWeightInfoExt for pallet_bridge_grandpa::WeightInfo<crate::Runtime>
 	}
 }
 
-impl ParachainsWeightInfoExt for bridge_polkadot_parachains::WeightInfo<crate::Runtime> {
+impl ParachainsWeightInfoExt for pallet_bridge_parachains::WeightInfo<crate::Runtime> {
 	fn expected_extra_storage_proof_size() -> u32 {
 		crate::bp_people_polkadot::EXTRA_STORAGE_PROOF_SIZE
 	}

…rc/weights/bridge_polkadot_parachains.rs …/src/weights/pallet_bridge_parachains.rsruntimes/bulletin-polkadot/src/weights/bridge_polkadot_parachains.rs renamed to runtimes/bulletin-polkadot/src/weights/pallet_bridge_parachains.rs runtimes/bulletin-polkadot/src/weights/bridge_polkadot_parachains.rs renamed to runtimes/bulletin-polkadot/src/weights/pallet_bridge_parachains.rs

@@ -1,24 +1,41 @@
+// Copyright (C) Parity Technologies and the various Polkadot contributors, see Contributions.md
+// for a list of specific contributors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Autogenerated weights for `pallet_bridge_parachains`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-09-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2025-09-01, STEPS: `2`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `MusXroom`, CPU: `13th Gen Intel(R) Core(TM) i7-13650HX`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! HOSTNAME: `toaster1`, CPU: `AMD Ryzen Threadripper 7980X 64-Cores`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: 1024
 
 // Executed Command:
-// target/release/polkadot-bulletin-chain
+// frame-omni-bencher
+// v1
 // benchmark
 // pallet
-// --chain=dev
-// --steps=50
-// --repeat=20
-// --pallet=pallet_bridge_parachains
 // --extrinsic=*
-// --wasm-execution=Compiled
+// --runtime=target/production/wbuild/bulletin-polkadot-runtime/bulletin_polkadot_runtime.wasm
+// --pallet=pallet_bridge_parachains
+// --header=/home/bkontur/cargo-remote-builds-bulletin/9907520327012243881/scripts/cmd/file_header.txt
+// --output=./runtimes/bulletin-polkadot/src/weights
+// --wasm-execution=compiled
+// --steps=2
+// --repeat=1
 // --heap-pages=4096
-// --output=./runtime/src/weights/bridge_polkadot_parachains.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -34,60 +51,60 @@ impl<T: frame_system::Config> pallet_bridge_parachains::WeightInfo for WeightInf
 	/// Storage: `BridgePolkadotParachains::PalletOperatingMode` (r:1 w:0)
 	/// Proof: `BridgePolkadotParachains::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotGrandpa::ImportedHeaders` (r:1 w:0)
-	/// Proof: `BridgePolkadotGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotGrandpa::ImportedHeaders` (`max_values`: Some(1200), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ParasInfo` (r:1 w:1)
 	/// Proof: `BridgePolkadotParachains::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ImportedParaHashes` (r:1 w:1)
-	/// Proof: `BridgePolkadotParachains::ImportedParaHashes` (`max_values`: Some(1024), `max_size`: Some(64), added: 1549, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotParachains::ImportedParaHashes` (`max_values`: Some(600), `max_size`: Some(64), added: 1549, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ImportedParaHeads` (r:0 w:1)
-	/// Proof: `BridgePolkadotParachains::ImportedParaHeads` (`max_values`: Some(1024), `max_size`: Some(196), added: 1681, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotParachains::ImportedParaHeads` (`max_values`: Some(600), `max_size`: Some(196), added: 1681, 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:  `195`
+		//  Measured:  `156`
 		//  Estimated: `2543`
-		// Minimum execution time: 27_407_000 picoseconds.
-		Weight::from_parts(29_060_391, 0)
+		// Minimum execution time: 26_050_000 picoseconds.
+		Weight::from_parts(26_511_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `BridgePolkadotParachains::PalletOperatingMode` (r:1 w:0)
 	/// Proof: `BridgePolkadotParachains::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotGrandpa::ImportedHeaders` (r:1 w:0)
-	/// Proof: `BridgePolkadotGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotGrandpa::ImportedHeaders` (`max_values`: Some(1200), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ParasInfo` (r:1 w:1)
 	/// Proof: `BridgePolkadotParachains::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ImportedParaHashes` (r:1 w:1)
-	/// Proof: `BridgePolkadotParachains::ImportedParaHashes` (`max_values`: Some(1024), `max_size`: Some(64), added: 1549, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotParachains::ImportedParaHashes` (`max_values`: Some(600), `max_size`: Some(64), added: 1549, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ImportedParaHeads` (r:0 w:1)
-	/// Proof: `BridgePolkadotParachains::ImportedParaHeads` (`max_values`: Some(1024), `max_size`: Some(196), added: 1681, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotParachains::ImportedParaHeads` (`max_values`: Some(600), `max_size`: Some(196), added: 1681, mode: `MaxEncodedLen`)
 	fn submit_parachain_heads_with_1kb_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `195`
+		//  Measured:  `156`
 		//  Estimated: `2543`
-		// Minimum execution time: 28_325_000 picoseconds.
-		Weight::from_parts(28_916_000, 0)
+		// Minimum execution time: 26_470_000 picoseconds.
+		Weight::from_parts(26_470_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `BridgePolkadotParachains::PalletOperatingMode` (r:1 w:0)
 	/// Proof: `BridgePolkadotParachains::PalletOperatingMode` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotGrandpa::ImportedHeaders` (r:1 w:0)
-	/// Proof: `BridgePolkadotGrandpa::ImportedHeaders` (`max_values`: Some(1024), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotGrandpa::ImportedHeaders` (`max_values`: Some(1200), `max_size`: Some(68), added: 1553, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ParasInfo` (r:1 w:1)
 	/// Proof: `BridgePolkadotParachains::ParasInfo` (`max_values`: Some(1), `max_size`: Some(60), added: 555, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ImportedParaHashes` (r:1 w:1)
-	/// Proof: `BridgePolkadotParachains::ImportedParaHashes` (`max_values`: Some(1024), `max_size`: Some(64), added: 1549, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotParachains::ImportedParaHashes` (`max_values`: Some(600), `max_size`: Some(64), added: 1549, mode: `MaxEncodedLen`)
 	/// Storage: `BridgePolkadotParachains::ImportedParaHeads` (r:0 w:1)
-	/// Proof: `BridgePolkadotParachains::ImportedParaHeads` (`max_values`: Some(1024), `max_size`: Some(196), added: 1681, mode: `MaxEncodedLen`)
+	/// Proof: `BridgePolkadotParachains::ImportedParaHeads` (`max_values`: Some(600), `max_size`: Some(196), added: 1681, mode: `MaxEncodedLen`)
 	fn submit_parachain_heads_with_16kb_proof() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `195`
+		//  Measured:  `156`
 		//  Estimated: `2543`
-		// Minimum execution time: 46_507_000 picoseconds.
-		Weight::from_parts(47_533_000, 0)
+		// Minimum execution time: 115_745_000 picoseconds.
+		Weight::from_parts(115_745_000, 0)
 			.saturating_add(Weight::from_parts(0, 2543))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))

runtimes/bulletin-polkadot/src/xcm_config.rs

@@ -17,7 +17,10 @@
 //! XCM configuration for Polkadot Bulletin chain.
 
 use crate::{
-	bridge_config::{BridgedNetwork, ToBridgeHaulBlobExporter},
+	bridge_config::{
+		bp_people_polkadot::PEOPLE_POLKADOT_PARACHAIN_ID, BridgedNetwork, PeoplePolkadotLocation,
+		ToBridgeHaulBlobExporter,
+	},
 	AllPalletsWithSystem, RuntimeCall, RuntimeOrigin,
 };
 
@@ -40,53 +43,38 @@ use xcm_executor::{
 	AssetsInHolding, XcmExecutor,
 };
 
-// TODO [bridge]: change to actual value here + everywhere where Kawabunga is mentioned
-/// Id of the Polkadot parachain that we are going to bridge with.
-const KAWABUNGA_PARACHAIN_ID: u32 = 1004;
-
 parameter_types! {
-	// TODO [bridge]: how we are supposed to set it? Named? ByGenesis - if so, when?
-	// After generating chain spec?
 	/// The Polkadot Bulletin Chain network ID.
 	pub const ThisNetwork: NetworkId = NetworkId::PolkadotBulletin;
 	/// Our location in the universe of consensus systems.
 	pub UniversalLocation: InteriorLocation = ThisNetwork::get().into();
 
-	/// TODO: (Kawabunga = People Chain) - rename somehow :)
-	/// Location of the Kawabunga parachain, relative to this runtime.
-	pub KawabungaLocation: Location = Location::new(1, [
-		GlobalConsensus(BridgedNetwork::get()),
-		Parachain(KAWABUNGA_PARACHAIN_ID),
-	]);
-
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.
 	pub const BaseXcmWeight: Weight = Weight::from_parts(1_000_000_000, 0);
 	/// Maximum number of instructions in a single XCM fragment. A sanity check against weight
 	/// calculations getting too crazy.
 	pub const MaxInstructions: u32 = 100;
 }
 
-pub struct OnlyKawabungaLocation;
-
-impl Contains<Location> for OnlyKawabungaLocation {
+pub struct OnlyPeoplePolkadotLocation;
+impl Contains<Location> for OnlyPeoplePolkadotLocation {
 	fn contains(l: &Location) -> bool {
 		matches!(l.unpack(), (1, [
 			GlobalConsensus(bridged_network),
-			Parachain(KAWABUNGA_PARACHAIN_ID),
+			Parachain(PEOPLE_POLKADOT_PARACHAIN_ID),
 		]) if bridged_network == &BridgedNetwork::get())
 	}
 }
 
 pub struct UniversalAliases;
-
 impl Contains<(Location, Junction)> for UniversalAliases {
 	fn contains(l: &(Location, Junction)) -> bool {
 		matches!(
 			l,
 			(
 				origin_location,
 				GlobalConsensus(bridged_network),
-			) if origin_location == &KawabungaLocation::get() && bridged_network == &BridgedNetwork::get())
+			) if origin_location == &PeoplePolkadotLocation::get() && bridged_network == &BridgedNetwork::get())
 	}
 }
 
@@ -107,7 +95,7 @@ impl ConvertOrigin<RuntimeOrigin> for KawabungaParachainAsRoot {
 		match (kind, origin.unpack()) {
 			(
 				OriginKind::Superuser,
-				(1, [GlobalConsensus(bridged_network), Parachain(KAWABUNGA_PARACHAIN_ID)]),
+				(1, [GlobalConsensus(bridged_network), Parachain(PEOPLE_POLKADOT_PARACHAIN_ID)]),
 			) if bridged_network == &BridgedNetwork::get() => Ok(RuntimeOrigin::root()),
 			_ => Err(origin),
 		}
@@ -178,7 +166,7 @@ pub type XcmRouter = LocalExporter<ToBridgeHaulBlobExporter, UniversalLocation>;
 pub type Barrier = TrailingSetTopicAsId<
 	WithComputedOrigin<
 		// We only allow unpaid execution from the Kawabunga parachain.
-		AllowUnpaidTransactsFrom<RuntimeCall, OnlyKawabungaLocation>,
+		AllowUnpaidTransactsFrom<RuntimeCall, OnlyPeoplePolkadotLocation>,
 		UniversalLocation,
 		ConstU32<2>,
 	>,
@@ -251,7 +239,7 @@ impl DispatchBlob for ImmediateXcmDispatcher {
 		log::trace!(
 			target: "runtime::xcm",
 			"Going to dispatch XCM message from {:?}: {:?}",
-			KawabungaLocation::get(),
+			PeoplePolkadotLocation::get(),
 			message,
 		);
 
@@ -263,7 +251,7 @@ impl DispatchBlob for ImmediateXcmDispatcher {
 		// execute the XCM program
 		let mut message_hash = message.using_encoded(blake2_256);
 		XcmExecutor::<XcmConfig>::prepare_and_execute(
-			KawabungaLocation::get(),
+			PeoplePolkadotLocation::get(),
 			message,
 			&mut message_hash,
 			weight_limit,
@@ -274,7 +262,7 @@ impl DispatchBlob for ImmediateXcmDispatcher {
 			log::trace!(
 				target: "runtime::xcm",
 				"XCM message from {:?} was dispatched with an error: {:?}",
-				KawabungaLocation::get(),
+				PeoplePolkadotLocation::get(),
 				e,
 			);