fix: P-1485 update all fields to optional in ...ResponseData of pumpx… (#3427)

* fix: P-1485 update all fields to optional in ...ResponseData of pumpx api to avoid decode error

* fix: P-1485 update format

* fix: P-1485 update optional fields in submit_swap_order

* fix: P-1485 remove Option for ApiResponse.data

---------

Co-authored-by: wli-pro <wli-pro>
Co-authored-by: BillyWooo <yang@trustcomputing.de>

Author: wli-pro

tee-worker/omni-executor/intent/executors/cross-chain/src/lib.rs

@@ -973,12 +973,11 @@ impl<Provider: EthereumRpcProvider<Transaction = TransactionRequest> + Send + Sy
 						})?;
 					debug!("Response get_gas_info: {:?}", res);
 
-					let Some(gas_info_data) = res.data else {
-						log::error!("Response data of call get gas info is none");
+					let Some(gas_info_vec) = res.data.gas_info else {
+						log::error!("Response data.gas_info of call get gas info is none");
 						return Err(());
 					};
-					let Some(gas_info) = gas_info_data
-						.gas_info
+					let Some(gas_info) = gas_info_vec
 						.iter()
 						.find(|g| g.chain_id == pumpx_config.to_chain_id.to_string())
 					else {

tee-worker/omni-executor/native-task-handler/src/lib.rs

@@ -598,16 +598,15 @@ async fn handle_native_task<
 			};
 			log::debug!("Response pumpx get_account_user_id: {:?}", res);
 
-			let Some(res_data) = res.data else {
+			let Some(user_id) = res.data.user_id else {
 				send_error(
-					"Response data of call get_account_user_id is none".to_string(),
+					"Response data.user_id of call get_account_user_id is none".to_string(),
 					response_sender,
 					NativeTaskError::PumpxApiError(PumpxApiError::GetAccountUserIdFailed),
 				);
 				return;
 			};
 
-			let user_id = res_data.user_id;
 			log::debug!("get_account_user_id ok, email: {}, user_id: {}", email, user_id);
 			let omni_account =
 				Identity::from_web2_account(&user_id, Web2IdentityType::Pumpx).to_omni_account();
@@ -650,20 +649,11 @@ async fn handle_native_task<
 			log::debug!("Response pumpx user_connect: {:?}", backend_response);
 
 			// check google auth value
-			if let Some(ref user_connect_res) = backend_response.data {
-				if !user_connect_res.google_auth_check {
-					send_error(
-						"Google code verification failed from user_connect".to_string(),
-						response_sender,
-						NativeTaskError::PumpxApiError(PumpxApiError::GoogleCodeVerificationFailed),
-					);
-					return;
-				}
-			} else {
+			if !backend_response.data.google_auth_check.unwrap_or(false) {
 				send_error(
-					"Invalid response data field of user_connect".to_string(),
+					"Google code verification failed from user_connect".to_string(),
 					response_sender,
-					NativeTaskError::PumpxApiError(PumpxApiError::UserConnectionFailed),
+					NativeTaskError::PumpxApiError(PumpxApiError::GoogleCodeVerificationFailed),
 				);
 				return;
 			}
@@ -722,25 +712,16 @@ async fn handle_native_task<
 				return;
 			};
 
-			log::debug!("Calling pumpx verify_google_code, code: {}", google_code);
-			let verify_result =
-				ctx.pumpx_api.verify_google_code(&access_token, google_code, None).await;
-			let verify_success = match verify_result {
-				Ok(res) => match res.data {
-					Some(data) => data.result,
-					None => {
-						log::error!("Google code verification response data is none");
-						false
-					},
-				},
-				Err(e) => {
-					log::error!("Google code verification request failed: {:?}", e);
-					false
-				},
-			};
+			let verify_success = verify_google_code(
+				ctx.pumpx_api.as_ref().as_ref(),
+				&access_token,
+				google_code,
+				None,
+			)
+			.await;
 			if !verify_success {
 				send_error(
-					"Google code verification failed".to_string(),
+					"Failed to verify google code within NativeTask::PumpxExportWallet".to_string(),
 					response_sender,
 					NativeTaskError::PumpxApiError(PumpxApiError::GoogleCodeVerificationFailed),
 				);
@@ -879,26 +860,13 @@ async fn handle_native_task<
 			};
 
 			// 2. Verify google code in every case
-			log::debug!("Calling pumpx verify_google_code, code: {}", google_code);
-			let verify_result = ctx
-				.pumpx_api
-				.verify_google_code(&access_token, google_code, language.clone())
-				.await;
-
-			let verify_success = match verify_result {
-				Ok(res) => match res.data {
-					Some(data) => data.result,
-					None => {
-						log::error!("Google code verification response data is none");
-						false
-					},
-				},
-				Err(e) => {
-					log::error!("Google code verification request failed: {:?}", e);
-					false
-				},
-			};
-
+			let verify_success = verify_google_code(
+				ctx.pumpx_api.as_ref().as_ref(),
+				&access_token,
+				google_code,
+				language.clone(),
+			)
+			.await;
 			if !verify_success {
 				send_error(
 					"Failed to verify google code within NativeTask::PumpxTransferWidthdraw"
@@ -1111,3 +1079,28 @@ async fn notify_intent_completed<
 		},
 	};
 }
+
+async fn verify_google_code(
+	pumpx_api: &dyn PumpxApi,
+	access_token: &str,
+	google_code: String,
+	language: Option<String>,
+) -> bool {
+	log::debug!("Calling pumpx verify_google_code, code: {}", google_code);
+	let verify_result = pumpx_api.verify_google_code(access_token, google_code, language).await;
+	verify_result.map_or_else(
+		|e| {
+			log::error!("Google code verification request failed: {:?}", e);
+			false
+		},
+		|res| {
+			res.data.result.map_or_else(
+				|| {
+					log::error!("Google code verification response result is none");
+					false
+				},
+				|success| success,
+			)
+		},
+	)
+}

tee-worker/omni-executor/pumpx/src/pumpx_api/types.rs

@@ -67,11 +67,11 @@ impl GasType {
 pub struct ApiResponse<T: Codec> {
 	pub code: u32,
 	pub message: String,
-	pub data: Option<T>,
+	pub data: T,
 }
 
 impl<T: Codec> ApiResponse<T> {
-	pub fn data(&self) -> &Option<T> {
+	pub fn data(&self) -> &T {
 		&self.data
 	}
 }
@@ -95,8 +95,8 @@ pub struct CreateTransferUnsignedTxBody {
 #[serde(rename_all = "camelCase")]
 pub struct CreateTransferUnsignedTxResponseData {
 	pub tx_data: Option<Vec<String>>,
-	pub transfer_id: u32,
-	pub chain_id: u32,
+	pub transfer_id: Option<u32>,
+	pub chain_id: Option<u32>,
 }
 
 // /v3/trade/send_transfer_tx
@@ -127,8 +127,8 @@ pub struct UserConnectBody {
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct UserConnectResponseData {
-	pub user_id: String,
-	pub google_auth_check: bool,
+	pub user_id: Option<String>,
+	pub google_auth_check: Option<bool>,
 }
 
 // /v3/trade/create_market_order_unsigned_tx
@@ -153,9 +153,9 @@ pub struct CreateMarketOrderUnsignedTxBody {
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateMarketOrderUnsignedTxResponseData {
-	pub chain_id: u32,
-	pub order_id: u32,
-	pub tx_data: Vec<String>,
+	pub chain_id: Option<u32>,
+	pub order_id: Option<u32>,
+	pub tx_data: Option<Vec<String>>,
 }
 
 // /v3/trade/create_market_order_tx
@@ -200,9 +200,9 @@ pub struct CreateTransferTxBody {
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateTransferTxResponseData {
-	pub tx_hash: String,
-	pub transfer_id: u32,
-	pub chain_id: u32,
+	pub tx_hash: Option<String>,
+	pub transfer_id: Option<u32>,
+	pub chain_id: Option<u32>,
 }
 
 // /v3/trade/send_order_tx
@@ -224,15 +224,15 @@ pub struct SendOrderTxResponseData {
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct UserTradeInfoResponseData {
-	pub gas_type_base: GasType,
-	pub gas_type_bsc: GasType,
-	pub gas_type_eth: GasType,
-	pub gas_type_sol: GasType,
-	pub gas_type_omni: GasType,
-	pub is_anti_mev: bool,
-	pub is_auto_slippage: bool,
-	pub slippage: u32,
-	pub slippage_display: String,
+	pub gas_type_base: Option<GasType>,
+	pub gas_type_bsc: Option<GasType>,
+	pub gas_type_eth: Option<GasType>,
+	pub gas_type_sol: Option<GasType>,
+	pub gas_type_omni: Option<GasType>,
+	pub is_anti_mev: Option<bool>,
+	pub is_auto_slippage: Option<bool>,
+	pub slippage: Option<u32>,
+	pub slippage_display: Option<String>,
 }
 
 // /v3/trade/create_limit_order/
@@ -274,7 +274,7 @@ pub struct GoogleCode {
 
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 pub struct VerifyGoogleCodeResponseData {
-	pub result: bool,
+	pub result: Option<bool>,
 }
 
 // /v3/trade/create_cross_order
@@ -318,7 +318,7 @@ pub struct GetGasInfoParams {
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct GetGasInfoResponseData {
-	pub gas_info: Vec<GasInfo>,
+	pub gas_info: Option<Vec<GasInfo>>,
 }
 
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
@@ -346,5 +346,5 @@ pub struct GetAccountUserIdParams {
 #[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct GetAccountUserIdResponseData {
-	pub user_id: String,
+	pub user_id: Option<String>,
 }

tee-worker/omni-executor/rpc-server/src/error_code.rs

@@ -26,6 +26,7 @@ const PUMPX_API_SEND_TRANSFER_TX_FAILED_CODE: i32 = -32036;
 const PUMPX_API_INVALID_INPUT_FAILED_CODE: i32 = -32037;
 const PUMPX_API_CREATE_TRANSFER_TX_FAILED_CODE: i32 = -32038;
 pub const PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE: i32 = -32039;
+pub const PUMPX_API_GET_USER_TRADE_INFO_FAILED_CODE: i32 = -32040;
 
 const PUMPX_SIGNER_REQUEST_SIGNATURE_FAILED_CODE: i32 = -32050;
 

tee-worker/omni-executor/rpc-server/src/methods/omni/submit_swap_order.rs

@@ -171,17 +171,18 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 
 			log::debug!("Response pumpx get_user_trade_info: {:?}", user_trade_info);
 
-			let Some(user_trade_info_data) = user_trade_info.data else {
-				log::error!("Response data of call get_user_trade_info is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
+			let gas_type_base = check_and_get_option_user_trade_info_field(user_trade_info.data.gas_type_base, "gas_type_base")?;
+			let gas_type_bsc = check_and_get_option_user_trade_info_field(user_trade_info.data.gas_type_bsc, "gas_type_bsc")?;
+			let gas_type_eth = check_and_get_option_user_trade_info_field(user_trade_info.data.gas_type_eth, "gas_type_eth")?;
+			let is_anti_mev = check_and_get_option_user_trade_info_field(user_trade_info.data.is_anti_mev, "is_anti_mev")?;
+			let is_auto_slippage = check_and_get_option_user_trade_info_field(user_trade_info.data.is_auto_slippage, "is_auto_slippage")?;
+			let slippage = check_and_get_option_user_trade_info_field(user_trade_info.data.slippage, "slippage")?;
+
 			let gas_type = match params.to_chain_id {
-				BASE_CHAIN_ID => user_trade_info_data.gas_type_base.to_number() as u32,
-				ETHEREUM_CHAIN_ID => user_trade_info_data.gas_type_eth.to_number() as u32,
-				BSC_CHAIN_ID => user_trade_info_data.gas_type_bsc.to_number() as u32,
-				SOLANA_CHAIN_ID => user_trade_info_data.gas_type_base.to_number() as u32,
+				BASE_CHAIN_ID => gas_type_base.to_number() as u32,
+				ETHEREUM_CHAIN_ID => gas_type_eth.to_number() as u32,
+				BSC_CHAIN_ID => gas_type_bsc.to_number() as u32,
+				SOLANA_CHAIN_ID => gas_type_base.to_number() as u32,
 				_ => {
 					log::error!("Unsupported chain id: {}", params.to_chain_id);
 					return Err(PumpxRpcError::from_error_code(ErrorCode::InvalidParams));
@@ -238,10 +239,10 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 				)?,
 				double_out: params.double_out,
 				is_one_click: params.is_one_click,
-				is_anti_mev: user_trade_info_data.is_anti_mev,
-				is_auto_slippage: user_trade_info_data.is_auto_slippage,
+				is_anti_mev,
+				is_auto_slippage,
 				gas_type,
-				slippage: user_trade_info_data.slippage,
+				slippage,
 				wallet_index: params.wallet_index,
 				token_cap,
 				price_usd,
@@ -310,3 +311,15 @@ pub fn register_submit_swap_order(module: &mut RpcModule<RpcContext>) {
 		})
 		.expect("Failed to register omni_submitSwapOrder method");
 }
+
+fn check_and_get_option_user_trade_info_field<T>(
+	field_value: Option<T>,
+	field_name: &str,
+) -> Result<T, PumpxRpcError> {
+	field_value.ok_or_else(|| {
+		log::error!("Response data.{} of call get_user_trade_info is none", field_name);
+		PumpxRpcError::from_error_code(ErrorCode::ServerError(
+			PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
+		))
+	})
+}

tee-worker/omni-executor/rpc-server/src/methods/pumpx/common.rs

@@ -16,6 +16,7 @@ pub struct PumpxRpcError {
 }
 
 #[derive(Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct PumpxRpcErrorData {
 	#[serde(skip_serializing_if = "Option::is_none")]
 	pub backend_response: Option<PumpxRpcErrorBackendResponse>,
@@ -119,3 +120,14 @@ where
 	}
 	Ok(())
 }
+
+pub fn check_and_get_option_response_data<T>(
+	data: Option<T>,
+	code: i32,
+	message: &str,
+) -> Result<T, PumpxRpcError> {
+	data.ok_or_else(|| {
+		log::error!("{}", message);
+		PumpxRpcError::from_error_code(ErrorCode::ServerError(code))
+	})
+}

tee-worker/omni-executor/rpc-server/src/methods/pumpx/export_wallet.rs

@@ -1,5 +1,8 @@
 use crate::{
-	error_code::*, methods::pumpx::PumpxRpcError, server::RpcContext, verify_auth::verify_auth,
+	error_code::*,
+	methods::pumpx::{common::check_and_get_option_response_data, PumpxRpcError},
+	server::RpcContext,
+	verify_auth::verify_auth,
 	Deserialize, ErrorCode,
 };
 use ethers::types::Bytes;
@@ -81,19 +84,14 @@ pub fn register_export_wallet(module: &mut RpcModule<RpcContext>) {
 			};
 			log::debug!("Response pumpx get_account_user_id: {:?}", res);
 
-			let Some(res_data) = res.data else {
-				log::error!("Response data of call get_account_user_id is none");
-				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
-					PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE,
-				)));
-			};
+			let user_id = check_and_get_option_response_data(res.data.user_id, PUMPX_API_GET_ACCOUNT_USER_ID_FAILED_CODE, "Response data.user_id of call get_account_user_id is none")?;
 
-			if res_data.user_id != params.user_id {
+			if user_id != params.user_id {
 				log::error!(
 					"Parameter mismatch: user_id {} and user_email {}, expected user_id {}",
 					params.user_id,
 					params.user_email,
-					res_data.user_id
+					user_id
 				);
 				return Err(PumpxRpcError::from_error_code(ErrorCode::ServerError(
 					USER_EMAIL_ID_MISMATCH_CODE,