remove utxo chain fee reserves

Author: 0xh3rman

crates/swapper/src/chainflip/provider.rs

@@ -349,7 +349,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::SwapperQuoteAsset;
+    use crate::{Options, SwapperQuoteAsset};
     use primitives::AssetId;
 
     #[test]
@@ -378,13 +378,18 @@ mod tests {
         let request = QuoteRequest {
             from_asset: SwapperQuoteAsset::from(AssetId::from_chain(Chain::Bitcoin)),
             to_asset: SwapperQuoteAsset::from(AssetId::from_chain(Chain::Ethereum)),
+            value: "89100".to_string(),
+            options: Options {
+                use_max_amount: true,
+                ..Default::default()
+            },
             ..QuoteRequest::mock(Chain::Bitcoin, None)
         };
 
         let quote_request = build_quote_request(&request).unwrap();
 
-        assert_eq!(quote_request.from_value, "1000000");
-        assert_eq!(quote_request.quote_request.amount, "1000000");
+        assert_eq!(quote_request.from_value, "89100");
+        assert_eq!(quote_request.quote_request.amount, "89100");
         assert_eq!(quote_request.quote_request.src_chain, "Bitcoin");
         assert_eq!(quote_request.quote_request.src_asset, "BTC");
         assert_eq!(quote_request.quote_request.dest_chain, "Ethereum");

crates/swapper/src/fees/reserve.rs

@@ -20,15 +20,10 @@ pub static RESERVED_NATIVE_FEES: LazyLock<HashMap<Chain, &'static str>> = LazyLo
         (Chain::Solana, "20000"),                 // 0.00002 SOL
         (Chain::Ton, "20000000"),                 // 0.02 TON
         (Chain::Tron, "20000000"),                // 20 TRX
-        (Chain::Bitcoin, "40000"),                // 0.0004 BTC
-        (Chain::Zcash, "1000000"),                // 0.01 ZEC
-        (Chain::Doge, "500000000"),               // 5 DOGE
         (Chain::Xrp, "2000000"),                  // 2 XRP
         (Chain::Cardano, "2000000"),              // 2 ADA
         (Chain::Aptos, "20000000"),               // 0.2 APT
         (Chain::Stellar, "100000"),               // 0.01 XLM
-        (Chain::Litecoin, "100000"),              // 0.001 LTC
-        (Chain::BitcoinCash, "100000"),           // 0.001 BCH
         (Chain::Monad, "5000000000000000"),       // 0.005 MON
         (Chain::XLayer, "5000000000000000"),      // 0.005 OKB
         (Chain::Plasma, "5000000000000000"),      // 0.005 XPL
@@ -65,3 +60,36 @@ pub fn quote_value_after_reserve_by_chain(request: &QuoteRequest) -> Result<Stri
     };
     quote_value_after_reserve(request, reserved)
 }
+
+#[cfg(test)]
+mod tests {
+    use primitives::AssetId;
+
+    use super::*;
+    use crate::{Options, SwapperQuoteAsset};
+
+    #[test]
+    fn btc_family_chains_have_no_reserve() {
+        // UTXO chains do not need swapper-side reserves; the signer subtracts fees from selected inputs.
+        for chain in [Chain::Bitcoin, Chain::Litecoin, Chain::BitcoinCash, Chain::Doge, Chain::Zcash] {
+            assert_eq!(reserved_tx_fees(chain), None, "{chain:?} should not be in the reserve table");
+        }
+    }
+
+    #[test]
+    fn btc_max_quote_passes_value_through() {
+        let request = QuoteRequest {
+            from_asset: SwapperQuoteAsset::from(AssetId::from_chain(Chain::Bitcoin)),
+            to_asset: SwapperQuoteAsset::from(AssetId::from_chain(Chain::Solana)),
+            wallet_address: "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4".into(),
+            destination_address: "11111111111111111111111111111111".into(),
+            value: "89100".to_string(),
+            options: Options {
+                use_max_amount: true,
+                ..Default::default()
+            },
+        };
+
+        assert_eq!(quote_value_after_reserve_by_chain(&request).unwrap(), "89100");
+    }
+}

crates/swapper/src/near_intents/provider.rs

@@ -395,14 +395,14 @@ mod tests {
 
     #[test]
     fn max_quote_keeps_transfer_amount() {
-        let mut request = QuoteRequest::mock(Chain::Tron, None);
+        let mut request = QuoteRequest::mock(Chain::Bitcoin, None);
         request.to_asset = SwapperQuoteAsset::from(AssetId::from_chain(Chain::Near));
-        request.value = "37000000".to_string();
+        request.value = "89100".to_string();
         request.options.use_max_amount = true;
 
         let quote_request = NearIntents::<RpcClient>::build_quote_request(&request, SwapType::FlexInput, true).unwrap();
 
-        assert_eq!(quote_request.amount, "37000000");
+        assert_eq!(quote_request.amount, "89100");
     }
 
     #[test]

crates/swapper/src/thorchain/provider.rs

@@ -243,6 +243,24 @@ mod tests {
         assert!(has_zcash);
     }
 
+    #[test]
+    fn test_quote_input_value_bitcoin_max_passes_value_through() {
+        let from_asset = THORChainAsset::from_asset_id(Chain::Bitcoin.as_ref()).unwrap();
+        let request = QuoteRequest {
+            from_asset: SwapperQuoteAsset::from(Chain::Bitcoin.as_asset_id()),
+            to_asset: SwapperQuoteAsset::from(Chain::Solana.as_asset_id()),
+            wallet_address: "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4".to_string(),
+            destination_address: "11111111111111111111111111111111".to_string(),
+            value: "89100".to_string(),
+            options: Options {
+                use_max_amount: true,
+                ..Default::default()
+            },
+        };
+
+        assert_eq!(quote_input_value(&from_asset, &request).unwrap(), "89100");
+    }
+
     #[tokio::test]
     async fn test_get_quote_data_uses_quote_from_value() {
         let provider = Arc::new(ProviderMock::new(String::new()));