compiling

Author: Ad96el

Cargo.lock

@@ -253,6 +253,7 @@ ismp-parachain             = { git = "https://github.com/polytope-labs/hyperbrid
 ismp-parachain-runtime-api = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2409", default-features = false }
 pallet-hyperbridge         = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2409", default-features = false }
 pallet-ismp                = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2409", default-features = false }
+pallet-ismp-rpc            = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2409" }
 pallet-ismp-runtime-api    = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2409", default-features = false }
 pallet-token-gateway       = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2409", default-features = false }
 

Cargo.toml

@@ -92,6 +92,10 @@ xcm                 = { workspace = true, features = ["std"] }
 frame-benchmarking     = { workspace = true, features = ["std"] }
 frame-benchmarking-cli = { workspace = true }
 
+#ISMP
+pallet-ismp-rpc         = { workspace = true }
+pallet-ismp-runtime-api = { workspace = true }
+
 [features]
 default = []
 fast-gov = ["peregrine-runtime/fast-gov", "runtime-common/fast-gov"]

nodes/parachain/Cargo.toml

@@ -25,7 +25,8 @@
 
 use std::sync::Arc;
 
-use sc_client_api::AuxStore;
+use pallet_ismp_rpc::{IsmpApiServer, IsmpRpcHandler};
+use sc_client_api::{AuxStore, BlockBackend, ProofProvider};
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
@@ -37,41 +38,51 @@ use runtime_common::{opaque::Block, AccountId, Balance, Nonce};
 pub(crate) type RpcExtension = jsonrpsee::RpcModule<()>;
 
 /// Full client dependencies.
-pub(crate) struct FullDeps<C, P> {
+pub(crate) struct FullDeps<C, P, B> {
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
 	pub pool: Arc<P>,
+	/// Backend used by the node.
+	pub backend: Arc<B>,
 }
 
 /// Instantiate all RPC extensions.
-pub(crate) fn create_full<C, P>(deps: FullDeps<C, P>) -> Result<RpcExtension, Box<dyn std::error::Error + Send + Sync>>
+pub(crate) fn create_full<C, P, B>(
+	deps: FullDeps<C, P, B>,
+) -> Result<RpcExtension, Box<dyn std::error::Error + Send + Sync>>
 where
 	C: ProvideRuntimeApi<Block>
 		+ HeaderBackend<Block>
+		+ BlockBackend<Block>
+		+ ProofProvider<Block>
 		+ AuxStore
 		+ HeaderMetadata<Block, Error = BlockChainError>
 		+ Send
 		+ Sync
 		+ 'static,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>
 		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>
-		+ BlockBuilder<Block>,
+		+ BlockBuilder<Block>
+		+ pallet_ismp_runtime_api::IsmpRuntimeApi<Block, sp_core::H256>,
+
 	P: TransactionPool + 'static,
+	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
+	B::State: sc_client_api::StateBackend<sp_runtime::traits::HashingFor<Block>>,
 {
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 	use substrate_frame_rpc_system::{System, SystemApiServer};
 
 	let mut module = RpcExtension::new(());
-	let FullDeps { client, pool } = deps;
+	let FullDeps { client, pool, backend } = deps;
 
 	module.merge(System::new(Arc::clone(&client), pool).into_rpc())?;
-	module.merge(TransactionPayment::new(client).into_rpc())?;
+	module.merge(TransactionPayment::new(Arc::clone(&client)).into_rpc())?;
 	// Extend this RPC with a custom API by using the following syntax.
 	// `YourRpcStruct` should have a reference to a client, which is needed
 	// to call into the runtime.
 	//
-	// `module.merge(YourRpcStruct::new(ReferenceToClient).into_rpc())?;`
+	module.merge(IsmpRpcHandler::new(client, backend)?.into_rpc())?;
 
 	Ok(module)
 }

nodes/parachain/src/rpc.rs

@@ -210,7 +210,8 @@ where
 		+ pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>
 		+ substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>
 		+ sp_consensus_aura::AuraApi<Block, AuthorityId>
-		+ cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>,
+		+ cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>
+		+ pallet_ismp_runtime_api::IsmpRuntimeApi<Block, sp_core::H256>,
 	sc_client_api::StateBackendFor<TFullBackend<Block>, Block>: sp_state_machine::Backend<BlakeTwo256>,
 	RB: FnOnce(
 			Arc<TFullClient<Block, RuntimeApi, WasmExecutor<HostFunctions>>>,
@@ -270,11 +271,13 @@ where
 	let rpc_builder = {
 		let client = Arc::clone(&client);
 		let transaction_pool = Arc::clone(&transaction_pool);
+		let backend = Arc::clone(&backend);
 
 		Box::new(move |_| {
 			let deps = crate::rpc::FullDeps {
 				client: Arc::clone(&client),
 				pool: Arc::clone(&transaction_pool),
+				backend: Arc::clone(&backend),
 			};
 
 			crate::rpc::create_full(deps).map_err(Into::into)
@@ -430,7 +433,8 @@ where
 		+ pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>
 		+ sp_consensus_aura::AuraApi<Block, AuthorityId>
 		+ cumulus_primitives_core::CollectCollationInfo<Block>
-		+ cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>,
+		+ cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>
+		+ pallet_ismp_runtime_api::IsmpRuntimeApi<Block, sp_core::H256>,
 	sc_client_api::StateBackendFor<TFullBackend<Block>, Block>: sp_state_machine::Backend<BlakeTwo256>,
 {
 	start_node_impl::<API, _, _>(

nodes/parachain/src/service.rs

@@ -4,11 +4,12 @@ use ismp::{host::StateMachine, module::IsmpModule, router::IsmpRouter};
 use runtime_common::{AccountId, Balance};
 use sp_core::{ConstU8, Get};
 use sp_std::{boxed::Box, vec::Vec};
-use xcm::v4::prelude::*;
+use sp_weights::Weight;
+use xcm::v4::Location;
 
 use crate::{
 	governance::{RootOrCollectiveProportion, TechnicalCollective},
-	Balances, Fungibles, Ismp, IsmpParachain, Runtime, RuntimeEvent, Timestamp, Treasury,
+	Balances, Fungibles, Ismp, IsmpParachain, Runtime, RuntimeEvent, Timestamp, TokenGateway, Treasury,
 };
 
 parameter_types! {
@@ -23,29 +24,24 @@ pub struct Router;
 impl IsmpRouter for Router {
 	fn module_for_id(&self, id: Vec<u8>) -> Result<Box<dyn IsmpModule>, anyhow::Error> {
 		match id.as_slice() {
-			//		pallet_hyperbridge::PALLET_HYPERBRIDGE_ID =>
-			// Ok(Box::new(pallet_hyperbridge::Pallet::<Runtime>::default())),
-			// id if TokenGateway::is_token_gateway(&id) => {
-			// 	Ok(Box::new(pallet_token_gateway::Pallet::<Runtime>::default()))
-			// }
+			pallet_hyperbridge::PALLET_HYPERBRIDGE_ID => Ok(Box::new(pallet_hyperbridge::Pallet::<Runtime>::default())),
+			id if TokenGateway::is_token_gateway(&id) => {
+				Ok(Box::new(pallet_token_gateway::Pallet::<Runtime>::default()))
+			}
 			_ => Err(ismp::Error::ModuleNotFound(id))?,
 		}
 	}
 }
 
 impl pallet_ismp::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	// Modify the consensus client's permissions, for example, TechAdmin
 	type AdminOrigin = RootOrCollectiveProportion<TechnicalCollective, 1, 2>;
 	// The state machine identifier of the chain -- parachain id
 	type HostStateMachine = HostStateMachine;
 	type TimestampProvider = Timestamp;
 	type Balance = Balance;
 	type Currency = Balances;
-	// Co-processor
 	type Coprocessor = Coprocessor;
-	// A tuple of types implementing the ConsensusClient interface, which defines
-	// all consensus algorithms supported by this protocol deployment
 	type ConsensusClients = (ismp_parachain::ParachainConsensusClient<Runtime, IsmpParachain>,);
 	type Router = Router;
 
@@ -55,7 +51,6 @@ impl pallet_ismp::Config for Runtime {
 
 impl pallet_hyperbridge::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	// pallet-ismp implements the IsmpHost
 	type IsmpHost = Ismp;
 }
 
@@ -86,9 +81,7 @@ impl Get<AccountId> for AssetAdmin {
 }
 
 parameter_types! {
-	// The hyperbridge parachain on Polkadot
-	pub const NativeAssetId: AssetId = AssetId(Location::here());
-
+	pub const NativeAssetId: Location = Location::here();
 }
 
 impl pallet_token_gateway::Config for Runtime {

runtimes/peregrine/src/ismp.rs

@@ -4,6 +4,7 @@ use ::xcm::{
 	v4::{Asset, AssetId, Location},
 	VersionedAssetId, VersionedLocation, VersionedXcm,
 };
+use cumulus_pallet_parachain_system::RelayChainState;
 use cumulus_primitives_aura::Slot;
 use cumulus_primitives_core::CollationInfo;
 use frame_support::{
@@ -15,6 +16,11 @@ use frame_support::{
 	},
 	weights::Weight,
 };
+use ismp::{
+	consensus::{ConsensusClientId, StateMachineHeight, StateMachineId},
+	host::StateMachine,
+	router::{Request, Response},
+};
 use kilt_runtime_api_did::RawDidLinkedInfo;
 use kilt_support::traits::ItemFilter;
 use pallet_asset_switch::xcm::AccountId32ToAccountId32JunctionConverter;
@@ -49,7 +55,7 @@ use runtime_common::{
 	AccountId, AuthorityId, Balance, BlockNumber, DidIdentifier, Hash, Nonce,
 };
 use sp_api::impl_runtime_apis;
-use sp_core::OpaqueMetadata;
+use sp_core::{OpaqueMetadata, H256};
 use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_metadata_ir::RuntimeApiMetadataIR;
 use sp_runtime::{
@@ -63,8 +69,9 @@ use crate::{
 	kilt::{DipProofError, DipProofRequest, NativeAndForeignAssets},
 	parachain::ConsensusHook,
 	xcm::UniversalLocation,
-	AssetSwitchPool1, Block, BondedCurrencies, BondedFungibles, Executive, InherentDataExt, ParachainStaking,
-	ParachainSystem, Runtime, RuntimeCall, RuntimeGenesisConfig, SessionKeys, TransactionPayment, Web3Name, VERSION,
+	AssetSwitchPool1, Block, BondedCurrencies, BondedFungibles, Executive, InherentDataExt, IsmpParachain,
+	ParachainStaking, ParachainSystem, Runtime, RuntimeCall, RuntimeGenesisConfig, SessionKeys, TransactionPayment,
+	Web3Name, VERSION,
 };
 
 // This is necessary since by default `RUNTIME_API_VERSIONS` generated by
@@ -617,6 +624,60 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl pallet_ismp_runtime_api::IsmpRuntimeApi<Block, <Block as BlockT>::Hash> for Runtime {
+		fn host_state_machine() -> StateMachine {
+			<Runtime as pallet_ismp::Config>::HostStateMachine::get()
+		}
+
+		fn challenge_period(state_machine_id: StateMachineId) -> Option<u64> {
+			pallet_ismp::Pallet::<Runtime>::challenge_period(state_machine_id)
+		}
+
+		/// Fetch all ISMP events in the block, should only be called from runtime-api.
+		fn block_events() -> Vec<::ismp::events::Event> {
+			pallet_ismp::Pallet::<Runtime>::block_events()
+		}
+
+		/// Fetch all ISMP events and their extrinsic metadata, should only be called from runtime-api.
+		fn block_events_with_metadata() -> Vec<(::ismp::events::Event, Option<u32>)> {
+			pallet_ismp::Pallet::<Runtime>::block_events_with_metadata()
+		}
+
+		/// Return the scale encoded consensus state
+		fn consensus_state(id: ConsensusClientId) -> Option<Vec<u8>> {
+			pallet_ismp::Pallet::<Runtime>::consensus_states(id)
+		}
+
+		/// Return the timestamp this client was last updated in seconds
+		fn state_machine_update_time(height: StateMachineHeight) -> Option<u64> {
+			pallet_ismp::Pallet::<Runtime>::state_machine_update_time(height)
+		}
+
+		/// Return the latest height of the state machine
+		fn latest_state_machine_height(id: StateMachineId) -> Option<u64> {
+			pallet_ismp::Pallet::<Runtime>::latest_state_machine_height(id)
+		}
+
+		/// Get actual requests
+		fn requests(commitments: Vec<H256>) -> Vec<Request> {
+			pallet_ismp::Pallet::<Runtime>::requests(commitments)
+		}
+
+		/// Get actual requests
+		fn responses(commitments: Vec<H256>) -> Vec<Response> {
+			pallet_ismp::Pallet::<Runtime>::responses(commitments)
+		}
+	}
+
+	impl ismp_parachain_runtime_api::IsmpParachainApi<Block> for Runtime {
+		fn para_ids() -> Vec<u32> {
+			IsmpParachain::para_ids()
+		}
+
+		fn current_relay_chain_state() -> RelayChainState {
+			IsmpParachain::current_relay_chain_state()
+		}
+	}
 
 	#[cfg(feature = "runtime-benchmarks")]
 	impl frame_benchmarking::Benchmark<Block> for Runtime {