Merge #46: Bump to rust-bitcoin 0.29.1

91b8e3c Bump to rust-bitcoin 0.29.1 (Jose D Robles)

Pull request description:

  I jump here because bdk have hwi as dependency and is not updated to rust-bitcoin, so i made this PR

ACKs for top commit:
  danielabrozzoni:
    ACK 91b8e3c - thanks for taking care of this!

Tree-SHA512: 8bccd441d52c2551d1d08a320ebb4f1c37885fcb22b931f3051b53a99c7e548e7b49bbdb072f5867c182381592b80fc33ff3e6b21985147e760b4e319bfa781e

Author: danielabrozzoni

Cargo.toml

@@ -10,10 +10,11 @@ repository = "https://github.com/bitcoindevkit/rust-hwi"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bitcoin = { version = "0.28", features = ["use-serde", "base64"] }
+bitcoin = { version = "0.29.1", features = ["serde", "base64"] }
 serde = { version = "^1.0", features = ["derive"] }
 serde_json = { version = "^1.0" }
 pyo3 = { version = "0.15.1", features = ["auto-initialize"]}
+base64 = "0.13.0"
 
 [dev-dependencies]
 serial_test = "0.6.0"

src/interface.rs

@@ -5,7 +5,7 @@ use bitcoin::consensus::encode::serialize;
 use bitcoin::util::bip32::DerivationPath;
 use bitcoin::util::psbt::PartiallySignedTransaction;
 
-use bitcoin::base64;
+use base64;
 
 use serde_json::value::Value;
 

src/lib.rs

@@ -170,7 +170,7 @@ mod tests {
 
         let previous_tx = Transaction {
             version: 1,
-            lock_time: 0,
+            lock_time: bitcoin::PackedLockTime(0),
             input: vec![TxIn::default()],
             output: vec![TxOut {
                 value: 100,
@@ -188,7 +188,7 @@ mod tests {
         let psbt = bitcoin::psbt::PartiallySignedTransaction {
             unsigned_tx: Transaction {
                 version: 1,
-                lock_time: 0,
+                lock_time: bitcoin::PackedLockTime(0),
                 input: vec![previous_txin],
                 output: vec![TxOut {
                     value: 50,

src/types.rs

@@ -30,7 +30,7 @@ pub struct HWISignature {
 
 fn from_b64<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<u8>, D::Error> {
     let b64_string = String::deserialize(d)?;
-    bitcoin::base64::decode(&b64_string)
+    base64::decode(&b64_string)
         .map_err(|_| serde::de::Error::custom("Error while Deserializing Signature"))
 }
 
@@ -57,7 +57,7 @@ fn deserialize_psbt<'de, D: Deserializer<'de>>(
     d: D,
 ) -> Result<PartiallySignedTransaction, D::Error> {
     let b64_string = String::deserialize(d)?;
-    let bytes = bitcoin::base64::decode(&b64_string).map_err(serde::de::Error::custom)?;
+    let bytes = base64::decode(&b64_string).map_err(serde::de::Error::custom)?;
     bitcoin::consensus::deserialize::<PartiallySignedTransaction>(&bytes[..])
         .map_err(serde::de::Error::custom)
 }