Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mempool space inf loop bug #1330

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Fix mempool space inf loop bug #1330

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fadd6ee
Fix bug
ercecan Oct 11, 2024
9fb4844
Fix tech debt
ercecan Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions crates/bitcoin-da/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::collections::HashSet;
use std::path::PathBuf;
use std::sync::Arc;

use anyhow::{bail, Context, Result};
use anyhow::{anyhow, bail, Context, Result};
use async_trait::async_trait;
use backoff::future::retry as retry_backoff;
use backoff::ExponentialBackoff;
Expand Down Expand Up @@ -560,9 +560,12 @@ impl BitcoinService {
#[instrument(level = "trace", skip_all, ret)]
pub async fn get_fee_rate_as_sat_vb(&self) -> Result<u64, anyhow::Error> {
// If network is regtest or signet, mempool space is not available
let smart_fee = match get_fee_rate_from_mempool_space(self.network).await? {
Some(fee_rate) => Some(fee_rate),
None => self.client.estimate_smart_fee(1, None).await?.fee_rate,
let smart_fee = match get_fee_rate_from_mempool_space(self.network).await {
Ok(fee_rate) => Some(fee_rate),
Err(e) => {
ercecan marked this conversation as resolved.
Show resolved Hide resolved
tracing::warn!(?e, "Failed to get fee rate from mempool.space");
self.client.estimate_smart_fee(1, None).await?.fee_rate
}
};
let sat_vkb = smart_fee.map_or(1000, |rate| rate.to_sat());

Expand Down Expand Up @@ -999,9 +1002,7 @@ fn calculate_witness_root(txdata: &[TransactionWrapper]) -> [u8; 32] {
BitcoinMerkleTree::new(hashes).root()
}

pub(crate) async fn get_fee_rate_from_mempool_space(
network: bitcoin::Network,
) -> Result<Option<Amount>> {
pub(crate) async fn get_fee_rate_from_mempool_space(network: bitcoin::Network) -> Result<Amount> {
let url = match network {
bitcoin::Network::Bitcoin => format!(
// Mainnet
Expand All @@ -1012,15 +1013,20 @@ pub(crate) async fn get_fee_rate_from_mempool_space(
"{}testnet4/{}",
MEMPOOL_SPACE_URL, MEMPOOL_SPACE_RECOMMENDED_FEE_ENDPOINT
),
_ => return Ok(None),
_ => {
return Err(anyhow!(
"Unsupported network for mempool space fee estimation"
))
}
};
let fee_rate = reqwest::get(url)
.await?
.json::<serde_json::Value>()
.await?
.get("fastestFee")
.and_then(|fee| fee.as_u64())
.map(|fee| Amount::from_sat(fee * 1000)); // multiply by 1000 to convert to sat/vkb
.map(|fee| Amount::from_sat(fee * 1000)) // multiply by 1000 to convert to sat/vkb
.ok_or(anyhow!("Failed to get fee rate from mempool space"))?;

Ok(fee_rate)
}
Expand Down Expand Up @@ -1503,19 +1509,15 @@ mod tests {
async fn test_mempool_space_fee_rate() {
let _fee_rate = get_fee_rate_from_mempool_space(bitcoin::Network::Bitcoin)
.await
.unwrap()
.unwrap();
let _fee_rate = get_fee_rate_from_mempool_space(bitcoin::Network::Testnet)
.await
.unwrap()
.unwrap();
assert!(get_fee_rate_from_mempool_space(bitcoin::Network::Regtest)
.await
.unwrap()
.is_none());
.is_err());
assert!(get_fee_rate_from_mempool_space(bitcoin::Network::Signet)
.await
.unwrap()
.is_none());
.is_err());
}
}
Loading