feat!: convert fees from BTC/kB to sats/vB

Author: storopoli

src/raw_client.rs

@@ -34,6 +34,7 @@ use rustls::{
 
 #[cfg(any(feature = "default", feature = "proxy"))]
 use crate::socks::{Socks5Stream, TargetAddr, ToTargetAddr};
+use crate::utils::convert_fee_rate;
 
 use stream::ClonableStream;
 
@@ -847,6 +848,7 @@ impl<T: Read + Write> ElectrumApi for RawClient<T> {
 
         result
             .as_f64()
+            .map(convert_fee_rate)
             .ok_or_else(|| Error::InvalidResponse(result.clone()))
     }
 
@@ -860,6 +862,7 @@ impl<T: Read + Write> ElectrumApi for RawClient<T> {
 
         result
             .as_f64()
+            .map(convert_fee_rate)
             .ok_or_else(|| Error::InvalidResponse(result.clone()))
     }
 
@@ -1046,7 +1049,9 @@ impl<T: Read + Write> ElectrumApi for RawClient<T> {
         I: IntoIterator + Clone,
         I::Item: Borrow<usize>,
     {
-        impl_batch_call!(self, numbers, estimate_fee, apply_deref)
+        let fee_rate_vec: Result<Vec<f64>, Error> =
+            impl_batch_call!(self, numbers, estimate_fee, apply_deref);
+        Ok(fee_rate_vec?.into_iter().map(convert_fee_rate).collect())
     }
 
     fn transaction_broadcast_raw(&self, raw_tx: &[u8]) -> Result<Txid, Error> {
@@ -1129,12 +1134,13 @@ mod test {
         assert_eq!(resp.hash_function, Some("sha256".into()));
         assert_eq!(resp.pruning, None);
     }
+
     #[test]
     fn test_relay_fee() {
         let client = RawClient::new(get_test_server(), None).unwrap();
 
         let resp = client.relay_fee().unwrap();
-        assert_eq!(resp, 0.00001);
+        assert!(resp > 1.0 && resp < 1.000001);
     }
 
     #[test]

src/utils.rs

@@ -6,6 +6,11 @@ use bitcoin::hashes::Hash;
 use bitcoin::Txid;
 use types::GetMerkleRes;
 
+
+/// Satoshis in a Bitcoin.
+/// 1 BTC = 100,000,000 satoshis.
+const SATOSHIS_IN_BTC: f64 = 100_000_000.0;
+
 /// Verifies a Merkle inclusion proof as retrieved via [`transaction_get_merkle`] for a transaction with the
 /// given `txid` and `merkle_root` as included in the [`BlockHeader`].
 ///
@@ -41,3 +46,8 @@ pub fn validate_merkle_proof(
 
     cur == merkle_root.to_raw_hash()
 }
+
+/// Converts a fee rate in BTC/kB to satoshi/vbyte.
+pub fn convert_fee_rate(fee_rate: f64) -> f64 {
+    (fee_rate * SATOSHIS_IN_BTC) / 1_000.0 // 1 kB = 1_000 bytes
+}