Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/cont_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- compiler
- rpc
- verify
- reserves
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ Cargo.lock

*.swp
.idea

.vscode/
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added Bitcoin core RPC added as blockchain backend
- Added a `verify` feature that can be enable to verify the unconfirmed txs we download against the consensus rules

### Proof of reserves
- Added a separate module to construct "proof of reserve" PSBTs, and verify them.

## [v0.8.0] - [v0.7.0]

### Wallet
Expand Down
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ lazy_static = { version = "1.4", optional = true }
tiny-bip39 = { version = "^0.8", optional = true }
zeroize = { version = "<1.4.0", optional = true }
bitcoinconsensus = { version = "0.19.0-3", optional = true }
base64 = { version = "^0.13", optional = true }

# Needed by bdk_blockchain_tests macro
bitcoincore-rpc = { version = "0.13", optional = true }
Expand All @@ -59,7 +60,7 @@ async-interface = ["async-trait"]
all-keys = ["keys-bip39"]
keys-bip39 = ["tiny-bip39", "zeroize"]
rpc = ["bitcoincore-rpc"]

reserves = ["bitcoinconsensus", "base64", "electrum"]

# Debug/Test features
test-blockchains = ["bitcoincore-rpc", "electrum-client"]
Expand All @@ -73,6 +74,7 @@ lazy_static = "1.4"
env_logger = "0.7"
clap = "2.33"
electrsd = { version= "0.6", features = ["trigger", "bitcoind_0_21_1"] }
rstest = "^0.10"

[[example]]
name = "address_validator"
Expand Down
3 changes: 3 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ pub enum Error {
},
/// Node doesn't have data to estimate a fee rate
FeeRateUnavailable,
/// Proof error
#[cfg(feature = "reserves")]
Proof(crate::wallet::reserves::ProofError),
/// In order to use the [`TxBuilder::add_global_xpubs`] option every extended
/// key in the descriptor must either be a master key itself (having depth = 0) or have an
/// explicit origin provided
Expand Down
2 changes: 2 additions & 0 deletions src/wallet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ use log::{debug, error, info, trace};
pub mod address_validator;
pub mod coin_selection;
pub mod export;
#[cfg(feature = "reserves")]
pub mod reserves;
pub mod signer;
pub mod time;
pub mod tx_builder;
Expand Down
Loading