Skip to content

Commit 632ea63

Browse files
luisschwabluisschwab
committed
Merge #141: Weekly Floresta bump
ebcdf1d chore(deps): bump `floresta-*` to cb1d608 (Luis Schwab) 9a3facf chore(example): drop fixed peer from signet example (Luis Schwab) Pull request description: Top commit has no ACKs. Tree-SHA512: aa2582853e202ba2afcd07375cde8fbf4f56530108b018a1805cb4e2f94b393396ddb03e6558ef745fcbb1322e4765e25002a9d1f493477d69d23f62fad4f885
2 parents 3e81d5e + ebcdf1d commit 632ea63

7 files changed

Lines changed: 87 additions & 23 deletions

File tree

‎.cargo/audit.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ ignore = [
1313
"RUSTSEC-2026-0007", # blame: floresta-wire@v0.5.0 -> ureq@v3.1.0 -> ureq-proto@v0.5.0 -> http@v1.1.0 -> bytes@v1.5.0
1414
"RUSTSEC-2026-0009", # note: time@v0.3.46 requires MSRV >= 1.86.0
1515
"RUSTSEC-2024-0332", # blame: floresta-wire@v0.5.0 -> tonic@v0.14.5 -> hyper-timeout@v0.5.0 -> hyper@v1.6.0 -> h2@v0.4.2
16+
"RUSTSEC-2026-0012", # blame: floresta-wire@v0.5.0 -> sha3@v0.10.7 -> keccak@v0.1.3
1617
]

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
Cargo.lock
2+
Cargo.lock.backup
3+
14
data/
25
target/
3-
Cargo.lock
6+
47
NOTES.md
58
*.txt

‎Cargo-minimal.lock‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ dependencies = [
148148
"dns-lookup",
149149
"floresta-chain",
150150
"floresta-compact-filters",
151+
"floresta-domain",
151152
"floresta-mempool",
152153
"floresta-wire",
153154
"futures",
@@ -668,7 +669,7 @@ dependencies = [
668669
[[package]]
669670
name = "floresta-chain"
670671
version = "0.5.0"
671-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
672+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
672673
dependencies = [
673674
"bitcoin",
674675
"floresta-common",
@@ -684,7 +685,7 @@ dependencies = [
684685
[[package]]
685686
name = "floresta-common"
686687
version = "0.5.0"
687-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
688+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
688689
dependencies = [
689690
"bitcoin",
690691
"hashbrown 0.16.1",
@@ -696,20 +697,31 @@ dependencies = [
696697
[[package]]
697698
name = "floresta-compact-filters"
698699
version = "0.5.0"
699-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
700+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
700701
dependencies = [
701702
"bitcoin",
702703
"floresta-chain",
703704
]
704705

706+
[[package]]
707+
name = "floresta-domain"
708+
version = "0.1.0"
709+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
710+
dependencies = [
711+
"bitcoin",
712+
"floresta-chain",
713+
"rustreexo",
714+
]
715+
705716
[[package]]
706717
name = "floresta-mempool"
707718
version = "0.5.0"
708-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
719+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
709720
dependencies = [
710721
"ahash",
711722
"bitcoin",
712723
"floresta-chain",
724+
"floresta-domain",
713725
"rand 0.9.4",
714726
"rustreexo",
715727
"tracing",
@@ -718,20 +730,21 @@ dependencies = [
718730
[[package]]
719731
name = "floresta-wire"
720732
version = "0.5.0"
721-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
733+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
722734
dependencies = [
723735
"bip324",
724736
"bitcoin",
725737
"dns-lookup",
726738
"floresta-chain",
727739
"floresta-common",
728740
"floresta-compact-filters",
729-
"floresta-mempool",
741+
"floresta-domain",
730742
"rand 0.9.4",
731743
"rustls",
732744
"rustreexo",
733745
"serde",
734746
"serde_json",
747+
"sha3",
735748
"tokio",
736749
"tonic",
737750
"tonic-prost",
@@ -1248,6 +1261,15 @@ dependencies = [
12481261
"serde_json",
12491262
]
12501263

1264+
[[package]]
1265+
name = "keccak"
1266+
version = "0.1.3"
1267+
source = "registry+https://github.com/rust-lang/crates.io-index"
1268+
checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
1269+
dependencies = [
1270+
"cpufeatures",
1271+
]
1272+
12511273
[[package]]
12521274
name = "lazy_static"
12531275
version = "1.5.0"
@@ -1764,6 +1786,16 @@ dependencies = [
17641786
"digest",
17651787
]
17661788

1789+
[[package]]
1790+
name = "sha3"
1791+
version = "0.10.7"
1792+
source = "registry+https://github.com/rust-lang/crates.io-index"
1793+
checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c"
1794+
dependencies = [
1795+
"digest",
1796+
"keccak",
1797+
]
1798+
17671799
[[package]]
17681800
name = "sharded-slab"
17691801
version = "0.1.4"

‎Cargo-recent.lock‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ dependencies = [
139139
"dns-lookup",
140140
"floresta-chain",
141141
"floresta-compact-filters",
142+
"floresta-domain",
142143
"floresta-mempool",
143144
"floresta-wire",
144145
"futures",
@@ -646,7 +647,7 @@ dependencies = [
646647
[[package]]
647648
name = "floresta-chain"
648649
version = "0.5.0"
649-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
650+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
650651
dependencies = [
651652
"bitcoin",
652653
"floresta-common",
@@ -662,7 +663,7 @@ dependencies = [
662663
[[package]]
663664
name = "floresta-common"
664665
version = "0.5.0"
665-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
666+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
666667
dependencies = [
667668
"bitcoin",
668669
"hashbrown 0.16.1",
@@ -674,20 +675,31 @@ dependencies = [
674675
[[package]]
675676
name = "floresta-compact-filters"
676677
version = "0.5.0"
677-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
678+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
678679
dependencies = [
679680
"bitcoin",
680681
"floresta-chain",
681682
]
682683

684+
[[package]]
685+
name = "floresta-domain"
686+
version = "0.1.0"
687+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
688+
dependencies = [
689+
"bitcoin",
690+
"floresta-chain",
691+
"rustreexo",
692+
]
693+
683694
[[package]]
684695
name = "floresta-mempool"
685696
version = "0.5.0"
686-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
697+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
687698
dependencies = [
688699
"ahash",
689700
"bitcoin",
690701
"floresta-chain",
702+
"floresta-domain",
691703
"rand 0.9.4",
692704
"rustreexo",
693705
"tracing",
@@ -696,20 +708,21 @@ dependencies = [
696708
[[package]]
697709
name = "floresta-wire"
698710
version = "0.5.0"
699-
source = "git+https://github.com/getfloresta/Floresta.git?rev=3c038fac86d85777148a20944f77dfe17c2d9518#3c038fac86d85777148a20944f77dfe17c2d9518"
711+
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
700712
dependencies = [
701713
"bip324",
702714
"bitcoin",
703715
"dns-lookup",
704716
"floresta-chain",
705717
"floresta-common",
706718
"floresta-compact-filters",
707-
"floresta-mempool",
719+
"floresta-domain",
708720
"rand 0.9.4",
709721
"rustls",
710722
"rustreexo",
711723
"serde",
712724
"serde_json",
725+
"sha3",
713726
"tokio",
714727
"tonic",
715728
"tonic-prost",
@@ -1198,6 +1211,15 @@ dependencies = [
11981211
"serde_json",
11991212
]
12001213

1214+
[[package]]
1215+
name = "keccak"
1216+
version = "0.1.6"
1217+
source = "registry+https://github.com/rust-lang/crates.io-index"
1218+
checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
1219+
dependencies = [
1220+
"cpufeatures",
1221+
]
1222+
12011223
[[package]]
12021224
name = "lazy_static"
12031225
version = "1.5.0"
@@ -1684,6 +1706,16 @@ dependencies = [
16841706
"digest",
16851707
]
16861708

1709+
[[package]]
1710+
name = "sha3"
1711+
version = "0.10.9"
1712+
source = "registry+https://github.com/rust-lang/crates.io-index"
1713+
checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874"
1714+
dependencies = [
1715+
"digest",
1716+
"keccak",
1717+
]
1718+
16871719
[[package]]
16881720
name = "sharded-slab"
16891721
version = "0.1.7"

‎Cargo.toml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ toml = { version = "=1.1.2" }
2929
[dependencies]
3030
bitcoin = { version = "=0.32.8" }
3131
bdk_wallet = { version = "=3.0.0" }
32-
floresta-chain = { git = "https://github.com/getfloresta/Floresta.git", rev = "3c038fac86d85777148a20944f77dfe17c2d9518", features = ["flat-chainstore"] }
33-
floresta-compact-filters = { git = "https://github.com/getfloresta/Floresta.git", rev = "3c038fac86d85777148a20944f77dfe17c2d9518" }
34-
floresta-mempool = { git = "https://github.com/getfloresta/Floresta.git", rev = "3c038fac86d85777148a20944f77dfe17c2d9518" }
35-
floresta-wire = { git = "https://github.com/getfloresta/Floresta.git", rev = "3c038fac86d85777148a20944f77dfe17c2d9518" }
32+
floresta-chain = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97", features = ["flat-chainstore"] }
33+
floresta-domain = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
34+
floresta-compact-filters = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
35+
floresta-mempool = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
36+
floresta-wire = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
3637
futures = { version = "=0.3.32" }
3738
tokio = { version = "=1.52.3", features = ["rt", "signal", "sync", "time"] }
3839
tracing = { version = "=0.1.44" }

‎examples/client_signet.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
//! [`Node`]: bdk_floresta::node::Node
2727
2828
use std::env;
29-
use std::net::SocketAddr;
3029
use std::path::PathBuf;
31-
use std::str::FromStr;
3230
use std::sync::Arc;
3331

3432
use bdk_floresta::builder::Builder;
@@ -47,8 +45,6 @@ use tracing::info;
4745
use tracing::warn;
4846
use tracing::Level;
4947

50-
const UTREEXO_BRIDGE: &str = "utreexod.signet.lab.vinteum.org";
51-
5248
const NETWORK: Network = Network::Signet;
5349
const DATA_DIR: &str = "./examples/data/client_signet/";
5450

@@ -69,7 +65,6 @@ async fn main() -> anyhow::Result<()> {
6965
let config = NodeConfig {
7066
network: NETWORK,
7167
datadir: PathBuf::from(DATA_DIR).join("bdk_floresta"),
72-
fixed_peers: Some(vec![SocketAddr::from_str(UTREEXO_BRIDGE)?]),
7368
..Default::default()
7469
};
7570

‎src/node/error.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pub enum NodeError {
9797
Blockchain(floresta_chain::BlockchainError),
9898

9999
/// Mempool related errors.
100-
Mempool(floresta_mempool::mempool::MempoolError),
100+
Mempool(floresta_domain::mempool::error::MempoolError),
101101

102102
/// Failed to fetch all of the requested blocks.
103103
MissingBlock(bitcoin::BlockHash),

0 commit comments

Comments
 (0)