Skip to content

Commit

Permalink
Merge #20: Upgrade bitcoin requirement from 0.28.1 to 0.29.1
Browse files Browse the repository at this point in the history
64471d9 Upgrade bitcoin requirement from 0.28.1 to 0.29.1 (Daniel Granhão)

Pull request description:

  Upgrade `bitcoin` dependency to 0.29.1 to solve compatibility issues with LDK 0.0.111

Top commit has no ACKs.

Tree-SHA512: a4ed6558de36773a699bdc87d9bdfbdf8fc69b1fa8812e600e340849c12101a975c88f33a32cd775ff5141120e717c29620bc567480a8b4e384e09e03ca8ffc7
  • Loading branch information
notmandatory committed Oct 24, 2022
2 parents 8c93e0d + 64471d9 commit 56b0352
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ path = "src/lib.rs"

[dependencies]
serde = { version = "1.0", features = ["derive"] }
bitcoin = { version = "0.28.1", features = ["use-serde"] }
bitcoin = { version = "0.29.1", features = ["serde"] }
log = "^0.4"
ureq = { version = "~2.2.0", features = ["json"], optional = true }
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }

[dev-dependencies]
serde_json = "1.0"
tokio = { version = "1.20.1", features = ["full"] }
electrsd = { version = "0.19.1", features = ["legacy", "esplora_a33e97e1", "bitcoind_22_0"] }
electrum-client = "0.10"
electrsd = { version = "0.21.1", features = ["legacy", "esplora_a33e97e1", "bitcoind_22_0"] }
electrum-client = "0.12.0"
lazy_static = "1.4.0"

[features]
Expand Down
4 changes: 2 additions & 2 deletions src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl Tx {
pub fn to_tx(&self) -> Transaction {
Transaction {
version: self.version,
lock_time: self.locktime,
lock_time: bitcoin::PackedLockTime(self.locktime),
input: self
.vin
.iter()
Expand All @@ -94,7 +94,7 @@ impl Tx {
vout: vin.vout,
},
script_sig: vin.scriptsig,
sequence: vin.sequence,
sequence: bitcoin::Sequence(vin.sequence),
witness: Witness::from_vec(vin.witness),
})
.collect(),
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ mod test {
use tokio::sync::Mutex;
#[cfg(all(feature = "blocking", any(feature = "async", feature = "async-https")))]
use {
bitcoin::hashes::Hash,
bitcoin::Amount,
electrsd::{
bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType,
Expand Down Expand Up @@ -491,7 +492,7 @@ mod test {

let (blocking_client, async_client) = setup_clients().await;

let block_hash = BlockHash::default();
let block_hash = BlockHash::all_zeros();

let expected = BlockStatus {
in_best_chain: false,
Expand Down

0 comments on commit 56b0352

Please sign in to comment.