ConsensusId configurable in pallet config (#311)

* ConsensusId configurable in pallet config

* fix compilation

Author: Szegoo

Cargo.lock

@@ -37,6 +37,7 @@ polkadot-sdk = { workspace = true, features = [
     "pallet-balances",
 ], default-features = true }
 ismp = { workspace = true, default-features = false }
+ismp-parachain = { workspace = true, default-features = false }
 ismp-testsuite = { workspace = true }
 
 [features]
@@ -50,6 +51,7 @@ std = [
 	"scale-info/std",
 	"pallet-regions/std",
 	"ismp/std",
+	"ismp-parachain/std",
 	"polkadot-sdk/std",
 ]
 try-runtime = [ "polkadot-sdk/try-runtime" ]

pallets/market/Cargo.toml

@@ -22,13 +22,14 @@ use ismp::{
 	host::StateMachine,
 	router::PostResponse,
 };
+use ismp_parachain::PASEO_CONSENSUS_ID;
 use ismp_testsuite::mocks::Host;
 use pallet_regions::primitives::StateMachineHeightProvider;
 use polkadot_sdk::*;
 use sp_core::{ConstU64, H256};
 use sp_runtime::{
 	traits::{BlakeTwo256, BlockNumberProvider, IdentityLookup},
-	BuildStorage,
+	BuildStorage, ConsensusEngineId,
 };
 use std::sync::Arc;
 
@@ -125,6 +126,7 @@ impl<T: crate::Config> IsmpDispatcher for MockDispatcher<T> {
 parameter_types! {
 	pub const CoretimeChain: StateMachine = StateMachine::Kusama(1005); // coretime-kusama
 	pub const RegionsUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
+	pub const ConsensusId: ConsensusEngineId = PASEO_CONSENSUS_ID;
 }
 
 impl pallet_regions::Config for Test {
@@ -137,6 +139,7 @@ impl pallet_regions::Config for Test {
 	type RCBlockNumberProvider = RelayBlockNumberProvider;
 	type TimeslicePeriod = ConstU64<80>;
 	type UnsignedPriority = RegionsUnsignedPriority;
+	type ConsensusId = ConsensusId;
 	type WeightInfo = ();
 }
 

pallets/market/src/mock.rs

@@ -46,6 +46,7 @@ pallet-regions = { workspace = true, default-features = true }
 pallet-orders = { workspace = true, default-features = true }
 
 ismp = { workspace = true, default-features = true }
+ismp-parachain = { workspace = true, default-features = false }
 ismp-testsuite = { workspace = true, default-features = true }
 
 [features]
@@ -64,6 +65,7 @@ std = [
     "order-primitives/std",
     "region-primitives/std",
 	"ismp/std",
+	"ismp-parachain/std",
 	"polkadot-sdk/std",
 ]
 try-runtime = ["polkadot-sdk/try-runtime"]

pallets/processor/Cargo.toml

@@ -31,6 +31,7 @@ use ismp::{
 	host::StateMachine,
 	router::PostResponse,
 };
+use ismp_parachain::PASEO_CONSENSUS_ID;
 use ismp_testsuite::mocks::Host;
 use order_primitives::{OrderId, ParaId};
 use pallet_broker::RegionId;
@@ -41,7 +42,7 @@ use smallvec::smallvec;
 use sp_core::{ConstU64, H256};
 use sp_runtime::{
 	traits::{BlakeTwo256, BlockNumberProvider, Convert, IdentityLookup},
-	BuildStorage, DispatchResult, Perbill,
+	BuildStorage, ConsensusEngineId, DispatchResult, Perbill,
 };
 use staging_xcm as xcm;
 use std::sync::Arc;
@@ -165,6 +166,7 @@ parameter_types! {
 
 parameter_types! {
 	pub static RelayBlockNumber: u64 = 0;
+	pub const ConsensusId: ConsensusEngineId = PASEO_CONSENSUS_ID;
 }
 
 pub struct RelayBlockNumberProvider;
@@ -185,6 +187,7 @@ impl pallet_regions::Config for Test {
 	type UnsignedPriority = RegionsUnsignedPriority;
 	type RCBlockNumberProvider = RelayBlockNumberProvider;
 	type TimeslicePeriod = ConstU64<80>;
+	type ConsensusId = ConsensusId;
 	type WeightInfo = ();
 }
 

pallets/processor/src/mock.rs

@@ -26,7 +26,6 @@ use ismp::{
 	module::IsmpModule,
 	router::{PostRequest, Request, Response, StorageValue, Timeout},
 };
-use ismp_parachain::PASEO_CONSENSUS_ID;
 pub use pallet::*;
 use pallet_broker::{RegionId, Timeslice};
 use pallet_ismp::{weights::IsmpModuleWeight, ModuleId};
@@ -37,7 +36,7 @@ use scale_info::prelude::{format, vec, vec::Vec};
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlockNumberProvider, Zero},
-	SaturatedConversion,
+	ConsensusEngineId, SaturatedConversion,
 };
 
 #[cfg(test)]
@@ -137,6 +136,9 @@ pub mod pallet {
 		#[pallet::constant]
 		type UnsignedPriority: Get<TransactionPriority>;
 
+		#[pallet::constant]
+		type ConsensusId: Get<ConsensusEngineId>;
+
 		/// Weight Info
 		type WeightInfo: WeightInfo;
 	}
@@ -345,7 +347,7 @@ pub mod pallet {
 			let coretime_chain_height =
 				T::StateMachineHeightProvider::latest_state_machine_height(StateMachineId {
 					state_id: T::CoretimeChain::get(),
-					consensus_state_id: PASEO_CONSENSUS_ID, // Is this used on Kusama?
+					consensus_state_id: T::ConsensusId::get(),
 				})
 				.ok_or(Error::<T>::LatestHeightInaccessible)?;
 

pallets/regions/src/lib.rs

@@ -13,10 +13,11 @@
 // You should have received a copy of the GNU General Public License
 // along with RegionX.  If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{ismp_mock::MockDispatcher, StateMachineHeightProvider};
+use crate::{ismp_mock::MockDispatcher, ConsensusEngineId, StateMachineHeightProvider};
 use frame_support::{derive_impl, pallet_prelude::*, parameter_types, traits::Everything};
 use frame_system::{config_preludes::TestDefaultConfig, DefaultConfig};
 use ismp::{consensus::StateMachineId, host::StateMachine};
+use ismp_parachain::PASEO_CONSENSUS_ID;
 use polkadot_sdk::*;
 use sp_core::{ConstU64, H256};
 use sp_runtime::{
@@ -92,6 +93,7 @@ impl StateMachineHeightProvider for MockStateMachineHeightProvider {
 
 parameter_types! {
 	pub static RelayBlockNumber: u64 = 0;
+	pub const ConsensusId: ConsensusEngineId = PASEO_CONSENSUS_ID;
 }
 
 pub struct RelayBlockNumberProvider;
@@ -112,6 +114,7 @@ impl crate::Config for Test {
 	type UnsignedPriority = RegionsUnsignedPriority;
 	type RCBlockNumberProvider = RelayBlockNumberProvider;
 	type TimeslicePeriod = ConstU64<80>;
+	type ConsensusId = ConsensusId;
 	type WeightInfo = ();
 }
 

pallets/regions/src/mock.rs

@@ -93,11 +93,12 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot,
 };
+use ismp_parachain::PASEO_CONSENSUS_ID;
 use pallet_ismp::offchain::{Leaf, Proof, ProofKeys};
 use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
 use sp_core::H256;
 use sp_mmr_primitives::INDEXING_PREFIX;
-pub use sp_runtime::{MultiAddress, Perbill, Permill};
+pub use sp_runtime::{ConsensusEngineId, MultiAddress, Perbill, Permill};
 use xcm_config::XcmOriginToTransactDispatchOrigin;
 
 #[cfg(any(feature = "std", test))]
@@ -541,6 +542,7 @@ impl StateMachineHeightProviderT for StateMachineHeightProvider {
 parameter_types! {
 	pub const CoretimeChain: StateMachine = StateMachine::Kusama(CORETIME_CHAIN_PARA_ID); // coretime-kusama
 	pub const RegionsUnsignedPriority: TransactionPriority = TransactionPriority::MAX;
+	pub const ConsensusId: ConsensusEngineId = PASEO_CONSENSUS_ID;
 }
 
 impl pallet_regions::Config for Runtime {
@@ -553,6 +555,7 @@ impl pallet_regions::Config for Runtime {
 	type RCBlockNumberProvider = RelaychainDataProvider<Self>;
 	type TimeslicePeriod = ConstU32<80>;
 	type UnsignedPriority = RegionsUnsignedPriority;
+	type ConsensusId = ConsensusId;
 	type WeightInfo = weights::pallet_regions::WeightInfo<Runtime>;
 }