From 8c153080e7afc05a4bf02367dfa4955e10adab78 Mon Sep 17 00:00:00 2001 From: Leonardo Lima Date: Thu, 2 Oct 2025 14:42:28 +1000 Subject: [PATCH 1/4] chore(msrv): bump MSRV to `1.85.0` - update all references to previous 1.63.0 MSRV. - update the rust-version to 1.85.0. - update the CI to not exclude bdk_electrum anymore. - update the ci/pin-msrv.sh to 1.85.0. --- .github/workflows/cont_integration.yml | 21 ++------------------- CONTRIBUTING.md | 2 +- README.md | 7 +++---- ci/pin-msrv.sh | 25 +------------------------ clippy.toml | 2 +- crates/bitcoind_rpc/Cargo.toml | 2 +- crates/chain/Cargo.toml | 2 +- crates/core/Cargo.toml | 2 +- crates/electrum/Cargo.toml | 1 + crates/esplora/Cargo.toml | 1 + crates/file_store/Cargo.toml | 1 + crates/testenv/Cargo.toml | 2 +- 12 files changed, 15 insertions(+), 53 deletions(-) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index d6e5d9ef6..4786d5e0c 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -28,8 +28,7 @@ jobs: rust: - version: ${{ needs.prepare.outputs.rust_version }} clippy: true - - version: 1.63.0 # Overall MSRV - - version: 1.75.0 # Specific MSRV for `bdk_electrum` + - version: 1.85.0 # Overall MSRV features: - --no-default-features --features miniscript/no-std,bdk_chain/hashbrown - --all-features @@ -46,31 +45,15 @@ jobs: profile: minimal - name: Rust Cache uses: Swatinem/rust-cache@v2.7.8 - - name: Pin dependencies for 1.75 - if: matrix.rust.version == '1.75.0' - run: | - cargo update -p home --precise "0.5.9" - cargo update -p native-tls --precise "0.2.13" - cargo update -p idna_adapter --precise "1.1.0" - cargo update -p base64ct --precise "1.6.0" - cargo update -p minreq --precise "2.13.2" - cargo update -p rayon --precise "1.10.0" - cargo update -p rayon-core --precise "1.12.1" - cargo update -p time --precise "0.3.41" - name: Pin dependencies for MSRV - if: matrix.rust.version == '1.63.0' + if: matrix.rust.version == '1.85.0' run: ./ci/pin-msrv.sh - name: Build + Test env: MATRIX_RUST_VERSION: ${{ matrix.rust.version }} run: | - if [ $MATRIX_RUST_VERSION = '1.63.0' ]; then - cargo build --workspace --exclude 'example_*' --exclude 'bdk_electrum' ${{ matrix.features }} - cargo test --workspace --exclude 'example_*' --exclude 'bdk_electrum' ${{ matrix.features }} - else cargo build --workspace --exclude 'example_*' ${{ matrix.features }} cargo test --workspace --exclude 'example_*' ${{ matrix.features }} - fi check-no-std: needs: prepare diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b7778f781..a9a904653 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ Every new feature should be covered by functional tests where possible. When refactoring, structure your PR to make it easy to review and don't hesitate to split it into multiple small, focused PRs. -The Minimum Supported Rust Version is **1.63.0** (enforced by our CI). +The Minimum Supported Rust Version is **1.85.0** (enforced by our CI). Commits should cover both the issue fixed and the solution's rationale. These [guidelines](https://chris.beams.io/posts/git-commit/) should be kept in mind. Commit messages follow the ["Conventional Commits 1.0.0"](https://www.conventionalcommits.org/en/v1.0.0/) to make commit histories easier to read by humans and automated tools. All commits must be [GPG signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits). diff --git a/README.md b/README.md index 635489d8b..472222ad6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ MIT or Apache-2.0 Licensed CI Status - Rustc Version 1.63.0+ + Rustc Version 1.85.0+ Chat on Discord

@@ -58,15 +58,14 @@ Fully working examples of how to use these components are in `/examples`: ## Minimum Supported Rust Version (MSRV) -The following BDK crates maintains a MSRV of 1.63.0. To build these crates with the MSRV of 1.63.0 you will need to pin dependencies by running the [`pin-msrv.sh`](./ci/pin-msrv.sh) script. +The following BDK crates maintains a MSRV of 1.85.0. To build these crates with the MSRV of 1.85.0 you will need to pin dependencies by running the [`pin-msrv.sh`](./ci/pin-msrv.sh) script. - `bdk_core` - `bdk_chain` - `bdk_bitcoind_rpc` - `bdk_esplora` - `bdk_file_store` - -The MSRV of the `bdk_electrum` crate is 1.75.0. +- `bdk_electrum` ## Just diff --git a/ci/pin-msrv.sh b/ci/pin-msrv.sh index 421a68372..0384cc452 100755 --- a/ci/pin-msrv.sh +++ b/ci/pin-msrv.sh @@ -8,27 +8,4 @@ set -euo pipefail # To pin deps, switch toolchain to MSRV and execute the below updates # cargo clean -# rustup override set 1.63.0 - -cargo update -p zstd-sys --precise "2.0.8+zstd.1.5.5" -cargo update -p time --precise "0.3.20" -cargo update -p home --precise "0.5.5" -cargo update -p proptest --precise "1.2.0" -cargo update -p url --precise "2.5.0" -cargo update -p tokio --precise "1.38.1" -cargo update -p reqwest --precise "0.12.4" -cargo update -p security-framework-sys --precise "2.11.1" -cargo update -p csv --precise "1.3.0" -cargo update -p unicode-width --precise "0.1.13" -cargo update -p native-tls --precise "0.2.13" -cargo update -p flate2 --precise "1.0.35" -cargo update -p bzip2-sys --precise "0.1.12" -cargo update -p ring --precise "0.17.12" -cargo update -p once_cell --precise "1.20.3" -cargo update -p base64ct --precise "1.6.0" -cargo update -p minreq --precise "2.13.2" -cargo update -p tracing-core --precise "0.1.33" -cargo update -p webpki-roots@1.0.3 --precise "1.0.1" -cargo update -p rayon --precise "1.10.0" -cargo update -p rayon-core --precise "1.12.1" -cargo update -p socket2@0.6.0 --precise "0.5.10" +# rustup override set 1.85.0 diff --git a/clippy.toml b/clippy.toml index 69478ceab..730b7f372 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv="1.63.0" +msrv="1.85.0" diff --git a/crates/bitcoind_rpc/Cargo.toml b/crates/bitcoind_rpc/Cargo.toml index 2b8e03d20..572d1f523 100644 --- a/crates/bitcoind_rpc/Cargo.toml +++ b/crates/bitcoind_rpc/Cargo.toml @@ -2,7 +2,7 @@ name = "bdk_bitcoind_rpc" version = "0.22.0" edition = "2021" -rust-version = "1.63" +rust-version = "1.85.0" homepage = "https://bitcoindevkit.org" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_bitcoind_rpc" diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml index dd7d2bb36..895045e26 100644 --- a/crates/chain/Cargo.toml +++ b/crates/chain/Cargo.toml @@ -2,7 +2,7 @@ name = "bdk_chain" version = "0.23.2" edition = "2021" -rust-version = "1.63" +rust-version = "1.85.0" homepage = "https://bitcoindevkit.org" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_chain" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 4fc71c50f..a56863d96 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -2,7 +2,7 @@ name = "bdk_core" version = "0.6.2" edition = "2021" -rust-version = "1.63" +rust-version = "1.85.0" homepage = "https://bitcoindevkit.org" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_core" diff --git a/crates/electrum/Cargo.toml b/crates/electrum/Cargo.toml index 8fdd7823b..4a6dc4d5a 100644 --- a/crates/electrum/Cargo.toml +++ b/crates/electrum/Cargo.toml @@ -2,6 +2,7 @@ name = "bdk_electrum" version = "0.23.2" edition = "2021" +rust-version = "1.85.0" homepage = "https://bitcoindevkit.org" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_electrum" diff --git a/crates/esplora/Cargo.toml b/crates/esplora/Cargo.toml index e4c553f77..a052916a7 100644 --- a/crates/esplora/Cargo.toml +++ b/crates/esplora/Cargo.toml @@ -2,6 +2,7 @@ name = "bdk_esplora" version = "0.22.1" edition = "2021" +rust-version = "1.85.0" homepage = "https://bitcoindevkit.org" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_esplora" diff --git a/crates/file_store/Cargo.toml b/crates/file_store/Cargo.toml index 714c40e1b..8fbdc358d 100644 --- a/crates/file_store/Cargo.toml +++ b/crates/file_store/Cargo.toml @@ -2,6 +2,7 @@ name = "bdk_file_store" version = "0.22.0" edition = "2021" +rust-version = "1.85.0" license = "MIT OR Apache-2.0" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_file_store" diff --git a/crates/testenv/Cargo.toml b/crates/testenv/Cargo.toml index eff58a41c..2a707fe32 100644 --- a/crates/testenv/Cargo.toml +++ b/crates/testenv/Cargo.toml @@ -2,7 +2,7 @@ name = "bdk_testenv" version = "0.13.1" edition = "2021" -rust-version = "1.63" +rust-version = "1.85.0" homepage = "https://bitcoindevkit.org" repository = "https://github.com/bitcoindevkit/bdk" documentation = "https://docs.rs/bdk_testenv" From 6b67a3409bfda1b9294d705f83cf69d3dcdbd19d Mon Sep 17 00:00:00 2001 From: Leonardo Lima Date: Thu, 2 Oct 2025 14:49:44 +1000 Subject: [PATCH 2/4] fix(clippy): use `is_none_or` instead of `map_or` - use `is_non_or` instead of `map_or` - update lifetime on `find_direct_anchor` --- crates/chain/src/canonical_view.rs | 4 ++-- crates/chain/src/indexer/keychain_txout.rs | 2 +- crates/electrum/src/bdk_electrum_client.rs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/chain/src/canonical_view.rs b/crates/chain/src/canonical_view.rs index 09b18e50a..8567db10d 100644 --- a/crates/chain/src/canonical_view.rs +++ b/crates/chain/src/canonical_view.rs @@ -93,8 +93,8 @@ impl CanonicalView { where C: ChainOracle, { - fn find_direct_anchor<'g, A: Anchor, C: ChainOracle>( - tx_node: &TxNode<'g, Arc, A>, + fn find_direct_anchor( + tx_node: &TxNode<'_, Arc, A>, chain: &C, chain_tip: BlockId, ) -> Result, C::Error> { diff --git a/crates/chain/src/indexer/keychain_txout.rs b/crates/chain/src/indexer/keychain_txout.rs index b99a6a224..99931cf5e 100644 --- a/crates/chain/src/indexer/keychain_txout.rs +++ b/crates/chain/src/indexer/keychain_txout.rs @@ -1058,7 +1058,7 @@ impl Merge for ChangeSet { debug_assert!( orig_spks .iter() - .all(|(i, orig_spk)| spks.get(i).map_or(true, |spk| spk == orig_spk)), + .all(|(i, orig_spk)| spks.get(i).is_none_or(|spk| spk == orig_spk)), "spk of the same descriptor-id and derivation index must not be different" ); orig_spks.extend(spks); diff --git a/crates/electrum/src/bdk_electrum_client.rs b/crates/electrum/src/bdk_electrum_client.rs index ea14fa14e..05b501871 100644 --- a/crates/electrum/src/bdk_electrum_client.rs +++ b/crates/electrum/src/bdk_electrum_client.rs @@ -695,6 +695,7 @@ fn chain_update( #[cfg(test)] #[cfg_attr(coverage_nightly, coverage(off))] +#[allow(unused_imports)] mod test { use crate::{bdk_electrum_client::TxUpdate, electrum_client::ElectrumApi, BdkElectrumClient}; use bdk_chain::bitcoin::Amount; From 7c189d0c5c1315a246261cb242ee5cef8265f00a Mon Sep 17 00:00:00 2001 From: Leonardo Lima Date: Wed, 8 Oct 2025 11:02:13 +1100 Subject: [PATCH 3/4] chore(deps): bump `criterion` to `0.7` --- crates/chain/Cargo.toml | 2 +- crates/chain/benches/canonicalization.rs | 8 ++++---- crates/chain/benches/indexer.rs | 4 ++-- crates/electrum/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml index 895045e26..031005260 100644 --- a/crates/chain/Cargo.toml +++ b/crates/chain/Cargo.toml @@ -28,7 +28,7 @@ rusqlite = { version = "0.31.0", features = ["bundled"], optional = true } rand = "0.8" proptest = "1.2.0" bdk_testenv = { path = "../testenv" } -criterion = { version = "0.2" } +criterion = { version = "0.7" } [features] default = ["std", "miniscript"] diff --git a/crates/chain/benches/canonicalization.rs b/crates/chain/benches/canonicalization.rs index 3d8d8b295..074e38cc4 100644 --- a/crates/chain/benches/canonicalization.rs +++ b/crates/chain/benches/canonicalization.rs @@ -7,7 +7,7 @@ use bitcoin::{ absolute, constants, hashes::Hash, key::Secp256k1, transaction, Amount, BlockHash, Network, OutPoint, ScriptBuf, Transaction, TxIn, TxOut, }; -use criterion::{black_box, criterion_group, criterion_main, Criterion}; +use criterion::{criterion_group, criterion_main, Criterion}; use miniscript::{Descriptor, DescriptorPublicKey}; use std::sync::Arc; @@ -126,7 +126,7 @@ fn run_filter_chain_unspents(tx_graph: &KeychainTxGraph, chain: &LocalChain, exp pub fn many_conflicting_unconfirmed(c: &mut Criterion) { const CONFLICTING_TX_COUNT: u32 = 2100; - let (tx_graph, chain) = black_box(setup(|tx_graph, _chain| { + let (tx_graph, chain) = std::hint::black_box(setup(|tx_graph, _chain| { let previous_output = add_ancestor_tx(tx_graph, tip_block_id(), 0); // Create conflicting txs that spend from `previous_output`. let spk_1 = spk_at_index(&tx_graph.index, 1); @@ -164,7 +164,7 @@ pub fn many_conflicting_unconfirmed(c: &mut Criterion) { pub fn many_chained_unconfirmed(c: &mut Criterion) { const TX_CHAIN_COUNT: u32 = 2100; - let (tx_graph, chain) = black_box(setup(|tx_graph, _chain| { + let (tx_graph, chain) = std::hint::black_box(setup(|tx_graph, _chain| { let mut previous_output = add_ancestor_tx(tx_graph, tip_block_id(), 0); // Create a chain of unconfirmed txs where each subsequent tx spends the output of the // previous one. @@ -203,7 +203,7 @@ pub fn many_chained_unconfirmed(c: &mut Criterion) { pub fn nested_conflicts(c: &mut Criterion) { const CONFLICTS_PER_OUTPUT: usize = 3; const GRAPH_DEPTH: usize = 7; - let (tx_graph, chain) = black_box(setup(|tx_graph, _chain| { + let (tx_graph, chain) = std::hint::black_box(setup(|tx_graph, _chain| { let mut prev_ops = core::iter::once(add_ancestor_tx(tx_graph, tip_block_id(), 0)) .collect::>(); for depth in 1..GRAPH_DEPTH { diff --git a/crates/chain/benches/indexer.rs b/crates/chain/benches/indexer.rs index 3caea42d2..5907c76a0 100644 --- a/crates/chain/benches/indexer.rs +++ b/crates/chain/benches/indexer.rs @@ -8,7 +8,7 @@ use bitcoin::{ absolute, constants, hashes::Hash, key::Secp256k1, transaction, Amount, BlockHash, Network, Transaction, TxIn, TxOut, }; -use criterion::{black_box, criterion_group, criterion_main, Criterion}; +use criterion::{criterion_group, criterion_main, Criterion}; use miniscript::Descriptor; use std::sync::Arc; @@ -91,7 +91,7 @@ fn do_bench(indexed_tx_graph: &KeychainTxGraph, chain: &LocalChain) { } pub fn reindex_tx_graph(c: &mut Criterion) { - let (graph, chain) = black_box(setup(|graph, _chain| { + let (graph, chain) = std::hint::black_box(setup(|graph, _chain| { // Add relevant txs to graph for i in 0..TX_CT { let script_pubkey = graph.index.reveal_next_spk(()).unwrap().0 .1; diff --git a/crates/electrum/Cargo.toml b/crates/electrum/Cargo.toml index 4a6dc4d5a..4c324a8e1 100644 --- a/crates/electrum/Cargo.toml +++ b/crates/electrum/Cargo.toml @@ -20,7 +20,7 @@ electrum-client = { version = "0.24.0", features = [ "proxy" ], default-features [dev-dependencies] bdk_testenv = { path = "../testenv" } bdk_chain = { path = "../chain" } -criterion = { version = "0.2" } +criterion = { version = "0.7" } [features] default = ["use-rustls"] From 81ed4d0668acdefbc36416dc2c94b4587615b85b Mon Sep 17 00:00:00 2001 From: Leonardo Lima Date: Wed, 8 Oct 2025 11:12:12 +1100 Subject: [PATCH 4/4] feat(ci): update to `actions-rust-lang/setup-rust-toolchain@v1` --- .github/workflows/cont_integration.yml | 34 +++++++++----------------- .github/zizmor.yml | 8 ++++++ 2 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 .github/zizmor.yml diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 4786d5e0c..b35f6b173 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -28,7 +28,7 @@ jobs: rust: - version: ${{ needs.prepare.outputs.rust_version }} clippy: true - - version: 1.85.0 # Overall MSRV + - version: 1.85.0 # MSRV features: - --no-default-features --features miniscript/no-std,bdk_chain/hashbrown - --all-features @@ -38,13 +38,11 @@ jobs: with: persist-credentials: false - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ matrix.rust.version }} override: true - profile: minimal - - name: Rust Cache - uses: Swatinem/rust-cache@v2.7.8 + cache: true - name: Pin dependencies for MSRV if: matrix.rust.version == '1.85.0' run: ./ci/pin-msrv.sh @@ -65,14 +63,12 @@ jobs: with: persist-credentials: false - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ needs.prepare.outputs.rust_version }} override: true - profile: minimal + cache: true # target: "thumbv6m-none-eabi" - - name: Rust Cache - uses: Swatinem/rust-cache@v2.7.8 - name: Check bdk_chain working-directory: ./crates/chain # TODO "--target thumbv6m-none-eabi" should work but currently does not @@ -99,14 +95,12 @@ jobs: - run: sudo apt-get update || exit 1 - run: sudo apt-get install -y libclang-common-14-dev clang-14 libc6-dev-i386 || exit 1 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ needs.prepare.outputs.rust_version }} override: true - profile: minimal + cache: true target: "wasm32-unknown-unknown" - - name: Rust Cache - uses: Swatinem/rust-cache@v2.7.8 - name: Check esplora working-directory: ./crates/esplora run: cargo check --target wasm32-unknown-unknown --no-default-features --features bdk_core/hashbrown,async @@ -120,11 +114,10 @@ jobs: with: persist-credentials: false - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly override: true - profile: minimal components: rustfmt - name: Check fmt run: cargo fmt --all --check @@ -139,13 +132,12 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: actions-rs/toolchain@v1 + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ needs.prepare.outputs.rust_version }} components: clippy override: true - - name: Rust Cache - uses: Swatinem/rust-cache@v2.7.8 + cache: true - uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -169,13 +161,11 @@ jobs: with: persist-credentials: false - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ needs.prepare.outputs.rust_version }} override: true - profile: minimal - - name: Rust Cache - uses: Swatinem/rust-cache@v2.7.8 + cache: true - name: Build working-directory: examples/${{ matrix.example-dir }} run: cargo build diff --git a/.github/zizmor.yml b/.github/zizmor.yml new file mode 100644 index 000000000..667e912ae --- /dev/null +++ b/.github/zizmor.yml @@ -0,0 +1,8 @@ +# Zizmor config +rules: + unpinned-uses: + config: + policies: + # Allow pin by ref/tag + actions-rust-lang/setup-rust-toolchain: ref-pin + actions/*: ref-pin