Merge pull request #943 from bifrost-finance/fix-moonriver-remarkwith…

…event

fix-moonriver-remarkwithevent

pallets/slp/src/agents/moonbeam_agent/agent.rs

@@ -1153,8 +1153,15 @@ impl<T: Config> MoonbeamAgent<T> {
 			.ok_or(Error::<T>::DelegatorNotExist)?;
 
 		// Temporary wrapping remark event in Moonriver/Moonbeam for ease use of backend service.
-		let remark_call =
-			MoonbeamCall::System(MoonbeamSystemCall::RemarkWithEvent(Box::new(query_id.encode())));
+		let remark_call = if currency_id == MOVR {
+			MoonbeamCall::System(MoonbeamSystemCall::MoonriverRemarkWithEvent(Box::new(
+				query_id.encode(),
+			)))
+		} else {
+			MoonbeamCall::System(MoonbeamSystemCall::MoonbeamRemarkWithEvent(Box::new(
+				query_id.encode(),
+			)))
+		};
 
 		let call_batched_with_remark =
 			MoonbeamCall::Utility(Box::new(MoonbeamUtilityCall::BatchAll(Box::new(vec![

pallets/slp/src/agents/moonbeam_agent/types.rs

@@ -86,8 +86,10 @@ pub enum MoonbeamXtokensCall<T: Config> {
 
 #[derive(Encode, Decode, RuntimeDebug, Clone)]
 pub enum MoonbeamSystemCall {
+	#[codec(index = 7)]
+	MoonriverRemarkWithEvent(Box<Vec<u8>>),
 	#[codec(index = 8)]
-	RemarkWithEvent(Box<Vec<u8>>),
+	MoonbeamRemarkWithEvent(Box<Vec<u8>>),
 }
 
 #[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]