Skip to content

Upgrade bitcoin requirement from 0.28.1 to 0.29.1 #20

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

Merged
merged 1 commit into from
Oct 24, 2022
Merged

Upgrade bitcoin requirement from 0.28.1 to 0.29.1 #20

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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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