Merge branch 'bump_deps' into new-index

Author: RCasatta

Cargo.lock

@@ -22,14 +22,13 @@ arraydeque = "0.5.1"
 arrayref = "0.3.6"
 base64 = "0.22"
 bincode = "1.3.1"
-bitcoin = { version = "0.31", features = ["serde"] }
+bitcoin = { version = "0.32", features = ["serde"] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "5.0.1"
-elements = { version = "0.24", features = ["serde"], optional = true }
+elements = { version = "0.25", features = ["serde"], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
-hex = { package = "hex-conservative", version = "0.1.1" }
 itertools = "0.12"
 lazy_static = "1.3.0"
 libc = "0.2.81"
@@ -61,8 +60,8 @@ zmq = "0.10.0"
 
 
 [dev-dependencies]
-bitcoind = { version = "0.34.3", features = ["25_0"] }
-elementsd = { version = "0.9.2", features = ["22_1_1"] }
+bitcoind = { version = "0.36", features = ["25_0"] }
+elementsd = { version = "0.11", features = ["22_1_1"] }
 electrumd = { version = "0.1.0", features = ["4_5_4"] }
 ureq = { version = "2.9", default-features = false, features = ["json"] }
 tempfile = "3.10"

Cargo.toml

@@ -1,11 +1,11 @@
 extern crate electrs;
 
+use bitcoin::hex::DisplayHex;
 use electrs::{
     config::Config,
     new_index::{Store, TxHistoryKey},
     util::bincode,
 };
-use hex::DisplayHex;
 
 fn main() {
     let config = Config::from_args();

src/bin/popular-scripts.rs

@@ -62,7 +62,7 @@ fn main() {
         }
 
         let tx: Transaction = deserialize(&value).expect("failed to parse Transaction");
-        let txid = tx.txid();
+        let txid = tx.compute_txid();
 
         iter.next();
 

src/bin/tx-fingerprint-stats.rs

@@ -10,8 +10,8 @@ use std::time::Duration;
 use std::{env, fs, io};
 
 use base64::prelude::{Engine, BASE64_STANDARD};
+use bitcoin::hex::FromHex;
 use error_chain::ChainedError;
-use hex::FromHex;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use serde_json::{from_str, from_value, Value};
 

src/daemon.rs

@@ -7,10 +7,10 @@ use std::thread;
 use std::time::Instant;
 
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
+use bitcoin::hex::DisplayHex;
 use crypto::digest::Digest;
 use crypto::sha2::Sha256;
 use error_chain::ChainedError;
-use hex::{self, DisplayHex};
 use serde_json::{from_str, Value};
 
 #[cfg(not(feature = "liquid"))]

src/electrum/server.rs

@@ -94,4 +94,13 @@ pub mod ebcompact {
             self.is_v1_p2tr()
         }
     }
+
+    pub trait TxidCompat {
+        fn compute_txid(&self) -> elements::Txid;
+    }
+    impl TxidCompat for elements::Transaction {
+        fn compute_txid(&self) -> elements::Txid {
+            self.txid()
+        }
+    }
 }