Skip to content

Backport of #343 #344 #352

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

Merged
merged 2 commits into from
Jan 25, 2025
Merged

Backport of #343 #344 #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
492b016
chore: add new utreexo seed [seed.bitcoin.luisschwab.com] (#343)
luisschwab Jan 21, 2025
779d7a4
fix,log: remove unresponsive peers, better DNS logging (#344)
luisschwab Jan 22, 2025
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
15 changes: 5 additions & 10 deletions crates/floresta-chain/src/pruned_utreexo/chainparams.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,21 +277,16 @@ pub fn get_chain_dns_seeds(network: Network) -> Vec<DnsSeed> {
Network::Bitcoin => {
seeds.push(DnsSeed::new(
Network::Bitcoin,
"seed.bitcoin.sipa.be",
x9, // no COMPACT_FILTERS
"seed.bitcoin.luisschwab.com",
x1000049,
));
seeds.push(DnsSeed::new(Network::Bitcoin, "dnsseed.bluematt.me", x49));
seeds.push(DnsSeed::new(
Network::Bitcoin,
"dnsseed.bitcoin.dashjr.org",
none, // no filter
"seed.bitcoin.sipa.be",
x9, // no COMPACT_FILTERS
));
seeds.push(DnsSeed::new(Network::Bitcoin, "dnsseed.bluematt.me", x49));
seeds.push(DnsSeed::new(Network::Bitcoin, "seed.bitcoinstats.com", x49));
seeds.push(DnsSeed::new(
Network::Bitcoin,
"seed.bitcoin.jonasschnelli.ch",
x49,
));
seeds.push(DnsSeed::new(
Network::Bitcoin,
"seed.btc.petertodd.org",
Expand Down
13 changes: 10 additions & 3 deletions crates/floresta-wire/src/p2p_wire/address_man.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,16 +449,23 @@ impl AddressMan {
self.push_addresses(&persisted_peers);

let mut peers_from_dns = 0;
info!("Starting peer discovery via DNS seeds");
for seed in dns_seeds {
match self.get_seeds_from_dns(seed, default_port) {
Ok(peers) => peers_from_dns += peers,
Ok(peers) => {
peers_from_dns += peers;
info!("Got {} peers from {}", peers, seed.seed);
}
Err(e) => {
info!("Error getting peers from DNS seed {}: {e:?}", seed.seed);
}
}
}

info!("Got {peers_from_dns} peers from DNS Seeds",);
info!(
"Got {} peers from {} DNS seeds",
peers_from_dns,
dns_seeds.len()
);

let anchors = std::fs::read_to_string(format!("{datadir}/anchors.json"))?;
let anchors = serde_json::from_str::<Vec<DiskLocalAddress>>(&anchors)?;
Expand Down