Update rust-bitcoin to v0.28, rust-elements to v0.19, plus some more updates

Cargo.toml

@@ -22,11 +22,11 @@ arraydeque = "0.4"
 arrayref = "0.3.6"
 base64 = "0.13.0"
 bincode = "1.3.1"
-bitcoin = { version = "0.27", features = [ "use-serde" ] }
+bitcoin = { version = "0.28", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
-dirs = "3.0.1"
-elements = { version = "0.18", features = [ "serde-feature" ], optional = true }
+dirs = "4.0.0"
+elements = { version = "0.19.1", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
@@ -37,7 +37,7 @@ log = "0.4.11"
 socket2 = { version = "0.4", features = ["all"] }
 num_cpus = "1.12.0"
 page_size = "0.4.2"
-prometheus = "0.12"
+prometheus = "0.13"
 rayon = "1.5.0"
 rocksdb = { version = "0.17.0", optional = true }
 rocksdb-oldcpu = { version = "0.12.4", optional = true, package = "rocksdb" }
@@ -49,7 +49,7 @@ signal-hook = "0.3"
 stderrlog = "0.5.0"
 sysconf = ">=0.3.4"
 time = { version = "0.3", features = ["formatting"] }
-tiny_http = "0.8"
+tiny_http = "0.11"
 url = "2.2.0"
 hyper = "0.14"
 hyperlocal = "0.8"
@@ -71,8 +71,3 @@ codegen-units = 1
 [patch.crates-io.electrum-client]
 git = "https://github.com/Blockstream/rust-electrum-client"
 rev = "d3792352992a539afffbe11501d1aff9fd5b919d" # add-peer branch
-
-# needed for https://github.com/ElementsProject/rust-elements/pull/98 until a new release is made
-[patch.crates-io.elements]
-git = "https://github.com/ElementsProject/rust-elements"
-rev = "d988bd7ed9cf539b8fea0da042efa5a4e1eef86f"

src/elements/mod.rs

@@ -73,4 +73,4 @@ impl From<&TxIn> for IssuanceValue {
             },
         }
     }
-}
+}

src/new_index/fetch.rs

@@ -88,7 +88,7 @@ fn bitcoind_fetcher(
                     .zip(entries)
                     .map(|(block, entry)| BlockEntry {
                         entry: entry.clone(), // TODO: remove this clone()
-                        size: block.get_size() as u32,
+                        size: block.size() as u32,
                         block,
                     })
                     .collect();

src/rest.rs

@@ -156,8 +156,8 @@ impl TransactionValue {
             locktime: tx.lock_time,
             vin: vins,
             vout: vouts,
-            size: tx.get_size() as u32,
-            weight: tx.get_weight() as u32,
+            size: tx.size() as u32,
+            weight: tx.weight() as u32,
             fee,
             status: Some(TransactionStatus::from(blockid)),
         }
@@ -438,9 +438,9 @@ impl From<Utxo> for UtxoValue {
             surjection_proof: utxo
                 .witness
                 .surjection_proof
-                .map_or(vec![], |p| p.serialize()),
+                .map_or(vec![], |p| (*p).serialize()),
             #[cfg(feature = "liquid")]
-            range_proof: utxo.witness.rangeproof.map_or(vec![], |p| p.serialize()),
+            range_proof: utxo.witness.rangeproof.map_or(vec![], |p| (*p).serialize()),
         }
     }
 }

src/util/block.rs

@@ -294,7 +294,7 @@ impl From<&BlockEntry> for BlockMeta {
     fn from(b: &BlockEntry) -> BlockMeta {
         BlockMeta {
             tx_count: b.block.txdata.len() as u32,
-            weight: b.block.get_weight() as u32,
+            weight: b.block.weight() as u32,
             size: b.size,
         }
     }

src/util/fees.rs

@@ -12,7 +12,7 @@ pub struct TxFeeInfo {
 impl TxFeeInfo {
     pub fn new(tx: &Transaction, prevouts: &HashMap<u32, &TxOut>, network: Network) -> Self {
         let fee = get_tx_fee(tx, prevouts, network);
-        let vsize = tx.get_weight() / 4;
+        let vsize = tx.weight() / 4;
 
         TxFeeInfo {
             fee,

src/util/script.rs

@@ -56,7 +56,14 @@ pub fn get_innerscripts(txin: &TxIn, prevout: &TxOut) -> InnerScripts {
         let witness = &txin.witness;
         #[cfg(feature = "liquid")]
         let witness = &witness.script_witness;
-        witness.iter().last().cloned().map(Script::from)
+
+        // rust-bitcoin returns witness items as a [u8] slice, while rust-elements returns a Vec<u8>
+        #[cfg(not(feature = "liquid"))]
+        let wit_to_vec = Vec::from;
+        #[cfg(feature = "liquid")]
+        let wit_to_vec = Clone::clone;
+
+        witness.iter().last().map(wit_to_vec).map(Script::from)
     } else {
         None
     };