Skip to content

Weekly Floresta Bump #149

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

Closed
luisschwab wants to merge 1 commit into from
Closed

Weekly Floresta Bump #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
384 changes: 299 additions & 85 deletions Cargo-minimal.lock
View file
Open in desktop

Large diffs are not rendered by default.

141 changes: 73 additions & 68 deletions Cargo-recent.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ dependencies = [
"bdk_wallet",
"bitcoin",
"bitcoin-consensus-encoding 1.0.0-rc.3",
"floresta-chain",
"floresta-compact-filters",
"floresta-domain",
"floresta-mempool",
"floresta-wire",
"floresta",
"futures",
"halfin",
"lazy_static",
Expand Down Expand Up @@ -198,14 +194,13 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f"

[[package]]
name = "bip324"
version = "0.10.0"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10e93f07cf774278cf032e8f1d97343a08d079017a33bb20097df380fd55d26c"
checksum = "a03c45ad0d13f5df3aff10b7fdf6897dba1e9fc819cf932589d48ddba2536c94"
dependencies = [
"bitcoin",
"bitcoin_hashes 0.15.0",
"chacha20-poly1305",
"rand 0.8.6",
"secp256k1",
"tokio",
]

Expand Down Expand Up @@ -422,6 +417,17 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

[[package]]
name = "chacha20"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
"rand_core 0.10.1",
]

[[package]]
name = "chacha20-poly1305"
version = "0.1.2"
Expand Down Expand Up @@ -491,6 +497,15 @@ dependencies = [
"libc",
]

[[package]]
name = "cpufeatures"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
dependencies = [
"libc",
]

[[package]]
name = "crc32fast"
version = "1.5.0"
Expand Down Expand Up @@ -643,10 +658,22 @@ dependencies = [
"zlib-rs",
]

[[package]]
name = "floresta"
version = "0.5.0"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"floresta-chain",
"floresta-compact-filters",
"floresta-domain",
"floresta-mempool",
"floresta-wire",
]

[[package]]
name = "floresta-chain"
version = "0.5.0"
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"bitcoin",
"floresta-common",
Expand All @@ -662,10 +689,10 @@ dependencies = [
[[package]]
name = "floresta-common"
version = "0.5.0"
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"bitcoin",
"hashbrown 0.16.1",
"hashbrown 0.17.0",
"sha2",
"spin",
"tracing",
Expand All @@ -674,7 +701,7 @@ dependencies = [
[[package]]
name = "floresta-compact-filters"
version = "0.5.0"
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"bitcoin",
"floresta-chain",
Expand All @@ -683,7 +710,7 @@ dependencies = [
[[package]]
name = "floresta-domain"
version = "0.1.0"
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"bitcoin",
"floresta-chain",
Expand All @@ -693,21 +720,21 @@ dependencies = [
[[package]]
name = "floresta-mempool"
version = "0.5.0"
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"ahash",
"bitcoin",
"floresta-chain",
"floresta-domain",
"rand 0.9.4",
"rand 0.10.1",
"rustreexo",
"tracing",
]

[[package]]
name = "floresta-wire"
version = "0.5.0"
source = "git+https://github.com/getfloresta/Floresta.git?rev=cb1d60828f4a39fbb311975059f2c7eb3d18bc97#cb1d60828f4a39fbb311975059f2c7eb3d18bc97"
source = "git+https://github.com/luisschwab/Floresta?branch=fix%2Ffloresta-re-exports#41216f16425ec3c5ac7ab78d1e6f07e7910ef4f0"
dependencies = [
"bip324",
"bitcoin",
Expand All @@ -716,7 +743,7 @@ dependencies = [
"floresta-common",
"floresta-compact-filters",
"floresta-domain",
"rand 0.9.4",
"rand 0.10.1",
"rustls",
"rustreexo",
"serde",
Expand Down Expand Up @@ -861,14 +888,14 @@ dependencies = [

[[package]]
name = "getrandom"
version = "0.3.4"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasip2",
"rand_core 0.10.1",
]

[[package]]
Expand Down Expand Up @@ -933,9 +960,14 @@ dependencies = [

[[package]]
name = "hashbrown"
version = "0.17.1"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash",
]

[[package]]
name = "hex-conservative"
Expand Down Expand Up @@ -1180,7 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
dependencies = [
"equivalent",
"hashbrown 0.17.1",
"hashbrown 0.17.0",
]

[[package]]
Expand Down Expand Up @@ -1216,7 +1248,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
dependencies = [
"cpufeatures",
"cpufeatures 0.2.17",
]

[[package]]
Expand Down Expand Up @@ -1263,11 +1295,11 @@ checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"

[[package]]
name = "lru"
version = "0.16.4"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
checksum = "0e0b564323a0fb6d54b864f625ae139de9612e27edb944dda37c109f05aac531"
dependencies = [
"hashbrown 0.16.1",
"hashbrown 0.17.0",
]

[[package]]
Expand All @@ -1293,9 +1325,9 @@ checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"

[[package]]
name = "memmap2"
version = "0.9.10"
version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
dependencies = [
"libc",
]
Expand Down Expand Up @@ -1467,9 +1499,9 @@ dependencies = [

[[package]]
name = "r-efi"
version = "5.3.0"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"

[[package]]
name = "rand"
Expand All @@ -1478,18 +1510,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
dependencies = [
"libc",
"rand_chacha 0.3.1",
"rand_chacha",
"rand_core 0.6.4",
]

[[package]]
name = "rand"
version = "0.9.4"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.5",
"chacha20",
"getrandom 0.4.3",
"rand_core 0.10.1",
]

[[package]]
Expand All @@ -1502,16 +1535,6 @@ dependencies = [
"rand_core 0.6.4",
]

[[package]]
name = "rand_chacha"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core 0.9.5",
]

[[package]]
name = "rand_core"
version = "0.6.4"
Expand All @@ -1523,12 +1546,9 @@ dependencies = [

[[package]]
name = "rand_core"
version = "0.9.5"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
dependencies = [
"getrandom 0.3.4",
]
checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"

[[package]]
name = "regex-automata"
Expand Down Expand Up @@ -1701,7 +1721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures",
"cpufeatures 0.2.17",
"digest",
]

Expand Down Expand Up @@ -2280,15 +2300,6 @@ version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"

[[package]]
name = "wasip2"
version = "1.0.3+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
dependencies = [
"wit-bindgen",
]

[[package]]
name = "webpki-roots"
version = "1.0.7"
Expand Down Expand Up @@ -2494,12 +2505,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"

[[package]]
name = "wit-bindgen"
version = "0.57.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"

[[package]]
name = "writeable"
version = "0.6.3"
Expand Down
21 changes: 11 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ readme = "README.md"
rust-version = "1.85.0" # MSRV
edition = "2024"

[features]
default = ["logger"]
logger = ["dep:tracing-appender", "dep:tracing-subscriber", "dep:time"]

[[example]]
name = "client_regtest"
required-features = ["logger"]
Expand All @@ -23,14 +19,19 @@ required-features = ["logger"]
name = "client_signet"
required-features = ["logger"]

[features]
default = ["logger"]
logger = ["dep:tracing-appender", "dep:tracing-subscriber", "dep:time"]

[dependencies]
bitcoin = { version = "=0.32.8" }
bdk_wallet = { version = "=3.0.0" }
floresta-chain = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97", features = ["flat-chainstore"] }
floresta-domain = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
floresta-compact-filters = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
floresta-mempool = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
floresta-wire = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
#floresta-chain = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97", features = ["flat-chainstore"] }
#floresta-domain = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
#floresta-compact-filters = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
#floresta-mempool = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
#floresta-wire = { git = "https://github.com/getfloresta/Floresta.git", rev = "cb1d60828f4a39fbb311975059f2c7eb3d18bc97" }
floresta = { git = "https://github.com/luisschwab/Floresta", branch = "fix/floresta-re-exports", default-features = false, features = ["chain-flat-chainstore", "compact-filters", "domain", "mempool", "wire"] }
futures = { version = "=0.3.32" }
tokio = { version = "=1.52.3", features = ["rt", "signal", "sync", "time"] }
tracing = { version = "=0.1.44" }
Expand Down Expand Up @@ -59,6 +60,7 @@ toolchains = { stable = "1.96.0", nightly = "nightly-2026-06-23" }
tools = { cargo-audit = "=0.22.2", zizmor = "=1.26.1" }
test = { sample_strategy = "all" }
lint = { allowed_duplicates = [
"cpufeatures",
"base64", # blame: bitcoin@v0.32.8 (v0.21) vs floresta-wire@v0.5.0 -> tonic@v0.14.5 (v0.22)
"bitcoin_hashes", # blame: bitcoin@v0.32.8 (v0.14), floresta-wire@v0.5.0 -> bip324@v0.10.0 (v0.15), floresta-chain@v0.5.0 -> rustreexo@v0.5.0 (v0.20)
"bitcoin-consensus-encoding", # blame: floresta-chain@v0.5.0 -> rustreexo@v0.5.0 -> bitcoin_hashes@v0.20.0 (v0.1.0) vs bitcoin-io@v0.3.0 / bitcoin_hashes@v1.0.0 (v1.0.0)
Expand All @@ -69,7 +71,6 @@ lint = { allowed_duplicates = [
"hex-conservative", # blame: bitcoin@v0.32.8 (v0.2), floresta-wire@v0.5.0 -> bip324@v0.10.0 -> bitcoin_hashes@v0.15.0 (v0.3), floresta-chain@v0.5.0 -> rustreexo@v0.5.0 (v1.1)
"rand", # blame: floresta-wire@v0.5.0 -> bip324@v0.10.0 -> rand@v0.8.6 (v0.8) vs floresta-wire@v0.5.0 -> rand@v0.9.4 (v0.9)
"rand_core", # blame: floresta-wire@v0.5.0 -> bip324@v0.10.0 -> rand@v0.8.6 -> rand_core@v0.6.4 (v0.6) vs floresta-wire@v0.5.0 -> rand@v0.9.4 -> rand_core@v0.9.5 (v0.9)
"rand_chacha", # blame: floresta-wire@v0.5.0 -> bip324@v0.10.0 -> rand@v0.8.6 -> rand_chacha@v0.3.1 (v0.3) vs floresta-wire@v0.5.0 -> rand@v0.9.4 -> rand_chacha@v0.9.0 (v0.9)
"windows-sys", # blame: floresta-wire@v0.5.0 -> ring@v0.17.14 (v0.52), dns-lookup@v2.1.1 (v0.60), tokio@v1.52.3 (v0.61)
"windows-targets", # blame: cascades from windows-sys versions above
"windows_aarch64_gnullvm", # blame: cascades from windows-targets versions above
Expand Down
Loading
Loading