diff --git a/swap/src/api/request.rs b/swap/src/api/request.rs index 2279475f..5480522f 100644 --- a/swap/src/api/request.rs +++ b/swap/src/api/request.rs @@ -660,9 +660,8 @@ impl Request { anyhow::anyhow!("Failed to convert BTC amount to Decimal") })? .checked_div(xmr_amount.as_xmr()) - .ok_or_else(|| anyhow::anyhow!("Division by zero or overflow"))? - .round_dp(8); - let exchange_rate_str = format!("{} XMR/BTC", exchange_rate); + .ok_or_else(|| anyhow::anyhow!("Division by zero or overflow"))?; + let exchange_rate_str = format!("{} XMR/BTC", exchange_rate.round_dp(8)); let swap_data = json!({ "swap_id": swap_id.to_string(), diff --git a/swap/src/bin/asb.rs b/swap/src/bin/asb.rs index 131fe113..9184abc7 100644 --- a/swap/src/bin/asb.rs +++ b/swap/src/bin/asb.rs @@ -267,11 +267,10 @@ async fn main() -> Result<()> { let swap_start_date = db.get_swap_start_date(swap_id).await?; let peer_id = db.get_peer_id(swap_id).await?; - let exchange_rate = Decimal::from_f64(btc_amount.to_btc()) + let exchange_rate = Decimal::from_f64(state3.btc.to_btc()) .ok_or_else(|| anyhow::anyhow!("Failed to convert BTC amount to Decimal"))? - .checked_div(xmr_amount.as_xmr()) - .ok_or_else(|| anyhow::anyhow!("Division by zero or overflow"))? - .round_dp(8); + .checked_div(state3.xmr.as_xmr()) + .ok_or_else(|| anyhow::anyhow!("Division by zero or overflow"))?; let exchange_rate = format!("{} XMR/BTC", exchange_rate.round_dp(8)); if json {