Update wallet core implementation

gemcoder21 · gemcoder21 · commit 5e198200b266 · 2026-05-27T19:22:00.000Z
diff --git a/crates/gem_tron/src/signer/chain_signer.rs b/crates/gem_tron/src/signer/chain_signer.rs
@@ -263,6 +263,7 @@ mod tests {
                     quote: primitives::swap::SwapQuote {
                         from_address: SENDER.to_string(),
                         from_value: "2000000".to_string(),
+                        min_from_value: None,
                         to_address: "TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z".to_string(),
                         to_value: "1".to_string(),
                         provider_data: primitives::swap::SwapProviderData {
diff --git a/crates/gem_xrp/src/signer/chain_signer.rs b/crates/gem_xrp/src/signer/chain_signer.rs
@@ -230,6 +230,7 @@ mod tests {
                     quote: SwapQuote {
                         from_address: "rfxdLwsZnoespnTDDb1Xhvbc8EFNdztaoq".to_string(),
                         from_value: "10".to_string(),
+                        min_from_value: None,
                         to_address: "rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF".to_string(),
                         to_value: "1".to_string(),
                         provider_data: SwapProviderData {
diff --git a/crates/primitives/src/swap/approval.rs b/crates/primitives/src/swap/approval.rs
@@ -78,6 +78,8 @@ pub struct SwapData {
 pub struct SwapQuote {
     pub from_address: String,
     pub from_value: String,
+    #[serde(default)]
+    pub min_from_value: Option<String>,
     pub to_address: String,
     pub to_value: String,
     pub provider_data: SwapProviderData,
diff --git a/crates/primitives/src/testkit/swap_mock.rs b/crates/primitives/src/testkit/swap_mock.rs
@@ -97,6 +97,7 @@ impl SwapQuote {
     pub fn mock() -> Self {
         SwapQuote {
             from_value: "1000000000".to_string(),
+            min_from_value: None,
             to_value: "1000000".to_string(),
             provider_data: SwapProviderData::mock(),
             from_address: TEST_EVM_RECIPIENT.to_string(),
@@ -114,6 +115,7 @@ impl SwapQuote {
     pub fn mock_with_values(provider: SwapProvider, from_value: &str, to_value: &str) -> Self {
         SwapQuote {
             from_value: from_value.to_string(),
+            min_from_value: None,
             to_value: to_value.to_string(),
             provider_data: SwapProviderData::mock_with_provider(provider),
             from_address: TEST_EVM_RECIPIENT.to_string(),
diff --git a/crates/swapper/src/across/provider.rs b/crates/swapper/src/across/provider.rs
@@ -489,6 +489,7 @@ impl Swapper for Across {
 
         Ok(Quote {
             from_value: request.value.clone(),
+            min_from_value: None,
             to_value: to_value.to_string(),
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/cetus_clmm/provider.rs b/crates/swapper/src/cetus_clmm/provider.rs
@@ -54,6 +54,7 @@ impl Swapper for CetusClmm {
 
         Ok(Quote {
             from_value,
+            min_from_value: None,
             to_value: route.net_amount_out().to_string(),
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/chainflip/provider.rs b/crates/swapper/src/chainflip/provider.rs
@@ -203,6 +203,7 @@ where
 
         Ok(Quote {
             from_value,
+            min_from_value: None,
             to_value: egress_amount.to_string(),
             data: ProviderData {
                 provider: self.provider.clone(),
diff --git a/crates/swapper/src/hyperliquid/provider/bridge.rs b/crates/swapper/src/hyperliquid/provider/bridge.rs
@@ -53,6 +53,7 @@ impl Swapper for HyperCoreBridge {
 
         let quote = Quote {
             from_value: request.value.clone(),
+            min_from_value: None,
             to_value,
             data: ProviderData {
                 provider: self.provider.clone(),
diff --git a/crates/swapper/src/hyperliquid/provider/spot/provider.rs b/crates/swapper/src/hyperliquid/provider/spot/provider.rs
@@ -212,6 +212,7 @@ impl Swapper for HyperCoreSpot {
 
         let quote = Quote {
             from_value,
+            min_from_value: None,
             to_value,
             data: ProviderData {
                 provider: self.provider.clone(),
diff --git a/crates/swapper/src/jupiter/provider.rs b/crates/swapper/src/jupiter/provider.rs
@@ -137,6 +137,7 @@ where
 
         let quote = Quote {
             from_value: request.value.clone(),
+            min_from_value: None,
             to_value: out_amount.to_string(),
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/mayan/provider.rs b/crates/swapper/src/mayan/provider.rs
@@ -123,6 +123,7 @@ where
 
         Ok(Quote {
             from_value,
+            min_from_value: None,
             to_value,
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/models.rs b/crates/swapper/src/models.rs
@@ -87,6 +87,7 @@ impl Default for Options {
 #[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct Quote {
     pub from_value: String,
+    pub min_from_value: Option<String>,
     pub to_value: String,
     pub data: ProviderData,
     pub request: QuoteRequest,
diff --git a/crates/swapper/src/near_intents/model.rs b/crates/swapper/src/near_intents/model.rs
@@ -1,4 +1,6 @@
+use num_bigint::BigUint;
 use serde::{Deserialize, Serialize};
+use serde_serializers::deserialize_biguint_from_str;
 
 pub const DEPOSIT_TYPE_ORIGIN: &str = "ORIGIN_CHAIN";
 pub const RECIPIENT_TYPE_DESTINATION: &str = "DESTINATION_CHAIN";
@@ -73,12 +75,16 @@ pub struct Quote {
     pub deposit_address: Option<String>,
     pub deposit_memo: Option<String>,
     pub deposit_mode: Option<DepositMode>,
-    pub amount_in: String,
+    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    pub amount_in: BigUint,
     pub amount_in_formatted: String,
-    pub min_amount_in: String,
-    pub amount_out: String,
+    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    pub min_amount_in: BigUint,
+    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    pub amount_out: BigUint,
     pub amount_out_formatted: String,
-    pub min_amount_out: String,
+    #[serde(deserialize_with = "deserialize_biguint_from_str")]
+    pub min_amount_out: BigUint,
     pub deadline: Option<String>,
     pub time_when_inactive: Option<String>,
     pub time_estimate: u32,
diff --git a/crates/swapper/src/near_intents/provider.rs b/crates/swapper/src/near_intents/provider.rs
@@ -144,14 +144,6 @@ where
         })
     }
 
-    fn parse_amount(value: &str, field: &str) -> Result<String, SwapperError> {
-        if value.is_empty() {
-            Err(SwapperError::ComputeQuoteError(format!("Missing {field} in Near Intents response")))
-        } else {
-            Ok(value.to_string())
-        }
-    }
-
     fn map_transaction_status(status: &str) -> SwapStatus {
         match status {
             "SWAP_COMPLETED" | "SWAP_COMPLETED_TX" | "SUCCESS" => SwapStatus::Completed,
@@ -290,13 +282,15 @@ where
         let quote_request = Self::build_quote_request(request, SwapType::FlexInput, true)?;
         let amount = quote_request.amount.clone();
         let response = Self::extract_quote(self.client.fetch_quote(&quote_request).await?, request.from_asset.decimals)?;
-        let amount_out = Self::parse_amount(&response.quote.amount_out, "amountOut")?;
 
         let eta = response.quote.time_estimate;
+        let min_amount_in = response.quote.min_amount_in.to_string();
+        let amount_out = response.quote.amount_out.to_string();
         let route_data = serde_json::to_string(&quote_request)?;
 
         Ok(Quote {
             from_value: amount,
+            min_from_value: Some(min_amount_in),
             to_value: amount_out,
             data: ProviderData {
                 provider: self.provider.clone(),
@@ -327,7 +321,7 @@ where
         let deposit_address = near_quote
             .deposit_address
             .ok_or_else(|| SwapperError::ComputeQuoteError("Missing depositAddress in Near Intents response".into()))?;
-        let amount_in = Self::parse_amount(&near_quote.amount_in, "amountIn")?;
+        let amount_in = near_quote.amount_in.to_string();
         let deposit_mode = near_quote
             .deposit_mode
             .or(Some(request_deposit_mode))
diff --git a/crates/swapper/src/panora/provider.rs b/crates/swapper/src/panora/provider.rs
@@ -76,6 +76,7 @@ where
 
         Ok(Quote {
             from_value,
+            min_from_value: None,
             to_value: BigNumberFormatter::value_from_amount(&quote.to_token_amount, response.to_token.decimals)?,
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/proxy/provider.rs b/crates/swapper/src/proxy/provider.rs
@@ -166,6 +166,7 @@ where
 
         Ok(Quote {
             from_value: request.value.clone(),
+            min_from_value: None,
             to_value: quote.output_value.clone(),
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/relay/provider.rs b/crates/swapper/src/relay/provider.rs
@@ -98,6 +98,7 @@ where
 
         let quote = Quote {
             from_value,
+            min_from_value: None,
             to_value,
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/squid/provider.rs b/crates/swapper/src/squid/provider.rs
@@ -116,6 +116,7 @@ where
 
         Ok(Quote {
             from_value,
+            min_from_value: None,
             to_value: response.route.estimate.to_amount,
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/stonfi/provider.rs b/crates/swapper/src/stonfi/provider.rs
@@ -422,6 +422,7 @@ where
 
         Ok(Quote {
             from_value,
+            min_from_value: None,
             to_value: path.to_value,
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/testkit.rs b/crates/swapper/src/testkit.rs
@@ -54,6 +54,7 @@ impl Quote {
     pub fn mock(chain: Chain, token_id: Option<&str>) -> Self {
         Quote {
             from_value: "1000000".to_string(),
+            min_from_value: None,
             to_value: "1000000".to_string(),
             data: ProviderData::mock(),
             request: QuoteRequest::mock(chain, token_id),
@@ -64,6 +65,7 @@ impl Quote {
     pub fn mock_with_provider(provider: SwapperProvider, to_value: &str) -> Self {
         Quote {
             from_value: "1000000".to_string(),
+            min_from_value: None,
             to_value: to_value.to_string(),
             data: ProviderData {
                 provider: ProviderType::new(provider),
diff --git a/crates/swapper/src/thorchain/provider.rs b/crates/swapper/src/thorchain/provider.rs
@@ -144,6 +144,7 @@ where
 
         let quote = Quote {
             from_value,
+            min_from_value: None,
             to_value: to_value.to_string(),
             data: ProviderData {
                 provider: self.provider().clone(),
@@ -261,6 +262,7 @@ mod tests {
         };
         let quote = Quote {
             from_value: "10000000".to_string(),
+            min_from_value: None,
             to_value: "1".to_string(),
             data: ProviderData {
                 provider: swapper.provider().clone(),
diff --git a/crates/swapper/src/uniswap/v3/provider.rs b/crates/swapper/src/uniswap/v3/provider.rs
@@ -180,6 +180,7 @@ impl Swapper for UniswapV3 {
 
         Ok(Quote {
             from_value: request.value.clone(),
+            min_from_value: None,
             to_value: to_value.to_string(),
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/crates/swapper/src/uniswap/v4/provider.rs b/crates/swapper/src/uniswap/v4/provider.rs
@@ -177,6 +177,7 @@ impl Swapper for UniswapV4 {
 
         Ok(Quote {
             from_value: request.value.clone(),
+            min_from_value: None,
             to_value: to_value.to_string(),
             data: ProviderData {
                 provider: self.provider().clone(),
diff --git a/gemstone/src/gem_swapper/remote_types.rs b/gemstone/src/gem_swapper/remote_types.rs
@@ -97,6 +97,7 @@ pub struct SwapperProviderData {
 #[uniffi::remote(Record)]
 pub struct SwapperQuote {
     pub from_value: String,
+    pub min_from_value: Option<String>,
     pub to_value: String,
     pub data: SwapperProviderData,
     pub request: SwapperQuoteRequest,
diff --git a/gemstone/src/models/swap.rs b/gemstone/src/models/swap.rs
@@ -34,6 +34,7 @@ pub struct GemSwapData {
 pub struct GemSwapQuote {
     pub from_address: String,
     pub from_value: String,
+    pub min_from_value: Option<String>,
     pub to_address: String,
     pub to_value: String,
     pub provider_data: GemSwapProviderData,
