reduce number of request-wallet calls (#3474)

Author: kziemianek

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

@@ -26,6 +26,7 @@ impl<
 		from_address: String,
 		from_wallet: Vec<u8>,
 		pumpx_config: &PumpxConfig,
+		to_address: String,
 	) -> Result<(String, String, Option<InstantFlowDetails>), ()> {
 		debug!("executing cross chain swap");
 
@@ -34,11 +35,6 @@ impl<
 			return Err(());
 		}
 
-		let Some(to_chain_type) = ChainType::from_pumpx_chain_id(pumpx_config.to_chain_id) else {
-			error!("Unsupported to_chain_id: {}", pumpx_config.to_chain_id);
-			return Err(());
-		};
-
 		let from_asset_binance_coin_name =
 			BinanceAsset::from_chain_asset(&swap_order.from_asset)?.coin.name();
 
@@ -84,14 +80,6 @@ impl<
 			)?;
 		}
 
-		let to_wallet = self
-			.pumpx_signer_client
-			.request_wallet(to_chain_type, pumpx_config.wallet_index, omni_account)
-			.await
-			.map_err(|e| error!("Could not get to_wallet from pumpx-signer: {:?}", e))?;
-
-		let to_address = pubkey_to_address(to_chain_type, &to_wallet)?;
-
 		self.pumpx_create_cross_order(
 			intent_id,
 			pumpx_config.from_token_ca.clone(),

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

@@ -113,7 +113,7 @@ async fn simple_cross_chain_swap_sol_to_bsc() {
 			mockall::predicate::eq(pumpx_wallet_index),
 			mockall::predicate::eq(pumpx_wallet_omni_account),
 		)
-		.times(2)
+		.times(1)
 		.returning(|_, _, _| {
 			Ok(hex::decode("0365db18229197e1ff835e0faaec9a9a9900b0aeb5f18e3faa5a4ca60c80213d7c")
 				.unwrap()
@@ -415,7 +415,7 @@ async fn simple_cross_chain_swap_bsc_to_sol() {
 			mockall::predicate::eq(pumpx_wallet_index),
 			mockall::predicate::eq(pumpx_wallet_omni_account),
 		)
-		.times(2)
+		.times(1)
 		.returning(|_, _, _| {
 			Ok([
 				150, 221, 47, 78, 207, 124, 147, 48, 228, 240, 229, 138, 142, 98, 114, 103, 47,
@@ -719,7 +719,7 @@ async fn instant_payout_cross_chain_swap() {
 				116, 52, 128, 14, 245, 109, 68, 26, 222, 183, 80, 165, 126, 31,
 			]),
 		)
-		.times(2)
+		.times(1)
 		.returning(|_, _, _| {
 			Ok(hex::decode("0365db18229197e1ff835e0faaec9a9a9900b0aeb5f18e3faa5a4ca60c80213d7c")
 				.unwrap()
@@ -840,6 +840,7 @@ async fn instant_payout_cross_chain_swap() {
 			mockall::predicate::eq(None),
 			mockall::predicate::eq(None),
 		)
+		// second call is done in separate thread when doing deposit asynchronously in case of instant swap
 		.times(2)
 		.returning(|_, _, _, _| {
 			Ok(vec![prepare_coin_info(solana_coin_ticker, solana_coin_name, "SOL")])
@@ -853,6 +854,7 @@ async fn instant_payout_cross_chain_swap() {
 			mockall::predicate::always(),
 			mockall::predicate::eq(None),
 		)
+		// second call is done in separate thread when doing deposit asynchronously in case of instant swap
 		.times(2)
 		.returning(|_, _, _, _| {
 			Ok(DepositAddress {
@@ -882,6 +884,7 @@ async fn instant_payout_cross_chain_swap() {
 			mockall::predicate::eq("/api/v3/ticker/price"),
 			mockall::predicate::eq(Some(sol_bnb_price_params)),
 		)
+		// second call is done in separate thread when doing deposit asynchronously in case of instant swap
 		.times(2)
 		.returning(|_, _| Ok(SymbolPrice { price: "10".to_string() }));
 

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

@@ -197,6 +197,20 @@ impl<
 
 				let mut from_address = pubkey_to_address(from_chain_type, &from_wallet)?;
 
+				let Some(to_chain_type) = ChainType::from_pumpx_chain_id(pumpx_config.to_chain_id)
+				else {
+					error!("Unsupported to_chain_id: {}", pumpx_config.to_chain_id);
+					return Err(());
+				};
+
+				let to_wallet = self
+					.pumpx_signer_client
+					.request_wallet(to_chain_type, pumpx_config.wallet_index, *account_id.as_ref())
+					.await
+					.map_err(|e| error!("Could not get to_wallet from pumpx-signer: {:?}", e))?;
+
+				let to_address = pubkey_to_address(to_chain_type, &to_wallet)?;
+
 				let storage = PumpxJwtStorage::new(self.storage_db.clone());
 				let Ok(Some(access_token)) =
 					storage.get(&(account_id.clone(), AUTH_TOKEN_ACCESS_TYPE))
@@ -221,6 +235,7 @@ impl<
 							from_address,
 							from_wallet,
 							&pumpx_config,
+							to_address.clone(),
 						)
 						.await
 					{
@@ -250,6 +265,7 @@ impl<
 						amount,
 						&pumpx_config,
 						from_address,
+						to_address,
 					)
 					.await?;
 

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

@@ -18,6 +18,7 @@ impl<
 		amount: String,
 		pumpx_config: &PumpxConfig,
 		from_address: String,
+		to_address: String,
 	) -> Result<Vec<u8>, ()> {
 		debug!("executing single chain swap");
 
@@ -26,14 +27,6 @@ impl<
 			return Err(());
 		};
 
-		let to_wallet = self
-			.pumpx_signer_client
-			.request_wallet(to_chain_type, pumpx_config.wallet_index, omni_account)
-			.await
-			.map_err(|e| error!("Could not get to_wallet from pumpx-signer: {:?}", e))?;
-
-		let to_address = pubkey_to_address(to_chain_type, &to_wallet)?;
-
 		// always use `to_token_ca` from RPC
 		let token_ca = pumpx_config.to_token_ca.clone();