X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fconvert.rs;h=64039233e7d5800fc9c1c147c2e800c328ced0fd;hb=2dbe461743604d8ce8219e99ea337dd7b8b498df;hp=06677bc5780962d1bf4e16ecd5091f8cb96bb656;hpb=b630ab9aecd9cae3ca264aaafb1af70ce81de0d7;p=ldk-sample

diff --git a/src/convert.rs b/src/convert.rs
index 06677bc..6403923 100644
--- a/src/convert.rs
+++ b/src/convert.rs
@@ -51,8 +51,7 @@ impl TryInto<NewAddress> for JsonResponse {
 }
 
 pub struct FeeResponse {
-	pub feerate: Option<u32>,
-	// pub errors: Array<String>,
+	pub feerate_sat_per_kw: Option<u32>,
 	pub errored: bool,
 }
 
@@ -62,13 +61,15 @@ impl TryInto<FeeResponse> for JsonResponse {
 		let errored = !self.0["errors"].is_null();
 		Ok(FeeResponse {
 			errored,
-			  feerate: match self.0["feerate"].as_f64() {
-            Some(fee) => Some((fee * 100_000_000.0).round() as u32),
-            None => None
-        }
-				// true => None,
-				// // The feerate from bitcoind is in BTC/kb, and we want satoshis/kb.
-				// false => Some((self.0["feerate"].as_f64().unwrap() * 100_000_000.0).round() as u32),
+			feerate_sat_per_kw: match self.0["feerate"].as_f64() {
+				// Bitcoin Core gives us a feerate in BTC/KvB, which we need to convert to
+				// satoshis/KW. Thus, we first multiply by 10^8 to get satoshis, then divide by 4
+				// to convert virtual-bytes into weight units.
+				Some(feerate_btc_per_kvbyte) => {
+					Some((feerate_btc_per_kvbyte * 100_000_000.0 / 4.0).round() as u32)
+				}
+				None => None,
+			},
 		})
 	}
 }
@@ -76,6 +77,7 @@ impl TryInto<FeeResponse> for JsonResponse {
 pub struct BlockchainInfo {
 	pub latest_height: usize,
 	pub latest_blockhash: BlockHash,
+	pub chain: String,
 }
 
 impl TryInto<BlockchainInfo> for JsonResponse {
@@ -85,6 +87,7 @@ impl TryInto<BlockchainInfo> for JsonResponse {
 			latest_height: self.0["blocks"].as_u64().unwrap() as usize,
 			latest_blockhash: BlockHash::from_hex(self.0["bestblockhash"].as_str().unwrap())
 				.unwrap(),
+			chain: self.0["chain"].as_str().unwrap().to_string(),
 		})
 	}
 }