Merge #51: Revert "Revert "Bump to rust-bitcoin 0.29.1""

c6e8810 ci: Trezor emulator needs rust nightly (Daniela Brozzoni)
0aae38c Revert "Revert "Bump to rust-bitcoin 0.29.1"" (Daniela Brozzoni)

Pull request description:

  This reverts commit 80990d7.

ACKs for top commit:
  afilini:
    ACK c6e8810

Tree-SHA512: 86ebc9e7aa28d671298e290b35cdd5dedb3f3d0d71e8d3f1fef3d9edd279cc13070593e1f0a6afa629c08ea8a6d5f300bad67cf24a52b3a73f50deed88cfe1d8

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"
 once_cell = "=1.14"
 
 [dev-dependencies]

ci/Dockerfile.trezor

@@ -1,5 +1,7 @@
 FROM rust
 
+RUN rustup toolchain install nightly
+RUN rustup default nightly
 RUN apt-get update
 RUN apt-get install scons libsdl2-dev python3 python3-pip libsdl2-image-dev llvm-dev libclang-dev clang protobuf-compiler libusb-1.0-0-dev -y
 RUN git clone --recursive https://github.com/trezor/trezor-firmware/ trezor-firmware

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)
 }