diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index e034620..72c281b 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -31,7 +31,7 @@ jobs: rust: - version: ${{ needs.prepare.outputs.rust_version }} clippy: true - - version: 1.85.0 # Overall MSRV + - version: 1.89.0 # Overall MSRV features: - --no-default-features - --all-features diff --git a/Cargo.toml b/Cargo.toml index 537a364..d3c8004 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,28 +1,28 @@ [package] name = "bdk_redb" -version = "0.2.0" +version = "0.3.0" edition = "2024" license = "MIT OR Apache-2.0" description = "Persistence backend for bdk using redb" repository = "https://github.com/110CodingP/bdk_redb" readme = "README.md" -rust-version = "1.85.0" +rust-version = "1.89.0" [dependencies] bdk_wallet = {version = "3", optional = true} bdk_chain = {version = "0.23", features = ["serde"]} ciborium = "0.2.2" -redb = "2.5.0" -thiserror = "2.0.12" +redb = "4.1" +thiserror = "2.0" [features] default = ["wallet"] wallet = ["bdk_wallet"] [dev-dependencies] -anyhow = "1.0.98" +anyhow = "1.0" bdk_testenv = { version = "0.13.0" } -tempfile = "3.20.0" +tempfile = "3.20" [lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)'] } \ No newline at end of file +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)'] } diff --git a/README.md b/README.md index cdcaa14..7f530a7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # bdk_redb [![Crate Info](https://img.shields.io/crates/v/bdk_redb.svg)](https://crates.io/crates/bdk_redb) -[![Rustc Version 1.85.0+](https://img.shields.io/badge/rustc-1.85.0%2B-yellow.svg)](https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html) +![Rustc Version](https://img.shields.io/crates/msrv/bdk_redb) [![Wallet API Docs](https://img.shields.io/badge/docs.rs-bdk_redb-green)](https://docs.rs/bdk_redb) [![Coverage Status](https://coveralls.io/repos/github/110CodingP/bdk_redb/badge.svg)](https://coveralls.io/github/110CodingP/bdk_redb) [![CI Status](https://github.com/110CodingP/bdk_redb/workflows/CI/badge.svg)](https://github.com/110CodingP/bdk_redb/actions?query=workflow:CI) @@ -24,7 +24,7 @@ There is currently one published crate in this repository: The crate has a default feature called `wallet` which provides methods on [`Store`](./src/lib.rs) to persist [`bdk_wallet::ChangeSet`](http://docs.rs/bdk_wallet/2.0.0/bdk_wallet/struct.ChangeSet.html) and [`bdk_wallet::WalletPersister`](https://docs.rs/bdk_wallet/2.0.0/bdk_wallet/trait.WalletPersister.html) implementation for [`Store`](./src/lib.rs). ## Minimum Supported Rust Version (MSRV) -The library maintains a MSRV of 1.85.0 due to dependency on [`redb`](https://crates.io/crates/redb). +The library maintains a MSRV of 1.89.0 due to dependency on [`redb`](https://crates.io/crates/redb). ## License @@ -40,4 +40,4 @@ at your option. Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or -conditions. \ No newline at end of file +conditions. diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index f3bd183..0000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv="1.85.0" \ No newline at end of file diff --git a/rust-version b/rust-version index 2db3303..a0f550d 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -1.85.0 \ No newline at end of file +1.89.0 \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index d4bc3c6..d054a60 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,10 +12,7 @@ //! //! ```toml //! [dependencies] -//! anyhow = "1.0.98" -//! bdk_redb = "0.1.1" -//! bdk_wallet = "2.0.0" -//! tempfile = "3.20.0" +//! bdk_redb = "0.3.0" //! ``` //! //! Now: @@ -27,6 +24,7 @@ //! use bdk_wallet::{KeychainKind, Wallet}; //! use std::sync::Arc; //! use tempfile::NamedTempFile; +//! use bdk_redb::{redb::Database, Store}; //! //! use anyhow::Result; //! @@ -38,13 +36,12 @@ //! fn main() -> Result<()> { //! let network = Network::Signet; //! let file_path = NamedTempFile::new()?; -//! let db = Arc::new(bdk_redb::redb::Database::create(file_path.path())?); -//! let mut store = bdk_redb::Store::new(db, "wallet1".to_string())?; +//! let db = Arc::new(Database::create(file_path.path())?); +//! let mut store = Store::new(db, "wallet1".to_string())?; //! //! let wallet_opt = Wallet::load() //! .descriptor(KeychainKind::External, Some(EXTERNAL_DESCRIPTOR)) //! .descriptor(KeychainKind::Internal, Some(INTERNAL_DESCRIPTOR)) -//! .extract_keys() //! .check_network(network) //! .load_wallet(&mut store)?; //! @@ -88,7 +85,9 @@ use bdk_chain::{BlockId, DescriptorId, keychain_txout, local_chain, tx_graph}; #[cfg(feature = "wallet")] use bdk_wallet::{ChangeSet, WalletPersister}; use error::StoreError; -use redb::{Database, ReadTransaction, ReadableTable, TableDefinition, WriteTransaction}; +use redb::{ + Database, ReadTransaction, ReadableDatabase, ReadableTable, TableDefinition, WriteTransaction, +}; use std::collections::{BTreeMap, BTreeSet}; use std::str::FromStr; use std::sync::Arc;