From b6d0f0b7c04e6eda747df9a7068977295e2e45e3 Mon Sep 17 00:00:00 2001
From: herryho <herry.heyi@gmail.com>
Date: Fri, 7 Apr 2023 12:04:53 +0800
Subject: [PATCH] fix-vglmr-remark-event

---
 pallets/slp/src/agents/moonbeam_agent/agent.rs | 11 ++---------
 pallets/slp/src/agents/moonbeam_agent/types.rs |  4 +---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pallets/slp/src/agents/moonbeam_agent/agent.rs b/pallets/slp/src/agents/moonbeam_agent/agent.rs
index c0105d5fd..808dabdbb 100644
--- a/pallets/slp/src/agents/moonbeam_agent/agent.rs
+++ b/pallets/slp/src/agents/moonbeam_agent/agent.rs
@@ -1148,15 +1148,8 @@ 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 = if currency_id == MOVR {
-			MoonbeamCall::System(MoonbeamSystemCall::MoonriverRemarkWithEvent(Box::new(
-				query_id.encode(),
-			)))
-		} else {
-			MoonbeamCall::System(MoonbeamSystemCall::MoonbeamRemarkWithEvent(Box::new(
-				query_id.encode(),
-			)))
-		};
+		let remark_call =
+			MoonbeamCall::System(MoonbeamSystemCall::RemarkWithEvent(Box::new(query_id.encode())));
 
 		let call_batched_with_remark =
 			MoonbeamCall::Utility(Box::new(MoonbeamUtilityCall::BatchAll(Box::new(vec![
diff --git a/pallets/slp/src/agents/moonbeam_agent/types.rs b/pallets/slp/src/agents/moonbeam_agent/types.rs
index 27aab86f9..3e22070a8 100644
--- a/pallets/slp/src/agents/moonbeam_agent/types.rs
+++ b/pallets/slp/src/agents/moonbeam_agent/types.rs
@@ -87,9 +87,7 @@ pub enum MoonbeamXtokensCall<T: Config> {
 #[derive(Encode, Decode, RuntimeDebug, Clone)]
 pub enum MoonbeamSystemCall {
 	#[codec(index = 7)]
-	MoonriverRemarkWithEvent(Box<Vec<u8>>),
-	#[codec(index = 8)]
-	MoonbeamRemarkWithEvent(Box<Vec<u8>>),
+	RemarkWithEvent(Box<Vec<u8>>),
 }
 
 #[derive(PartialEq, Eq, Copy, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]