r0gue-io · f-gate · Apr 29, 2025 · Apr 29, 2025 · Apr 29, 2025 · Apr 29, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,14 +17,14 @@ repository = "https://github.com/r0gue-io/pop-node/"
 [workspace]
 exclude = [
 	"extension/contract",
+	"integration-tests",
 	"pop-api",
 	"tests/contracts",
-	"integration-tests",
 ]
 members = [
 	"node",
 	"pallets/*",
-	#"pop-api/integration-tests",
+	"pop-api/integration-tests",
 	"primitives",
 	"runtime/devnet",
 	"runtime/mainnet",
@@ -148,8 +148,8 @@ sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "sta
 sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412" }
 sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
-sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412" }
 
 # Polkadot

diff --git a/pallets/api/Cargo.toml b/pallets/api/Cargo.toml
@@ -24,8 +24,8 @@ frame-support.workspace = true
 frame-system.workspace = true
 pallet-assets.workspace = true
 pallet-balances.workspace = true
-pallet-timestamp.workspace = true
 pallet-nfts.workspace = true
+pallet-timestamp.workspace = true
 sp-core.workspace = true
 sp-io.workspace = true
 sp-runtime.workspace = true
@@ -75,7 +75,7 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-builder/std"
+	"xcm-builder/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",

diff --git a/pallets/api/src/messaging/benchmarking.rs b/pallets/api/src/messaging/benchmarking.rs
@@ -1,5 +1,5 @@
 //! Benchmarking setup for pallet_api::messaging
 #![cfg(feature = "runtime-benchmarks")]

 use ::ismp::{
 	messaging::hash_request,
@@ -29,10 +29,10 @@
 	frame_system::Pallet::<T>::assert_has_event(generic_event.into());
 }

 #[benchmarks(
 	where
 	T: pallet_balances::Config + pallet_timestamp::Config,
 )]
 mod messaging_benchmarks {
 	use super::*;

@@ -57,13 +57,13 @@

 			// Timeout messages release callback deposit hence, are most expensive case for now.
 			let good_message = Message::IsmpTimeout {
 				commitment: commitment.clone(),
 				message_deposit,
 				callback_deposit: Some(callback_deposit),
 			};

 			Messages::<T>::insert(&owner, &message_id.0, &good_message);
 			IsmpRequests::<T>::insert(&commitment, (&owner, &message_id.0));
 			message_ids.try_push(message_id.0).unwrap();
 		}
 		#[extrinsic_call]
@@ -102,10 +102,10 @@
 		#[extrinsic_call]
 		Pallet::<T>::xcm_new_query(
 			RawOrigin::Signed(owner.clone()),
 			message_id.clone(),
 			responder.clone(),
 			timeout,
 			callback.clone(),
 		);

 		assert_has_event::<T>(
@@ -146,7 +146,7 @@
 			message_id,
 			responder.clone(),
 			timeout,
 			callback.clone(),
 		)
 		.unwrap();

@@ -240,8 +240,8 @@

 		let message = Message::Ismp { commitment, callback, message_deposit };

 		IsmpRequests::<T>::insert(&commitment, (&origin, &message_id));
 		Messages::<T>::insert(&origin, &message_id, &message);

 		let handler = crate::messaging::ismp::Handler::<T>::new();

@@ -299,8 +299,8 @@

 		let input_message = Message::Ismp { commitment, callback, message_deposit: One::one() };

 		IsmpRequests::<T>::insert(&commitment, (&origin, &message_id));
 		Messages::<T>::insert(&origin, &message_id, &input_message);

 		let handler = crate::messaging::ismp::Handler::<T>::new();
 		#[block]
@@ -329,9 +329,10 @@
 		let id_data = (x, y, a, "ismp_get");
 		let encoded = id_data.encode();
 		let message_id = H256::from(blake2_256(&encoded));
+		let ismp_relayer_fee: BalanceOf<T> = u32::MAX.into();
 
 		let inner_keys: BoundedVec<u8, T::MaxKeyLen> =
 			vec![1u8].repeat(T::MaxKeyLen::get() as usize).try_into().unwrap();

 		let mut outer_keys = vec![];
 		for _ in 0..y {
@@ -352,7 +353,7 @@
 			dest: 2000,
 			height: 100_000,
 			timeout: 100_000,
 			context: vec![1u8].repeat(x as usize).try_into().unwrap(),
 			keys: outer_keys.try_into().unwrap(),
 		};

@@ -362,7 +363,13 @@
 		);
 
 		#[extrinsic_call]
-		Pallet::<T>::ismp_get(RawOrigin::Signed(origin.clone()), message_id.into(), get, callback);
+		Pallet::<T>::ismp_get(
+			RawOrigin::Signed(origin.clone()),
+			message_id.into(),
+			get,
+			ismp_relayer_fee,
+			callback,
+		);
 	}
 
 	/// Sends a `Post` request using ISMP with a variable-sized data payload.
@@ -380,8 +387,9 @@
 		let id_data = (x, y, b"ismp_post");
 		let encoded = id_data.encode();
 		let message_id = H256::from(blake2_256(&encoded));
+		let ismp_relayer_fee: BalanceOf<T> = u32::MAX.into();
 
 		let data = vec![1u8].repeat(x as usize).try_into().unwrap();
 
 		let get = crate::messaging::ismp::Post::<T> { dest: 2000, timeout: 100_000, data };

@@ -402,7 +410,13 @@
 		);
 
 		#[extrinsic_call]
-		Pallet::<T>::ismp_post(RawOrigin::Signed(origin.clone()), message_id.into(), get, callback);
+		Pallet::<T>::ismp_post(
+			RawOrigin::Signed(origin.clone()),
+			message_id.into(),
+			get,
+			ismp_relayer_fee,
+			callback,
+		);
 	}
 
 	/// Tops up callback weight for callback execution of pending messages.
@@ -416,7 +430,7 @@
 
 		let message: Message<T> = Message::Ismp {
 			commitment: [10u8; 32].into(),
-			deposit: 100_000u32.into(),
+			message_deposit: 100_000u32.into(),
 			callback: Some(callback),
 		};
 

diff --git a/pallets/api/src/messaging/mod.rs b/pallets/api/src/messaging/mod.rs
@@ -59,7 +59,7 @@
 type BalanceOf<T> = <<T as Config>::Fungibles as Inspect<AccountIdOf<T>>>::Balance;
 type DbWeightOf<T> = <T as frame_system::Config>::DbWeight;

 pub type MessageId = [u8; 32];

 #[frame_support::pallet]
 pub mod pallet {
@@ -72,7 +72,7 @@
 		/// Because this pallet emits events, it depends on the runtime's definition of an event.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

 		type OriginConverter: TryConvert<Self::RuntimeOrigin, Location>;

 		/// The base byte fee for data stored onchain.
 		#[pallet::constant]
@@ -139,9 +139,6 @@
 		/// payment.
 		type WeightToFee: WeightToFee<Balance = BalanceOf<Self>>;
 
-		/// The fee paid to the relayers account for relaying a message.
-		type IsmpRelayerFee: Get<BalanceOf<Self>>;
-
 		/// The implementation of Keccak used for commitment hashes.
 		type Keccak256: ::ismp::messaging::Keccak256;
 
@@ -274,13 +271,13 @@
 			messages: Vec<MessageId>,
 		},
 		/// An ISMP message has timed out.
 		IsmpTimedOut { commitment: H256 },
 		/// A collection of xcm queries have timed out.
 		XcmQueriesTimedOut { query_ids: Vec<QueryId> },
 		/// An error has occured while attempting to refund weight.
 		WeightRefundErrored { message_id: MessageId, error: DispatchError },
 		/// Callback gas has been topped up.
 		CallbackGasIncreased { message_id: MessageId, total_weight: Weight },
 	}

 	#[pallet::error]
@@ -322,7 +319,7 @@
 		#[codec(index = 0)]
 		Messaging,
 		#[codec(index = 1)]
 		CallbackGas,
 	}

 	#[pallet::hooks]
@@ -383,6 +380,7 @@
 			origin: OriginFor<T>,
 			id: MessageId,
 			message: ismp::Get<T>,
+			ismp_relayer_fee: BalanceOf<T>,
 			callback: Option<Callback>,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
@@ -408,7 +406,7 @@
 			// Process message by dispatching request via ISMP.
 			let commitment = match T::IsmpDispatcher::default().dispatch_request(
 				message.into(),
-				FeeMetadata { payer: origin.clone(), fee: T::IsmpRelayerFee::get() },
+				FeeMetadata { payer: origin.clone(), fee: ismp_relayer_fee },
 			) {
 				Ok(commitment) => Ok::<H256, DispatchError>(commitment),
 				Err(e) => {
@@ -454,6 +452,7 @@
 			origin: OriginFor<T>,
 			id: MessageId,
 			message: ismp::Post<T>,
+			ismp_relayer_fee: BalanceOf<T>,
 			callback: Option<Callback>,
 		) -> DispatchResult {
 			let origin = ensure_signed(origin)?;
@@ -480,7 +479,7 @@
 			let commitment = T::IsmpDispatcher::default()
 				.dispatch_request(
 					message.into(),
-					FeeMetadata { payer: origin.clone(), fee: T::IsmpRelayerFee::get() },
+					FeeMetadata { payer: origin.clone(), fee: ismp_relayer_fee },
 				)
 				.map_err(|_| Error::<T>::IsmpDispatchFailed)?;
 
@@ -683,7 +682,7 @@

 		/// Remove a batch of completed or timed-out messages.
 		///
 		/// Allows users to clean up storage and reclaim deposits for messages that have concluded.
 		///
 		/// # Parameters
 		/// - `origin`: The account removing the messages.
@@ -1029,25 +1028,25 @@
 				Fortitude::Polite,
 			)?;

 			// Handle assets.
 			T::FeeHandler::on_unbalanced(credit);
 			Ok(())
 		}
 	}
 }
 #[derive(Encode, Decode, Debug, MaxEncodedLen)]
 #[cfg_attr(feature = "std", derive(PartialEq, Clone))]
 #[repr(u8)]
 #[allow(clippy::unnecessary_cast)]
 pub enum Read<T: Config> {
 	#[codec(index = 0)]
 	PollStatus((T::AccountId, MessageId)),
 	#[codec(index = 1)]
 	GetResponse((T::AccountId, MessageId)),
 	#[codec(index = 2)]
 	QueryId((T::AccountId, MessageId)),
 }

 #[derive(Debug)]
 #[cfg_attr(feature = "std", derive(PartialEq, Clone))]
 pub enum ReadResult {
@@ -1176,18 +1175,18 @@
 			Message::Ismp { .. } => MessageStatus::Pending,
 			Message::XcmQuery { .. } => MessageStatus::Pending,
 			Message::IsmpResponse { .. } => MessageStatus::Complete,
 			Message::XcmResponse { .. } => MessageStatus::Complete,
 			Message::IsmpTimeout { .. } => MessageStatus::Timeout,
 			Message::XcmTimeout { .. } => MessageStatus::Timeout,
 		}
 	}
 }

 /// The related message status of a Message.
 #[derive(Clone, Debug, Encode, Eq, Decode, MaxEncodedLen, PartialEq, TypeInfo)]
 pub enum MessageStatus {
 	Pending,
 	Complete,
 	Timeout,
 }

@@ -1201,7 +1200,7 @@
 }

 impl Callback {
 	pub(crate) fn increase_callback_weight(&mut self, additional_weight: Weight) -> Weight {
 		let new_callback_weight = self.weight.saturating_add(additional_weight);
 		self.weight = new_callback_weight;
 		new_callback_weight

diff --git a/pallets/api/src/messaging/tests.rs b/pallets/api/src/messaging/tests.rs
@@ -894,7 +894,8 @@ mod xcm_hooks {
 	fn xcm_queries_expire_on_expiry_block() {
 		new_test_ext().execute_with(|| {
 			let message_id = [0; 32];
-			let timeout = System::block_number() + 10;
+			// timeout in 100 blocks time.
+			let timeout = 100;
 			assert_ok!(Messaging::xcm_new_query(
 				signed(ALICE),
 				message_id,
@@ -912,7 +913,22 @@ mod xcm_hooks {
 				None,
 			));
 
-			run_to(timeout + 1);
+			// assert that the block before is not timed out.
+
+			run_to(timeout + System::block_number() - 1);
+			let Some(Message::XcmQuery { .. }): Option<Message<Test>> =
+				Messages::get(ALICE, message_id)
+			else {
+				panic!("Message should be a query!")
+			};
+
+			let Some(Message::XcmQuery { .. }): Option<Message<Test>> =
+				Messages::get(ALICE, message_id_2)
+			else {
+				panic!("Message should be query!")
+			};
+
+			run_to(System::block_number() + 1);
 
 			let Some(Message::XcmTimeout { .. }): Option<Message<Test>> =
 				Messages::get(ALICE, message_id)
@@ -1178,10 +1194,17 @@ mod ismp_get {
 				keys: bounded_vec!(),
 			};
 			let callback = None;
+			let ismp_relayer_fee: Balance = u32::MAX.into();
 
-			assert_ok!(Messaging::ismp_get(signed(ALICE), message_id, message.clone(), callback));
+			assert_ok!(Messaging::ismp_get(
+				signed(ALICE),
+				message_id,
+				message.clone(),
+				ismp_relayer_fee,
+				callback
+			));
 			assert_noop!(
-				Messaging::ismp_get(signed(ALICE), message_id, message, callback),
+				Messaging::ismp_get(signed(ALICE), message_id, message, ismp_relayer_fee, callback),
 				Error::<Test>::MessageExists
 			);
 		})
@@ -1202,6 +1225,7 @@ mod ismp_get {
 			let callback = Callback { selector: [1; 4], weight, abi: Abi::Scale };
 
 			let callback_deposit = <Test as Config>::WeightToFee::weight_to_fee(&weight);
+			let ismp_relayer_fee: Balance = u32::MAX.into();
 
 			let expected_deposit = calculate_protocol_deposit::<
 				Test,
@@ -1215,7 +1239,13 @@ mod ismp_get {
 			assert_eq!(alice_hold_balance_pre_hold, 0);
 			assert!(expected_deposit != 0);
 
-			assert_ok!(Messaging::ismp_get(signed(ALICE), message_id, message, Some(callback)));
+			assert_ok!(Messaging::ismp_get(
+				signed(ALICE),
+				message_id,
+				message,
+				ismp_relayer_fee,
+				Some(callback)
+			));
 
 			let alice_hold_balance_post_hold = Balances::total_balance_on_hold(&ALICE);
 
@@ -1235,7 +1265,15 @@ mod ismp_get {
 				keys: bounded_vec!(),
 			};
 			let callback = None;
-			assert_ok!(Messaging::ismp_get(signed(ALICE), message_id, message, callback));
+			let ismp_relayer_fee: Balance = u32::MAX.into();
+
+			assert_ok!(Messaging::ismp_get(
+				signed(ALICE),
+				message_id,
+				message,
+				ismp_relayer_fee,
+				callback
+			));
 			let events = events();
 			let Some(Event::<Test>::IsmpGetDispatched { origin, id, commitment, callback }) =
 				events.first()
@@ -1262,10 +1300,23 @@ mod ismp_post {
 			let message_id = [0u8; 32];
 			let message = ismp::Post { dest: 2000, timeout: 100, data: bounded_vec![] };
 			let callback = None;
+			let ismp_relayer_fee: Balance = u32::MAX.into();
 
-			assert_ok!(Messaging::ismp_post(signed(ALICE), message_id, message.clone(), callback));
+			assert_ok!(Messaging::ismp_post(
+				signed(ALICE),
+				message_id,
+				message.clone(),
+				ismp_relayer_fee,
+				callback
+			));
 			assert_noop!(
-				Messaging::ismp_post(signed(ALICE), message_id, message, callback),
+				Messaging::ismp_post(
+					signed(ALICE),
+					message_id,
+					message,
+					ismp_relayer_fee,
+					callback
+				),
 				Error::<Test>::MessageExists
 			);
 		})
@@ -1277,6 +1328,7 @@ mod ismp_post {
 			let message_id = [0u8; 32];
 			let message = ismp::Post { dest: 2000, timeout: 100, data: bounded_vec![] };
 			let weight = Weight::from_parts(100_000_000, 100_000_000);
+			let ismp_relayer_fee: Balance = u32::MAX.into();
 			let callback = Callback { selector: [1; 4], weight, abi: Abi::Scale };
 			let callback_deposit = <Test as Config>::WeightToFee::weight_to_fee(&weight);
 			let expected_deposit = calculate_protocol_deposit::<
@@ -1297,6 +1349,7 @@ mod ismp_post {
 				signed(ALICE),
 				message_id,
 				message.clone(),
+				ismp_relayer_fee,
 				Some(callback)
 			));
 
@@ -1312,8 +1365,15 @@ mod ismp_post {
 			let message_id = [0u8; 32];
 			let message = ismp::Post { dest: 2000, timeout: 100, data: bounded_vec![] };
 			let callback = None;
+			let ismp_relayer_fee: Balance = u32::MAX.into();
 
-			assert_ok!(Messaging::ismp_post(signed(ALICE), message_id, message.clone(), callback));
+			assert_ok!(Messaging::ismp_post(
+				signed(ALICE),
+				message_id,
+				message.clone(),
+				ismp_relayer_fee,
+				callback
+			));
 
 			let events = events();
 			let Some(Event::<Test>::IsmpPostDispatched { origin, id, commitment, callback }) =

diff --git a/pallets/api/src/mock.rs b/pallets/api/src/mock.rs
@@ -242,7 +242,6 @@ parameter_types! {
 	pub const OffChainByteFee: Balance = 5;
 	pub const MaxXcmQueryTimeoutsPerBlock: u32 = 10;
 	pub const FeeAccount: AccountId = FEE_ACCOUNT;
-	pub const IsmpRelayerFee: Balance = 100_000;
 }
 
 pub struct MockNotifyQuery<T>(T);
@@ -270,7 +269,6 @@ impl crate::messaging::Config for Test {
 	type FeeHandler = ResolveTo<FeeAccount, Balances>;
 	type Fungibles = Balances;
 	type IsmpDispatcher = pallet_ismp::Pallet<Test>;
-	type IsmpRelayerFee = IsmpRelayerFee;
 	type Keccak256 = Keccak;
 	type MaxContextLen = ConstU32<64>;
 	type MaxDataLen = ConstU32<1024>;

diff --git a/pop-api/Cargo.toml b/pop-api/Cargo.toml
@@ -34,10 +34,10 @@ path = "src/lib.rs"
 [features]
 default = [ "std" ]
 fungibles = [  ]
+messaging = [  ]
 nonfungibles = [  ]
 std = [
 	"ink/std",
 	"pop-primitives/std",
 	"sp-io/std",
 ]
-messaging = [  ] 
diff --git a/pop-api/examples/messaging/lib.rs b/pop-api/examples/messaging/lib.rs
@@ -49,7 +49,7 @@ mod messaging {
                 self.id,
                 Get::new(self.para, height, 0, Vec::default(), Vec::from([key.clone()])),
                 0,
-                Some(Callback::to(0x57ad942b, Weight::from_parts(800_000_000, 500_000))),
+                Some(Callback::new(0x57ad942b, Weight::from_parts(800_000_000, 500_000))),
             )?;
             self.env().emit_event(IsmpRequested { id: self.id, key, height });
             Ok(())
@@ -95,7 +95,7 @@ mod messaging {
                 self.id,
                 dest.clone(),
                 self.env().block_number().saturating_add(100),
-                Some(Callback::to(0x641b0b03, Weight::from_parts(800_000_000, 500_000))),
+                Some(Callback::new(0x641b0b03, Weight::from_parts(800_000_000, 500_000), Abi::Scale)),
             )?
                 .unwrap(); // TODO: handle error
 

diff --git a/pop-api/integration-tests/Cargo.toml b/pop-api/integration-tests/Cargo.toml
@@ -20,6 +20,8 @@ pallet-balances = { workspace = true, default-features = false }
 pallet-contracts = { workspace = true, default-features = false }
 pallet-ismp = { workspace = true, default-features = false }
 pallet-nfts = { workspace = true, default-features = false }
+pallet-revive = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 pallet-xcm = { workspace = true, default-features = false }
 pop-api = { path = "../../pop-api", default-features = false, features = [
 	"fungibles",
@@ -37,6 +39,7 @@ xcm-executor.workspace = true
 [features]
 default = [ "std" ]
 devnet = [ "pop-runtime-devnet/default" ]
+
 std = [
 	"codec/std",
 	"frame-support/std",
@@ -46,6 +49,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-contracts/std",
 	"pallet-nfts/std",
+	"pallet-timestamp/std",
 	"pop-api/std",
 	"pop-primitives/std",
 	"pop-runtime-devnet/std",