Update to rust-elements v0.19

And fix some compatibility issues with the changes introduced in
rust-bitcoin v0.28.

Author: shesek

Cargo.lock

@@ -26,7 +26,7 @@ bitcoin = { version = "0.28", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "4.0.0"
-elements = { version = "0.18", features = [ "serde-feature" ], optional = true }
+elements = { version = "0.19", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
@@ -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"

Cargo.toml

@@ -74,3 +74,29 @@ impl From<&TxIn> for IssuanceValue {
         }
     }
 }
+
+// Compatibility for Transaction/Block methods between rust-bitcoin and rust-elements
+// rust-bitcoin deprecated the 'get_' prefix in https://github.com/rust-bitcoin/rust-bitcoin/pull/861,
+// while rust-elements still uses it. This allows using the prefix-less methods to avoid the deprecation warnings.
+pub trait EBCompact {
+    fn weight(&self) -> usize;
+    fn size(&self) -> usize;
+}
+
+impl EBCompact for elements::Transaction {
+    fn weight(&self) -> usize {
+        self.get_weight()
+    }
+    fn size(&self) -> usize {
+        self.get_size()
+    }
+}
+
+impl EBCompact for elements::Block {
+    fn weight(&self) -> usize {
+        self.get_weight()
+    }
+    fn size(&self) -> usize {
+        self.get_size()
+    }
+}

src/elements/mod.rs

@@ -4,6 +4,8 @@ use rayon::prelude::*;
 use bitcoin::consensus::encode::{deserialize, Decodable};
 #[cfg(feature = "liquid")]
 use elements::encode::{deserialize, Decodable};
+#[cfg(feature = "liquid")]
+use crate::elements::EBCompact;
 
 use std::collections::HashMap;
 use std::fs;

src/new_index/fetch.rs

@@ -23,7 +23,7 @@ use hyperlocal::UnixServerExt;
 use std::fs;
 #[cfg(feature = "liquid")]
 use {
-    crate::elements::{peg::PegoutValue, AssetSorting, IssuanceValue},
+    crate::elements::{peg::PegoutValue, AssetSorting, IssuanceValue, EBCompact},
     elements::{
         confidential::{Asset, Nonce, Value},
         encode, AssetId,
@@ -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/rest.rs

@@ -9,6 +9,9 @@ use std::slice;
 use time::format_description::well_known::Rfc3339;
 use time::OffsetDateTime as DateTime;
 
+#[cfg(feature = "liquid")]
+use crate::elements::EBCompact;
+
 const MTP_SPAN: usize = 11;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]

src/util/block.rs

@@ -1,6 +1,9 @@
 use crate::chain::{Network, Transaction, TxOut};
 use std::collections::HashMap;
 
+#[cfg(feature = "liquid")]
+use crate::elements::EBCompact;
+
 const VSIZE_BIN_WIDTH: u32 = 50_000; // in vbytes
 
 pub struct TxFeeInfo {

src/util/fees.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().map(Vec::from).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
     };