Feat/integrated hyperbrdige

Cargo.toml

@@ -31,8 +31,10 @@ members = [
 	"pallets/channel-commission",
 	"pallets/clouds-convert",
 	"pallets/vbnc-convert",
+	"pallets/ismp",
 
 	"runtime/bifrost-kusama",
+	"runtime/bifrost-paseo",
 	"runtime/bifrost-polkadot/src/evm/evm-utility/macro",
 	"runtime/bifrost-polkadot/src/evm/precompiles/call-permit",
 	"runtime/bifrost-polkadot",
@@ -96,12 +98,15 @@ bifrost-xcm-interface                  = { path = "pallets/xcm-interface", defau
 lend-market                            = { path = "pallets/lend-market", default-features = false }
 lend-market-rpc-runtime-api            = { path = "pallets/lend-market/rpc/runtime-api", default-features = false }
 leverage-staking                       = { path = "pallets/leverage-staking", default-features = false }
+module-evm-utility 					   = { path = "runtime/bifrost-polkadot/src/evm/evm-utility", default-features = false }
 module-evm-utility-macro               = { path = "runtime/bifrost-polkadot/src/evm/evm-utility/macro", default-features = false }
 pallet-evm-precompile-call-permit      = { path = "runtime/bifrost-polkadot/src/evm/precompiles/call-permit", default-features = false }
 pallet-evm-accounts                    = { path = "pallets/evm-accounts", default-features = false }
 pallet-evm-accounts-rpc-runtime-api    = { path = "pallets/evm-accounts/rpc/runtime-api", default-features = false }
 pallet-prices                          = { path = "pallets/prices", default-features = false }
 pallet-traits                          = { path = "pallets/traits", default-features = false }
+bifrost-ismp                           = { path = "pallets/ismp", default-features = false }
+pallet-token-gateway                   = { path = "pallets/token-gateway", default-features = false }
 
 # Zenlink
 merkle-distributor             = { git = "https://github.com/bifrost-io/Zenlink-DEX-Module", branch = "release-polkadot-stable2407", default-features = false }
@@ -151,6 +156,17 @@ pallet-evm-precompile-sha3fips = { git = "https://github.com/bifrost-io/frontier
 pallet-evm-precompile-simple   = { git = "https://github.com/bifrost-io/frontier", branch = "release-polkadot-stable2407", default-features = false }
 precompile-utils               = { git = "https://github.com/bifrost-io/frontier", branch = "release-polkadot-stable2407", default-features = false }
 
+# Hyperbridge
+pallet-ismp                 = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+pallet-ismp-rpc             = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407" }
+pallet-ismp-runtime-api     = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+ismp-parachain 				= { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+ismp-parachain-inherent 	= { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+ismp-parachain-runtime-api  = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+ismp                        = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+pallet-hyperbridge          = { git = "https://github.com/polytope-labs/hyperbridge", branch = "polkadot-stable2407", default-features = false }
+anyhow                      = { version = "1.0.93", default-features = false }
+
 # polkadot-sdk (wasm)
 cumulus-client-collator                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 cumulus-client-consensus-proposer          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
@@ -223,6 +239,7 @@ sp-genesis-builder                         = { git = "https://github.com/parityt
 sp-inherents                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 sp-io                                      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 sp-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
+sp-mmr-primitives                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 sp-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 sp-runtime                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
 sp-session                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }
@@ -327,6 +344,9 @@ strum                 = { version = "0.26.3", default-features = false, features
 strum_macros          = { version = "0.26.2" }
 syn                   = { version = "2.0.90", features = ["full", "fold", "extra-traits", "visit"] }
 tiny-keccak           = { version = "2.0", features = ["fips202"] }
+alloy-sol-macro = "0.7.7"
+alloy-sol-types = { version = "0.7.7", default-features = false }
+alloy-primitives = { version = "0.7.7", default-features = false, features = ["rlp"] }
 
 [profile.dev]
 split-debuginfo = "unpacked"

node/cli/src/command.rs

@@ -255,7 +255,9 @@ fn set_default_ss58_version(spec: &Box<dyn ChainSpec>) {
 /// Parse command line arguments into service configuration.
 #[allow(unreachable_code)]
 pub fn run() -> Result<()> {
-	let cli = Cli::from_args();
+	let mut cli = Cli::from_args();
+
+	cli.run.base.offchain_worker_params.indexing_enabled = true;
 
 	match &cli.subcommand {
 		Some(Subcommand::BuildSpec(cmd)) => {

node/rpc/Cargo.toml

@@ -68,3 +68,6 @@ fc-rpc-core = { workspace = true }
 fc-storage = { workspace = true }
 fp-rpc = { workspace = true, features = ["default"] }
 
+pallet-ismp-runtime-api = { workspace = true }
+pallet-ismp-rpc = { workspace = true }
+

node/rpc/src/lib.rs

@@ -50,13 +50,16 @@ use bifrost_vtoken_minting_rpc_runtime_api::VtokenMintingRuntimeApi;
 use futures::channel::mpsc;
 use lend_market_rpc::{LendMarket, LendMarketApiServer};
 use lend_market_rpc_runtime_api::LendMarketApi;
+use pallet_ismp_rpc::{IsmpApiServer, IsmpRpcHandler};
 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
+use sc_client_api::{AuxStore, BlockBackend, ProofProvider};
 use sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApiServer};
 use sc_rpc_api::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
+use sp_core::H256;
 use sp_runtime::traits::BlockIdTo;
 use substrate_frame_rpc_system::{System, SystemApiServer};
 use zenlink_protocol::AssetId;
@@ -78,7 +81,7 @@ pub struct FullDeps<C, P> {
 }
 
 /// Full client dependencies.
-pub struct FullDepsPolkadot<C, P> {
+pub struct FullDepsPolkadot<C, P, B> {
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
@@ -87,6 +90,8 @@ pub struct FullDepsPolkadot<C, P> {
 	pub deny_unsafe: DenyUnsafe,
 	/// Manual seal command sink
 	pub command_sink: Option<mpsc::Sender<EngineCommand<Hash>>>,
+	/// Backend used by the node.
+	pub backend: Arc<B>,
 }
 
 /// A IO handler that uses all Full RPC extensions.
@@ -140,12 +145,15 @@ where
 }
 
 /// RPC of bifrost-polkadot runtime.
-pub fn create_full_polkadot<C, P>(
-	deps: FullDepsPolkadot<C, P>,
+pub fn create_full_polkadot<C, P, B>(
+	deps: FullDepsPolkadot<C, P, B>,
 ) -> Result<RpcExtension, Box<dyn std::error::Error + Send + Sync>>
 where
 	C: ProvideRuntimeApi<Block>
 		+ HeaderBackend<Block>
+		+ AuxStore
+		+ BlockBackend<Block>
+		+ ProofProvider<Block>
 		+ HeaderMetadata<Block, Error = BlockChainError>
 		+ Send
 		+ Sync
@@ -162,6 +170,10 @@ where
 	C::Api: ZenlinkProtocolRuntimeApi<Block, AccountId, AssetId>,
 	C::Api: StablePoolRuntimeApi<Block>,
 	C::Api: BlockBuilder<Block>,
+	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
+	B::State: sc_client_api::StateBackend<sp_runtime::traits::HashingFor<Block>>,
+	// pallet_ismp_runtime_api bound
+	C::Api: pallet_ismp_runtime_api::IsmpRuntimeApi<Block, H256>,
 	P: TransactionPool + Sync + Send + 'static,
 {
 	let mut module = RpcExtension::new(());
@@ -170,6 +182,7 @@ where
 		pool,
 		deny_unsafe,
 		command_sink,
+		backend,
 	} = deps;
 
 	module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
@@ -182,7 +195,9 @@ where
 	module.merge(ZenlinkProtocol::new(client.clone()).into_rpc())?;
 	module.merge(StablePoolRpc::new(client.clone()).into_rpc())?;
 	module.merge(LendMarket::new(client.clone()).into_rpc())?;
-	module.merge(VtokenMintingRpc::new(client).into_rpc())?;
+	module.merge(VtokenMintingRpc::new(client.clone()).into_rpc())?;
+
+	module.merge(IsmpRpcHandler::new(client, backend.clone())?.into_rpc())?;
 
 	if let Some(command_sink) = command_sink {
 		module.merge(

node/service/Cargo.toml

@@ -126,6 +126,8 @@ bifrost-salp-rpc-runtime-api = { workspace = true }
 bifrost-farming-rpc-runtime-api = { workspace = true }
 bb-bnc-rpc-runtime-api = { workspace = true }
 
+ismp-parachain-inherent = { workspace = true }
+
 [features]
 default = [ "std" ]
 std = []

node/service/src/collator_polkadot.rs

@@ -283,8 +283,23 @@ fn start_consensus(
 		client.clone(),
 	);
 
+	let (client_clone, relay_chain_interface_clone) =
+		(client.clone(), relay_chain_interface.clone());
 	let params = AuraParams {
-		create_inherent_data_providers: move |_, ()| async move { Ok(()) },
+		create_inherent_data_providers: move |parent, ()| {
+			let client = client_clone.clone();
+			let relay_chain_interface = relay_chain_interface_clone.clone();
+			async move {
+				let inherent = ismp_parachain_inherent::ConsensusInherentProvider::create(
+					parent,
+					client,
+					relay_chain_interface,
+				)
+				.await?;
+
+				Ok(inherent)
+			}
+		},
 		block_import,
 		para_client: client.clone(),
 		para_backend: backend.clone(),
@@ -426,6 +441,7 @@ where
 	let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
 
 	let rpc_builder = {
+		let backend = backend.clone();
 		let client = client.clone();
 		let is_authority = parachain_config.role.is_authority();
 		let transaction_pool = transaction_pool.clone();
@@ -443,6 +459,7 @@ where
 				pool: transaction_pool.clone(),
 				deny_unsafe,
 				command_sink: None,
+				backend: backend.clone(),
 			};
 			let module = crate::rpc::create_full_polkadot(deps)?;
 

node/service/src/dev.rs

@@ -207,6 +207,7 @@ where
 	let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
 
 	let rpc_builder = {
+		let backend = backend.clone();
 		let client = client.clone();
 		let is_authority = parachain_config.role.is_authority();
 		let transaction_pool = transaction_pool.clone();
@@ -224,6 +225,7 @@ where
 				pool: transaction_pool.clone(),
 				deny_unsafe,
 				command_sink: Some(command_sink.clone()),
+				backend: backend.clone(),
 			};
 			let module = crate::rpc::create_full_polkadot(deps)?;
 

node/service/src/lib.rs

@@ -35,17 +35,26 @@ pub trait IdentifyVariant {
 	/// Returns if this is a configuration for the `Bifrost-Polkadot` network.
 	fn is_bifrost_polkadot(&self) -> bool;
 
+	/// Returns if this is a configuration for the `Bifrost-Paseo` network.
+	fn is_bifrost_paseo(&self) -> bool;
+
 	/// Returns if this is a configuration for the `Dev` network.
 	fn is_dev(&self) -> bool;
 }
 
 impl IdentifyVariant for Box<dyn sc_service::ChainSpec> {
 	fn is_bifrost_kusama(&self) -> bool {
-		self.id().starts_with("bifrost") && !self.id().starts_with("bifrost_polkadot")
+		self.id().starts_with("bifrost")
+			&& !self.id().starts_with("bifrost_polkadot")
+			&& !self.id().starts_with("bifrost_paseo")
 	}
 
 	fn is_bifrost_polkadot(&self) -> bool {
-		self.id().starts_with("bifrost_polkadot")
+		self.id().starts_with("bifrost_polkadot") || self.id().starts_with("bifrost_paseo")
+	}
+
+	fn is_bifrost_paseo(&self) -> bool {
+		self.id().starts_with("bifrost_paseo")
 	}
 
 	fn is_dev(&self) -> bool {

pallets/asset-registry/src/lib.rs

@@ -23,7 +23,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub use bifrost_primitives::{
-	AssetIds, CurrencyId,
+	AssetIds, AssetMetadata, CurrencyId,
 	CurrencyId::{Native, Token, Token2},
 	CurrencyIdConversion, CurrencyIdMapping, CurrencyIdRegister, ForeignAssetId, LeasePeriod,
 	ParaId, PoolId, TokenId, TokenInfo, TokenSymbol,
@@ -36,10 +36,10 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::pallet_prelude::*;
-use scale_info::{prelude::string::String, TypeInfo};
+use scale_info::prelude::string::String;
 use sp_runtime::{
 	traits::{One, UniqueSaturatedFrom},
-	ArithmeticError, RuntimeDebug,
+	ArithmeticError,
 };
 use sp_std::{boxed::Box, vec::Vec};
 use xcm::{
@@ -62,14 +62,6 @@ pub use weights::WeightInfo;
 pub type BalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
-#[derive(Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode, TypeInfo)]
-pub struct AssetMetadata<Balance> {
-	pub name: Vec<u8>,
-	pub symbol: Vec<u8>,
-	pub decimals: u8,
-	pub minimal_balance: Balance,
-}
-
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
@@ -545,7 +537,7 @@ impl<T: Config> CurrencyIdConversion<CurrencyId> for AssetIdMaps<T> {
 	}
 }
 
-impl<T: Config> CurrencyIdRegister<CurrencyId> for AssetIdMaps<T> {
+impl<T: Config> CurrencyIdRegister<CurrencyId, AssetMetadata<BalanceOf<T>>> for AssetIdMaps<T> {
 	fn check_token_registered(token_symbol: TokenSymbol) -> bool {
 		CurrencyMetadatas::<T>::get(CurrencyId::Token(token_symbol)).is_some()
 	}
@@ -625,4 +617,11 @@ impl<T: Config> CurrencyIdRegister<CurrencyId> for AssetIdMaps<T> {
 			},
 		)
 	}
+
+	fn register_metadata(
+		currency_id: CurrencyId,
+		metadata: AssetMetadata<BalanceOf<T>>,
+	) -> DispatchResult {
+		Pallet::<T>::do_register_metadata(currency_id, &metadata)
+	}
 }

pallets/buy-back/src/lib.rs

@@ -31,7 +31,9 @@ mod benchmarking;
 pub mod weights;
 
 use bb_bnc::{BbBNCInterface, BB_BNC_SYSTEM_POOL_ID};
-use bifrost_primitives::{currency::BNC, CurrencyId, CurrencyIdRegister, TryConvertFrom};
+use bifrost_primitives::{
+	currency::BNC, AssetMetadata, CurrencyId, CurrencyIdRegister, TryConvertFrom,
+};
 use cumulus_primitives_core::ParaId;
 use frame_support::{
 	pallet_prelude::*,
@@ -87,7 +89,7 @@ pub mod pallet {
 
 		type ParachainId: Get<ParaId>;
 
-		type CurrencyIdRegister: CurrencyIdRegister<CurrencyId>;
+		type CurrencyIdRegister: CurrencyIdRegister<CurrencyId, AssetMetadata<BalanceOf<Self>>>;
 
 		type BbBNC: BbBNCInterface<
 			AccountIdOf<Self>,

pallets/currencies/src/lib.rs

@@ -38,6 +38,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(clippy::unused_unit)]
 
+// use bifrost_primitives::{
+// 	ContributionStatus, CurrencyIdConversion, CurrencyIdRegister, TrieIndex, VtokenMintingInterface,
+// };
 use frame_support::{
 	pallet_prelude::*,
 	traits::{
@@ -128,6 +131,8 @@ pub mod module {
 
 		/// Weight information for extrinsics in this module.
 		type WeightInfo: WeightInfo;
+
+		// type AssetIdMaps: CurrencyIdRegister<CurrencyId>;
 	}
 
 	#[pallet::error]