From 085872d5038f9a8b8c70a9a958c55d9eb25d0c67 Mon Sep 17 00:00:00 2001
From: Daniel Savu <savudani04@yahoo.ro>
Date: Thu, 29 Oct 2020 02:45:37 +0200
Subject: [PATCH 01/47] Add index-unspendables CLI flag (#28)

---
 README.md                | 1 +
 doc/schema.md            | 2 +-
 src/config.rs            | 7 +++++++
 src/new_index/mempool.rs | 4 +++-
 src/new_index/schema.rs  | 4 +++-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71a1dd57e..5cf685fff 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ In addition to electrs's original configuration options, a few new options are a
 - `--lightmode` - enable light mode (see above)
 - `--cors <origins>` - origins allowed to make cross-site request (optional, defaults to none).
 - `--address-search` - enables the by-prefix address search index.
+- `--index-unspendables` - enables indexing of provably unspendable outputs.
 - `--utxos-limit <num>` - maximum number of utxos to return per address.
 - `--electrum-txs-limit <num>` - maximum number of txs to return per address in the electrum server (does not apply for the http api).
 - `--electrum-banner <text>` - welcome banner text for electrum server.
diff --git a/doc/schema.md b/doc/schema.md
index 851c67544..4875cb4df 100644
--- a/doc/schema.md
+++ b/doc/schema.md
@@ -43,7 +43,7 @@ When the indexer is synced up to the tip of the chain, the hash of the tip is sa
 
 ### `history`
 
-Each funding output (except for provably unspendable ones) results in the following new rows (`H` is for history, `F` is for funding):
+Each funding output (except for provably unspendable ones when `--index-unspendables` is not enabled) results in the following new rows (`H` is for history, `F` is for funding):
 
  * `"H{funding-scripthash}{funding-height}F{funding-txid:vout}{value}" → ""`
  * `"a{funding-address-str}" → ""` (for prefix address search, only saved when `--address-search` is enabled)
diff --git a/src/config.rs b/src/config.rs
index 48adaf05a..189ac5579 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -31,6 +31,7 @@ pub struct Config {
     pub jsonrpc_import: bool,
     pub light_mode: bool,
     pub address_search: bool,
+    pub index_unspendables: bool,
     pub cors: Option<String>,
     pub precache_scripts: Option<String>,
     pub utxos_limit: usize,
@@ -148,6 +149,11 @@ impl Config {
                     .long("address-search")
                     .help("Enable prefix address search")
             )
+            .arg(
+                Arg::with_name("index_unspendables")
+                    .long("index-unspendables")
+                    .help("Enable indexing of provably unspendable outputs")
+            )
             .arg(
                 Arg::with_name("cors")
                     .long("cors")
@@ -362,6 +368,7 @@ impl Config {
             jsonrpc_import: m.is_present("jsonrpc_import"),
             light_mode: m.is_present("light_mode"),
             address_search: m.is_present("address_search"),
+            index_unspendables: m.is_present("index_unspendables"),
             cors: m.value_of("cors").map(|s| s.to_string()),
             precache_scripts: m.value_of("precache_scripts").map(|s| s.to_string()),
 
diff --git a/src/new_index/mempool.rs b/src/new_index/mempool.rs
index 16a771ce7..cf67790bf 100644
--- a/src/new_index/mempool.rs
+++ b/src/new_index/mempool.rs
@@ -378,12 +378,14 @@ impl Mempool {
                 )
             });
 
+            let config = &self.config;
+
             // An iterator over (ScriptHash, TxHistoryInfo)
             let funding = tx
                 .output
                 .iter()
                 .enumerate()
-                .filter(|(_, txo)| is_spendable(txo))
+                .filter(|(_, txo)| is_spendable(txo) || config.index_unspendables)
                 .map(|(index, txo)| {
                     (
                         compute_script_hash(&txo.script_pubkey),
diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index facc9f363..bb85bda00 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -169,6 +169,7 @@ pub struct Indexer {
 struct IndexerConfig {
     light_mode: bool,
     address_search: bool,
+    index_unspendables: bool,
     network: Network,
     #[cfg(feature = "liquid")]
     parent_network: Network,
@@ -179,6 +180,7 @@ impl From<&Config> for IndexerConfig {
         IndexerConfig {
             light_mode: config.light_mode,
             address_search: config.address_search,
+            index_unspendables: config.index_unspendables,
             network: config.network_type,
             #[cfg(feature = "liquid")]
             parent_network: config.parent_network,
@@ -1072,7 +1074,7 @@ fn index_transaction(
     //      S{funding-txid:vout}{spending-txid:vin} → ""
     let txid = full_hash(&tx.txid()[..]);
     for (txo_index, txo) in tx.output.iter().enumerate() {
-        if is_spendable(txo) {
+        if is_spendable(txo) || iconfig.index_unspendables {
             let history = TxHistoryRow::new(
                 &txo.script_pubkey,
                 confirmed_height,

From 91076cff8bef143922abe455031ff80424de4d9c Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Wed, 4 Nov 2020 02:17:54 +0200
Subject: [PATCH 02/47] http: Implement GET /block/:hash/header

---
 src/new_index/schema.rs |  5 +++++
 src/rest.rs             | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index bb85bda00..a7a16e818 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -420,6 +420,11 @@ impl ChainQuery {
         }
     }
 
+    pub fn get_block_header(&self, hash: &BlockHash) -> Option<BlockHeader> {
+        let _timer = self.start_timer("get_block_header");
+        Some(*self.header_by_hash(hash)?.header())
+    }
+
     pub fn get_block_with_meta(&self, hash: &BlockHash) -> Option<BlockHeaderMeta> {
         let _timer = self.start_timer("get_block_with_meta");
         Some(BlockHeaderMeta {
diff --git a/src/rest.rs b/src/rest.rs
index fee6aba8e..ef653b305 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -673,6 +673,16 @@ fn handle_request(
                 .ok_or_else(|| HttpError::not_found("Block not found".to_string()))?;
             json_response(txids, TTL_LONG)
         }
+        (&Method::GET, Some(&"block"), Some(hash), Some(&"header"), None, None) => {
+            let hash = BlockHash::from_hex(hash)?;
+            let header = query
+                .chain()
+                .get_block_header(&hash)
+                .ok_or_else(|| HttpError::not_found("Block not found".to_string()))?;
+
+            let header_hex = hex::encode(encode::serialize(&header));
+            http_message(StatusCode::OK, header_hex, TTL_LONG)
+        }
         (&Method::GET, Some(&"block"), Some(hash), Some(&"raw"), None, None) => {
             let hash = BlockHash::from_hex(hash)?;
             let raw = query
@@ -718,7 +728,7 @@ fn handle_request(
                 )));
             }
 
-            // header_by_hash() only returns the BlockId for non-orphaned blocks,
+            // blockid_by_hash() only returns the BlockId for non-orphaned blocks,
             // or None for orphaned
             let confirmed_blockid = query.chain().blockid_by_hash(&hash);
 

From 78adcdb3504c61055aae8680220d680279a5ca0e Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 5 Nov 2020 00:09:26 +0200
Subject: [PATCH 03/47] Add median time past to blocks json

---
 src/new_index/schema.rs |  9 ++++++++-
 src/rest.rs             |  2 ++
 src/util/block.rs       | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index a7a16e818..707f15816 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -425,11 +425,18 @@ impl ChainQuery {
         Some(*self.header_by_hash(hash)?.header())
     }
 
+    pub fn get_mtp(&self, height: usize) -> u32 {
+        let _timer = self.start_timer("get_block_mtp");
+        self.store.indexed_headers.read().unwrap().get_mtp(height)
+    }
+
     pub fn get_block_with_meta(&self, hash: &BlockHash) -> Option<BlockHeaderMeta> {
         let _timer = self.start_timer("get_block_with_meta");
+        let header_entry = self.header_by_hash(hash)?;
         Some(BlockHeaderMeta {
-            header_entry: self.header_by_hash(hash)?,
             meta: self.get_block_meta(hash)?,
+            mtp: self.get_mtp(header_entry.height()),
+            header_entry,
         })
     }
 
diff --git a/src/rest.rs b/src/rest.rs
index ef653b305..74df2fadd 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -65,6 +65,7 @@ struct BlockValue {
     weight: u32,
     merkle_root: String,
     previousblockhash: Option<String>,
+    mediantime: u32,
 
     #[cfg(not(feature = "liquid"))]
     nonce: u32,
@@ -96,6 +97,7 @@ impl BlockValue {
             } else {
                 None
             },
+            mediantime: blockhm.mtp,
 
             #[cfg(not(feature = "liquid"))]
             bits: header.bits,
diff --git a/src/util/block.rs b/src/util/block.rs
index 112ef4e2b..1bb7cd294 100644
--- a/src/util/block.rs
+++ b/src/util/block.rs
@@ -10,6 +10,8 @@ use std::iter::FromIterator;
 use std::slice;
 use time::OffsetDateTime as DateTime;
 
+const MTP_SPAN: usize = 11;
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct BlockId {
     pub height: usize,
@@ -231,6 +233,23 @@ impl HeaderList {
     pub fn iter(&self) -> slice::Iter<HeaderEntry> {
         self.headers.iter()
     }
+
+    /// Get the Median Time Past
+    pub fn get_mtp(&self, height: usize) -> u32 {
+        // Use the timestamp as the mtp of the genesis block.
+        // Matches bitcoind's behaviour: bitcoin-cli getblock `bitcoin-cli getblockhash 0` | jq '.time == .mediantime'
+        if height == 0 {
+            self.headers.get(0).unwrap().header.time
+        } else if height > self.len() - 1 {
+            0
+        } else {
+            let mut timestamps = (height.saturating_sub(MTP_SPAN - 1)..=height)
+                .map(|p_height| self.headers.get(p_height).unwrap().header.time)
+                .collect::<Vec<_>>();
+            timestamps.sort_unstable();
+            timestamps[timestamps.len() / 2]
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize)]
@@ -269,6 +288,7 @@ pub struct BlockMeta {
 pub struct BlockHeaderMeta {
     pub header_entry: HeaderEntry,
     pub meta: BlockMeta,
+    pub mtp: u32,
 }
 
 impl From<&BlockEntry> for BlockMeta {

From 627b12467cec777b7935f3398b87e79ffa678619 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 7 Nov 2020 01:30:13 +0200
Subject: [PATCH 04/47] Make asset sorting case insensitive

The domain name doesn't need lower-casing because its
guaranteed to be in all lowercase.
---
 src/elements/registry.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/elements/registry.rs b/src/elements/registry.rs
index 50507054c..3d1bba43d 100644
--- a/src/elements/registry.rs
+++ b/src/elements/registry.rs
@@ -141,10 +141,10 @@ impl AssetSorting {
             AssetSortField::Name => {
                 // Order by name first, use asset id as a tie breaker. the other sorting fields
                 // don't require this because they're guaranteed to be unique.
-                Box::new(|a, b| a.1.name.cmp(&b.1.name).then_with(|| a.0.cmp(b.0)))
+                Box::new(|a, b| lc_cmp(&a.1.name, &b.1.name).then_with(|| a.0.cmp(b.0)))
             }
             AssetSortField::Domain => Box::new(|a, b| a.1.domain().cmp(&b.1.domain())),
-            AssetSortField::Ticker => Box::new(|a, b| a.1.ticker.cmp(&b.1.ticker)),
+            AssetSortField::Ticker => Box::new(|a, b| lc_cmp(&a.1.ticker, &b.1.ticker)),
         };
 
         match self.1 {
@@ -172,3 +172,7 @@ impl AssetSorting {
         Ok(Self(field, dir))
     }
 }
+
+fn lc_cmp(a: &str, b: &str) -> cmp::Ordering {
+    a.to_lowercase().cmp(&b.to_lowercase())
+}

From 1e69fa6376037deab19cb6fc6254f280c57bafc7 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 7 Nov 2020 06:03:53 +0200
Subject: [PATCH 05/47] Fix get_fee_histogram

https://github.com/romanz/electrs/commit/c88a0dc331eb16163276becf98fcc020565d97eb
---
 src/util/fees.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/util/fees.rs b/src/util/fees.rs
index ae9166265..1e28ac784 100644
--- a/src/util/fees.rs
+++ b/src/util/fees.rs
@@ -43,18 +43,18 @@ pub fn make_fee_histogram(mut entries: Vec<&TxFeeInfo>) -> Vec<(f32, u32)> {
 
     let mut histogram = vec![];
     let mut bin_size = 0;
-    let mut last_fee_rate = None;
+    let mut last_fee_rate = 0.0;
     for e in entries.iter().rev() {
-        bin_size += e.vsize;
-        if bin_size > VSIZE_BIN_WIDTH && last_fee_rate.map_or(true, |last| e.fee_per_vbyte < last) {
-            // vsize of transactions paying >= e.fee_per_vbyte
-            histogram.push((e.fee_per_vbyte, bin_size));
+        if bin_size > VSIZE_BIN_WIDTH && last_fee_rate != e.fee_per_vbyte {
+            // vsize of transactions paying >= last_fee_rate
+            histogram.push((last_fee_rate, bin_size));
             bin_size = 0;
         }
-        last_fee_rate = Some(e.fee_per_vbyte);
+        last_fee_rate = e.fee_per_vbyte;
+        bin_size += e.vsize;
     }
-    if let Some(fee_rate) = last_fee_rate {
-        histogram.push((fee_rate, bin_size));
+    if bin_size > 0 {
+        histogram.push((last_fee_rate, bin_size));
     }
     histogram
 }

From 641a99f1871dd42481c7cca684ffbedfb6bd3873 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 12 Nov 2020 14:57:38 +0200
Subject: [PATCH 06/47] Fix ordering by asset ticker

---
 src/elements/registry.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/elements/registry.rs b/src/elements/registry.rs
index 3d1bba43d..8554d9e13 100644
--- a/src/elements/registry.rs
+++ b/src/elements/registry.rs
@@ -144,7 +144,7 @@ impl AssetSorting {
                 Box::new(|a, b| lc_cmp(&a.1.name, &b.1.name).then_with(|| a.0.cmp(b.0)))
             }
             AssetSortField::Domain => Box::new(|a, b| a.1.domain().cmp(&b.1.domain())),
-            AssetSortField::Ticker => Box::new(|a, b| lc_cmp(&a.1.ticker, &b.1.ticker)),
+            AssetSortField::Ticker => Box::new(|a, b| lc_cmp_opt(&a.1.ticker, &b.1.ticker)),
         };
 
         match self.1 {
@@ -176,3 +176,8 @@ impl AssetSorting {
 fn lc_cmp(a: &str, b: &str) -> cmp::Ordering {
     a.to_lowercase().cmp(&b.to_lowercase())
 }
+fn lc_cmp_opt(a: &Option<String>, b: &Option<String>) -> cmp::Ordering {
+    a.as_ref()
+        .map(|a| a.to_lowercase())
+        .cmp(&b.as_ref().map(|b| b.to_lowercase()))
+}

From 85e0d9f2600675d1210bc954f87d1473e545ad71 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 12 Nov 2020 15:02:33 +0200
Subject: [PATCH 07/47] Fix get_block_header() in liquid mode

Liquid's BlockHeaders are not Copyable
---
 src/new_index/schema.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index 707f15816..bee8273ba 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -422,7 +422,7 @@ impl ChainQuery {
 
     pub fn get_block_header(&self, hash: &BlockHash) -> Option<BlockHeader> {
         let _timer = self.start_timer("get_block_header");
-        Some(*self.header_by_hash(hash)?.header())
+        Some(self.header_by_hash(hash)?.header().clone())
     }
 
     pub fn get_mtp(&self, height: usize) -> u32 {

From 1cbc86fbfdb5680fea752377bf8f18ed417f0edd Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 13 Nov 2020 21:15:44 +0200
Subject: [PATCH 08/47] Return the total number of available registered assets

As the `X-Total-Results` header, in reply to `GET /assets/registry`
---
 src/elements/registry.rs | 12 ++++++++++--
 src/new_index/query.rs   | 20 ++++++++++----------
 src/rest.rs              | 10 ++++++++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/elements/registry.rs b/src/elements/registry.rs
index 8554d9e13..8c1fc6969 100644
--- a/src/elements/registry.rs
+++ b/src/elements/registry.rs
@@ -35,14 +35,22 @@ impl AssetRegistry {
             .map(|(_, metadata)| metadata)
     }
 
-    pub fn list(&self, start_index: usize, limit: usize, sorting: AssetSorting) -> Vec<AssetEntry> {
+    pub fn list(
+        &self,
+        start_index: usize,
+        limit: usize,
+        sorting: AssetSorting,
+    ) -> (usize, Vec<AssetEntry>) {
         let mut assets: Vec<AssetEntry> = self
             .assets_cache
             .iter()
             .map(|(asset_id, (_, metadata))| (asset_id, metadata))
             .collect();
         assets.sort_by(sorting.as_comparator());
-        assets.into_iter().skip(start_index).take(limit).collect()
+        (
+            assets.len(),
+            assets.into_iter().skip(start_index).take(limit).collect(),
+        )
     }
 
     pub fn fs_sync(&mut self) -> Result<()> {
diff --git a/src/new_index/query.rs b/src/new_index/query.rs
index fa1ddf6ef..c7211af43 100644
--- a/src/new_index/query.rs
+++ b/src/new_index/query.rs
@@ -245,20 +245,20 @@ impl Query {
         start_index: usize,
         limit: usize,
         sorting: AssetSorting,
-    ) -> Result<Vec<LiquidAsset>> {
+    ) -> Result<(usize, Vec<LiquidAsset>)> {
         let asset_db = match &self.asset_db {
-            None => return Ok(vec![]),
+            None => return Ok((0, vec![])),
             Some(db) => db.read().unwrap(),
         };
-        Ok(asset_db
-            .list(start_index, limit, sorting)
+        let (total_num, results) = asset_db.list(start_index, limit, sorting);
+        // Attach on-chain information alongside the registry metadata
+        let results = results
             .into_iter()
-            .filter_map(|(asset_id, metadata)| {
-                // Attach on-chain information alongside the registry metadata
-                lookup_asset(&self, None, asset_id, Some(metadata))
-                    .ok()
-                    .flatten()
+            .map(|(asset_id, metadata)| {
+                Ok(lookup_asset(&self, None, asset_id, Some(metadata))?
+                    .chain_err(|| "missing registered asset")?)
             })
-            .collect())
+            .collect::<Result<Vec<_>>>()?;
+        Ok((total_num, results))
     }
 }
diff --git a/src/rest.rs b/src/rest.rs
index 74df2fadd..00a971df8 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -1047,9 +1047,15 @@ fn handle_request(
 
             let sorting = AssetSorting::from_query_params(&query_params)?;
 
-            let assets = query.list_registry_assets(start_index, limit, sorting)?;
+            let (total_num, assets) = query.list_registry_assets(start_index, limit, sorting)?;
 
-            json_response(assets, TTL_SHORT)
+            Ok(Response::builder()
+                // Disable caching because we don't currently support caching with query string params
+                .header("Cache-Control", "no-store")
+                .header("Content-Type", "application/json")
+                .header("X-Total-Results", total_num.to_string())
+                .body(Body::from(serde_json::to_string(&assets)?))
+                .unwrap())
         }
 
         #[cfg(feature = "liquid")]

From 773291f3684924a9ec1de27364bb520fd39655c2 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Mon, 30 Nov 2020 07:02:36 +0200
Subject: [PATCH 09/47] Can derive Default

---
 src/elements/asset.rs | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index 188e939f1..a5717fa03 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -408,7 +408,7 @@ pub fn get_issuance_entropy(txin: &TxIn) -> Result<sha256::Midstate> {
 // Asset stats
 //
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Default)]
 pub struct IssuedAssetStats {
     pub tx_count: usize,
     pub issuance_count: usize,
@@ -419,21 +419,7 @@ pub struct IssuedAssetStats {
     pub burned_reissuance_tokens: u64,
 }
 
-impl Default for IssuedAssetStats {
-    fn default() -> Self {
-        Self {
-            tx_count: 0,
-            issuance_count: 0,
-            issued_amount: 0,
-            burned_amount: 0,
-            has_blinded_issuances: false,
-            reissuance_tokens: None,
-            burned_reissuance_tokens: 0,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Default)]
 pub struct NativeAssetStats {
     pub tx_count: usize,
     pub peg_in_count: usize,
@@ -444,20 +430,6 @@ pub struct NativeAssetStats {
     pub burned_amount: u64,
 }
 
-impl Default for NativeAssetStats {
-    fn default() -> Self {
-        Self {
-            tx_count: 0,
-            peg_in_count: 0,
-            peg_in_amount: 0,
-            peg_out_count: 0,
-            peg_out_amount: 0,
-            burn_count: 0,
-            burned_amount: 0,
-        }
-    }
-}
-
 type AssetStatApplyFn<T> = fn(&TxHistoryInfo, &mut T, &mut HashSet<Txid>);
 
 fn asset_cache_key(asset_id: &AssetId) -> Bytes {

From 65e20f9e1196c0039d56307b34ea7bcfbe375b99 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 19 Dec 2020 19:31:48 +0200
Subject: [PATCH 10/47] Update crate dependencies

tokio and hyper were not upgraded because hyperlocal doesn't support
their latest versions.
---
 Cargo.lock | 298 +++++++++++++++++++++++++++++------------------------
 Cargo.toml |  34 +++---
 2 files changed, 183 insertions(+), 149 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d0aadac5..99031f2db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,7 +87,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "miniz_oxide",
  "object",
@@ -117,9 +117,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 
 [[package]]
 name = "base64"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bech32"
@@ -139,17 +139,17 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.53.3"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5"
+checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if",
+ "cfg-if 0.1.10",
  "clang-sys",
  "clap",
  "env_logger",
- "lazy_static 1.4.0",
+ "lazy_static",
  "lazycell",
  "log",
  "peeking_take_while",
@@ -244,6 +244,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "chrono"
 version = "0.4.13"
@@ -274,9 +280,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.1"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
  "ansi_term",
  "atty",
@@ -287,6 +293,12 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "const_fn"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -295,60 +307,59 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
 dependencies = [
- "cfg-if",
- "crossbeam-utils",
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.1",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
 dependencies = [
+ "cfg-if 1.0.0",
  "crossbeam-epoch",
- "crossbeam-utils",
- "maybe-uninit",
+ "crossbeam-utils 0.8.1",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.8.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
 dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "lazy_static 1.4.0",
- "maybe-uninit",
+ "cfg-if 1.0.0",
+ "const_fn",
+ "crossbeam-utils 0.8.1",
+ "lazy_static",
  "memoffset",
  "scopeguard",
 ]
 
 [[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
+name = "crossbeam-utils"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "maybe-uninit",
+ "autocfg",
+ "cfg-if 0.1.10",
+ "lazy_static",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
 dependencies = [
  "autocfg",
- "cfg-if",
- "lazy_static 1.4.0",
+ "cfg-if 1.0.0",
+ "lazy_static",
 ]
 
 [[package]]
@@ -389,7 +400,7 @@ version = "0.4.1"
 dependencies = [
  "arraydeque",
  "arrayref",
- "base64 0.12.3",
+ "base64 0.13.0",
  "bincode",
  "bitcoin",
  "clap",
@@ -403,7 +414,7 @@ dependencies = [
  "hyper",
  "hyperlocal",
  "itertools",
- "lazy_static 1.4.0",
+ "lazy_static",
  "libc",
  "log",
  "num_cpus",
@@ -411,7 +422,7 @@ dependencies = [
  "prometheus",
  "rayon",
  "rocksdb 0.12.4",
- "rocksdb 0.14.0",
+ "rocksdb 0.15.0",
  "rust-crypto",
  "serde",
  "serde_derive",
@@ -421,7 +432,7 @@ dependencies = [
  "stderrlog",
  "sysconf",
  "tempfile",
- "time 0.2.16",
+ "time 0.2.23",
  "tiny_http",
  "tokio",
  "url",
@@ -488,9 +499,9 @@ dependencies = [
 
 [[package]]
 name = "error-chain"
-version = "0.12.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
+checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
 dependencies = [
  "backtrace",
  "version_check",
@@ -502,6 +513,16 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
@@ -607,7 +628,7 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi",
 ]
@@ -757,6 +778,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -800,12 +830,6 @@ dependencies = [
  "winapi-build",
 ]
 
-[[package]]
-name = "lazy_static"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -820,9 +844,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
-version = "0.2.71"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "libloading"
@@ -836,9 +860,9 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.7.4"
+version = "6.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005"
+checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09"
 dependencies = [
  "bindgen",
  "cc",
@@ -846,13 +870,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "lock_api"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -861,7 +894,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "generator",
  "scoped-tls",
 ]
@@ -872,12 +905,6 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
 [[package]]
 name = "memchr"
 version = "2.3.3"
@@ -886,9 +913,9 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
 [[package]]
 name = "memoffset"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
 dependencies = [
  "autocfg",
 ]
@@ -908,7 +935,7 @@ version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "fuchsia-zircon",
  "fuchsia-zircon-sys",
  "iovec",
@@ -950,7 +977,7 @@ version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "winapi 0.3.9",
 ]
@@ -1022,6 +1049,31 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -1095,15 +1147,16 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd"
+checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "fnv",
- "lazy_static 1.4.0",
+ "lazy_static",
+ "parking_lot",
  "protobuf",
- "spin",
+ "regex",
  "thiserror",
 ]
 
@@ -1209,9 +1262,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
 dependencies = [
  "autocfg",
  "crossbeam-deque",
@@ -1221,14 +1274,14 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
 dependencies = [
+ "crossbeam-channel",
  "crossbeam-deque",
- "crossbeam-queue",
- "crossbeam-utils",
- "lazy_static 1.4.0",
+ "crossbeam-utils 0.8.1",
+ "lazy_static",
  "num_cpus",
 ]
 
@@ -1276,7 +1329,7 @@ dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local 1.0.1",
+ "thread_local",
 ]
 
 [[package]]
@@ -1301,7 +1354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ba5a8ec64ee89a76c98c549af81ff14813df09c3e6dc4766c3856da48597a0c"
 dependencies = [
  "cc",
- "lazy_static 1.4.0",
+ "lazy_static",
  "libc",
  "spin",
  "untrusted",
@@ -1321,9 +1374,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61aa17a99a2413cd71c1106691bf59dad7de0cd5099127f90e9d99c429c40d4a"
+checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -1338,7 +1391,7 @@ dependencies = [
  "base64 0.11.0",
  "blake2b_simd",
  "constant_time_eq",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
 ]
 
 [[package]]
@@ -1458,18 +1511,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.114"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.114"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1478,9 +1531,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
 dependencies = [
  "itoa",
  "ryu",
@@ -1501,9 +1554,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
 [[package]]
 name = "signal-hook"
-version = "0.1.16"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed"
+checksum = "8133fd06d2c721d4168f9b76a9a7fd3a0bfc96df58cf7316c7fb9f23bd677f4e"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -1525,15 +1578,20 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
+[[package]]
+name = "smallvec"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+
 [[package]]
 name = "socket2"
-version = "0.3.12"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "97e0e9fd577458a4f61fb91fcb559ea2afecc54c934119421f9f5d3d5b1a1057"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
  "winapi 0.3.9",
 ]
 
@@ -1566,15 +1624,15 @@ dependencies = [
 
 [[package]]
 name = "stderrlog"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e5ee9b90a5452c570a0b0ac1c99ae9498db7e56e33d74366de7f2a7add7f25"
+checksum = "b02f316286ae558d83acc93dd81eaba096e746987a7961d4a9ae026842bae67f"
 dependencies = [
  "atty",
  "chrono",
  "log",
  "termcolor",
- "thread_local 0.3.4",
+ "thread_local",
 ]
 
 [[package]]
@@ -1661,7 +1719,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "rand 0.7.3",
  "redox_syscall",
@@ -1719,23 +1777,13 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "thread_local"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
-dependencies = [
- "lazy_static 0.2.11",
- "unreachable",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 dependencies = [
- "lazy_static 1.4.0",
+ "lazy_static",
 ]
 
 [[package]]
@@ -1750,11 +1798,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.16"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15"
+checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b"
 dependencies = [
- "cfg-if",
+ "const_fn",
  "libc",
  "standback",
  "stdweb",
@@ -1815,7 +1863,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "iovec",
- "lazy_static 1.4.0",
+ "lazy_static",
  "libc",
  "memchr",
  "mio",
@@ -1892,15 +1940,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
-[[package]]
-name = "unreachable"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-dependencies = [
- "void",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -1909,10 +1948,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
 dependencies = [
+ "form_urlencoded",
  "idna",
  "matches",
  "percent-encoding",
@@ -1930,12 +1970,6 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "want"
 version = "0.3.0"
@@ -1958,7 +1992,7 @@ version = "0.2.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "wasm-bindgen-macro",
 ]
 
@@ -1969,7 +2003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
 dependencies = [
  "bumpalo",
- "lazy_static 1.4.0",
+ "lazy_static",
  "log",
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index a04d1fb34..8fcfdf2cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,35 +20,35 @@ oldcpu = [ "rocksdb-oldcpu" ]
 [dependencies]
 arraydeque = "0.4"
 arrayref = "0.3.6"
-base64 = "0.12.3"
+base64 = "0.13.0"
 bincode = "1.3.1"
-clap = "2.31"
-crossbeam-channel = "0.4"
+clap = "2.33.3"
+crossbeam-channel = "0.5.0"
 dirs = "3.0.1"
-error-chain = "0.12.2"
+error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
 itertools = "0.9.0"
 lazy_static = "1.3.0"
-libc = "0.2.68"
-log = "0.4"
-socket2 = { version = "0.3.12", features = ["reuseport"] }
+libc = "0.2.81"
+log = "0.4.11"
+socket2 = { version = "0.3.18", features = ["reuseport"] }
 num_cpus = "1.12.0"
 page_size = "0.4.2"
-prometheus = "0.9"
-rayon = "1.3.1"
-rocksdb = { version = "0.14.0", optional = true }
+prometheus = "0.11.0"
+rayon = "1.5.0"
+rocksdb = { version = "0.15.0", optional = true }
 rocksdb-oldcpu = { version = "0.12.4", optional = true, package = "rocksdb" }
 rust-crypto = "0.2"
-serde = "1.0.114"
-serde_derive = "1.0.114"
-serde_json = "1.0.56"
-signal-hook = "0.1"
-stderrlog = "0.4.3"
+serde = "1.0.118"
+serde_derive = "1.0.118"
+serde_json = "1.0.60"
+signal-hook = "0.2.2"
+stderrlog = "0.5.0"
 sysconf = ">=0.3.4"
-time = "0.2.16"
+time = "0.2.23"
 tiny_http = "0.7.0"
-url = "2.1.1"
+url = "2.2.0"
 hyper = "0.13.6"
 hyperlocal = "0.7"
 # close to same tokio version as dependent by hyper v0.13.6 and hyperlocal 0.7 -- things can go awry if they mismatch

From c484efa2ebb2cbcdc15cb2c5b890ede3a0b77096 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 31 Dec 2020 20:04:13 +0200
Subject: [PATCH 11/47] Don't add mempool transaction that already exists

Doing this doesn't affect the indexes, but may result in multiple
duplciated entries showing in the `recent` transactions.
---
 src/new_index/mempool.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/new_index/mempool.rs b/src/new_index/mempool.rs
index cf67790bf..5caf6e8cb 100644
--- a/src/new_index/mempool.rs
+++ b/src/new_index/mempool.rs
@@ -317,8 +317,10 @@ impl Mempool {
     }
 
     pub fn add_by_txid(&mut self, daemon: &Daemon, txid: &Txid) {
-        if let Ok(tx) = daemon.getmempooltx(&txid) {
-            self.add(vec![tx])
+        if self.txstore.get(txid).is_none() {
+            if let Ok(tx) = daemon.getmempooltx(&txid) {
+                self.add(vec![tx])
+            }
         }
     }
 

From bae488118de24d571042fb94e18789f0a9d1f69f Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Mon, 15 Feb 2021 22:50:09 +0200
Subject: [PATCH 12/47] Properly handle negative balanaces in the Electrum RPC

Refs https://github.com/bitcoindevkit/rust-electrum-client/issues/45
---
 src/electrum/server.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/electrum/server.rs b/src/electrum/server.rs
index b35ed3f6c..96d4213aa 100644
--- a/src/electrum/server.rs
+++ b/src/electrum/server.rs
@@ -286,8 +286,8 @@ impl Connection {
         let (chain_stats, mempool_stats) = self.query.stats(&script_hash[..]);
 
         Ok(json!({
-            "confirmed": chain_stats.funded_txo_sum - chain_stats.spent_txo_sum,
-            "unconfirmed": mempool_stats.funded_txo_sum - mempool_stats.spent_txo_sum,
+            "confirmed": chain_stats.funded_txo_sum as i64 - chain_stats.spent_txo_sum as i64,
+            "unconfirmed": mempool_stats.funded_txo_sum as i64 - mempool_stats.spent_txo_sum as i64,
         }))
     }
 

From d1fd717d5e5d15ae43c938d08d71e0567323d505 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Mon, 15 Feb 2021 23:51:48 +0200
Subject: [PATCH 13/47] Confirmed balances have to be positive

h/t @sgeisler https://github.com/bitcoindevkit/rust-electrum-client/issues/45#issuecomment-779453735
---
 src/electrum/server.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/electrum/server.rs b/src/electrum/server.rs
index 96d4213aa..6157fbef4 100644
--- a/src/electrum/server.rs
+++ b/src/electrum/server.rs
@@ -286,7 +286,7 @@ impl Connection {
         let (chain_stats, mempool_stats) = self.query.stats(&script_hash[..]);
 
         Ok(json!({
-            "confirmed": chain_stats.funded_txo_sum as i64 - chain_stats.spent_txo_sum as i64,
+            "confirmed": chain_stats.funded_txo_sum - chain_stats.spent_txo_sum,
             "unconfirmed": mempool_stats.funded_txo_sum as i64 - mempool_stats.spent_txo_sum as i64,
         }))
     }

From a33e97e1a1fc63fa9c20a116bb92579bbf43b254 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 20 Feb 2021 16:45:07 +0200
Subject: [PATCH 14/47] Display warning message with just the number of
 transactions

The full list of txids can get pretty huge and is not really useful.
---
 src/new_index/mempool.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/new_index/mempool.rs b/src/new_index/mempool.rs
index 5caf6e8cb..7963c5060 100644
--- a/src/new_index/mempool.rs
+++ b/src/new_index/mempool.rs
@@ -291,7 +291,7 @@ impl Mempool {
         let to_add = match daemon.gettransactions(&txids) {
             Ok(txs) => txs,
             Err(err) => {
-                warn!("failed to get transactions {:?}: {}", txids, err); // e.g. new block or RBF
+                warn!("failed to get {} transactions: {}", txids.len(), err); // e.g. new block or RBF
                 return Ok(()); // keep the mempool until next update()
             }
         };

From abfbce73eb0504630a09f1e6599114ef4fa25bda Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 25 Jun 2021 22:07:08 +0300
Subject: [PATCH 15/47] Report the indexed tip height as a Prometheus metric
 (#37)

---
 src/new_index/schema.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index bee8273ba..120eae454 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -24,7 +24,7 @@ use crate::chain::{BlockHeader, Network, OutPoint, Transaction, TxOut, Value};
 use crate::config::Config;
 use crate::daemon::Daemon;
 use crate::errors::*;
-use crate::metrics::{HistogramOpts, HistogramTimer, HistogramVec, Metrics};
+use crate::metrics::{Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
 use crate::util::{
     full_hash, has_prevout, is_spendable, script_to_address, BlockHeaderMeta, BlockId, BlockMeta,
     BlockStatus, Bytes, HeaderEntry, HeaderList,
@@ -164,6 +164,7 @@ pub struct Indexer {
     from: FetchFrom,
     iconfig: IndexerConfig,
     duration: HistogramVec,
+    tip_metric: Gauge,
 }
 
 struct IndexerConfig {
@@ -208,6 +209,7 @@ impl Indexer {
                 HistogramOpts::new("index_duration", "Index update duration (in seconds)"),
                 &["step"],
             ),
+            tip_metric: metrics.gauge(MetricOpts::new("tip_height", "Current chain tip height")),
         }
     }
 
@@ -296,6 +298,8 @@ impl Indexer {
             self.from = FetchFrom::Bitcoind;
         }
 
+        self.tip_metric.set(headers.len() as i64 - 1);
+
         Ok(tip)
     }
 

From 6b7416b4417b85b3a205165772c5183b2de5910c Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 21 Jan 2021 05:53:51 +0200
Subject: [PATCH 16/47] Upgrade to rust-bitcoin v0.25 and elements v0.15

---
 Cargo.lock             | 148 +++++++++++++++++++++++++++++++++--------
 Cargo.toml             |  19 +-----
 src/chain.rs           |   3 +-
 src/daemon.rs          |   5 +-
 src/new_index/fetch.rs |   4 +-
 src/rest.rs            |  10 +--
 src/util/block.rs      |   6 +-
 src/util/script.rs     |   2 +-
 8 files changed, 136 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 99031f2db..faa5177d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -134,7 +134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
 dependencies = [
  "byteorder",
- "serde",
+ "serde 1.0.118",
 ]
 
 [[package]]
@@ -164,13 +164,26 @@ dependencies = [
 [[package]]
 name = "bitcoin"
 version = "0.23.0"
-source = "git+https://github.com/blockstream/rust-bitcoin?rev=0.23-electrs#dd131855022c2cdd691a531c1d5c2f5ab707e4d4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a32c9d2fa897cfbb0db45d71e3d2838666194abc4828c0f994e4b5c3bf85ba4"
 dependencies = [
  "bech32",
- "bitcoin_hashes",
+ "bitcoin_hashes 0.7.6",
  "hex 0.3.2",
- "secp256k1",
- "serde",
+ "secp256k1 0.17.2",
+ "serde 1.0.118",
+]
+
+[[package]]
+name = "bitcoin"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aefc9be9f17185f4ebccae6575d342063f775924d57df0000edb1880c0fb7095"
+dependencies = [
+ "bech32",
+ "bitcoin_hashes 0.9.4",
+ "secp256k1 0.19.0",
+ "serde 1.0.118",
 ]
 
 [[package]]
@@ -179,7 +192,16 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b375d62f341cef9cd9e77793ec8f1db3fc9ce2e4d57e982c8fe697a2c16af3b6"
 dependencies = [
- "serde",
+ "serde 1.0.118",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aaf87b776808e26ae93289bc7d025092b6d909c193f0cdee0b3a86e7bd3c776"
+dependencies = [
+ "serde 1.0.118",
 ]
 
 [[package]]
@@ -257,7 +279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
 dependencies = [
  "num-integer",
- "num-traits",
+ "num-traits 0.2.12",
  "time 0.1.43",
 ]
 
@@ -388,6 +410,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
+[[package]]
+name = "dtoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"
+
 [[package]]
 name = "either"
 version = "1.5.3"
@@ -402,7 +430,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin",
+ "bitcoin 0.25.2",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -424,9 +452,9 @@ dependencies = [
  "rocksdb 0.12.4",
  "rocksdb 0.15.0",
  "rust-crypto",
- "serde",
+ "serde 1.0.118",
  "serde_derive",
- "serde_json",
+ "serde_json 1.0.60",
  "signal-hook",
  "socket2",
  "stderrlog",
@@ -443,11 +471,11 @@ name = "electrum-client"
 version = "0.1.0-beta.6"
 source = "git+https://github.com/Blockstream/rust-electrum-client?rev=bd783aa70604fa1a0d8b29a3459326c640001354#bd783aa70604fa1a0d8b29a3459326c640001354"
 dependencies = [
- "bitcoin",
+ "bitcoin 0.23.0",
  "log",
  "rustls",
- "serde",
- "serde_json",
+ "serde 1.0.118",
+ "serde_json 1.0.60",
  "socks",
  "webpki",
  "webpki-roots",
@@ -455,12 +483,15 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.12.1"
-source = "git+https://github.com/elementsproject/rust-elements?rev=98e0c4ba1b55cd876d1d8bcff64bcf01c4c370b6#98e0c4ba1b55cd876d1d8bcff64bcf01c4c370b6"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd3865be0d3cabe1c92022d310b747e08b6308de5d81a70c921c35701133cd8"
 dependencies = [
- "bitcoin",
- "bitcoin_hashes",
- "serde",
+ "bitcoin 0.25.2",
+ "bitcoin_hashes 0.9.4",
+ "serde 1.0.118",
+ "serde_json 0.9.10",
+ "slip21",
 ]
 
 [[package]]
@@ -693,7 +724,7 @@ checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
 dependencies = [
  "bytes",
  "fnv",
- "itoa",
+ "itoa 0.4.6",
 ]
 
 [[package]]
@@ -735,7 +766,7 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
- "itoa",
+ "itoa 0.4.6",
  "log",
  "pin-project",
  "socket2",
@@ -805,6 +836,12 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
+
 [[package]]
 name = "itoa"
 version = "0.4.6"
@@ -999,7 +1036,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
 dependencies = [
  "autocfg",
- "num-traits",
+ "num-traits 0.2.12",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+dependencies = [
+ "num-traits 0.2.12",
 ]
 
 [[package]]
@@ -1481,8 +1527,18 @@ version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2932dc07acd2066ff2e3921a4419606b220ba6cd03a9935123856cc534877056"
 dependencies = [
- "secp256k1-sys",
- "serde",
+ "secp256k1-sys 0.1.2",
+ "serde 1.0.118",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6179428c22c73ac0fbb7b5579a56353ce78ba29759b3b8575183336ea74cdfb"
+dependencies = [
+ "secp256k1-sys 0.3.0",
+ "serde 1.0.118",
 ]
 
 [[package]]
@@ -1494,6 +1550,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11553d210db090930f4432bea123b31f70bbf693ace14504ea2a35e796c28dd2"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -1509,6 +1574,12 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
+[[package]]
+name = "serde"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
+
 [[package]]
 name = "serde"
 version = "1.0.118"
@@ -1529,15 +1600,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_json"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
+dependencies = [
+ "dtoa",
+ "itoa 0.3.4",
+ "num-traits 0.1.43",
+ "serde 0.9.15",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
 dependencies = [
- "itoa",
+ "itoa 0.4.6",
  "ryu",
- "serde",
+ "serde 1.0.118",
 ]
 
 [[package]]
@@ -1578,6 +1661,15 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
+[[package]]
+name = "slip21"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acff9a1a0f4d902c8184bdde5338861dd95eb1397a12c4df78fb0b6ebeed4cbe"
+dependencies = [
+ "bitcoin_hashes 0.7.6",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.5.1"
@@ -1657,7 +1749,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde",
+ "serde 1.0.118",
  "serde_derive",
  "syn",
 ]
@@ -1671,9 +1763,9 @@ dependencies = [
  "base-x",
  "proc-macro2",
  "quote",
- "serde",
+ "serde 1.0.118",
  "serde_derive",
- "serde_json",
+ "serde_json 1.0.60",
  "sha1",
  "syn",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 8fcfdf2cf..148a11573 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,9 +22,11 @@ arraydeque = "0.4"
 arrayref = "0.3.6"
 base64 = "0.13.0"
 bincode = "1.3.1"
+bitcoin = { version = "0.25.0", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "3.0.1"
+elements = { version = "0.15.0", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
@@ -57,15 +59,6 @@ tokio = { version = "=0.2.6", features = ["sync", "macros"] }
 # optional dependencies for electrum-discovery
 electrum-client = { version = "0.1.0-beta.6", optional = true }
 
-[dependencies.bitcoin]
-version = "0.23.0"
-features = ["use-serde"]
-
-[dependencies.elements]
-optional = true
-version = "0.12.1"
-features = ["serde-feature"]
-
 [dev-dependencies]
 tempfile = "3.0"
 
@@ -74,14 +67,6 @@ lto = true
 panic = 'abort'
 codegen-units = 1
 
-[patch.crates-io.bitcoin]
-git = "https://github.com/blockstream/rust-bitcoin"
-rev = "0.23-electrs"
-
-[patch.crates-io.elements]
-git = "https://github.com/elementsproject/rust-elements"
-rev = "98e0c4ba1b55cd876d1d8bcff64bcf01c4c370b6"
-
 [patch.crates-io.electrum-client]
 git = "https://github.com/Blockstream/rust-electrum-client"
 rev = "bd783aa70604fa1a0d8b29a3459326c640001354" # add-peer
diff --git a/src/chain.rs b/src/chain.rs
index 5e5e3fd8a..d8f006240 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -12,7 +12,6 @@ pub use {
 
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::network::constants::Network as BNetwork;
-use bitcoin::util::hash::BitcoinHash;
 use bitcoin::BlockHash;
 
 use std::collections::HashMap;
@@ -46,7 +45,7 @@ impl Network {
             return *block_hash;
         }
 
-        let block_hash = genesis_block(BNetwork::from(self)).bitcoin_hash();
+        let block_hash = genesis_block(BNetwork::from(self)).block_hash();
         CACHED_GENESIS.write().unwrap().insert(self, block_hash);
         block_hash
     }
diff --git a/src/daemon.rs b/src/daemon.rs
index 529369954..afffa2041 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -7,7 +7,6 @@ use std::time::Duration;
 
 use base64;
 use bitcoin::hashes::hex::{FromHex, ToHex};
-use bitcoin::util::hash::BitcoinHash;
 use bitcoin::{BlockHash, Txid};
 use glob;
 use hex;
@@ -461,7 +460,7 @@ impl Daemon {
         let block = block_from_value(
             self.request("getblock", json!([blockhash.to_hex(), /*verbose=*/ false]))?,
         )?;
-        assert_eq!(block.bitcoin_hash(), *blockhash);
+        assert_eq!(block.block_hash(), *blockhash);
         Ok(block)
     }
 
@@ -588,7 +587,7 @@ impl Daemon {
         let mut blockhash = BlockHash::default();
         for header in &result {
             assert_eq!(header.prev_blockhash, blockhash);
-            blockhash = header.bitcoin_hash();
+            blockhash = header.block_hash();
         }
         assert_eq!(blockhash, *tip);
         Ok(result)
diff --git a/src/new_index/fetch.rs b/src/new_index/fetch.rs
index 6b9651445..0cb6375c8 100644
--- a/src/new_index/fetch.rs
+++ b/src/new_index/fetch.rs
@@ -1,6 +1,6 @@
 use crate::chain::Block;
 
-use bitcoin::{BitcoinHash, BlockHash};
+use bitcoin::BlockHash;
 use rayon::prelude::*;
 
 #[cfg(not(feature = "liquid"))]
@@ -124,7 +124,7 @@ fn blkfiles_fetcher(
                 let block_entries: Vec<BlockEntry> = sizedblocks
                     .into_iter()
                     .filter_map(|(block, size)| {
-                        let blockhash = block.bitcoin_hash();
+                        let blockhash = block.block_hash();
                         entry_map
                             .remove(&blockhash)
                             .map(|entry| BlockEntry { block, entry, size })
diff --git a/src/rest.rs b/src/rest.rs
index 00a971df8..2b280c735 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -12,7 +12,7 @@ use crate::util::{
 use bitcoin::consensus::encode;
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::Error as HashError;
-use bitcoin::{BitcoinHash, BlockHash, Script, Txid};
+use bitcoin::{BlockHash, Script, Txid};
 use hex::{self, FromHexError};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Method, Response, Server, StatusCode};
@@ -84,9 +84,9 @@ impl BlockValue {
     fn new(blockhm: BlockHeaderMeta, network: Network) -> Self {
         let header = blockhm.header_entry.header();
         BlockValue {
-            id: header.bitcoin_hash().to_hex(),
+            id: header.block_hash().to_hex(),
             height: blockhm.header_entry.height() as u32,
-            version: header.version,
+            version: header.version as u32,
             timestamp: header.time,
             tx_count: blockhm.meta.tx_count,
             size: blockhm.meta.size,
@@ -152,7 +152,7 @@ impl TransactionValue {
 
         TransactionValue {
             txid: tx.txid(),
-            version: tx.version,
+            version: tx.version as u32,
             locktime: tx.lock_time,
             vin: vins,
             vout: vouts,
@@ -959,7 +959,7 @@ fn handle_request(
 
             let height = query
                 .chain()
-                .height_by_hash(&merkleblock.header.bitcoin_hash());
+                .height_by_hash(&merkleblock.header.block_hash());
 
             http_message(
                 StatusCode::OK,
diff --git a/src/util/block.rs b/src/util/block.rs
index 1bb7cd294..0e2c73ab6 100644
--- a/src/util/block.rs
+++ b/src/util/block.rs
@@ -2,7 +2,7 @@ use crate::chain::BlockHeader;
 use crate::errors::*;
 use crate::new_index::BlockEntry;
 
-use bitcoin::{BitcoinHash, BlockHash};
+use bitcoin::BlockHash;
 
 use std::collections::HashMap;
 use std::fmt;
@@ -97,7 +97,7 @@ impl HeaderList {
                 panic!(
                     "missing expected blockhash in headers map: {:?}, pointed from: {:?}",
                     blockhash,
-                    headers_chain.last().map(|h| h.bitcoin_hash())
+                    headers_chain.last().map(|h| h.block_hash())
                 )
             });
             blockhash = header.prev_blockhash;
@@ -124,7 +124,7 @@ impl HeaderList {
         }
         let hashed_headers =
             Vec::<HashedHeader>::from_iter(new_headers.into_iter().map(|header| HashedHeader {
-                blockhash: header.bitcoin_hash(),
+                blockhash: header.block_hash(),
                 header,
             }));
         for i in 1..hashed_headers.len() {
diff --git a/src/util/script.rs b/src/util/script.rs
index 5d1bb7958..9faf4c186 100644
--- a/src/util/script.rs
+++ b/src/util/script.rs
@@ -31,7 +31,7 @@ pub fn get_script_asm(script: &Script) -> String {
 pub fn get_innerscripts(txin: &TxIn, prevout: &TxOut) -> InnerScripts {
     // Wrapped redeemScript for P2SH spends
     let redeem_script = if prevout.script_pubkey.is_p2sh() {
-        if let Some(PushBytes(redeemscript)) = txin.script_sig.iter(true).last() {
+        if let Some(Ok(PushBytes(redeemscript))) = txin.script_sig.instructions().last() {
             Some(Script::from(redeemscript.to_vec()))
         } else {
             None

From f905a01102d09c02239c2c5e363406e1dc72bc25 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 21 Jan 2021 09:51:51 +0200
Subject: [PATCH 17/47] Adjust for rust-elements's new data types

---
 src/chain.rs                | 43 ++++++++++++++++++++-----------------
 src/config.rs               | 11 ++++++----
 src/daemon.rs               |  3 +--
 src/electrum/client.rs      |  3 ++-
 src/electrum/discovery.rs   |  4 +---
 src/electrum/mod.rs         |  3 +--
 src/electrum/server.rs      |  2 +-
 src/elements/asset.rs       |  9 ++++----
 src/elements/peg.rs         | 23 +++++++++++---------
 src/elements/registry.rs    |  2 +-
 src/new_index/fetch.rs      |  4 +---
 src/new_index/mempool.rs    |  4 +---
 src/new_index/query.rs      |  4 +---
 src/new_index/schema.rs     | 15 +++++++------
 src/rest.rs                 | 18 +++++++---------
 src/util/block.rs           |  4 +---
 src/util/electrum_merkle.rs |  5 ++---
 src/util/mod.rs             |  2 +-
 src/util/script.rs          | 35 ++++++++++++++++--------------
 src/util/transaction.rs     | 10 ++++-----
 20 files changed, 100 insertions(+), 104 deletions(-)

diff --git a/src/chain.rs b/src/chain.rs
index d8f006240..d35896130 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -1,18 +1,20 @@
 #[cfg(not(feature = "liquid"))] // use regular Bitcoin data structures
-pub use bitcoin::{util::address, Block, BlockHeader, OutPoint, Transaction, TxIn, TxOut};
+pub use bitcoin::{
+    blockdata::script, consensus::deserialize, util::address, Block, BlockHash, BlockHeader,
+    OutPoint, Script, Transaction, TxIn, TxOut, Txid,
+};
 
 #[cfg(feature = "liquid")]
 pub use {
     crate::elements::asset,
     elements::{
-        address, confidential, Address, AssetId, Block, BlockHeader, OutPoint, Transaction, TxIn,
-        TxOut,
+        address, confidential, encode::deserialize, script, Address, AssetId, Block, BlockHash,
+        BlockHeader, OutPoint, Script, Transaction, TxIn, TxOut, Txid,
     },
 };
 
 use bitcoin::blockdata::constants::genesis_block;
-use bitcoin::network::constants::Network as BNetwork;
-use bitcoin::BlockHash;
+pub use bitcoin::network::constants::Network as BNetwork;
 
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
@@ -22,11 +24,6 @@ pub type Value = u64;
 #[cfg(feature = "liquid")]
 pub use confidential::Value;
 
-lazy_static! {
-    static ref CACHED_GENESIS: Arc<RwLock<HashMap<Network, BlockHash>>> =
-        Arc::new(RwLock::new(HashMap::new()));
-}
-
 #[derive(Debug, Copy, Clone, PartialEq, Hash, Serialize, Ord, PartialOrd, Eq)]
 pub enum Network {
     Bitcoin,
@@ -40,16 +37,6 @@ pub enum Network {
 }
 
 impl Network {
-    pub fn genesis_hash(self) -> BlockHash {
-        if let Some(block_hash) = CACHED_GENESIS.read().unwrap().get(&self) {
-            return *block_hash;
-        }
-
-        let block_hash = genesis_block(BNetwork::from(self)).block_hash();
-        CACHED_GENESIS.write().unwrap().insert(self, block_hash);
-        block_hash
-    }
-
     pub fn magic(self) -> u32 {
         match self {
             Network::Bitcoin => 0xD9B4_BEF9,
@@ -102,6 +89,22 @@ impl Network {
     }
 }
 
+// For bitcoin (non-elements) chains only
+pub fn genesis_hash(network: BNetwork) -> bitcoin::BlockHash {
+    lazy_static! {
+        static ref CACHED_GENESIS: Arc<RwLock<HashMap<BNetwork, bitcoin::BlockHash>>> =
+            Arc::new(RwLock::new(HashMap::new()));
+    }
+
+    if let Some(block_hash) = CACHED_GENESIS.read().unwrap().get(&network) {
+        return *block_hash;
+    }
+
+    let block_hash = genesis_block(network).block_hash();
+    CACHED_GENESIS.write().unwrap().insert(network, block_hash);
+    block_hash
+}
+
 impl From<&str> for Network {
     fn from(network_name: &str) -> Self {
         match network_name {
diff --git a/src/config.rs b/src/config.rs
index 189ac5579..9a68e4507 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -9,9 +9,11 @@ use stderrlog;
 
 use crate::chain::Network;
 use crate::daemon::CookieGetter;
-
 use crate::errors::*;
 
+#[cfg(feature = "liquid")]
+use bitcoin::Network as BNetwork;
+
 const ELECTRS_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 #[derive(Debug, Clone)]
@@ -39,7 +41,7 @@ pub struct Config {
     pub electrum_banner: String,
 
     #[cfg(feature = "liquid")]
-    pub parent_network: Network,
+    pub parent_network: BNetwork,
     #[cfg(feature = "liquid")]
     pub asset_db_path: Option<PathBuf>,
 
@@ -235,9 +237,10 @@ impl Config {
         let parent_network = m
             .value_of("parent_network")
             .map(Network::from)
+            .map(BNetwork::from)
             .unwrap_or_else(|| match network_type {
-                Network::Liquid => Network::Bitcoin,
-                Network::LiquidRegtest => Network::Regtest,
+                Network::Liquid => BNetwork::Bitcoin,
+                Network::LiquidRegtest => BNetwork::Regtest,
                 _ => panic!("unknown liquid network, --parent-network is required"),
             });
 
diff --git a/src/daemon.rs b/src/daemon.rs
index afffa2041..eb05680b3 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -7,7 +7,6 @@ use std::time::Duration;
 
 use base64;
 use bitcoin::hashes::hex::{FromHex, ToHex};
-use bitcoin::{BlockHash, Txid};
 use glob;
 use hex;
 use serde_json::{from_str, from_value, Value};
@@ -17,7 +16,7 @@ use bitcoin::consensus::encode::{deserialize, serialize};
 #[cfg(feature = "liquid")]
 use elements::encode::{deserialize, serialize};
 
-use crate::chain::{Block, BlockHeader, Network, Transaction};
+use crate::chain::{Block, BlockHash, BlockHeader, Network, Transaction, Txid};
 use crate::metrics::{HistogramOpts, HistogramVec, Metrics};
 use crate::signal::Waiter;
 use crate::util::HeaderList;
diff --git a/src/electrum/client.rs b/src/electrum/client.rs
index f6326e620..436754116 100644
--- a/src/electrum/client.rs
+++ b/src/electrum/client.rs
@@ -2,13 +2,14 @@ use std::collections::HashMap;
 use std::convert::{TryFrom, TryInto};
 use std::net::ToSocketAddrs;
 
-use bitcoin::{hashes::Hash, BlockHash};
+use bitcoin::hashes::Hash;
 use electrum_client::client::{
     Client as RClient, ElectrumPlaintextStream, ElectrumProxyStream, ElectrumSslStream,
 };
 pub use electrum_client::types::ServerFeaturesRes;
 pub use electrum_client::Error as ElectrumError;
 
+use crate::chain::BlockHash;
 use crate::electrum::ServerFeatures;
 use crate::errors::{Error, ResultExt};
 
diff --git a/src/electrum/discovery.rs b/src/electrum/discovery.rs
index 3eecc55dc..2cc1c45cb 100644
--- a/src/electrum/discovery.rs
+++ b/src/electrum/discovery.rs
@@ -7,9 +7,7 @@ use std::sync::{Arc, RwLock};
 use std::thread;
 use std::time::{Duration, Instant};
 
-use bitcoin::BlockHash;
-
-use crate::chain::Network;
+use crate::chain::{BlockHash, Network};
 use crate::electrum::{Client, Hostname, Port, ProtocolVersion, ServerFeatures};
 use crate::errors::{Result, ResultExt};
 use crate::util::spawn_thread;
diff --git a/src/electrum/mod.rs b/src/electrum/mod.rs
index b618a2ec6..d28426d7d 100644
--- a/src/electrum/mod.rs
+++ b/src/electrum/mod.rs
@@ -14,8 +14,7 @@ use std::str::FromStr;
 
 use serde::{de, Deserialize, Deserializer, Serialize};
 
-use bitcoin::BlockHash;
-
+use crate::chain::BlockHash;
 use crate::errors::ResultExt;
 use crate::util::BlockId;
 
diff --git a/src/electrum/server.rs b/src/electrum/server.rs
index 6157fbef4..cbcf12bef 100644
--- a/src/electrum/server.rs
+++ b/src/electrum/server.rs
@@ -6,7 +6,6 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
-use bitcoin::Txid;
 use crypto::digest::Digest;
 use crypto::sha2::Sha256;
 use error_chain::ChainedError;
@@ -18,6 +17,7 @@ use bitcoin::consensus::encode::serialize;
 #[cfg(feature = "liquid")]
 use elements::encode::serialize;
 
+use crate::chain::Txid;
 use crate::config::Config;
 use crate::electrum::{get_electrum_height, ProtocolVersion};
 use crate::errors::*;
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index a5717fa03..67578bc33 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -2,12 +2,11 @@ use std::collections::{HashMap, HashSet};
 use std::sync::{Arc, RwLock};
 
 use bitcoin::hashes::{hex::FromHex, sha256, Hash};
-use bitcoin::{BlockHash, Txid};
 use elements::confidential::{Asset, Value};
 use elements::encode::{deserialize, serialize};
 use elements::{issuance::ContractHash, AssetId, AssetIssuance, OutPoint, Transaction, TxIn};
 
-use crate::chain::Network;
+use crate::chain::{BNetwork, BlockHash, Network, Txid};
 use crate::elements::peg::{get_pegin_data, get_pegout_data, PeginInfo, PegoutInfo};
 use crate::elements::registry::{AssetMeta, AssetRegistry};
 use crate::errors::*;
@@ -169,7 +168,7 @@ pub fn index_confirmed_tx_assets(
     tx: &Transaction,
     confirmed_height: u32,
     network: Network,
-    parent_network: Network,
+    parent_network: BNetwork,
     rows: &mut Vec<DBRow>,
 ) {
     let (history, issuances) = index_tx_assets(tx, network, parent_network);
@@ -193,7 +192,7 @@ pub fn index_confirmed_tx_assets(
 pub fn index_mempool_tx_assets(
     tx: &Transaction,
     network: Network,
-    parent_network: Network,
+    parent_network: BNetwork,
     asset_history: &mut HashMap<AssetId, Vec<TxHistoryInfo>>,
     asset_issuance: &mut HashMap<AssetId, AssetRow>,
 ) {
@@ -231,7 +230,7 @@ pub fn remove_mempool_tx_assets(
 fn index_tx_assets(
     tx: &Transaction,
     network: Network,
-    parent_network: Network,
+    parent_network: BNetwork,
 ) -> (Vec<(AssetId, TxHistoryInfo)>, Vec<(AssetId, AssetRow)>) {
     let mut history = vec![];
     let mut issuances = vec![];
diff --git a/src/elements/peg.rs b/src/elements/peg.rs
index f980ae05a..77c058530 100644
--- a/src/elements/peg.rs
+++ b/src/elements/peg.rs
@@ -1,8 +1,8 @@
-use bitcoin::{hashes::hex::ToHex, Script};
+use bitcoin::hashes::hex::ToHex;
 use elements::{confidential::Asset, PeginData, PegoutData, TxIn, TxOut};
 
-use crate::chain::Network;
-use crate::util::{get_script_asm, script_to_address, FullHash};
+use crate::chain::{genesis_hash, BNetwork, Network};
+use crate::util::{FullHash, ScriptExt};
 
 pub fn get_pegin_data(txout: &TxIn, network: Network) -> Option<PeginData> {
     txout
@@ -13,11 +13,11 @@ pub fn get_pegin_data(txout: &TxIn, network: Network) -> Option<PeginData> {
 pub fn get_pegout_data(
     txout: &TxOut,
     network: Network,
-    parent_network: Network,
+    parent_network: BNetwork,
 ) -> Option<PegoutData> {
     txout.pegout_data().filter(|pegout| {
         pegout.asset == Asset::Explicit(*network.native_asset())
-            && pegout.genesis_hash == parent_network.genesis_hash()
+            && pegout.genesis_hash == genesis_hash(parent_network)
     })
 }
 
@@ -25,21 +25,24 @@ pub fn get_pegout_data(
 #[derive(Serialize, Deserialize, Clone)]
 pub struct PegoutValue {
     pub genesis_hash: String,
-    pub scriptpubkey: Script,
+    pub scriptpubkey: bitcoin::Script,
     pub scriptpubkey_asm: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub scriptpubkey_address: Option<String>,
 }
 
 impl PegoutValue {
-    pub fn from_txout(txout: &TxOut, network: Network, parent_network: Network) -> Option<Self> {
+    pub fn from_txout(txout: &TxOut, network: Network, parent_network: BNetwork) -> Option<Self> {
         let pegoutdata = get_pegout_data(txout, network, parent_network)?;
 
+        // pending https://github.com/ElementsProject/rust-elements/pull/69 is merged
+        let scriptpubkey = bitcoin::Script::from(pegoutdata.script_pubkey.into_bytes());
+
         Some(PegoutValue {
             genesis_hash: pegoutdata.genesis_hash.to_hex(),
-            scriptpubkey_asm: get_script_asm(&pegoutdata.script_pubkey),
-            scriptpubkey_address: script_to_address(&pegoutdata.script_pubkey, parent_network),
-            scriptpubkey: pegoutdata.script_pubkey,
+            scriptpubkey_asm: scriptpubkey.to_asm(),
+            scriptpubkey_address: scriptpubkey.to_address(parent_network.into()),
+            scriptpubkey,
         })
     }
 }
diff --git a/src/elements/registry.rs b/src/elements/registry.rs
index 8c1fc6969..e0728320d 100644
--- a/src/elements/registry.rs
+++ b/src/elements/registry.rs
@@ -5,7 +5,7 @@ use std::{cmp, fs, path, thread};
 
 use serde_json::Value as JsonValue;
 
-use elements::bitcoin_hashes::hex::FromHex;
+use bitcoin::hashes::hex::FromHex;
 use elements::AssetId;
 
 use crate::errors::*;
diff --git a/src/new_index/fetch.rs b/src/new_index/fetch.rs
index 0cb6375c8..2a3112252 100644
--- a/src/new_index/fetch.rs
+++ b/src/new_index/fetch.rs
@@ -1,6 +1,3 @@
-use crate::chain::Block;
-
-use bitcoin::BlockHash;
 use rayon::prelude::*;
 
 #[cfg(not(feature = "liquid"))]
@@ -15,6 +12,7 @@ use std::path::PathBuf;
 use std::sync::mpsc::Receiver;
 use std::thread;
 
+use crate::chain::{Block, BlockHash};
 use crate::daemon::Daemon;
 use crate::errors::*;
 use crate::util::{spawn_thread, HeaderEntry, SyncChannel};
diff --git a/src/new_index/mempool.rs b/src/new_index/mempool.rs
index 7963c5060..9586c5168 100644
--- a/src/new_index/mempool.rs
+++ b/src/new_index/mempool.rs
@@ -1,6 +1,4 @@
 use arraydeque::{ArrayDeque, Wrapping};
-use bitcoin::consensus::encode::deserialize;
-use bitcoin::Txid;
 use itertools::Itertools;
 
 #[cfg(not(feature = "liquid"))]
@@ -13,7 +11,7 @@ use std::iter::FromIterator;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
-use crate::chain::{Network, OutPoint, Transaction, TxOut};
+use crate::chain::{deserialize, Network, OutPoint, Transaction, TxOut, Txid};
 use crate::config::Config;
 use crate::daemon::Daemon;
 use crate::errors::*;
diff --git a/src/new_index/query.rs b/src/new_index/query.rs
index c7211af43..387e8f70f 100644
--- a/src/new_index/query.rs
+++ b/src/new_index/query.rs
@@ -4,15 +4,13 @@ use std::collections::{BTreeSet, HashMap};
 use std::sync::{Arc, RwLock, RwLockReadGuard};
 use std::time::{Duration, Instant};
 
-use crate::chain::{Network, OutPoint, Transaction, TxOut};
+use crate::chain::{Network, OutPoint, Transaction, TxOut, Txid};
 use crate::config::Config;
 use crate::daemon::Daemon;
 use crate::errors::*;
 use crate::new_index::{ChainQuery, Mempool, ScriptStats, SpendingInput, Utxo};
 use crate::util::{is_spendable, BlockId, Bytes, TransactionStatus};
 
-use bitcoin::Txid;
-
 #[cfg(feature = "liquid")]
 use crate::{
     chain::AssetId,
diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index 120eae454..7b69f5135 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -1,8 +1,7 @@
-use bitcoin::blockdata::script::Script;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 #[cfg(not(feature = "liquid"))]
 use bitcoin::util::merkleblock::MerkleBlock;
-use bitcoin::{BlockHash, Txid, VarInt};
+use bitcoin::VarInt;
 use crypto::digest::Digest;
 use crypto::sha2::Sha256;
 use itertools::Itertools;
@@ -20,14 +19,16 @@ use std::collections::{BTreeSet, HashMap, HashSet};
 use std::path::Path;
 use std::sync::{Arc, RwLock};
 
-use crate::chain::{BlockHeader, Network, OutPoint, Transaction, TxOut, Value};
+use crate::chain::{
+    BlockHash, BlockHeader, Network, OutPoint, Script, Transaction, TxOut, Txid, Value,
+};
 use crate::config::Config;
 use crate::daemon::Daemon;
 use crate::errors::*;
 use crate::metrics::{Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
 use crate::util::{
-    full_hash, has_prevout, is_spendable, script_to_address, BlockHeaderMeta, BlockId, BlockMeta,
-    BlockStatus, Bytes, HeaderEntry, HeaderList,
+    full_hash, has_prevout, is_spendable, BlockHeaderMeta, BlockId, BlockMeta, BlockStatus, Bytes,
+    HeaderEntry, HeaderList, ScriptExt,
 };
 
 use crate::new_index::db::{DBFlush, DBRow, ReverseScanIterator, ScanIterator, DB};
@@ -173,7 +174,7 @@ struct IndexerConfig {
     index_unspendables: bool,
     network: Network,
     #[cfg(feature = "liquid")]
-    parent_network: Network,
+    parent_network: crate::chain::BNetwork,
 }
 
 impl From<&Config> for IndexerConfig {
@@ -1151,7 +1152,7 @@ fn index_transaction(
 }
 
 fn addr_search_row(spk: &Script, network: Network) -> Option<DBRow> {
-    script_to_address(spk, network).map(|address| DBRow {
+    spk.to_address(network).map(|address| DBRow {
         key: [b"a", address.as_bytes()].concat(),
         value: vec![],
     })
diff --git a/src/rest.rs b/src/rest.rs
index 2b280c735..b7fd38fe5 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -1,18 +1,16 @@
-use crate::chain::{address, Network, OutPoint, Transaction, TxIn, TxOut};
+use crate::chain::{address, BlockHash, Network, OutPoint, Script, Transaction, TxIn, TxOut, Txid};
 use crate::config::Config;
 use crate::errors;
 use crate::new_index::{compute_script_hash, Query, SpendingInput, Utxo};
 use crate::util::{
-    create_socket, electrum_merkle, extract_tx_prevouts, full_hash, get_innerscripts,
-    get_script_asm, get_tx_fee, has_prevout, is_coinbase, script_to_address, BlockHeaderMeta,
-    BlockId, FullHash, TransactionStatus,
+    create_socket, electrum_merkle, extract_tx_prevouts, full_hash, get_innerscripts, get_tx_fee,
+    has_prevout, is_coinbase, BlockHeaderMeta, BlockId, FullHash, ScriptExt, TransactionStatus,
 };
 
 #[cfg(not(feature = "liquid"))]
 use bitcoin::consensus::encode;
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::Error as HashError;
-use bitcoin::{BlockHash, Script, Txid};
 use hex::{self, FromHexError};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Method, Response, Server, StatusCode};
@@ -208,17 +206,17 @@ impl TxInValue {
             txid: txin.previous_output.txid,
             vout: txin.previous_output.vout,
             prevout: prevout.map(|prevout| TxOutValue::new(prevout, config)),
-            scriptsig_asm: get_script_asm(&txin.script_sig),
+            scriptsig_asm: txin.script_sig.to_asm(),
             witness,
 
             inner_redeemscript_asm: innerscripts
                 .as_ref()
                 .and_then(|i| i.redeem_script.as_ref())
-                .map(get_script_asm),
+                .map(ScriptExt::to_asm),
             inner_witnessscript_asm: innerscripts
                 .as_ref()
                 .and_then(|i| i.witness_script.as_ref())
-                .map(get_script_asm),
+                .map(ScriptExt::to_asm),
 
             is_coinbase,
             sequence: txin.sequence,
@@ -299,8 +297,8 @@ impl TxOutValue {
         let is_fee = txout.is_fee();
 
         let script = &txout.script_pubkey;
-        let script_asm = get_script_asm(&script);
-        let script_addr = script_to_address(&script, config.network_type);
+        let script_asm = script.to_asm();
+        let script_addr = script.to_address(config.network_type);
 
         // TODO should the following something to put inside rust-elements lib?
         let script_type = if is_fee {
diff --git a/src/util/block.rs b/src/util/block.rs
index 0e2c73ab6..8dea9c60f 100644
--- a/src/util/block.rs
+++ b/src/util/block.rs
@@ -1,9 +1,7 @@
-use crate::chain::BlockHeader;
+use crate::chain::{BlockHash, BlockHeader};
 use crate::errors::*;
 use crate::new_index::BlockEntry;
 
-use bitcoin::BlockHash;
-
 use std::collections::HashMap;
 use std::fmt;
 use std::iter::FromIterator;
diff --git a/src/util/electrum_merkle.rs b/src/util/electrum_merkle.rs
index a8048b155..954782a7d 100644
--- a/src/util/electrum_merkle.rs
+++ b/src/util/electrum_merkle.rs
@@ -1,8 +1,7 @@
-use bitcoin::hashes::{sha256d::Hash as Sha256dHash, Hash};
-use bitcoin::{BlockHash, Txid};
-
+use crate::chain::{BlockHash, Txid};
 use crate::errors::*;
 use crate::new_index::ChainQuery;
+use bitcoin::hashes::{sha256d::Hash as Sha256dHash, Hash};
 
 pub fn get_tx_merkle_proof(
     chain: &ChainQuery,
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 6ef04b3f6..c0505d1e2 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -7,7 +7,7 @@ pub mod fees;
 
 pub use self::block::{BlockHeaderMeta, BlockId, BlockMeta, BlockStatus, HeaderEntry, HeaderList};
 pub use self::fees::get_tx_fee;
-pub use self::script::{get_innerscripts, get_script_asm, script_to_address};
+pub use self::script::{get_innerscripts, ScriptExt};
 pub use self::transaction::{
     extract_tx_prevouts, has_prevout, is_coinbase, is_spendable, TransactionStatus, TxInput,
 };
diff --git a/src/util/script.rs b/src/util/script.rs
index 9faf4c186..09faa84da 100644
--- a/src/util/script.rs
+++ b/src/util/script.rs
@@ -1,30 +1,33 @@
-use bitcoin::blockdata::script::{Instruction::PushBytes, Script};
-
 #[cfg(feature = "liquid")]
 use elements::address as elements_address;
 
-use crate::chain::Network;
-use crate::chain::{TxIn, TxOut};
+use crate::chain::{script, Network, Script, TxIn, TxOut};
+use script::Instruction::PushBytes;
 
 pub struct InnerScripts {
     pub redeem_script: Option<Script>,
     pub witness_script: Option<Script>,
 }
 
-pub fn script_to_address(script: &Script, network: Network) -> Option<String> {
-    match network {
-        #[cfg(feature = "liquid")]
-        Network::Liquid | Network::LiquidRegtest => {
-            elements_address::Address::from_script(script, None, network.address_params())
-                .map(|a| a.to_string())
-        }
-        _ => bitcoin::Address::from_script(script, network.into()).map(|s| s.to_string()),
+pub trait ScriptExt: std::fmt::Debug {
+    fn to_asm(&self) -> String {
+        let asm = format!("{:?}", self);
+        (&asm[7..asm.len() - 1]).to_string()
     }
-}
 
-pub fn get_script_asm(script: &Script) -> String {
-    let asm = format!("{:?}", script);
-    (&asm[7..asm.len() - 1]).to_string()
+    fn to_address(&self, network: Network) -> Option<String>;
+}
+impl ScriptExt for bitcoin::Script {
+    fn to_address(&self, network: Network) -> Option<String> {
+        bitcoin::Address::from_script(self, network.into()).map(|s| s.to_string())
+    }
+}
+#[cfg(feature = "liquid")]
+impl ScriptExt for elements::Script {
+    fn to_address(&self, network: Network) -> Option<String> {
+        elements_address::Address::from_script(self, None, network.address_params())
+            .map(|a| a.to_string())
+    }
 }
 
 // Returns the witnessScript in the case of p2wsh, or the redeemScript in the case of p2sh.
diff --git a/src/util/transaction.rs b/src/util/transaction.rs
index 120802816..7a34179e8 100644
--- a/src/util/transaction.rs
+++ b/src/util/transaction.rs
@@ -1,13 +1,11 @@
-use bitcoin::{BlockHash, Txid};
-
-#[cfg(feature = "liquid")]
-use bitcoin::hashes::hex::FromHex;
-
-use crate::chain::{OutPoint, Transaction, TxIn, TxOut};
+use crate::chain::{BlockHash, OutPoint, Transaction, TxIn, TxOut, Txid};
 use crate::util::BlockId;
 
 use std::collections::HashMap;
 
+#[cfg(feature = "liquid")]
+use bitcoin::hashes::hex::FromHex;
+
 #[cfg(feature = "liquid")]
 lazy_static! {
     static ref REGTEST_INITIAL_ISSUANCE_PREVOUT: Txid =

From 44223503210980b8a2c189332fc60f76fa7d83d0 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 23 Jan 2021 04:41:24 +0200
Subject: [PATCH 18/47] Refactor and cleanup network handling

Remove bitcoin network variants in liquid mode, forbid setting
networks that mismatch the compile flags, and avoid nonsensical
network conversions.

This also fixes and optimizes genesis block hash calculation, which was
broken in the prior commit in with the `electrum-discovery` feature.
---
 src/chain.rs                              | 91 ++++++++++++++---------
 src/config.rs                             | 24 ++++--
 src/electrum/discovery.rs                 |  8 +-
 src/electrum/discovery/default_servers.rs |  2 +
 src/electrum/server.rs                    |  3 +-
 src/elements/peg.rs                       |  9 ++-
 src/new_index/query.rs                    |  2 +-
 src/new_index/schema.rs                   |  4 +-
 src/rest.rs                               | 10 +--
 src/util/mod.rs                           |  2 +-
 src/util/script.rs                        | 18 +++--
 11 files changed, 106 insertions(+), 67 deletions(-)

diff --git a/src/chain.rs b/src/chain.rs
index d35896130..77692780f 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -16,9 +16,6 @@ pub use {
 use bitcoin::blockdata::constants::genesis_block;
 pub use bitcoin::network::constants::Network as BNetwork;
 
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
-
 #[cfg(not(feature = "liquid"))]
 pub type Value = u64;
 #[cfg(feature = "liquid")]
@@ -26,8 +23,11 @@ pub use confidential::Value;
 
 #[derive(Debug, Copy, Clone, PartialEq, Hash, Serialize, Ord, PartialOrd, Eq)]
 pub enum Network {
+    #[cfg(not(feature = "liquid"))]
     Bitcoin,
+    #[cfg(not(feature = "liquid"))]
     Testnet,
+    #[cfg(not(feature = "liquid"))]
     Regtest,
 
     #[cfg(feature = "liquid")]
@@ -39,8 +39,11 @@ pub enum Network {
 impl Network {
     pub fn magic(self) -> u32 {
         match self {
+            #[cfg(not(feature = "liquid"))]
             Network::Bitcoin => 0xD9B4_BEF9,
+            #[cfg(not(feature = "liquid"))]
             Network::Testnet => 0x0709_110B,
+            #[cfg(not(feature = "liquid"))]
             Network::Regtest => 0xDAB5_BFFA,
 
             #[cfg(feature = "liquid")]
@@ -50,13 +53,22 @@ impl Network {
         }
     }
 
+    pub fn is_regtest(self) -> bool {
+        match self {
+            #[cfg(not(feature = "liquid"))]
+            Network::Regtest => true,
+            #[cfg(feature = "liquid")]
+            Network::LiquidRegtest => true,
+            _ => false,
+        }
+    }
+
     #[cfg(feature = "liquid")]
     pub fn address_params(self) -> &'static address::AddressParams {
         // Liquid regtest uses elements's address params
         match self {
             Network::Liquid => &address::AddressParams::LIQUID,
             Network::LiquidRegtest => &address::AddressParams::ELEMENTS,
-            _ => panic!("the liquid-only address_params() called with non-liquid network"),
         }
     }
 
@@ -66,7 +78,6 @@ impl Network {
             Network::Liquid => &*asset::NATIVE_ASSET_ID,
             // same for testnet and regtest
             Network::LiquidRegtest => &*asset::NATIVE_ASSET_ID_TESTNET,
-            _ => panic!("the liquid-only native_asset_id() called with non-liquid network"),
         }
     }
 
@@ -79,37 +90,59 @@ impl Network {
         ];
 
         #[cfg(feature = "liquid")]
-        return vec![
-            "mainnet".to_string(),
-            "testnet".to_string(),
-            "regtest".to_string(),
-            "liquid".to_string(),
-            "liquidregtest".to_string(),
-        ];
+        return vec!["liquid".to_string(), "liquidregtest".to_string()];
     }
 }
 
-// For bitcoin (non-elements) chains only
-pub fn genesis_hash(network: BNetwork) -> bitcoin::BlockHash {
+pub fn genesis_hash(network: Network) -> BlockHash {
+    #[cfg(not(feature = "liquid"))]
+    return bitcoin_genesis_hash(network.into());
+    #[cfg(feature = "liquid")]
+    return liquid_genesis_hash(network);
+}
+
+pub fn bitcoin_genesis_hash(network: BNetwork) -> bitcoin::BlockHash {
     lazy_static! {
-        static ref CACHED_GENESIS: Arc<RwLock<HashMap<BNetwork, bitcoin::BlockHash>>> =
-            Arc::new(RwLock::new(HashMap::new()));
+        static ref BITCOIN_GENESIS: bitcoin::BlockHash =
+            genesis_block(BNetwork::Bitcoin).block_hash();
+        static ref TESTNET_GENESIS: bitcoin::BlockHash =
+            genesis_block(BNetwork::Testnet).block_hash();
+        static ref REGTEST_GENESIS: bitcoin::BlockHash =
+            genesis_block(BNetwork::Regtest).block_hash();
     }
+    match network {
+        BNetwork::Bitcoin => *BITCOIN_GENESIS,
+        BNetwork::Testnet => *TESTNET_GENESIS,
+        BNetwork::Regtest => *REGTEST_GENESIS,
+    }
+}
 
-    if let Some(block_hash) = CACHED_GENESIS.read().unwrap().get(&network) {
-        return *block_hash;
+#[cfg(feature = "liquid")]
+pub fn liquid_genesis_hash(network: Network) -> elements::BlockHash {
+    lazy_static! {
+        static ref LIQUID_GENESIS: BlockHash =
+            "1466275836220db2944ca059a3a10ef6fd2ea684b0688d2c379296888a206003"
+                .parse()
+                .unwrap();
     }
 
-    let block_hash = genesis_block(network).block_hash();
-    CACHED_GENESIS.write().unwrap().insert(network, block_hash);
-    block_hash
+    match network {
+        Network::Liquid => *LIQUID_GENESIS,
+        // The genesis block for liquid regtest chains varies based on the chain configuration.
+        // This instead uses an all zeroed-out hash, which doesn't matter in practice because its
+        // only used for Electrum server discovery, which isn't active on regtest.
+        _ => Default::default(),
+    }
 }
 
 impl From<&str> for Network {
     fn from(network_name: &str) -> Self {
         match network_name {
+            #[cfg(not(feature = "liquid"))]
             "mainnet" => Network::Bitcoin,
+            #[cfg(not(feature = "liquid"))]
             "testnet" => Network::Testnet,
+            #[cfg(not(feature = "liquid"))]
             "regtest" => Network::Regtest,
 
             #[cfg(feature = "liquid")]
@@ -122,34 +155,24 @@ impl From<&str> for Network {
     }
 }
 
+#[cfg(not(feature = "liquid"))]
 impl From<Network> for BNetwork {
     fn from(network: Network) -> Self {
         match network {
             Network::Bitcoin => BNetwork::Bitcoin,
             Network::Testnet => BNetwork::Testnet,
             Network::Regtest => BNetwork::Regtest,
-
-            #[cfg(feature = "liquid")]
-            Network::Liquid => BNetwork::Bitcoin, // @FIXME
-            #[cfg(feature = "liquid")]
-            Network::LiquidRegtest => BNetwork::Regtest, // @FIXME
         }
     }
 }
 
+#[cfg(not(feature = "liquid"))]
 impl From<BNetwork> for Network {
     fn from(network: BNetwork) -> Self {
         match network {
-            #[cfg(not(feature = "liquid"))]
             BNetwork::Bitcoin => Network::Bitcoin,
-            #[cfg(not(feature = "liquid"))]
+            BNetwork::Testnet => Network::Testnet,
             BNetwork::Regtest => Network::Regtest,
-
-            #[cfg(feature = "liquid")]
-            BNetwork::Bitcoin => Network::Liquid, // @FIXME
-            #[cfg(feature = "liquid")]
-            BNetwork::Regtest => Network::LiquidRegtest, // @FIXME
-            BNetwork::Testnet => Network::Testnet, // @FIXME
         }
     }
 }
diff --git a/src/config.rs b/src/config.rs
index 9a68e4507..85b5bec55 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -64,10 +64,7 @@ fn str_to_socketaddr(address: &str, what: &str) -> SocketAddr {
 
 impl Config {
     pub fn from_args() -> Config {
-        let network_help = format!(
-            "Select Bitcoin network type ({})",
-            Network::names().join(", ")
-        );
+        let network_help = format!("Select network type ({})", Network::names().join(", "));
 
         let args = App::new("Electrum Rust Server")
             .version(crate_version!())
@@ -236,20 +233,21 @@ impl Config {
         #[cfg(feature = "liquid")]
         let parent_network = m
             .value_of("parent_network")
-            .map(Network::from)
-            .map(BNetwork::from)
+            .map(|s| s.parse().expect("invalid parent network"))
             .unwrap_or_else(|| match network_type {
                 Network::Liquid => BNetwork::Bitcoin,
                 Network::LiquidRegtest => BNetwork::Regtest,
-                _ => panic!("unknown liquid network, --parent-network is required"),
             });
 
         #[cfg(feature = "liquid")]
         let asset_db_path = m.value_of("asset_db_path").map(PathBuf::from);
 
         let default_daemon_port = match network_type {
+            #[cfg(not(feature = "liquid"))]
             Network::Bitcoin => 8332,
+            #[cfg(not(feature = "liquid"))]
             Network::Testnet => 18332,
+            #[cfg(not(feature = "liquid"))]
             Network::Regtest => 18443,
 
             #[cfg(feature = "liquid")]
@@ -258,8 +256,11 @@ impl Config {
             Network::LiquidRegtest => 7041,
         };
         let default_electrum_port = match network_type {
+            #[cfg(not(feature = "liquid"))]
             Network::Bitcoin => 50001,
+            #[cfg(not(feature = "liquid"))]
             Network::Testnet => 60001,
+            #[cfg(not(feature = "liquid"))]
             Network::Regtest => 60401,
 
             #[cfg(feature = "liquid")]
@@ -268,8 +269,11 @@ impl Config {
             Network::LiquidRegtest => 51401,
         };
         let default_http_port = match network_type {
+            #[cfg(not(feature = "liquid"))]
             Network::Bitcoin => 3000,
+            #[cfg(not(feature = "liquid"))]
             Network::Testnet => 3001,
+            #[cfg(not(feature = "liquid"))]
             Network::Regtest => 3002,
 
             #[cfg(feature = "liquid")]
@@ -278,8 +282,11 @@ impl Config {
             Network::LiquidRegtest => 3002,
         };
         let default_monitoring_port = match network_type {
+            #[cfg(not(feature = "liquid"))]
             Network::Bitcoin => 4224,
+            #[cfg(not(feature = "liquid"))]
             Network::Testnet => 14224,
+            #[cfg(not(feature = "liquid"))]
             Network::Regtest => 24224,
 
             #[cfg(feature = "liquid")]
@@ -320,8 +327,11 @@ impl Config {
                 default_dir
             });
         match network_type {
+            #[cfg(not(feature = "liquid"))]
             Network::Bitcoin => (),
+            #[cfg(not(feature = "liquid"))]
             Network::Testnet => daemon_dir.push("testnet3"),
+            #[cfg(not(feature = "liquid"))]
             Network::Regtest => daemon_dir.push("regtest"),
 
             #[cfg(feature = "liquid")]
diff --git a/src/electrum/discovery.rs b/src/electrum/discovery.rs
index 2cc1c45cb..d196358f7 100644
--- a/src/electrum/discovery.rs
+++ b/src/electrum/discovery.rs
@@ -7,7 +7,7 @@ use std::sync::{Arc, RwLock};
 use std::thread;
 use std::time::{Duration, Instant};
 
-use crate::chain::{BlockHash, Network};
+use crate::chain::Network;
 use crate::electrum::{Client, Hostname, Port, ProtocolVersion, ServerFeatures};
 use crate::errors::{Result, ResultExt};
 use crate::util::spawn_thread;
@@ -30,9 +30,6 @@ pub struct DiscoveryManager {
     /// A list of servers that were found to be healthy on their last health check
     healthy: RwLock<HashMap<ServerAddr, Server>>,
 
-    /// Used to test for network compatibility
-    our_genesis_hash: BlockHash,
-
     /// Used to test for protocol version compatibility
     our_version: ProtocolVersion,
 
@@ -108,7 +105,6 @@ impl DiscoveryManager {
             })
             .collect();
         let discovery = Self {
-            our_genesis_hash: our_network.genesis_hash(),
             our_addrs,
             our_version,
             our_features,
@@ -348,7 +344,7 @@ impl DiscoveryManager {
 
     fn verify_compatibility(&self, features: &ServerFeatures) -> Result<()> {
         ensure!(
-            features.genesis_hash == self.our_genesis_hash,
+            features.genesis_hash == self.our_features.genesis_hash,
             "incompatible networks"
         );
 
diff --git a/src/electrum/discovery/default_servers.rs b/src/electrum/discovery/default_servers.rs
index 5d021237d..95754ecef 100644
--- a/src/electrum/discovery/default_servers.rs
+++ b/src/electrum/discovery/default_servers.rs
@@ -3,6 +3,7 @@ use crate::electrum::discovery::{DiscoveryManager, Service};
 
 pub fn add_default_servers(discovery: &DiscoveryManager, network: Network) {
     match network {
+        #[cfg(not(feature = "liquid"))]
         Network::Bitcoin => {
             discovery
                 .add_default_server(
@@ -401,6 +402,7 @@ pub fn add_default_servers(discovery: &DiscoveryManager, network: Network) {
                 )
                 .ok();
         }
+        #[cfg(not(feature = "liquid"))]
         Network::Testnet => {
             discovery
                 .add_default_server(
diff --git a/src/electrum/server.rs b/src/electrum/server.rs
index cbcf12bef..ceb065a97 100644
--- a/src/electrum/server.rs
+++ b/src/electrum/server.rs
@@ -687,10 +687,11 @@ impl RPC {
         // Discovery is enabled when electrum-public-hosts is set
         #[cfg(feature = "electrum-discovery")]
         let discovery = config.electrum_public_hosts.clone().map(|hosts| {
+            use crate::chain::genesis_hash;
             let features = ServerFeatures {
                 hosts,
                 server_version: format!("electrs-esplora {}", ELECTRS_VERSION),
-                genesis_hash: config.network_type.genesis_hash(),
+                genesis_hash: genesis_hash(config.network_type),
                 protocol_min: PROTOCOL_VERSION,
                 protocol_max: PROTOCOL_VERSION,
                 hash_function: "sha256".into(),
diff --git a/src/elements/peg.rs b/src/elements/peg.rs
index 77c058530..acae191d7 100644
--- a/src/elements/peg.rs
+++ b/src/elements/peg.rs
@@ -1,8 +1,8 @@
 use bitcoin::hashes::hex::ToHex;
 use elements::{confidential::Asset, PeginData, PegoutData, TxIn, TxOut};
 
-use crate::chain::{genesis_hash, BNetwork, Network};
-use crate::util::{FullHash, ScriptExt};
+use crate::chain::{bitcoin_genesis_hash, BNetwork, Network};
+use crate::util::{FullHash, ScriptToAsm};
 
 pub fn get_pegin_data(txout: &TxIn, network: Network) -> Option<PeginData> {
     txout
@@ -17,7 +17,7 @@ pub fn get_pegout_data(
 ) -> Option<PegoutData> {
     txout.pegout_data().filter(|pegout| {
         pegout.asset == Asset::Explicit(*network.native_asset())
-            && pegout.genesis_hash == genesis_hash(parent_network)
+            && pegout.genesis_hash == bitcoin_genesis_hash(parent_network)
     })
 }
 
@@ -37,11 +37,12 @@ impl PegoutValue {
 
         // pending https://github.com/ElementsProject/rust-elements/pull/69 is merged
         let scriptpubkey = bitcoin::Script::from(pegoutdata.script_pubkey.into_bytes());
+        let address = bitcoin::Address::from_script(&scriptpubkey, parent_network);
 
         Some(PegoutValue {
             genesis_hash: pegoutdata.genesis_hash.to_hex(),
             scriptpubkey_asm: scriptpubkey.to_asm(),
-            scriptpubkey_address: scriptpubkey.to_address(parent_network.into()),
+            scriptpubkey_address: address.map(|s| s.to_string()),
             scriptpubkey,
         })
     }
diff --git a/src/new_index/query.rs b/src/new_index/query.rs
index 387e8f70f..1e621ac0d 100644
--- a/src/new_index/query.rs
+++ b/src/new_index/query.rs
@@ -163,7 +163,7 @@ impl Query {
     }
 
     pub fn estimate_fee(&self, conf_target: u16) -> Option<f64> {
-        if self.config.network_type == Network::Regtest {
+        if self.config.network_type.is_regtest() {
             return self.get_relayfee().ok();
         }
         if let (ref cache, Some(cache_time)) = *self.cached_estimates.read().unwrap() {
diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index 7b69f5135..8820b3f7a 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -28,7 +28,7 @@ use crate::errors::*;
 use crate::metrics::{Gauge, HistogramOpts, HistogramTimer, HistogramVec, MetricOpts, Metrics};
 use crate::util::{
     full_hash, has_prevout, is_spendable, BlockHeaderMeta, BlockId, BlockMeta, BlockStatus, Bytes,
-    HeaderEntry, HeaderList, ScriptExt,
+    HeaderEntry, HeaderList, ScriptToAddr,
 };
 
 use crate::new_index::db::{DBFlush, DBRow, ReverseScanIterator, ScanIterator, DB};
@@ -1152,7 +1152,7 @@ fn index_transaction(
 }
 
 fn addr_search_row(spk: &Script, network: Network) -> Option<DBRow> {
-    spk.to_address(network).map(|address| DBRow {
+    spk.to_address_str(network).map(|address| DBRow {
         key: [b"a", address.as_bytes()].concat(),
         value: vec![],
     })
diff --git a/src/rest.rs b/src/rest.rs
index b7fd38fe5..b6fbb7895 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -4,7 +4,8 @@ use crate::errors;
 use crate::new_index::{compute_script_hash, Query, SpendingInput, Utxo};
 use crate::util::{
     create_socket, electrum_merkle, extract_tx_prevouts, full_hash, get_innerscripts, get_tx_fee,
-    has_prevout, is_coinbase, BlockHeaderMeta, BlockId, FullHash, ScriptExt, TransactionStatus,
+    has_prevout, is_coinbase, BlockHeaderMeta, BlockId, FullHash, ScriptToAddr, ScriptToAsm,
+    TransactionStatus,
 };
 
 #[cfg(not(feature = "liquid"))]
@@ -212,11 +213,11 @@ impl TxInValue {
             inner_redeemscript_asm: innerscripts
                 .as_ref()
                 .and_then(|i| i.redeem_script.as_ref())
-                .map(ScriptExt::to_asm),
+                .map(ScriptToAsm::to_asm),
             inner_witnessscript_asm: innerscripts
                 .as_ref()
                 .and_then(|i| i.witness_script.as_ref())
-                .map(ScriptExt::to_asm),
+                .map(ScriptToAsm::to_asm),
 
             is_coinbase,
             sequence: txin.sequence,
@@ -298,7 +299,7 @@ impl TxOutValue {
 
         let script = &txout.script_pubkey;
         let script_asm = script.to_asm();
-        let script_addr = script.to_address(config.network_type);
+        let script_addr = script.to_address_str(config.network_type);
 
         // TODO should the following something to put inside rust-elements lib?
         let script_type = if is_fee {
@@ -1227,7 +1228,6 @@ fn to_scripthash(
     }
 }
 
-#[allow(unused_variables)] // `network` is unused in liquid mode
 fn address_to_scripthash(addr: &str, network: Network) -> Result<FullHash, HttpError> {
     let addr = address::Address::from_str(addr)?;
 
diff --git a/src/util/mod.rs b/src/util/mod.rs
index c0505d1e2..a214d7049 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -7,7 +7,7 @@ pub mod fees;
 
 pub use self::block::{BlockHeaderMeta, BlockId, BlockMeta, BlockStatus, HeaderEntry, HeaderList};
 pub use self::fees::get_tx_fee;
-pub use self::script::{get_innerscripts, ScriptExt};
+pub use self::script::{get_innerscripts, ScriptToAddr, ScriptToAsm};
 pub use self::transaction::{
     extract_tx_prevouts, has_prevout, is_coinbase, is_spendable, TransactionStatus, TxInput,
 };
diff --git a/src/util/script.rs b/src/util/script.rs
index 09faa84da..6991d9cea 100644
--- a/src/util/script.rs
+++ b/src/util/script.rs
@@ -9,22 +9,28 @@ pub struct InnerScripts {
     pub witness_script: Option<Script>,
 }
 
-pub trait ScriptExt: std::fmt::Debug {
+pub trait ScriptToAsm: std::fmt::Debug {
     fn to_asm(&self) -> String {
         let asm = format!("{:?}", self);
         (&asm[7..asm.len() - 1]).to_string()
     }
+}
+impl ScriptToAsm for bitcoin::Script {}
+#[cfg(feature = "liquid")]
+impl ScriptToAsm for elements::Script {}
 
-    fn to_address(&self, network: Network) -> Option<String>;
+pub trait ScriptToAddr {
+    fn to_address_str(&self, network: Network) -> Option<String>;
 }
-impl ScriptExt for bitcoin::Script {
-    fn to_address(&self, network: Network) -> Option<String> {
+#[cfg(not(feature = "liquid"))]
+impl ScriptToAddr for bitcoin::Script {
+    fn to_address_str(&self, network: Network) -> Option<String> {
         bitcoin::Address::from_script(self, network.into()).map(|s| s.to_string())
     }
 }
 #[cfg(feature = "liquid")]
-impl ScriptExt for elements::Script {
-    fn to_address(&self, network: Network) -> Option<String> {
+impl ScriptToAddr for elements::Script {
+    fn to_address_str(&self, network: Network) -> Option<String> {
         elements_address::Address::from_script(self, None, network.address_params())
             .map(|a| a.to_string())
     }

From 2784463cd4f658fa5cc64e8b8571e83ce5b5c234 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 23 Jan 2021 05:13:42 +0200
Subject: [PATCH 19/47] Use rust-bitcoin v0.26 when not in liquid mode

Or stick with v0.25 when we are, for compatibility with rust-elements.
---
 Cargo.lock         | 32 ++++++++++++++++++++++++++++++++
 Cargo.toml         | 10 +++++++---
 src/bin/electrs.rs |  1 -
 src/lib.rs         |  5 +++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index faa5177d6..307653a98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -186,6 +186,18 @@ dependencies = [
  "serde 1.0.118",
 ]
 
+[[package]]
+name = "bitcoin"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec5f88a446d66e7474a3b8fa2e348320b574463fb78d799d90ba68f79f48e0e"
+dependencies = [
+ "bech32",
+ "bitcoin_hashes 0.9.4",
+ "secp256k1 0.20.1",
+ "serde 1.0.118",
+]
+
 [[package]]
 name = "bitcoin_hashes"
 version = "0.7.6"
@@ -431,6 +443,7 @@ dependencies = [
  "base64 0.13.0",
  "bincode",
  "bitcoin 0.25.2",
+ "bitcoin 0.26.0",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -1541,6 +1554,16 @@ dependencies = [
  "serde 1.0.118",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "733b114f058f260c0af7591434eef4272ae1a8ec2751766d3cb89c6df8d5e450"
+dependencies = [
+ "secp256k1-sys 0.4.0",
+ "serde 1.0.118",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.1.2"
@@ -1559,6 +1582,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e4b6455ee49f5901c8985b88f98fb0a0e1d90a6661f5a03f4888bd987dad29"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "semver"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index 148a11573..7b7f9f553 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ readme = "README.md"
 edition = "2018"
 
 [features]
-default = [ "rocksdb" ]
-liquid = [ "elements" ]
+default = [ "rocksdb", "bitcoin" ]
+liquid = [ "elements", "elements-bitcoin" ]
 electrum-discovery = [ "electrum-client"]
 oldcpu = [ "rocksdb-oldcpu" ]
 
@@ -22,7 +22,6 @@ arraydeque = "0.4"
 arrayref = "0.3.6"
 base64 = "0.13.0"
 bincode = "1.3.1"
-bitcoin = { version = "0.25.0", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "3.0.1"
@@ -59,6 +58,11 @@ tokio = { version = "=0.2.6", features = ["sync", "macros"] }
 # optional dependencies for electrum-discovery
 electrum-client = { version = "0.1.0-beta.6", optional = true }
 
+# use rust-bitcoin v0.25 in liquid mode, v0.26 otherwise
+# temporary, until rust-elements is upgraded to v0.26
+bitcoin = { version = "0.26.0", optional = true, package = "bitcoin", features = [ "use-serde" ] }
+elements-bitcoin = { version = "0.25.2", optional = true, package = "bitcoin", features = [ "use-serde" ] }
+
 [dev-dependencies]
 tempfile = "3.0"
 
diff --git a/src/bin/electrs.rs b/src/bin/electrs.rs
index 14f563adb..5511593c8 100644
--- a/src/bin/electrs.rs
+++ b/src/bin/electrs.rs
@@ -1,4 +1,3 @@
-extern crate bitcoin;
 extern crate error_chain;
 #[macro_use]
 extern crate log;
diff --git a/src/lib.rs b/src/lib.rs
index 9dbc58153..7e6436ec9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,6 +6,11 @@ extern crate rocksdb;
 #[cfg(feature = "oldcpu")]
 extern crate rocksdb_oldcpu as rocksdb;
 
+#[cfg(not(feature = "liquid"))]
+extern crate bitcoin;
+#[cfg(feature = "liquid")]
+extern crate elements_bitcoin as bitcoin;
+
 #[macro_use]
 extern crate clap;
 #[macro_use]

From bf7df0ac39ebe3a7008bdcbd138e91aba010de06 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 23 Jan 2021 05:26:12 +0200
Subject: [PATCH 20/47] Add Signet support

---
 src/chain.rs  | 12 ++++++++++++
 src/config.rs | 10 ++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/chain.rs b/src/chain.rs
index 77692780f..6bfcc91b3 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -29,6 +29,8 @@ pub enum Network {
     Testnet,
     #[cfg(not(feature = "liquid"))]
     Regtest,
+    #[cfg(not(feature = "liquid"))]
+    Signet,
 
     #[cfg(feature = "liquid")]
     Liquid,
@@ -45,6 +47,8 @@ impl Network {
             Network::Testnet => 0x0709_110B,
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => 0xDAB5_BFFA,
+            #[cfg(not(feature = "liquid"))]
+            Network::Signet => 0x0A03_CF40,
 
             #[cfg(feature = "liquid")]
             Network::Liquid => 0xDAB5_BFFA,
@@ -87,6 +91,7 @@ impl Network {
             "mainnet".to_string(),
             "testnet".to_string(),
             "regtest".to_string(),
+            "signet".to_string(),
         ];
 
         #[cfg(feature = "liquid")]
@@ -109,11 +114,14 @@ pub fn bitcoin_genesis_hash(network: BNetwork) -> bitcoin::BlockHash {
             genesis_block(BNetwork::Testnet).block_hash();
         static ref REGTEST_GENESIS: bitcoin::BlockHash =
             genesis_block(BNetwork::Regtest).block_hash();
+        static ref SIGNET_GENESIS: bitcoin::BlockHash =
+            genesis_block(BNetwork::Signet).block_hash();
     }
     match network {
         BNetwork::Bitcoin => *BITCOIN_GENESIS,
         BNetwork::Testnet => *TESTNET_GENESIS,
         BNetwork::Regtest => *REGTEST_GENESIS,
+        BNetwork::Signet => *SIGNET_GENESIS,
     }
 }
 
@@ -144,6 +152,8 @@ impl From<&str> for Network {
             "testnet" => Network::Testnet,
             #[cfg(not(feature = "liquid"))]
             "regtest" => Network::Regtest,
+            #[cfg(not(feature = "liquid"))]
+            "signet" => Network::Signet,
 
             #[cfg(feature = "liquid")]
             "liquid" => Network::Liquid,
@@ -162,6 +172,7 @@ impl From<Network> for BNetwork {
             Network::Bitcoin => BNetwork::Bitcoin,
             Network::Testnet => BNetwork::Testnet,
             Network::Regtest => BNetwork::Regtest,
+            Network::Signet => BNetwork::Signet,
         }
     }
 }
@@ -173,6 +184,7 @@ impl From<BNetwork> for Network {
             BNetwork::Bitcoin => Network::Bitcoin,
             BNetwork::Testnet => Network::Testnet,
             BNetwork::Regtest => Network::Regtest,
+            BNetwork::Signet => Network::Signet,
         }
     }
 }
diff --git a/src/config.rs b/src/config.rs
index 85b5bec55..77469c417 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -249,6 +249,8 @@ impl Config {
             Network::Testnet => 18332,
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => 18443,
+            #[cfg(not(feature = "liquid"))]
+            Network::Signet => 38332,
 
             #[cfg(feature = "liquid")]
             Network::Liquid => 7041,
@@ -262,6 +264,8 @@ impl Config {
             Network::Testnet => 60001,
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => 60401,
+            #[cfg(not(feature = "liquid"))]
+            Network::Signet => 60601,
 
             #[cfg(feature = "liquid")]
             Network::Liquid => 51000,
@@ -275,6 +279,8 @@ impl Config {
             Network::Testnet => 3001,
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => 3002,
+            #[cfg(not(feature = "liquid"))]
+            Network::Signet => 3003,
 
             #[cfg(feature = "liquid")]
             Network::Liquid => 3000,
@@ -288,6 +294,8 @@ impl Config {
             Network::Testnet => 14224,
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => 24224,
+            #[cfg(not(feature = "liquid"))]
+            Network::Signet => 34224,
 
             #[cfg(feature = "liquid")]
             Network::Liquid => 34224,
@@ -333,6 +341,8 @@ impl Config {
             Network::Testnet => daemon_dir.push("testnet3"),
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => daemon_dir.push("regtest"),
+            #[cfg(not(feature = "liquid"))]
+            Network::Signet => daemon_dir.push("signet"),
 
             #[cfg(feature = "liquid")]
             Network::Liquid => daemon_dir.push("liquidv1"),

From 617f16d53bbf246c4d04d191a8effece8b6ad50f Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 20 Feb 2021 19:31:58 +0200
Subject: [PATCH 21/47] Update to rust-elements v0.16

It depends on the latest rust-bitcoin v0.26 release,
making the conditional rust-bitcoin dependency unnecessary.
---
 Cargo.lock | 38 +++-----------------------------------
 Cargo.toml | 11 ++++-------
 src/lib.rs |  5 -----
 3 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 307653a98..5f35f6bae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -174,18 +174,6 @@ dependencies = [
  "serde 1.0.118",
 ]
 
-[[package]]
-name = "bitcoin"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aefc9be9f17185f4ebccae6575d342063f775924d57df0000edb1880c0fb7095"
-dependencies = [
- "bech32",
- "bitcoin_hashes 0.9.4",
- "secp256k1 0.19.0",
- "serde 1.0.118",
-]
-
 [[package]]
 name = "bitcoin"
 version = "0.26.0"
@@ -442,7 +430,6 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin 0.25.2",
  "bitcoin 0.26.0",
  "clap",
  "crossbeam-channel",
@@ -496,11 +483,11 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd3865be0d3cabe1c92022d310b747e08b6308de5d81a70c921c35701133cd8"
+checksum = "e77124f1ecdbeb92691beae289c44553df24c94c86dd3bc07a7037c2064ac3d3"
 dependencies = [
- "bitcoin 0.25.2",
+ "bitcoin 0.26.0",
  "bitcoin_hashes 0.9.4",
  "serde 1.0.118",
  "serde_json 0.9.10",
@@ -1544,16 +1531,6 @@ dependencies = [
  "serde 1.0.118",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6179428c22c73ac0fbb7b5579a56353ce78ba29759b3b8575183336ea74cdfb"
-dependencies = [
- "secp256k1-sys 0.3.0",
- "serde 1.0.118",
-]
-
 [[package]]
 name = "secp256k1"
 version = "0.20.1"
@@ -1573,15 +1550,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "secp256k1-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11553d210db090930f4432bea123b31f70bbf693ace14504ea2a35e796c28dd2"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "secp256k1-sys"
 version = "0.4.0"
diff --git a/Cargo.toml b/Cargo.toml
index 7b7f9f553..ff02cdebe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ readme = "README.md"
 edition = "2018"
 
 [features]
-default = [ "rocksdb", "bitcoin" ]
-liquid = [ "elements", "elements-bitcoin" ]
+default = [ "rocksdb" ]
+liquid = [ "elements" ]
 electrum-discovery = [ "electrum-client"]
 oldcpu = [ "rocksdb-oldcpu" ]
 
@@ -22,10 +22,11 @@ arraydeque = "0.4"
 arrayref = "0.3.6"
 base64 = "0.13.0"
 bincode = "1.3.1"
+bitcoin = { version = "0.26.0", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "3.0.1"
-elements = { version = "0.15.0", features = [ "serde-feature" ], optional = true }
+elements = { version = "0.16.0", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
@@ -58,10 +59,6 @@ tokio = { version = "=0.2.6", features = ["sync", "macros"] }
 # optional dependencies for electrum-discovery
 electrum-client = { version = "0.1.0-beta.6", optional = true }
 
-# use rust-bitcoin v0.25 in liquid mode, v0.26 otherwise
-# temporary, until rust-elements is upgraded to v0.26
-bitcoin = { version = "0.26.0", optional = true, package = "bitcoin", features = [ "use-serde" ] }
-elements-bitcoin = { version = "0.25.2", optional = true, package = "bitcoin", features = [ "use-serde" ] }
 
 [dev-dependencies]
 tempfile = "3.0"
diff --git a/src/lib.rs b/src/lib.rs
index 7e6436ec9..9dbc58153 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,11 +6,6 @@ extern crate rocksdb;
 #[cfg(feature = "oldcpu")]
 extern crate rocksdb_oldcpu as rocksdb;
 
-#[cfg(not(feature = "liquid"))]
-extern crate bitcoin;
-#[cfg(feature = "liquid")]
-extern crate elements_bitcoin as bitcoin;
-
 #[macro_use]
 extern crate clap;
 #[macro_use]

From 7bdb00c76548ce3a1eabe931aa1f317023f853ba Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 20 Feb 2021 21:25:17 +0200
Subject: [PATCH 22/47] Change monitoring port for Signet

It conflicted with Liquid.
---
 src/config.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.rs b/src/config.rs
index 77469c417..5982efebe 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -295,7 +295,7 @@ impl Config {
             #[cfg(not(feature = "liquid"))]
             Network::Regtest => 24224,
             #[cfg(not(feature = "liquid"))]
-            Network::Signet => 34224,
+            Network::Signet => 54224,
 
             #[cfg(feature = "liquid")]
             Network::Liquid => 34224,

From 5ff4260c08d546c11278401c99686ab74109cfce Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 28 Jan 2021 18:45:33 +0200
Subject: [PATCH 23/47] Delegate magic() to bitcoin::Network

(cherry picked from commit d9b1bb14032e791b35d9859a6f644cf4cb2dde89)
---
 src/chain.rs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/chain.rs b/src/chain.rs
index 6bfcc91b3..5ff6f2a9c 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -39,20 +39,15 @@ pub enum Network {
 }
 
 impl Network {
+    #[cfg(not(feature = "liquid"))]
     pub fn magic(self) -> u32 {
-        match self {
-            #[cfg(not(feature = "liquid"))]
-            Network::Bitcoin => 0xD9B4_BEF9,
-            #[cfg(not(feature = "liquid"))]
-            Network::Testnet => 0x0709_110B,
-            #[cfg(not(feature = "liquid"))]
-            Network::Regtest => 0xDAB5_BFFA,
-            #[cfg(not(feature = "liquid"))]
-            Network::Signet => 0x0A03_CF40,
+        BNetwork::from(self).magic()
+    }
 
-            #[cfg(feature = "liquid")]
+    #[cfg(feature = "liquid")]
+    pub fn magic(self) -> u32 {
+        match self {
             Network::Liquid => 0xDAB5_BFFA,
-            #[cfg(feature = "liquid")]
             Network::LiquidRegtest => 0xDAB5_BFFA,
         }
     }

From 33d81b7b806c5ec0c34fcbee315acda5958468a6 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 28 Jan 2021 18:48:17 +0200
Subject: [PATCH 24/47] Refactor parse_blocks()

Similarly to https://github.com/romanz/electrs/commit/4f44a78dd37108221c7f0c259051a8edfb696845

(cherry picked from commit 3b802fc349033851e419ce3cd371e00daac64ecb)
---
 src/new_index/fetch.rs | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/new_index/fetch.rs b/src/new_index/fetch.rs
index 2a3112252..356407880 100644
--- a/src/new_index/fetch.rs
+++ b/src/new_index/fetch.rs
@@ -7,7 +7,7 @@ use elements::encode::{deserialize, Decodable};
 
 use std::collections::HashMap;
 use std::fs;
-use std::io::{Cursor, Seek, SeekFrom};
+use std::io::Cursor;
 use std::path::PathBuf;
 use std::sync::mpsc::Receiver;
 use std::thread;
@@ -188,39 +188,37 @@ fn parse_blocks(blob: Vec<u8>, magic: u32) -> Result<Vec<SizedBlock>> {
     let mut cursor = Cursor::new(&blob);
     let mut slices = vec![];
     let max_pos = blob.len() as u64;
+
     while cursor.position() < max_pos {
+        let offset = cursor.position();
         match u32::consensus_decode(&mut cursor) {
             Ok(value) => {
                 if magic != value {
-                    cursor
-                        .seek(SeekFrom::Current(-3))
-                        .expect("failed to seek back");
+                    cursor.set_position(offset + 1);
                     continue;
                 }
             }
             Err(_) => break, // EOF
         };
         let block_size = u32::consensus_decode(&mut cursor).chain_err(|| "no block size")?;
-        let start = cursor.position() as usize;
-        cursor
-            .seek(SeekFrom::Current(block_size as i64))
-            .chain_err(|| format!("seek {} failed", block_size))?;
-        let end = cursor.position() as usize;
-
-        // If Core's WriteBlockToDisk ftell fails, only the magic byte and size will be written
-        // and the block body will be unwritten data. skip that's data.
-        let mut tmp_cursor = Cursor::new(&blob[start..(start + 4)]);
-        match u32::consensus_decode(&mut tmp_cursor) {
+        let start = cursor.position();
+        let end = start + block_size as u64;
+
+        // If Core's WriteBlockToDisk ftell fails, only the magic bytes and size will be written
+        // and the block body won't be written to the blk*.dat file.
+        // Since the first 4 bytes should contain the block's version, we can skip such blocks
+        // by peeking the cursor (and skipping previous `magic` and `block_size`).
+        match u32::consensus_decode(&mut cursor) {
             Ok(value) => {
                 if magic == value {
-                    cursor.set_position(start as u64);
+                    cursor.set_position(start);
                     continue;
                 }
             }
             Err(_) => break, // EOF
         }
-
-        slices.push((&blob[start..end], block_size));
+        slices.push((&blob[start as usize..end as usize], block_size));
+        cursor.set_position(end as u64);
     }
 
     let pool = rayon::ThreadPoolBuilder::new()

From 098f44457326a04d8ff4257bf665295fbe921b63 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Wed, 3 Mar 2021 05:14:56 +0200
Subject: [PATCH 25/47] Fix address network test for Signet

---
 src/rest.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/rest.rs b/src/rest.rs
index b6fbb7895..9c8f3b831 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -1234,7 +1234,12 @@ fn address_to_scripthash(addr: &str, network: Network) -> Result<FullHash, HttpE
     #[cfg(not(feature = "liquid"))]
     let is_expected_net = {
         let addr_network = Network::from(addr.network);
-        addr_network == network || (addr_network == Network::Testnet && network == Network::Regtest)
+
+        // Testnet, Regtest and Signet all share the same version bytes,
+        // `addr_network` will be detected as Testnet for all of them.
+        addr_network == network
+            || (addr_network == Network::Testnet
+                && matches!(network, Network::Regtest | Network::Signet))
     };
 
     #[cfg(feature = "liquid")]

From 22014acd9ed6e86875e31b75801d48ea58b8fc8e Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 20 Aug 2021 00:04:19 +0300
Subject: [PATCH 26/47] Patch version bumps for cargo dependencies

---
 Cargo.lock | 915 +++++++++++++++++++++++++----------------------------
 1 file changed, 431 insertions(+), 484 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f35f6bae..461bdbc0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,24 +2,24 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addr2line"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler"
-version = "0.2.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
  "memchr",
 ]
@@ -33,12 +33,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "arc-swap"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
-
 [[package]]
 name = "arraydeque"
 version = "0.4.5"
@@ -51,12 +45,6 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
-[[package]]
-name = "arrayvec"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-
 [[package]]
 name = "ascii"
 version = "1.0.0"
@@ -65,29 +53,29 @@ checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109"
 
 [[package]]
 name = "atty"
-version = "0.2.11"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
+ "hermit-abi",
  "libc",
- "termion",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.50"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
+checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d"
 dependencies = [
  "addr2line",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
  "object",
@@ -96,9 +84,9 @@ dependencies = [
 
 [[package]]
 name = "base-x"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
 
 [[package]]
 name = "base64"
@@ -109,12 +97,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -123,42 +105,36 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bech32"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c"
+checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1"
 
 [[package]]
 name = "bincode"
-version = "1.3.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "byteorder",
- "serde 1.0.118",
+ "serde 1.0.127",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.54.0"
+version = "0.59.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36"
+checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375"
 dependencies = [
  "bitflags",
  "cexpr",
- "cfg-if 0.1.10",
  "clang-sys",
- "clap",
- "env_logger",
  "lazy_static",
  "lazycell",
- "log",
  "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "which",
 ]
 
 [[package]]
@@ -171,19 +147,19 @@ dependencies = [
  "bitcoin_hashes 0.7.6",
  "hex 0.3.2",
  "secp256k1 0.17.2",
- "serde 1.0.118",
+ "serde 1.0.127",
 ]
 
 [[package]]
 name = "bitcoin"
-version = "0.26.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec5f88a446d66e7474a3b8fa2e348320b574463fb78d799d90ba68f79f48e0e"
+checksum = "6742ec672d3f12506f4ac5c0d853926ff1f94e675f60ffd3224039972bf663f1"
 dependencies = [
  "bech32",
- "bitcoin_hashes 0.9.4",
- "secp256k1 0.20.1",
- "serde 1.0.118",
+ "bitcoin_hashes 0.9.7",
+ "secp256k1 0.20.3",
+ "serde 1.0.127",
 ]
 
 [[package]]
@@ -192,55 +168,59 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b375d62f341cef9cd9e77793ec8f1db3fc9ce2e4d57e982c8fe697a2c16af3b6"
 dependencies = [
- "serde 1.0.118",
+ "serde 1.0.127",
 ]
 
 [[package]]
 name = "bitcoin_hashes"
-version = "0.9.4"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aaf87b776808e26ae93289bc7d025092b6d909c193f0cdee0b3a86e7bd3c776"
+checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
 dependencies = [
- "serde 1.0.118",
+ "serde 1.0.127",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "blake2b_simd"
-version = "0.5.10"
+name = "bitvec"
+version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
 dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq",
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b"
-dependencies = [
- "loom",
-]
+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cc"
@@ -253,9 +233,9 @@ dependencies = [
 
 [[package]]
 name = "cexpr"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
+checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89"
 dependencies = [
  "nom",
 ]
@@ -274,26 +254,28 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.13"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
+ "libc",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "time 0.1.43",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "chunked_transfer"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d29eb15132782371f71da8f947dba48b3717bdb6fa771b9b434d645e40a7193"
+checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
 
 [[package]]
 name = "clang-sys"
-version = "0.29.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
 dependencies = [
  "glob",
  "libc",
@@ -317,46 +299,39 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
 dependencies = [
  "cfg-if 1.0.0",
- "const_fn",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils",
  "lazy_static",
  "memoffset",
  "scopeguard",
@@ -364,40 +339,28 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
-dependencies = [
- "autocfg",
  "cfg-if 1.0.0",
  "lazy_static",
 ]
 
 [[package]]
 name = "dirs"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"
+checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
 dependencies = [
  "libc",
  "redox_users",
@@ -412,15 +375,15 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
 [[package]]
 name = "dtoa"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e"
+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
 [[package]]
 name = "either"
-version = "1.5.3"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "electrs"
@@ -430,7 +393,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin 0.26.0",
+ "bitcoin 0.26.2",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -438,7 +401,7 @@ dependencies = [
  "elements",
  "error-chain",
  "glob",
- "hex 0.4.2",
+ "hex 0.4.3",
  "hyper",
  "hyperlocal",
  "itertools",
@@ -452,15 +415,15 @@ dependencies = [
  "rocksdb 0.12.4",
  "rocksdb 0.15.0",
  "rust-crypto",
- "serde 1.0.118",
+ "serde 1.0.127",
  "serde_derive",
- "serde_json 1.0.60",
+ "serde_json 1.0.66",
  "signal-hook",
  "socket2",
  "stderrlog",
  "sysconf",
  "tempfile",
- "time 0.2.23",
+ "time 0.2.27",
  "tiny_http",
  "tokio",
  "url",
@@ -474,8 +437,8 @@ dependencies = [
  "bitcoin 0.23.0",
  "log",
  "rustls",
- "serde 1.0.118",
- "serde_json 1.0.60",
+ "serde 1.0.127",
+ "serde_json 1.0.66",
  "socks",
  "webpki",
  "webpki-roots",
@@ -487,31 +450,18 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e77124f1ecdbeb92691beae289c44553df24c94c86dd3bc07a7037c2064ac3d3"
 dependencies = [
- "bitcoin 0.26.0",
- "bitcoin_hashes 0.9.4",
- "serde 1.0.118",
+ "bitcoin 0.26.2",
+ "bitcoin_hashes 0.9.7",
+ "serde 1.0.127",
  "serde_json 0.9.10",
  "slip21",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "errno"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b480f641ccf0faf324e20c1d3e53d81b7484c698b42ea677f6907ae4db195371"
+checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -546,9 +496,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
  "matches",
  "percent-encoding",
@@ -576,27 +526,34 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
 [[package]]
 name = "futures-channel"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
+checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -605,29 +562,27 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
 
 [[package]]
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
-dependencies = [
- "once_cell",
-]
+checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.5"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
+ "autocfg",
  "futures-core",
  "futures-macro",
  "futures-task",
- "pin-project",
+ "pin-project-lite 0.2.7",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -640,35 +595,22 @@ version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
-[[package]]
-name = "generator"
-version = "0.6.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustc_version",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "getrandom"
-version = "0.1.14"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
  "wasi",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 
 [[package]]
 name = "glob"
@@ -678,28 +620,35 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "h2"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
  "http",
  "indexmap",
- "log",
  "slab",
  "tokio",
  "tokio-util",
+ "tracing",
+ "tracing-futures",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+
 [[package]]
 name = "hermit-abi"
-version = "0.1.15"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -712,19 +661,19 @@ checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 
 [[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "http"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
- "bytes",
+ "bytes 1.0.1",
  "fnv",
- "itoa 0.4.6",
+ "itoa 0.4.7",
 ]
 
 [[package]]
@@ -733,32 +682,23 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "http",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.3.4"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
+checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
 [[package]]
 name = "hyper"
-version = "0.13.6"
+version = "0.13.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f"
+checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -766,13 +706,13 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
- "itoa 0.4.6",
- "log",
- "pin-project",
+ "itoa 0.4.7",
+ "pin-project 0.4.28",
  "socket2",
  "time 0.1.43",
  "tokio",
  "tower-service",
+ "tracing",
  "want",
 ]
 
@@ -783,17 +723,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f192a5a791c0781b93e69f60a652eb6ae9331f77b9efe90c9827a75df5141a9b"
 dependencies = [
  "futures-util",
- "hex 0.4.2",
+ "hex 0.4.3",
  "hyper",
- "pin-project",
+ "pin-project 0.4.28",
  "tokio",
 ]
 
 [[package]]
 name = "idna"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -802,18 +742,19 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.4.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe"
+checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
  "autocfg",
+ "hashbrown",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -844,15 +785,15 @@ checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 
 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.41"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916"
+checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -875,31 +816,31 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
 
 [[package]]
 name = "libloading"
-version = "0.5.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
 dependencies = [
- "cc",
+ "cfg-if 1.0.0",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.11.4"
+version = "6.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09"
+checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d"
 dependencies = [
  "bindgen",
  "cc",
@@ -909,68 +850,58 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 dependencies = [
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
-]
-
-[[package]]
-name = "loom"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
-dependencies = [
- "cfg-if 0.1.10",
- "generator",
- "scoped-tls",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "matches"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memoffset"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
+ "autocfg",
 ]
 
 [[package]]
 name = "mio"
-version = "0.6.22"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
 dependencies = [
  "cfg-if 0.1.10",
  "fuchsia-zircon",
@@ -998,9 +929,9 @@ dependencies = [
 
 [[package]]
 name = "miow"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
 dependencies = [
  "kernel32-sys",
  "net2",
@@ -1010,9 +941,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.34"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -1021,22 +952,24 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "5.1.2"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
 dependencies = [
+ "bitvec",
+ "funty",
  "memchr",
  "version_check",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
  "autocfg",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -1045,14 +978,14 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
@@ -1067,23 +1000,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "numtoa"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
-
 [[package]]
 name = "object"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
-
-[[package]]
-name = "once_cell"
-version = "1.4.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
 
 [[package]]
 name = "page_size"
@@ -1108,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
@@ -1134,18 +1055,38 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project"
-version = "0.4.22"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
+dependencies = [
+ "pin-project-internal 0.4.28",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+dependencies = [
+ "pin-project-internal 1.0.8",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
 dependencies = [
- "pin-project-internal",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "0.4.22"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1154,9 +1095,15 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.7"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -1166,27 +1113,27 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
  "unicode-xid",
 ]
@@ -1208,25 +1155,25 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.16.2"
+version = "2.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d883f78645c21b7281d21305181aa1f4dd9e9363e7cf2566c93121552cff003e"
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b"
 
 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
 [[package]]
 name = "rand"
 version = "0.3.23"
@@ -1252,25 +1199,24 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
- "getrandom",
  "libc",
  "rand_chacha",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
  "rand_hc",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
@@ -1290,27 +1236,27 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
 [[package]]
 name = "rand_core"
-version = "0.5.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
- "rand_core 0.5.1",
+ "rand_core 0.6.3",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
  "autocfg",
  "crossbeam-deque",
@@ -1320,13 +1266,13 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
- "crossbeam-utils 0.8.1",
+ "crossbeam-utils",
  "lazy_static",
  "num_cpus",
 ]
@@ -1342,47 +1288,39 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.56"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-
-[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
- "redox_syscall",
+ "bitflags",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.3.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom",
  "redox_syscall",
- "rust-argon2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
@@ -1428,18 +1366,6 @@ dependencies = [
  "librocksdb-sys",
 ]
 
-[[package]]
-name = "rust-argon2"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
-dependencies = [
- "base64 0.11.0",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils 0.7.2",
-]
-
 [[package]]
 name = "rust-crypto"
 version = "0.2.36"
@@ -1455,9 +1381,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.16"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49"
 
 [[package]]
 name = "rustc-hash"
@@ -1499,12 +1425,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
-[[package]]
-name = "scoped-tls"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -1528,17 +1448,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2932dc07acd2066ff2e3921a4419606b220ba6cd03a9935123856cc534877056"
 dependencies = [
  "secp256k1-sys 0.1.2",
- "serde 1.0.118",
+ "serde 1.0.127",
 ]
 
 [[package]]
 name = "secp256k1"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733b114f058f260c0af7591434eef4272ae1a8ec2751766d3cb89c6df8d5e450"
+checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
- "secp256k1-sys 0.4.0",
- "serde 1.0.118",
+ "secp256k1-sys 0.4.1",
+ "serde 1.0.127",
 ]
 
 [[package]]
@@ -1552,9 +1472,9 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e4b6455ee49f5901c8985b88f98fb0a0e1d90a6661f5a03f4888bd987dad29"
+checksum = "827cb7cce42533829c792fc51b82fbf18b125b45a702ef2c8be77fce65463a7b"
 dependencies = [
  "cc",
 ]
@@ -1582,18 +1502,18 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
 
 [[package]]
 name = "serde"
-version = "1.0.118"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1614,13 +1534,13 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.60"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
 dependencies = [
- "itoa 0.4.6",
+ "itoa 0.4.7",
  "ryu",
- "serde 1.0.118",
+ "serde 1.0.127",
 ]
 
 [[package]]
@@ -1631,15 +1551,15 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
 [[package]]
 name = "shlex"
-version = "0.1.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
 
 [[package]]
 name = "signal-hook"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8133fd06d2c721d4168f9b76a9a7fd3a0bfc96df58cf7316c7fb9f23bd677f4e"
+checksum = "844024c8913df6bfbfeee3061075ccc47216a897ac0b54a683dea3dfe16d19af"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -1647,19 +1567,18 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
- "arc-swap",
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 
 [[package]]
 name = "slip21"
@@ -1672,15 +1591,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "socket2"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97e0e9fd577458a4f61fb91fcb559ea2afecc54c934119421f9f5d3d5b1a1057"
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -1689,9 +1608,9 @@ dependencies = [
 
 [[package]]
 name = "socks"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a64cfa9346d26e836a49fcc1ddfcb4d3df666b6787b6864db61d4918e1cbc2"
+checksum = "30f86c7635fadf2814201a4f67efefb0007588ae7422ce299f354ab5c97f61ae"
 dependencies = [
  "byteorder",
  "libc",
@@ -1707,18 +1626,18 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "standback"
-version = "0.2.9"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0437cfb83762844799a60e1e3b489d5ceb6a650fbacb86437badc1b6d87b246"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
 dependencies = [
  "version_check",
 ]
 
 [[package]]
 name = "stderrlog"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b02f316286ae558d83acc93dd81eaba096e746987a7961d4a9ae026842bae67f"
+checksum = "45a53e2eff3e94a019afa6265e8ee04cb05b9d33fe9f5078b14e4e391d155a38"
 dependencies = [
  "atty",
  "chrono",
@@ -1749,7 +1668,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde 1.0.118",
+ "serde 1.0.127",
  "serde_derive",
  "syn",
 ]
@@ -1763,9 +1682,9 @@ dependencies = [
  "base-x",
  "proc-macro2",
  "quote",
- "serde 1.0.118",
+ "serde 1.0.127",
  "serde_derive",
- "serde_json 1.0.60",
+ "serde_json 1.0.66",
  "sha1",
  "syn",
 ]
@@ -1784,9 +1703,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.33"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1805,15 +1724,21 @@ dependencies = [
  "winapi 0.2.8",
 ]
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tempfile"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
- "rand 0.7.3",
+ "rand 0.8.4",
  "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -1821,25 +1746,13 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "termion"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905"
-dependencies = [
- "libc",
- "numtoa",
- "redox_syscall",
- "redox_termios",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.11.0"
@@ -1851,18 +1764,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.20"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.20"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1890,9 +1803,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.23"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
 dependencies = [
  "const_fn",
  "libc",
@@ -1905,9 +1818,9 @@ dependencies = [
 
 [[package]]
 name = "time-macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d"
+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
 dependencies = [
  "proc-macro-hack",
  "time-macros-impl",
@@ -1915,9 +1828,9 @@ dependencies = [
 
 [[package]]
 name = "time-macros-impl"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -1941,9 +1854,18 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "0.3.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
+checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
@@ -1951,7 +1873,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e1bef565a52394086ecac0a6fa3b8ace4cb3a138ee1d96bd2b93283b56824e3"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "futures-core",
  "iovec",
@@ -1960,16 +1882,16 @@ dependencies = [
  "memchr",
  "mio",
  "mio-uds",
- "pin-project-lite",
+ "pin-project-lite 0.1.12",
  "slab",
  "tokio-macros",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1982,40 +1904,68 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures-core",
  "futures-sink",
  "log",
- "pin-project-lite",
+ "pin-project-lite 0.1.12",
  "tokio",
 ]
 
 [[package]]
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
-name = "try-lock"
-version = "0.2.2"
+name = "tracing"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "log",
+ "pin-project-lite 0.2.7",
+ "tracing-core",
+]
 
 [[package]]
-name = "unicode-bidi"
-version = "0.3.4"
+name = "tracing-core"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
 dependencies = [
- "matches",
+ "lazy_static",
 ]
 
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project 1.0.8",
+ "tracing",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
+
 [[package]]
 name = "unicode-normalization"
-version = "0.1.13"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
@@ -2028,9 +1978,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "untrusted"
@@ -2040,9 +1990,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.2.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2058,9 +2008,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
 [[package]]
 name = "want"
@@ -2074,25 +2024,25 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.64"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2"
+checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.64"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df"
+checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -2105,9 +2055,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.64"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8"
+checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2115,9 +2065,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.64"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75"
+checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2128,15 +2078,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.64"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae"
+checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
 
 [[package]]
 name = "web-sys"
-version = "0.3.41"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d"
+checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2161,15 +2111,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -2222,3 +2163,9 @@ dependencies = [
  "winapi 0.2.8",
  "winapi-build",
 ]
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"

From 9ec7dbdb16ef958cb5838f41776689cb7ddbcc30 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 20 Aug 2021 04:22:09 +0300
Subject: [PATCH 27/47] Minor/major version bumps for cargo dependencies

itertools, socket2, prometheus, signal-hook, time, tiny_http, hyper, hyperlocal and tokio
---
 Cargo.lock             | 445 +++++++----------------------------------
 Cargo.toml             |  20 +-
 src/electrum/server.rs |   4 +-
 src/rest.rs            |   2 +-
 src/signal.rs          |  11 +-
 src/util/block.rs      |   5 +-
 src/util/mod.rs        |   6 +-
 7 files changed, 99 insertions(+), 394 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 461bdbc0b..089e8f9ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15,15 +15,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aho-corasick"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -75,19 +66,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d"
 dependencies = [
  "addr2line",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base-x"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
-
 [[package]]
 name = "base64"
 version = "0.10.1"
@@ -210,12 +195,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
 [[package]]
 name = "bytes"
 version = "1.0.1"
@@ -240,12 +219,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -297,19 +270,13 @@ dependencies = [
  "vec_map",
 ]
 
-[[package]]
-name = "const_fn"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -319,7 +286,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
@@ -330,7 +297,7 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
  "memoffset",
@@ -343,7 +310,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "lazy_static",
 ]
 
@@ -367,12 +334,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
 [[package]]
 name = "dtoa"
 version = "0.4.8"
@@ -423,7 +384,7 @@ dependencies = [
  "stderrlog",
  "sysconf",
  "tempfile",
- "time 0.2.27",
+ "time 0.3.1",
  "tiny_http",
  "tokio",
  "url",
@@ -510,22 +471,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
 [[package]]
 name = "funty"
 version = "1.1.0"
@@ -560,12 +505,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "futures-sink"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
-
 [[package]]
 name = "futures-task"
 version = "0.3.16"
@@ -582,7 +521,7 @@ dependencies = [
  "futures-core",
  "futures-macro",
  "futures-task",
- "pin-project-lite 0.2.7",
+ "pin-project-lite",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -601,7 +540,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi",
 ]
@@ -618,32 +557,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
-[[package]]
-name = "h2"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
-dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -671,19 +584,20 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
- "bytes 1.0.1",
+ "bytes",
  "fnv",
  "itoa 0.4.7",
 ]
 
 [[package]]
 name = "http-body"
-version = "0.3.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "http",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -692,24 +606,29 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
 
+[[package]]
+name = "httpdate"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+
 [[package]]
 name = "hyper"
-version = "0.13.7"
+version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb"
+checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
 dependencies = [
- "bytes 0.5.6",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
  "http",
  "http-body",
  "httparse",
+ "httpdate",
  "itoa 0.4.7",
- "pin-project 0.4.28",
+ "pin-project-lite",
  "socket2",
- "time 0.1.43",
  "tokio",
  "tower-service",
  "tracing",
@@ -718,14 +637,14 @@ dependencies = [
 
 [[package]]
 name = "hyperlocal"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f192a5a791c0781b93e69f60a652eb6ae9331f77b9efe90c9827a75df5141a9b"
+checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
 dependencies = [
  "futures-util",
  "hex 0.4.3",
  "hyper",
- "pin-project 0.4.28",
+ "pin-project",
  "tokio",
 ]
 
@@ -740,39 +659,20 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
 dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
+ "cfg-if",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
 dependencies = [
  "either",
 ]
@@ -832,7 +732,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "winapi 0.3.9",
 ]
 
@@ -863,7 +763,7 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -899,54 +799,23 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.6.23"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
  "libc",
  "log",
  "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio",
+ "ntapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "miow"
-version = "0.2.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
  "winapi 0.3.9",
 ]
 
@@ -962,6 +831,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.44"
@@ -1033,7 +911,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "instant",
  "libc",
  "redox_syscall",
@@ -1053,33 +931,13 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "pin-project"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
-dependencies = [
- "pin-project-internal 0.4.28",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
 dependencies = [
- "pin-project-internal 1.0.8",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "pin-project-internal",
 ]
 
 [[package]]
@@ -1093,12 +951,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.7"
@@ -1140,16 +992,16 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
+checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fnv",
  "lazy_static",
+ "memchr",
  "parking_lot",
  "protobuf",
- "regex",
  "thiserror",
 ]
 
@@ -1311,8 +1163,6 @@ version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
- "aho-corasick",
- "memchr",
  "regex-syntax",
 ]
 
@@ -1397,15 +1247,6 @@ version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustls"
 version = "0.16.0"
@@ -1479,21 +1320,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
 version = "0.9.15"
@@ -1543,12 +1369,6 @@ dependencies = [
  "serde 1.0.127",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-
 [[package]]
 name = "shlex"
 version = "1.0.0"
@@ -1557,9 +1377,9 @@ checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
 
 [[package]]
 name = "signal-hook"
-version = "0.2.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "844024c8913df6bfbfeee3061075ccc47216a897ac0b54a683dea3dfe16d19af"
+checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -1597,11 +1417,10 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "socket2"
-version = "0.3.19"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
 dependencies = [
- "cfg-if 1.0.0",
  "libc",
  "winapi 0.3.9",
 ]
@@ -1624,15 +1443,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "stderrlog"
 version = "0.5.1"
@@ -1646,55 +1456,6 @@ dependencies = [
  "thread_local",
 ]
 
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde 1.0.127",
- "serde_derive",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde 1.0.127",
- "serde_derive",
- "serde_json 1.0.66",
- "sha1",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -1736,7 +1497,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "rand 0.8.4",
  "redox_syscall",
@@ -1803,47 +1564,19 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.27"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
+checksum = "1a776787d9c5d455bec3db044586ccdd8a9c74d5da5dc319fb80f3db08808fe6"
 dependencies = [
- "const_fn",
+ "itoa 0.4.7",
  "libc",
- "standback",
- "stdweb",
- "time-macros",
- "version_check",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn",
 ]
 
 [[package]]
 name = "tiny_http"
-version = "0.7.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15ce4fc3c4cdea1a4399bb1819a539195fb69db4bbe0bde5b7c7f18fed412e02"
+checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39"
 dependencies = [
  "ascii",
  "chrono",
@@ -1869,49 +1602,30 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "0.2.6"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1bef565a52394086ecac0a6fa3b8ace4cb3a138ee1d96bd2b93283b56824e3"
+checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
- "bytes 0.5.6",
- "fnv",
- "futures-core",
- "iovec",
- "lazy_static",
+ "autocfg",
  "libc",
- "memchr",
  "mio",
- "mio-uds",
- "pin-project-lite 0.1.12",
- "slab",
+ "num_cpus",
+ "pin-project-lite",
  "tokio-macros",
+ "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "0.2.6"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
+checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "tokio-util"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
-dependencies = [
- "bytes 0.5.6",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite 0.1.12",
- "tokio",
-]
-
 [[package]]
 name = "tower-service"
 version = "0.3.1"
@@ -1924,9 +1638,8 @@ version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
- "cfg-if 1.0.0",
- "log",
- "pin-project-lite 0.2.7",
+ "cfg-if",
+ "pin-project-lite",
  "tracing-core",
 ]
 
@@ -1939,16 +1652,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project 1.0.8",
- "tracing",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -2034,7 +1737,7 @@ version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index ff02cdebe..560570d8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,14 +30,14 @@ elements = { version = "0.16.0", features = [ "serde-feature" ], optional = true
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
-itertools = "0.9.0"
+itertools = "0.10"
 lazy_static = "1.3.0"
 libc = "0.2.81"
 log = "0.4.11"
-socket2 = { version = "0.3.18", features = ["reuseport"] }
+socket2 = { version = "0.4", features = ["all"] }
 num_cpus = "1.12.0"
 page_size = "0.4.2"
-prometheus = "0.11.0"
+prometheus = "0.12"
 rayon = "1.5.0"
 rocksdb = { version = "0.15.0", optional = true }
 rocksdb-oldcpu = { version = "0.12.4", optional = true, package = "rocksdb" }
@@ -45,16 +45,16 @@ rust-crypto = "0.2"
 serde = "1.0.118"
 serde_derive = "1.0.118"
 serde_json = "1.0.60"
-signal-hook = "0.2.2"
+signal-hook = "0.3"
 stderrlog = "0.5.0"
 sysconf = ">=0.3.4"
-time = "0.2.23"
-tiny_http = "0.7.0"
+time = { version = "0.3", features = ["formatting"] }
+tiny_http = "0.8"
 url = "2.2.0"
-hyper = "0.13.6"
-hyperlocal = "0.7"
-# close to same tokio version as dependent by hyper v0.13.6 and hyperlocal 0.7 -- things can go awry if they mismatch
-tokio = { version = "=0.2.6", features = ["sync", "macros"] }
+hyper = "0.14"
+hyperlocal = "0.8"
+# close to same tokio version as dependent by hyper v0.14 and hyperlocal 0.8 -- things can go awry if they mismatch
+tokio = { version = "1", features = ["sync", "macros"] }
 
 # optional dependencies for electrum-discovery
 electrum-client = { version = "0.1.0-beta.6", optional = true }
diff --git a/src/electrum/server.rs b/src/electrum/server.rs
index ceb065a97..9fac5065e 100644
--- a/src/electrum/server.rs
+++ b/src/electrum/server.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::io::{BufRead, BufReader, Write};
-use std::net::{Shutdown, SocketAddr, TcpStream};
+use std::net::{Shutdown, SocketAddr, TcpListener, TcpStream};
 use std::sync::mpsc::{Sender, SyncSender, TrySendError};
 use std::sync::{Arc, Mutex};
 use std::thread;
@@ -653,7 +653,7 @@ impl RPC {
             socket
                 .set_nonblocking(false)
                 .expect("cannot set nonblocking to false");
-            let listener = socket.into_tcp_listener();
+            let listener = TcpListener::from(socket);
 
             info!("Electrum RPC server running on {}", addr);
             loop {
diff --git a/src/rest.rs b/src/rest.rs
index 9c8f3b831..29eea49c6 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -545,7 +545,7 @@ async fn run_server(config: Arc<Config>, query: Arc<Query>, rx: oneshot::Receive
             let socket = create_socket(&addr);
             socket.listen(511).expect("setting backlog failed");
 
-            Server::from_tcp(socket.into_tcp_listener())
+            Server::from_tcp(socket.into())
                 .expect("Server::from_tcp failed")
                 .serve(make_service_fn(move |_| make_service_fn_inn()))
                 .with_graceful_shutdown(async {
diff --git a/src/signal.rs b/src/signal.rs
index 26fdeeaa2..6b32aae19 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -3,6 +3,8 @@ use crossbeam_channel::RecvTimeoutError;
 use std::thread;
 use std::time::Duration;
 
+use signal_hook::consts::{SIGINT, SIGTERM, SIGUSR1};
+
 use crate::errors::*;
 
 #[derive(Clone)] // so multiple threads could wait on signals
@@ -12,7 +14,7 @@ pub struct Waiter {
 
 fn notify(signals: &[i32]) -> channel::Receiver<i32> {
     let (s, r) = channel::bounded(1);
-    let signals =
+    let mut signals =
         signal_hook::iterator::Signals::new(signals).expect("failed to register signal hook");
     thread::spawn(move || {
         for signal in signals.forever() {
@@ -27,15 +29,14 @@ impl Waiter {
     pub fn start() -> Waiter {
         Waiter {
             receiver: notify(&[
-                signal_hook::SIGINT,
-                signal_hook::SIGTERM,
-                signal_hook::SIGUSR1, // allow external triggering (e.g. via bitcoind `blocknotify`)
+                SIGINT, SIGTERM,
+                SIGUSR1, // allow external triggering (e.g. via bitcoind `blocknotify`)
             ]),
         }
     }
     pub fn wait(&self, duration: Duration, accept_sigusr: bool) -> Result<()> {
         match self.receiver.recv_timeout(duration) {
-            Ok(sig) if sig == signal_hook::SIGUSR1 => {
+            Ok(sig) if sig == SIGUSR1 => {
                 trace!("notified via SIGUSR1");
                 if accept_sigusr {
                     Ok(())
diff --git a/src/util/block.rs b/src/util/block.rs
index 8dea9c60f..76b593fdb 100644
--- a/src/util/block.rs
+++ b/src/util/block.rs
@@ -6,6 +6,7 @@ use std::collections::HashMap;
 use std::fmt;
 use std::iter::FromIterator;
 use std::slice;
+use time::format_description::well_known::Rfc3339;
 use time::OffsetDateTime as DateTime;
 
 const MTP_SPAN: usize = 11;
@@ -50,13 +51,13 @@ impl HeaderEntry {
 
 impl fmt::Debug for HeaderEntry {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let last_block_time = DateTime::from_unix_timestamp(self.header().time as i64);
+        let last_block_time = DateTime::from_unix_timestamp(self.header().time as i64).unwrap();
         write!(
             f,
             "hash={} height={} @ {}",
             self.hash(),
             self.height(),
-            last_block_time.format(time::Format::Rfc3339),
+            last_block_time.format(&Rfc3339).unwrap(),
         )
     }
 }
diff --git a/src/util/mod.rs b/src/util/mod.rs
index a214d7049..d70b1738a 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -113,11 +113,11 @@ impl BoolThen for bool {
 
 pub fn create_socket(addr: &SocketAddr) -> Socket {
     let domain = match &addr {
-        SocketAddr::V4(_) => Domain::ipv4(),
-        SocketAddr::V6(_) => Domain::ipv6(),
+        SocketAddr::V4(_) => Domain::IPV4,
+        SocketAddr::V6(_) => Domain::IPV6,
     };
     let socket =
-        Socket::new(domain, Type::stream(), Some(Protocol::tcp())).expect("creating socket failed");
+        Socket::new(domain, Type::STREAM, Some(Protocol::TCP)).expect("creating socket failed");
 
     #[cfg(unix)]
     socket

From 5c408c56d5af64fbf6f5754e7d28f038f7650bea Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 20 Aug 2021 05:36:47 +0300
Subject: [PATCH 28/47] Update rust-electrum-client to v0.8

---
 Cargo.lock                | 141 ++++++++++++++++++++------------------
 Cargo.toml                |   4 +-
 src/electrum/client.rs    |  58 +---------------
 src/electrum/discovery.rs |  33 ++++++---
 4 files changed, 101 insertions(+), 135 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 089e8f9ed..14f7b8eea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,9 +2,9 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addr2line"
-version = "0.14.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
+checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
 dependencies = [
  "gimli",
 ]
@@ -61,11 +61,12 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.57"
+version = "0.3.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d"
+checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
 dependencies = [
  "addr2line",
+ "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
@@ -94,6 +95,12 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1"
 
+[[package]]
+name = "bech32"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
+
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -124,26 +131,25 @@ dependencies = [
 
 [[package]]
 name = "bitcoin"
-version = "0.23.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a32c9d2fa897cfbb0db45d71e3d2838666194abc4828c0f994e4b5c3bf85ba4"
+checksum = "6742ec672d3f12506f4ac5c0d853926ff1f94e675f60ffd3224039972bf663f1"
 dependencies = [
- "bech32",
- "bitcoin_hashes 0.7.6",
- "hex 0.3.2",
- "secp256k1 0.17.2",
+ "bech32 0.7.3",
+ "bitcoin_hashes 0.9.7",
+ "secp256k1",
  "serde 1.0.127",
 ]
 
 [[package]]
 name = "bitcoin"
-version = "0.26.2"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6742ec672d3f12506f4ac5c0d853926ff1f94e675f60ffd3224039972bf663f1"
+checksum = "8a427b27dae305157520d86673f2393b3eb08d880609abfcffc6e3c3c820e764"
 dependencies = [
- "bech32",
- "bitcoin_hashes 0.9.7",
- "secp256k1 0.20.3",
+ "bech32 0.8.1",
+ "bitcoin_hashes 0.10.0",
+ "secp256k1",
  "serde 1.0.127",
 ]
 
@@ -152,15 +158,21 @@ name = "bitcoin_hashes"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b375d62f341cef9cd9e77793ec8f1db3fc9ce2e4d57e982c8fe697a2c16af3b6"
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
 dependencies = [
  "serde 1.0.127",
 ]
 
 [[package]]
 name = "bitcoin_hashes"
-version = "0.9.7"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
+checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0"
 dependencies = [
  "serde 1.0.127",
 ]
@@ -203,11 +215,11 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cc"
-version = "1.0.41"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 dependencies = [
- "rayon",
+ "jobserver",
 ]
 
 [[package]]
@@ -362,7 +374,7 @@ dependencies = [
  "elements",
  "error-chain",
  "glob",
- "hex 0.4.3",
+ "hex",
  "hyper",
  "hyperlocal",
  "itertools",
@@ -392,10 +404,10 @@ dependencies = [
 
 [[package]]
 name = "electrum-client"
-version = "0.1.0-beta.6"
-source = "git+https://github.com/Blockstream/rust-electrum-client?rev=bd783aa70604fa1a0d8b29a3459326c640001354#bd783aa70604fa1a0d8b29a3459326c640001354"
+version = "0.8.0"
+source = "git+https://github.com/Blockstream/rust-electrum-client?rev=d3792352992a539afffbe11501d1aff9fd5b919d#d3792352992a539afffbe11501d1aff9fd5b919d"
 dependencies = [
- "bitcoin 0.23.0",
+ "bitcoin 0.27.0",
  "log",
  "rustls",
  "serde 1.0.127",
@@ -547,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
+checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
 
 [[package]]
 name = "glob"
@@ -566,12 +578,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -642,7 +648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
 dependencies = [
  "futures-util",
- "hex 0.4.3",
+ "hex",
  "hyper",
  "pin-project",
  "tokio",
@@ -689,6 +695,15 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
+[[package]]
+name = "jobserver"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.53"
@@ -774,9 +789,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
@@ -821,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "6.2.1"
+version = "6.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
 dependencies = [
  "bitvec",
  "funty",
@@ -880,9 +895,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.23.0"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "page_size"
@@ -1159,9 +1183,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.6"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "regex-syntax",
 ]
@@ -1183,13 +1207,13 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.12"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba5a8ec64ee89a76c98c549af81ff14813df09c3e6dc4766c3856da48597a0c"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
- "lazy_static",
  "libc",
+ "once_cell",
  "spin",
  "untrusted",
  "web-sys",
@@ -1274,43 +1298,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "sct"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
  "ring",
  "untrusted",
 ]
 
-[[package]]
-name = "secp256k1"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2932dc07acd2066ff2e3921a4419606b220ba6cd03a9935123856cc534877056"
-dependencies = [
- "secp256k1-sys 0.1.2",
- "serde 1.0.127",
-]
-
 [[package]]
 name = "secp256k1"
 version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
- "secp256k1-sys 0.4.1",
+ "secp256k1-sys",
  "serde 1.0.127",
 ]
 
-[[package]]
-name = "secp256k1-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab2c26f0d3552a0f12e639ae8a64afc2e3db9c52fe32f5fc6c289d38519f220"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "secp256k1-sys"
 version = "0.4.1"
@@ -1797,9 +1802,9 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.21.2"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef"
+checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
  "ring",
  "untrusted",
diff --git a/Cargo.toml b/Cargo.toml
index 560570d8d..3c24c0b9a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,7 +57,7 @@ hyperlocal = "0.8"
 tokio = { version = "1", features = ["sync", "macros"] }
 
 # optional dependencies for electrum-discovery
-electrum-client = { version = "0.1.0-beta.6", optional = true }
+electrum-client = { version = "0.8", optional = true }
 
 
 [dev-dependencies]
@@ -70,4 +70,4 @@ codegen-units = 1
 
 [patch.crates-io.electrum-client]
 git = "https://github.com/Blockstream/rust-electrum-client"
-rev = "bd783aa70604fa1a0d8b29a3459326c640001354" # add-peer
+rev = "d3792352992a539afffbe11501d1aff9fd5b919d" # add-peer branch
diff --git a/src/electrum/client.rs b/src/electrum/client.rs
index 436754116..04d6ffba6 100644
--- a/src/electrum/client.rs
+++ b/src/electrum/client.rs
@@ -1,67 +1,15 @@
 use std::collections::HashMap;
-use std::convert::{TryFrom, TryInto};
-use std::net::ToSocketAddrs;
+use std::convert::TryFrom;
 
 use bitcoin::hashes::Hash;
-use electrum_client::client::{
-    Client as RClient, ElectrumPlaintextStream, ElectrumProxyStream, ElectrumSslStream,
-};
-pub use electrum_client::types::ServerFeaturesRes;
+pub use electrum_client::client::Client;
 pub use electrum_client::Error as ElectrumError;
+pub use electrum_client::ServerFeaturesRes;
 
 use crate::chain::BlockHash;
 use crate::electrum::ServerFeatures;
 use crate::errors::{Error, ResultExt};
 
-pub enum Client {
-    Tcp(RClient<ElectrumPlaintextStream>),
-    Ssl(RClient<ElectrumSslStream>),
-    ProxyTcp(RClient<ElectrumProxyStream>),
-    // proxy+ssl on the same connection appears to be unsupported by the electrum_client crate
-}
-
-// impl<S: Read + Write> Client<S> {
-
-impl Client {
-    pub fn new<A: ToSocketAddrs>(socket_addr: A) -> Result<Self, ElectrumError> {
-        Ok(Client::Tcp(RClient::new(socket_addr)?))
-    }
-
-    pub fn new_ssl(domain_addr: (&str, u16)) -> Result<Self, ElectrumError> {
-        // SSL certificates are not validated
-        Ok(Client::Ssl(RClient::new_ssl(domain_addr, false)?))
-        // XXX this should ideally use the previously resolved IP address instead of the hostname, which
-        // shuold be possible because we don't validate, but it appears like rustls does not support this.
-    }
-
-    pub fn new_proxy<A: ToSocketAddrs>(
-        target_addr: (&str, u16),
-        proxy_addr: A,
-    ) -> Result<Self, ElectrumError> {
-        Ok(Client::ProxyTcp(RClient::new_proxy(
-            target_addr,
-            proxy_addr,
-        )?))
-    }
-
-    pub fn server_features(&mut self) -> Result<ServerFeatures, Error> {
-        match self {
-            Client::Tcp(c) => c.server_features(),
-            Client::Ssl(c) => c.server_features(),
-            Client::ProxyTcp(c) => c.server_features(),
-        }?
-        .try_into()
-    }
-
-    pub fn server_add_peer(&mut self, features: &ServerFeatures) -> Result<bool, ElectrumError> {
-        match self {
-            Client::Tcp(c) => c.server_add_peer(features),
-            Client::Ssl(c) => c.server_add_peer(features),
-            Client::ProxyTcp(c) => c.server_add_peer(features),
-        }
-    }
-}
-
 // Convert from electrum-client's server features struct to ours. We're using a different struct because
 // the electrum-client's one doesn't support the "hosts" key.
 impl TryFrom<ServerFeaturesRes> for ServerFeatures {
diff --git a/src/electrum/discovery.rs b/src/electrum/discovery.rs
index d196358f7..5474d27c3 100644
--- a/src/electrum/discovery.rs
+++ b/src/electrum/discovery.rs
@@ -1,5 +1,6 @@
 use std::cmp::Ordering;
 use std::collections::{hash_map::Entry, BinaryHeap, HashMap, HashSet};
+use std::convert::TryInto;
 use std::fmt;
 use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
 use std::str::FromStr;
@@ -7,6 +8,8 @@ use std::sync::{Arc, RwLock};
 use std::thread;
 use std::time::{Duration, Instant};
 
+use electrum_client::ElectrumApi;
+
 use crate::chain::Network;
 use crate::electrum::{Client, Hostname, Port, ProtocolVersion, ServerFeatures};
 use crate::errors::{Result, ResultExt};
@@ -316,19 +319,29 @@ impl DiscoveryManager {
     ) -> Result<ServerFeatures> {
         debug!("checking service {:?} {:?}", addr, service);
 
-        let mut client: Client = match (addr, service) {
-            (ServerAddr::Clearnet(ip), Service::Tcp(port)) => Client::new((*ip, port))?,
-            (ServerAddr::Clearnet(_), Service::Ssl(port)) => Client::new_ssl((hostname, port))?,
-            (ServerAddr::Onion(hostname), Service::Tcp(port)) => {
-                let tor_proxy = self
-                    .tor_proxy
-                    .chain_err(|| "no tor proxy configured, onion hosts are unsupported")?;
-                Client::new_proxy((hostname, port), tor_proxy)?
+        let server_url = match (addr, service) {
+            (ServerAddr::Clearnet(ip), Service::Tcp(port)) => format!("tcp://{}:{}", ip, port),
+            (ServerAddr::Clearnet(_), Service::Ssl(port)) => format!("ssl://{}:{}", hostname, port),
+            (ServerAddr::Onion(onion_host), Service::Tcp(port)) => {
+                format!("tcp://{}:{}", onion_host, port)
+            }
+            (ServerAddr::Onion(onion_host), Service::Ssl(port)) => {
+                format!("ssl://{}:{}", onion_host, port)
             }
-            (ServerAddr::Onion(_), Service::Ssl(_)) => bail!("ssl over onion is unsupported"),
         };
 
-        let features = client.server_features()?;
+        let mut config = electrum_client::ConfigBuilder::new();
+        if let ServerAddr::Onion(_) = addr {
+            let socks = electrum_client::Socks5Config::new(
+                self.tor_proxy
+                    .chain_err(|| "no tor proxy configured, onion hosts are unsupported")?,
+            );
+            config = config.socks5(Some(socks)).unwrap()
+        }
+
+        let client = Client::from_config(&server_url, config.build()).unwrap();
+
+        let features = client.server_features()?.try_into()?;
         self.verify_compatibility(&features)?;
 
         if self.announce {

From df99d5e47fc9821da2cb8c393a1128387ad96c35 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 20 Aug 2021 08:45:01 +0300
Subject: [PATCH 29/47] Update to rust-bitcoin v0.27 & rust-elements v0.18

---
 Cargo.lock              | 187 ++++++++++++++++++++++++++++++++--------
 Cargo.toml              |   4 +-
 src/elements/asset.rs   |   5 +-
 src/elements/mod.rs     |   5 +-
 src/new_index/schema.rs |   5 +-
 src/rest.rs             |   7 +-
 6 files changed, 164 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14f7b8eea..f698698cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,6 +53,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -89,12 +95,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
-[[package]]
-name = "bech32"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1"
-
 [[package]]
 name = "bech32"
 version = "0.8.1"
@@ -129,25 +129,13 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "bitcoin"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6742ec672d3f12506f4ac5c0d853926ff1f94e675f60ffd3224039972bf663f1"
-dependencies = [
- "bech32 0.7.3",
- "bitcoin_hashes 0.9.7",
- "secp256k1",
- "serde 1.0.127",
-]
-
 [[package]]
 name = "bitcoin"
 version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a427b27dae305157520d86673f2393b3eb08d880609abfcffc6e3c3c820e764"
 dependencies = [
- "bech32 0.8.1",
+ "bech32",
  "bitcoin_hashes 0.10.0",
  "secp256k1",
  "serde 1.0.127",
@@ -164,9 +152,6 @@ name = "bitcoin_hashes"
 version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
-dependencies = [
- "serde 1.0.127",
-]
 
 [[package]]
 name = "bitcoin_hashes"
@@ -282,6 +267,15 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.1"
@@ -366,7 +360,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin 0.26.2",
+ "bitcoin",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -407,7 +401,7 @@ name = "electrum-client"
 version = "0.8.0"
 source = "git+https://github.com/Blockstream/rust-electrum-client?rev=d3792352992a539afffbe11501d1aff9fd5b919d#d3792352992a539afffbe11501d1aff9fd5b919d"
 dependencies = [
- "bitcoin 0.27.0",
+ "bitcoin",
  "log",
  "rustls",
  "serde 1.0.127",
@@ -419,12 +413,13 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.16.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77124f1ecdbeb92691beae289c44553df24c94c86dd3bc07a7037c2064ac3d3"
+checksum = "aa776445bd0ef9b30eab2e7c09cacc3a545e0502c178fdca9c4c6d80f738d519"
 dependencies = [
- "bitcoin 0.26.2",
- "bitcoin_hashes 0.9.7",
+ "bitcoin",
+ "bitcoin_hashes 0.10.0",
+ "secp256k1-zkp",
  "serde 1.0.127",
  "serde_json 0.9.10",
  "slip21",
@@ -510,7 +505,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -529,7 +524,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "futures-core",
  "futures-macro",
  "futures-task",
@@ -799,7 +794,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -809,7 +804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -861,7 +856,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "num-traits 0.2.14",
 ]
 
@@ -880,7 +875,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -1073,6 +1068,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+dependencies = [
+ "autocfg 0.1.7",
+ "libc",
+ "rand_chacha 0.1.1",
+ "rand_core 0.4.2",
+ "rand_hc 0.1.0",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg",
+ "rand_xorshift",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.4"
@@ -1080,9 +1094,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
- "rand_chacha",
+ "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc",
+ "rand_hc 0.3.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+dependencies = [
+ "autocfg 0.1.7",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -1119,6 +1143,15 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.3.1"
@@ -1128,13 +1161,66 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+dependencies = [
+ "libc",
+ "rand_core 0.4.2",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+dependencies = [
+ "autocfg 0.1.7",
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rayon"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -1312,6 +1398,8 @@ version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
+ "bitcoin_hashes 0.9.7",
+ "rand 0.6.5",
  "secp256k1-sys",
  "serde 1.0.127",
 ]
@@ -1325,6 +1413,29 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-zkp"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e57b977141f57b224fc579c23dac5978b5f594281450fe8b5e2b6aa816d0fde"
+dependencies = [
+ "bitcoin_hashes 0.9.7",
+ "rand 0.6.5",
+ "secp256k1",
+ "secp256k1-zkp-sys",
+ "serde 1.0.127",
+]
+
+[[package]]
+name = "secp256k1-zkp-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b45a3c4e1291985397df9770f864ed88bd51ee684b13a384f49d2fedb29f86f0"
+dependencies = [
+ "cc",
+ "secp256k1-sys",
+]
+
 [[package]]
 name = "serde"
 version = "0.9.15"
@@ -1611,7 +1722,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "libc",
  "mio",
  "num_cpus",
diff --git a/Cargo.toml b/Cargo.toml
index 3c24c0b9a..6a251aad2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,11 +22,11 @@ arraydeque = "0.4"
 arrayref = "0.3.6"
 base64 = "0.13.0"
 bincode = "1.3.1"
-bitcoin = { version = "0.26.0", features = [ "use-serde" ] }
+bitcoin = { version = "0.27", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "3.0.1"
-elements = { version = "0.16.0", features = [ "serde-feature" ], optional = true }
+elements = { version = "0.18", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index 67578bc33..7be37634d 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -4,6 +4,7 @@ use std::sync::{Arc, RwLock};
 use bitcoin::hashes::{hex::FromHex, sha256, Hash};
 use elements::confidential::{Asset, Value};
 use elements::encode::{deserialize, serialize};
+use elements::secp256k1_zkp::ZERO_TWEAK;
 use elements::{issuance::ContractHash, AssetId, AssetIssuance, OutPoint, Transaction, TxIn};
 
 use crate::chain::{BNetwork, BlockHash, Network, Txid};
@@ -274,7 +275,7 @@ fn index_tx_assets(
                 }),
             ));
         } else if txi.has_issuance() {
-            let is_reissuance = txi.asset_issuance.asset_blinding_nonce != [0u8; 32];
+            let is_reissuance = txi.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
 
             let asset_entropy = get_issuance_entropy(txi).expect("invalid issuance");
             let asset_id = AssetId::from_entropy(asset_entropy);
@@ -391,7 +392,7 @@ pub fn get_issuance_entropy(txin: &TxIn) -> Result<sha256::Midstate> {
         bail!("input has no issuance");
     }
 
-    let is_reissuance = txin.asset_issuance.asset_blinding_nonce != [0u8; 32];
+    let is_reissuance = txin.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
 
     Ok(if !is_reissuance {
         let contract_hash = ContractHash::from_slice(&txin.asset_issuance.asset_entropy)
diff --git a/src/elements/mod.rs b/src/elements/mod.rs
index 3da54f0d6..1e4a62425 100644
--- a/src/elements/mod.rs
+++ b/src/elements/mod.rs
@@ -1,4 +1,5 @@
 use bitcoin::hashes::{hex::ToHex, Hash};
+use elements::secp256k1_zkp::ZERO_TWEAK;
 use elements::{confidential::Value, encode::serialize, issuance::ContractHash, AssetId, TxIn};
 
 pub mod asset;
@@ -31,7 +32,7 @@ pub struct IssuanceValue {
 impl From<&TxIn> for IssuanceValue {
     fn from(txin: &TxIn) -> Self {
         let issuance = &txin.asset_issuance;
-        let is_reissuance = issuance.asset_blinding_nonce != [0u8; 32];
+        let is_reissuance = issuance.asset_blinding_nonce != ZERO_TWEAK;
 
         let asset_entropy = get_issuance_entropy(txin).expect("invalid issuance");
         let asset_id = AssetId::from_entropy(asset_entropy);
@@ -48,7 +49,7 @@ impl From<&TxIn> for IssuanceValue {
             contract_hash: contract_hash.map(|h| h.to_hex()),
             is_reissuance,
             asset_blinding_nonce: if is_reissuance {
-                Some(hex::encode(issuance.asset_blinding_nonce))
+                Some(hex::encode(issuance.asset_blinding_nonce.as_ref()))
             } else {
                 None
             },
diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index 8820b3f7a..35e49f8de 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -915,12 +915,11 @@ impl ChainQuery {
         let blockid = self.tx_confirming_block(txid)?;
         let headerentry = self.header_by_hash(&blockid.hash)?;
         let block_txids = self.get_block_txids(&blockid.hash)?;
-        let match_txids = vec![*txid].into_iter().collect();
 
-        Some(MerkleBlock::from_header_txids(
+        Some(MerkleBlock::from_header_txids_with_predicate(
             headerentry.header(),
             &block_txids,
-            &match_txids,
+            |t| t == txid,
         ))
     }
 
diff --git a/src/rest.rs b/src/rest.rs
index 29eea49c6..ebfaf3596 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -427,9 +427,12 @@ impl From<Utxo> for UtxoValue {
                 _ => None,
             },
             #[cfg(feature = "liquid")]
-            surjection_proof: utxo.witness.surjection_proof,
+            surjection_proof: utxo
+                .witness
+                .surjection_proof
+                .map_or(vec![], |p| p.serialize()),
             #[cfg(feature = "liquid")]
-            range_proof: utxo.witness.rangeproof,
+            range_proof: utxo.witness.rangeproof.map_or(vec![], |p| p.serialize()),
         }
     }
 }

From e03e24b3ca4390e06c767b66f355db31c73d4961 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Wed, 25 Aug 2021 20:19:58 +0300
Subject: [PATCH 30/47] Update rust-rocksdb to v0.17.0

This updates rocksdb itself from v6.11.4 to v6.20.3.
---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f698698cb..f11d4b3bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -380,7 +380,7 @@ dependencies = [
  "prometheus",
  "rayon",
  "rocksdb 0.12.4",
- "rocksdb 0.15.0",
+ "rocksdb 0.17.0",
  "rust-crypto",
  "serde 1.0.127",
  "serde_derive",
@@ -1318,9 +1318,9 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.15.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6"
+checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7"
 dependencies = [
  "libc",
  "librocksdb-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 6a251aad2..96d740188 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ num_cpus = "1.12.0"
 page_size = "0.4.2"
 prometheus = "0.12"
 rayon = "1.5.0"
-rocksdb = { version = "0.15.0", optional = true }
+rocksdb = { version = "0.17.0", optional = true }
 rocksdb-oldcpu = { version = "0.12.4", optional = true, package = "rocksdb" }
 rust-crypto = "0.2"
 serde = "1.0.118"

From 130d672523e4548e55e9873321f09d1cec0fb10f Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 2 Sep 2021 04:04:39 +0300
Subject: [PATCH 31/47] Fix electrum-disocvery socket creation

Also, update the tests to match the current DiscoveryManager
implementation.
---
 src/electrum/discovery.rs | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/electrum/discovery.rs b/src/electrum/discovery.rs
index 5474d27c3..cf70221f6 100644
--- a/src/electrum/discovery.rs
+++ b/src/electrum/discovery.rs
@@ -339,7 +339,7 @@ impl DiscoveryManager {
             config = config.socks5(Some(socks)).unwrap()
         }
 
-        let client = Client::from_config(&server_url, config.build()).unwrap();
+        let client = Client::from_config(&server_url, config.build())?;
 
         let features = client.server_features()?.try_into()?;
         self.verify_compatibility(&features)?;
@@ -521,36 +521,49 @@ fn is_remote_addr(addr: &ServerAddr) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::chain::genesis_hash;
     use crate::chain::Network;
     use std::time;
 
+    const PROTOCOL_VERSION: ProtocolVersion = ProtocolVersion::new(1, 4);
+
     #[test]
     fn test() -> Result<()> {
         stderrlog::new().verbosity(4).init().unwrap();
 
-        let discovery = DiscoveryManager::new(
+        let features = ServerFeatures {
+            hosts: serde_json::from_str("{\"test.foobar.example\":{\"tcp_port\":60002}}").unwrap(),
+            server_version: format!("electrs-esplora 9"),
+            genesis_hash: genesis_hash(Network::Testnet),
+            protocol_min: PROTOCOL_VERSION,
+            protocol_max: PROTOCOL_VERSION,
+            hash_function: "sha256".into(),
+            pruning: None,
+        };
+        let discovery = Arc::new(DiscoveryManager::new(
             Network::Testnet,
-            "1.4".parse().unwrap(),
-            Some("127.0.0.1:9150".parse().unwrap()),
-        );
-
+            features,
+            PROTOCOL_VERSION,
+            false,
+            None,
+        ));
         discovery.add_default_server(
             "electrum.blockstream.info".into(),
             vec![Service::Tcp(60001)],
-        );
-        discovery.add_default_server("testnet.hsmiths.com".into(), vec![Service::Ssl(53012)]);
+        ).unwrap();
+        discovery.add_default_server("testnet.hsmiths.com".into(), vec![Service::Ssl(53012)]).unwrap();
         discovery.add_default_server(
             "tn.not.fyi".into(),
             vec![Service::Tcp(55001), Service::Ssl(55002)],
-        );
+        ).unwrap();
         discovery.add_default_server(
             "electrum.blockstream.info".into(),
             vec![Service::Tcp(60001), Service::Ssl(60002)],
-        );
+        ).unwrap();
         discovery.add_default_server(
             "explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion".into(),
             vec![Service::Tcp(143)],
-        );
+        ).unwrap();
 
         debug!("{:#?}", discovery);
 

From 391c2d2a59241bd282451dc0438421fca411165c Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 25 Sep 2021 20:59:35 +0300
Subject: [PATCH 32/47] elements: Don't consider fee outputs as burns

This was the case before the recent rust-elements version bump,
the regression was introduced due to this change:

https://github.com/ElementsProject/rust-elements/commit/55bfea98f5063a7b766e8ed83904f345c93a3535#diff-6af9b0d0a45083ddc237f726aaf91cc0a3b0c3e2afe3c3f3f4cc50f82a163d39
---
 src/elements/asset.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index 7be37634d..647c87599 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -248,7 +248,7 @@ fn index_tx_assets(
                     value: pegout.value,
                 }),
             ));
-        } else if txo.script_pubkey.is_provably_unspendable() {
+        } else if txo.script_pubkey.is_provably_unspendable() && !txo.is_fee() {
             if let (Asset::Explicit(asset_id), Value::Explicit(value)) = (txo.asset, txo.value) {
                 if value > 0 {
                     history.push((

From 15e70531b325d18583005437eb5788bf455957b1 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 23 Apr 2021 00:03:00 +0300
Subject: [PATCH 33/47] Add the Liquid Testnet network

(cherry picked from commit 1d619ed887f2bf28e9537e4e411878087460299e)
---
 src/chain.rs            | 18 +++++++++++++-----
 src/config.rs           | 13 +++++++++++--
 src/elements/asset.rs   |  3 +++
 src/util/transaction.rs |  5 ++++-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/chain.rs b/src/chain.rs
index 5ff6f2a9c..fec028e19 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -35,6 +35,8 @@ pub enum Network {
     #[cfg(feature = "liquid")]
     Liquid,
     #[cfg(feature = "liquid")]
+    LiquidTestnet,
+    #[cfg(feature = "liquid")]
     LiquidRegtest,
 }
 
@@ -47,8 +49,7 @@ impl Network {
     #[cfg(feature = "liquid")]
     pub fn magic(self) -> u32 {
         match self {
-            Network::Liquid => 0xDAB5_BFFA,
-            Network::LiquidRegtest => 0xDAB5_BFFA,
+            Network::Liquid | Network::LiquidRegtest | Network::LiquidTestnet => 0xDAB5_BFFA,
         }
     }
 
@@ -67,7 +68,7 @@ impl Network {
         // Liquid regtest uses elements's address params
         match self {
             Network::Liquid => &address::AddressParams::LIQUID,
-            Network::LiquidRegtest => &address::AddressParams::ELEMENTS,
+            Network::LiquidTestnet | Network::LiquidRegtest => &address::AddressParams::ELEMENTS,
         }
     }
 
@@ -76,7 +77,8 @@ impl Network {
         match self {
             Network::Liquid => &*asset::NATIVE_ASSET_ID,
             // same for testnet and regtest
-            Network::LiquidRegtest => &*asset::NATIVE_ASSET_ID_TESTNET,
+            Network::LiquidTestnet => &*asset::NATIVE_ASSET_ID_TESTNET,
+            Network::LiquidRegtest => &*asset::NATIVE_ASSET_ID_REGTEST,
         }
     }
 
@@ -90,7 +92,11 @@ impl Network {
         ];
 
         #[cfg(feature = "liquid")]
-        return vec!["liquid".to_string(), "liquidregtest".to_string()];
+        return vec![
+            "liquid".to_string(),
+            "liquidtestnet".to_string(),
+            "liquidregtest".to_string(),
+        ];
     }
 }
 
@@ -153,6 +159,8 @@ impl From<&str> for Network {
             #[cfg(feature = "liquid")]
             "liquid" => Network::Liquid,
             #[cfg(feature = "liquid")]
+            "liquidtestnet" => Network::LiquidTestnet,
+            #[cfg(feature = "liquid")]
             "liquidregtest" => Network::LiquidRegtest,
 
             _ => panic!("unsupported Bitcoin network: {:?}", network_name),
diff --git a/src/config.rs b/src/config.rs
index 5982efebe..ea7376385 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -236,7 +236,8 @@ impl Config {
             .map(|s| s.parse().expect("invalid parent network"))
             .unwrap_or_else(|| match network_type {
                 Network::Liquid => BNetwork::Bitcoin,
-                Network::LiquidRegtest => BNetwork::Regtest,
+                // XXX liquid testnet/regtest don't have a parent chain
+                Network::LiquidTestnet | Network::LiquidRegtest => BNetwork::Regtest,
             });
 
         #[cfg(feature = "liquid")]
@@ -255,7 +256,7 @@ impl Config {
             #[cfg(feature = "liquid")]
             Network::Liquid => 7041,
             #[cfg(feature = "liquid")]
-            Network::LiquidRegtest => 7041,
+            Network::LiquidTestnet | Network::LiquidRegtest => 7040,
         };
         let default_electrum_port = match network_type {
             #[cfg(not(feature = "liquid"))]
@@ -270,6 +271,8 @@ impl Config {
             #[cfg(feature = "liquid")]
             Network::Liquid => 51000,
             #[cfg(feature = "liquid")]
+            Network::LiquidTestnet => 51301,
+            #[cfg(feature = "liquid")]
             Network::LiquidRegtest => 51401,
         };
         let default_http_port = match network_type {
@@ -285,6 +288,8 @@ impl Config {
             #[cfg(feature = "liquid")]
             Network::Liquid => 3000,
             #[cfg(feature = "liquid")]
+            Network::LiquidTestnet => 3001,
+            #[cfg(feature = "liquid")]
             Network::LiquidRegtest => 3002,
         };
         let default_monitoring_port = match network_type {
@@ -300,6 +305,8 @@ impl Config {
             #[cfg(feature = "liquid")]
             Network::Liquid => 34224,
             #[cfg(feature = "liquid")]
+            Network::LiquidTestnet => 44324,
+            #[cfg(feature = "liquid")]
             Network::LiquidRegtest => 44224,
         };
 
@@ -347,6 +354,8 @@ impl Config {
             #[cfg(feature = "liquid")]
             Network::Liquid => daemon_dir.push("liquidv1"),
             #[cfg(feature = "liquid")]
+            Network::LiquidTestnet => daemon_dir.push("liquidtestnetv1"),
+            #[cfg(feature = "liquid")]
             Network::LiquidRegtest => daemon_dir.push("liquidregtest"),
         }
         let blocks_dir = m
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index 647c87599..49b215f18 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -20,6 +20,9 @@ lazy_static! {
         AssetId::from_hex("6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d")
             .unwrap();
     pub static ref NATIVE_ASSET_ID_TESTNET: AssetId =
+        AssetId::from_hex("5d8629bf58c7f98e90e171a81058ce543418f0dc16e8459367773552b067f3f3")
+            .unwrap();
+    pub static ref NATIVE_ASSET_ID_REGTEST: AssetId =
         AssetId::from_hex("5ac9f65c0efcc4775e0baec4ec03abdde22473cd3cf33c0419ca290e0751b225")
             .unwrap();
 }
diff --git a/src/util/transaction.rs b/src/util/transaction.rs
index 7a34179e8..cb6065329 100644
--- a/src/util/transaction.rs
+++ b/src/util/transaction.rs
@@ -10,6 +10,8 @@ use bitcoin::hashes::hex::FromHex;
 lazy_static! {
     static ref REGTEST_INITIAL_ISSUANCE_PREVOUT: Txid =
         Txid::from_hex("50cdc410c9d0d61eeacc531f52d2c70af741da33af127c364e52ac1ee7c030a5").unwrap();
+    static ref TESTNET_INITIAL_ISSUANCE_PREVOUT: Txid =
+        Txid::from_hex("401eee35634bcaae6325f367674f5369cd9c9a2a892b7b5e971ede0a0781870f").unwrap();
 }
 
 #[derive(Serialize, Deserialize)]
@@ -61,7 +63,8 @@ pub fn has_prevout(txin: &TxIn) -> bool {
     #[cfg(feature = "liquid")]
     return !txin.is_coinbase()
         && !txin.is_pegin
-        && txin.previous_output.txid != *REGTEST_INITIAL_ISSUANCE_PREVOUT;
+        && txin.previous_output.txid != *REGTEST_INITIAL_ISSUANCE_PREVOUT
+        && txin.previous_output.txid != *TESTNET_INITIAL_ISSUANCE_PREVOUT;
 }
 
 pub fn is_spendable(txout: &TxOut) -> bool {

From ef2434f98b5a60405db5f99af75b7a1e30136ae7 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Wed, 22 Sep 2021 01:10:47 +0300
Subject: [PATCH 34/47] Update the liquid testnet network parameters

---
 src/chain.rs            | 15 +++++++++++++--
 src/config.rs           |  2 +-
 src/elements/asset.rs   |  2 +-
 src/util/transaction.rs |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/chain.rs b/src/chain.rs
index fec028e19..39f98d2bc 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -40,6 +40,15 @@ pub enum Network {
     LiquidRegtest,
 }
 
+#[cfg(feature = "liquid")]
+pub const LIQUID_TESTNET_PARAMS: address::AddressParams = address::AddressParams {
+    p2pkh_prefix: 36,
+    p2sh_prefix: 19,
+    blinded_prefix: 23,
+    bech_hrp: "tex",
+    blech_hrp: "tlq",
+};
+
 impl Network {
     #[cfg(not(feature = "liquid"))]
     pub fn magic(self) -> u32 {
@@ -49,7 +58,8 @@ impl Network {
     #[cfg(feature = "liquid")]
     pub fn magic(self) -> u32 {
         match self {
-            Network::Liquid | Network::LiquidRegtest | Network::LiquidTestnet => 0xDAB5_BFFA,
+            Network::Liquid | Network::LiquidRegtest => 0xDAB5_BFFA,
+            Network::LiquidTestnet => 0x62DD_0E41,
         }
     }
 
@@ -68,7 +78,8 @@ impl Network {
         // Liquid regtest uses elements's address params
         match self {
             Network::Liquid => &address::AddressParams::LIQUID,
-            Network::LiquidTestnet | Network::LiquidRegtest => &address::AddressParams::ELEMENTS,
+            Network::LiquidRegtest => &address::AddressParams::ELEMENTS,
+            Network::LiquidTestnet => &LIQUID_TESTNET_PARAMS,
         }
     }
 
diff --git a/src/config.rs b/src/config.rs
index ea7376385..309b4f19b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -354,7 +354,7 @@ impl Config {
             #[cfg(feature = "liquid")]
             Network::Liquid => daemon_dir.push("liquidv1"),
             #[cfg(feature = "liquid")]
-            Network::LiquidTestnet => daemon_dir.push("liquidtestnetv1"),
+            Network::LiquidTestnet => daemon_dir.push("liquidtestnet"),
             #[cfg(feature = "liquid")]
             Network::LiquidRegtest => daemon_dir.push("liquidregtest"),
         }
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index 49b215f18..a7c8ca342 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -20,7 +20,7 @@ lazy_static! {
         AssetId::from_hex("6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d")
             .unwrap();
     pub static ref NATIVE_ASSET_ID_TESTNET: AssetId =
-        AssetId::from_hex("5d8629bf58c7f98e90e171a81058ce543418f0dc16e8459367773552b067f3f3")
+        AssetId::from_hex("144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49")
             .unwrap();
     pub static ref NATIVE_ASSET_ID_REGTEST: AssetId =
         AssetId::from_hex("5ac9f65c0efcc4775e0baec4ec03abdde22473cd3cf33c0419ca290e0751b225")
diff --git a/src/util/transaction.rs b/src/util/transaction.rs
index cb6065329..07278b3a2 100644
--- a/src/util/transaction.rs
+++ b/src/util/transaction.rs
@@ -11,7 +11,7 @@ lazy_static! {
     static ref REGTEST_INITIAL_ISSUANCE_PREVOUT: Txid =
         Txid::from_hex("50cdc410c9d0d61eeacc531f52d2c70af741da33af127c364e52ac1ee7c030a5").unwrap();
     static ref TESTNET_INITIAL_ISSUANCE_PREVOUT: Txid =
-        Txid::from_hex("401eee35634bcaae6325f367674f5369cd9c9a2a892b7b5e971ede0a0781870f").unwrap();
+        Txid::from_hex("0c52d2526a5c9f00e9fb74afd15dd3caaf17c823159a514f929ae25193a43a52").unwrap();
 }
 
 #[derive(Serialize, Deserialize)]

From 0db507d5d2fcadc40934b8faa15799ef92364545 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 1 Oct 2021 21:22:49 +0300
Subject: [PATCH 35/47] Serialize the asset's issuance_prevout as an object

As was the case prior to https://github.com/rust-bitcoin/rust-bitcoin/pull/271
---
 src/elements/asset.rs   |  1 +
 src/util/mod.rs         |  3 ++-
 src/util/transaction.rs | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index a7c8ca342..b1624776c 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -49,6 +49,7 @@ pub struct NativeAsset {
 pub struct IssuedAsset {
     pub asset_id: AssetId,
     pub issuance_txin: TxInput,
+    #[serde(serialize_with = "crate::util::serialize_outpoint")]
     pub issuance_prevout: OutPoint,
     pub reissuance_token: AssetId,
 
diff --git a/src/util/mod.rs b/src/util/mod.rs
index d70b1738a..233e3efea 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -9,7 +9,8 @@ pub use self::block::{BlockHeaderMeta, BlockId, BlockMeta, BlockStatus, HeaderEn
 pub use self::fees::get_tx_fee;
 pub use self::script::{get_innerscripts, ScriptToAddr, ScriptToAsm};
 pub use self::transaction::{
-    extract_tx_prevouts, has_prevout, is_coinbase, is_spendable, TransactionStatus, TxInput,
+    extract_tx_prevouts, has_prevout, is_coinbase, is_spendable, serialize_outpoint,
+    TransactionStatus, TxInput,
 };
 
 use std::collections::HashMap;
diff --git a/src/util/transaction.rs b/src/util/transaction.rs
index 07278b3a2..ec0c28a6b 100644
--- a/src/util/transaction.rs
+++ b/src/util/transaction.rs
@@ -94,3 +94,14 @@ pub fn extract_tx_prevouts<'a>(
         })
         .collect()
 }
+
+pub fn serialize_outpoint<S>(outpoint: &OutPoint, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::ser::Serializer,
+{
+    use serde::ser::SerializeStruct;
+    let mut s = serializer.serialize_struct("OutPoint", 2)?;
+    s.serialize_field("txid", &outpoint.txid)?;
+    s.serialize_field("vout", &outpoint.vout)?;
+    s.end()
+}

From 499517c59f347d3127292e95be78c19a1a12fc83 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 1 Oct 2021 21:50:55 +0300
Subject: [PATCH 36/47] elements: Parse addresses using the configured
 network's params

The default Address FromStr implementation only works with the
built-in AddressParams::{LIQUID,ELEMENTS} network parameters.
---
 src/rest.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rest.rs b/src/rest.rs
index ebfaf3596..97f3ad790 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -9,7 +9,8 @@ use crate::util::{
 };
 
 #[cfg(not(feature = "liquid"))]
-use bitcoin::consensus::encode;
+use {bitcoin::consensus::encode, std::str::FromStr};
+
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::Error as HashError;
 use hex::{self, FromHexError};
@@ -33,7 +34,6 @@ use serde_json;
 use std::collections::HashMap;
 use std::num::ParseIntError;
 use std::os::unix::fs::FileTypeExt;
-use std::str::FromStr;
 use std::sync::Arc;
 use std::thread;
 use url::form_urlencoded;
@@ -1232,7 +1232,10 @@ fn to_scripthash(
 }
 
 fn address_to_scripthash(addr: &str, network: Network) -> Result<FullHash, HttpError> {
+    #[cfg(not(feature = "liquid"))]
     let addr = address::Address::from_str(addr)?;
+    #[cfg(feature = "liquid")]
+    let addr = address::Address::parse_with_params(addr, network.address_params())?;
 
     #[cfg(not(feature = "liquid"))]
     let is_expected_net = {

From 7220a867c8d81d190448c0bd95349d9c5fb72f0f Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sun, 3 Oct 2021 05:17:48 +0300
Subject: [PATCH 37/47] elements: Support networks where the native asset isn't
 pegged

This is the case in Liquid Testnet/Regtest, where the native asset
is created using the 'initialfreecoins' option.

The native asset id is still used to determine mining fees.
---
 src/chain.rs          |  9 ++++++++-
 src/elements/asset.rs | 36 +++++++++++++++++-------------------
 src/elements/peg.rs   |  6 ++++--
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/chain.rs b/src/chain.rs
index 39f98d2bc..a7feb3ffd 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -87,12 +87,19 @@ impl Network {
     pub fn native_asset(self) -> &'static AssetId {
         match self {
             Network::Liquid => &*asset::NATIVE_ASSET_ID,
-            // same for testnet and regtest
             Network::LiquidTestnet => &*asset::NATIVE_ASSET_ID_TESTNET,
             Network::LiquidRegtest => &*asset::NATIVE_ASSET_ID_REGTEST,
         }
     }
 
+    #[cfg(feature = "liquid")]
+    pub fn pegged_asset(self) -> Option<&'static AssetId> {
+        match self {
+            Network::Liquid => Some(&*asset::NATIVE_ASSET_ID),
+            Network::LiquidTestnet | Network::LiquidRegtest => None,
+        }
+    }
+
     pub fn names() -> Vec<String> {
         #[cfg(not(feature = "liquid"))]
         return vec![
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index b1624776c..44ee43625 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -35,14 +35,14 @@ fn parse_asset_id(sl: &[u8]) -> AssetId {
 #[serde(untagged)]
 pub enum LiquidAsset {
     Issued(IssuedAsset),
-    Native(NativeAsset),
+    Native(PeggedAsset),
 }
 
 #[derive(Serialize)]
-pub struct NativeAsset {
+pub struct PeggedAsset {
     pub asset_id: AssetId,
-    pub chain_stats: NativeAssetStats,
-    pub mempool_stats: NativeAssetStats,
+    pub chain_stats: PeggedAssetStats,
+    pub mempool_stats: PeggedAssetStats,
 }
 
 #[derive(Serialize)]
@@ -352,10 +352,10 @@ pub fn lookup_asset(
     asset_id: &AssetId,
     meta: Option<&AssetMeta>, // may optionally be provided if already known
 ) -> Result<Option<LiquidAsset>> {
-    if asset_id == query.network().native_asset() {
-        let (chain_stats, mempool_stats) = native_asset_stats(query);
+    if query.network().pegged_asset() == Some(asset_id) {
+        let (chain_stats, mempool_stats) = pegged_asset_stats(query, asset_id);
 
-        return Ok(Some(LiquidAsset::Native(NativeAsset {
+        return Ok(Some(LiquidAsset::Native(PeggedAsset {
             asset_id: *asset_id,
             chain_stats: chain_stats,
             mempool_stats: mempool_stats,
@@ -424,7 +424,7 @@ pub struct IssuedAssetStats {
 }
 
 #[derive(Serialize, Deserialize, Debug, Default)]
-pub struct NativeAssetStats {
+pub struct PeggedAssetStats {
     pub tx_count: usize,
     pub peg_in_count: usize,
     pub peg_in_amount: u64,
@@ -450,17 +450,15 @@ where
     }
 }
 
-// Get stats for the network's native asset
-fn native_asset_stats(query: &Query) -> (NativeAssetStats, NativeAssetStats) {
-    let asset_id = query.network().native_asset();
-
+// Get stats for the network's pegged asset
+fn pegged_asset_stats(query: &Query, asset_id: &AssetId) -> (PeggedAssetStats, PeggedAssetStats) {
     (
-        chain_asset_stats(query.chain(), asset_id, apply_native_asset_stats),
-        mempool_asset_stats(&query.mempool(), asset_id, apply_native_asset_stats),
+        chain_asset_stats(query.chain(), asset_id, apply_pegged_asset_stats),
+        mempool_asset_stats(&query.mempool(), asset_id, apply_pegged_asset_stats),
     )
 }
 
-// Get stats for user-issued assets
+// Get stats for issued assets
 fn issued_asset_stats(
     query: &Query,
     asset_id: &AssetId,
@@ -481,7 +479,7 @@ fn issued_asset_stats(
     (chain_stats, mempool_stats)
 }
 
-// Get on-chain confirmed asset stats (user-issued or the native asset)
+// Get on-chain confirmed asset stats (issued or the pegged asset)
 fn chain_asset_stats<T>(chain: &ChainQuery, asset_id: &AssetId, apply_fn: AssetStatApplyFn<T>) -> T
 where
     T: Default + serde::Serialize + serde::de::DeserializeOwned,
@@ -550,7 +548,7 @@ fn chain_asset_stats_delta<T>(
     (stats, lastblock)
 }
 
-// Get mempool asset stats (user-issued or the native asset)
+// Get mempool asset stats (issued or the pegged asset)
 pub fn mempool_asset_stats<T>(
     mempool: &Mempool,
     asset_id: &AssetId,
@@ -610,9 +608,9 @@ fn apply_issued_asset_stats(
     }
 }
 
-fn apply_native_asset_stats(
+fn apply_pegged_asset_stats(
     info: &TxHistoryInfo,
-    stats: &mut NativeAssetStats,
+    stats: &mut PeggedAssetStats,
     seen_txids: &mut HashSet<Txid>,
 ) {
     if seen_txids.insert(info.get_txid()) {
diff --git a/src/elements/peg.rs b/src/elements/peg.rs
index acae191d7..6efc074bd 100644
--- a/src/elements/peg.rs
+++ b/src/elements/peg.rs
@@ -5,9 +5,10 @@ use crate::chain::{bitcoin_genesis_hash, BNetwork, Network};
 use crate::util::{FullHash, ScriptToAsm};
 
 pub fn get_pegin_data(txout: &TxIn, network: Network) -> Option<PeginData> {
+    let pegged_asset_id = network.pegged_asset()?;
     txout
         .pegin_data()
-        .filter(|pegin| pegin.asset == Asset::Explicit(*network.native_asset()))
+        .filter(|pegin| pegin.asset == Asset::Explicit(*pegged_asset_id))
 }
 
 pub fn get_pegout_data(
@@ -15,8 +16,9 @@ pub fn get_pegout_data(
     network: Network,
     parent_network: BNetwork,
 ) -> Option<PegoutData> {
+    let pegged_asset_id = network.pegged_asset()?;
     txout.pegout_data().filter(|pegout| {
-        pegout.asset == Asset::Explicit(*network.native_asset())
+        pegout.asset == Asset::Explicit(*pegged_asset_id)
             && pegout.genesis_hash == bitcoin_genesis_hash(parent_network)
     })
 }

From e3a819e0743a1a18907646dd99f3e233163cb6ba Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 9 Oct 2021 09:31:45 +0300
Subject: [PATCH 38/47] Downgrade to rust-elements v0.16.0

A regression introduced in v0.17.0 made `Value` incompatible with
bincode: https://github.com/ElementsProject/rust-elements/pull/96

This also requires downgrading rust-bitcoin to v0.26, to match the
version used by rust-elements.

This reverts commit df99d5e47fc9821da2cb8c393a1128387ad96c35.
---
 Cargo.lock              | 187 ++++++++--------------------------------
 Cargo.toml              |   4 +-
 src/elements/asset.rs   |   5 +-
 src/elements/mod.rs     |   5 +-
 src/new_index/schema.rs |   5 +-
 src/rest.rs             |   7 +-
 6 files changed, 49 insertions(+), 164 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f11d4b3bb..d593d48e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,12 +53,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -95,6 +89,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
+[[package]]
+name = "bech32"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1"
+
 [[package]]
 name = "bech32"
 version = "0.8.1"
@@ -129,13 +129,25 @@ dependencies = [
  "shlex",
 ]
 
+[[package]]
+name = "bitcoin"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6742ec672d3f12506f4ac5c0d853926ff1f94e675f60ffd3224039972bf663f1"
+dependencies = [
+ "bech32 0.7.3",
+ "bitcoin_hashes 0.9.7",
+ "secp256k1",
+ "serde 1.0.127",
+]
+
 [[package]]
 name = "bitcoin"
 version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a427b27dae305157520d86673f2393b3eb08d880609abfcffc6e3c3c820e764"
 dependencies = [
- "bech32",
+ "bech32 0.8.1",
  "bitcoin_hashes 0.10.0",
  "secp256k1",
  "serde 1.0.127",
@@ -152,6 +164,9 @@ name = "bitcoin_hashes"
 version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
+dependencies = [
+ "serde 1.0.127",
+]
 
 [[package]]
 name = "bitcoin_hashes"
@@ -267,15 +282,6 @@ dependencies = [
  "vec_map",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.1"
@@ -360,7 +366,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin",
+ "bitcoin 0.26.2",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -401,7 +407,7 @@ name = "electrum-client"
 version = "0.8.0"
 source = "git+https://github.com/Blockstream/rust-electrum-client?rev=d3792352992a539afffbe11501d1aff9fd5b919d#d3792352992a539afffbe11501d1aff9fd5b919d"
 dependencies = [
- "bitcoin",
+ "bitcoin 0.27.0",
  "log",
  "rustls",
  "serde 1.0.127",
@@ -413,13 +419,12 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.18.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa776445bd0ef9b30eab2e7c09cacc3a545e0502c178fdca9c4c6d80f738d519"
+checksum = "e77124f1ecdbeb92691beae289c44553df24c94c86dd3bc07a7037c2064ac3d3"
 dependencies = [
- "bitcoin",
- "bitcoin_hashes 0.10.0",
- "secp256k1-zkp",
+ "bitcoin 0.26.2",
+ "bitcoin_hashes 0.9.7",
  "serde 1.0.127",
  "serde_json 0.9.10",
  "slip21",
@@ -505,7 +510,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -524,7 +529,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "futures-core",
  "futures-macro",
  "futures-task",
@@ -794,7 +799,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
 ]
 
 [[package]]
@@ -804,7 +809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
- "autocfg 1.0.1",
+ "autocfg",
 ]
 
 [[package]]
@@ -856,7 +861,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "num-traits 0.2.14",
 ]
 
@@ -875,7 +880,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
 ]
 
 [[package]]
@@ -1068,25 +1073,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.7",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.4"
@@ -1094,19 +1080,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rand_core 0.6.3",
- "rand_hc 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.3.1",
+ "rand_hc",
 ]
 
 [[package]]
@@ -1143,15 +1119,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.3.1"
@@ -1161,66 +1128,13 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.7",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rayon"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -1398,8 +1312,6 @@ version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
- "bitcoin_hashes 0.9.7",
- "rand 0.6.5",
  "secp256k1-sys",
  "serde 1.0.127",
 ]
@@ -1413,29 +1325,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "secp256k1-zkp"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e57b977141f57b224fc579c23dac5978b5f594281450fe8b5e2b6aa816d0fde"
-dependencies = [
- "bitcoin_hashes 0.9.7",
- "rand 0.6.5",
- "secp256k1",
- "secp256k1-zkp-sys",
- "serde 1.0.127",
-]
-
-[[package]]
-name = "secp256k1-zkp-sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45a3c4e1291985397df9770f864ed88bd51ee684b13a384f49d2fedb29f86f0"
-dependencies = [
- "cc",
- "secp256k1-sys",
-]
-
 [[package]]
 name = "serde"
 version = "0.9.15"
@@ -1722,7 +1611,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg",
  "libc",
  "mio",
  "num_cpus",
diff --git a/Cargo.toml b/Cargo.toml
index 96d740188..b8c9b60d3 100644
--- a/Cargo.toml
+++ b/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.26.0", 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 }
+elements = { version = "0.16.0", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index 44ee43625..a8de53c11 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -4,7 +4,6 @@ use std::sync::{Arc, RwLock};
 use bitcoin::hashes::{hex::FromHex, sha256, Hash};
 use elements::confidential::{Asset, Value};
 use elements::encode::{deserialize, serialize};
-use elements::secp256k1_zkp::ZERO_TWEAK;
 use elements::{issuance::ContractHash, AssetId, AssetIssuance, OutPoint, Transaction, TxIn};
 
 use crate::chain::{BNetwork, BlockHash, Network, Txid};
@@ -279,7 +278,7 @@ fn index_tx_assets(
                 }),
             ));
         } else if txi.has_issuance() {
-            let is_reissuance = txi.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
+            let is_reissuance = txi.asset_issuance.asset_blinding_nonce != [0u8; 32];
 
             let asset_entropy = get_issuance_entropy(txi).expect("invalid issuance");
             let asset_id = AssetId::from_entropy(asset_entropy);
@@ -396,7 +395,7 @@ pub fn get_issuance_entropy(txin: &TxIn) -> Result<sha256::Midstate> {
         bail!("input has no issuance");
     }
 
-    let is_reissuance = txin.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
+    let is_reissuance = txin.asset_issuance.asset_blinding_nonce != [0u8; 32];
 
     Ok(if !is_reissuance {
         let contract_hash = ContractHash::from_slice(&txin.asset_issuance.asset_entropy)
diff --git a/src/elements/mod.rs b/src/elements/mod.rs
index 1e4a62425..3da54f0d6 100644
--- a/src/elements/mod.rs
+++ b/src/elements/mod.rs
@@ -1,5 +1,4 @@
 use bitcoin::hashes::{hex::ToHex, Hash};
-use elements::secp256k1_zkp::ZERO_TWEAK;
 use elements::{confidential::Value, encode::serialize, issuance::ContractHash, AssetId, TxIn};
 
 pub mod asset;
@@ -32,7 +31,7 @@ pub struct IssuanceValue {
 impl From<&TxIn> for IssuanceValue {
     fn from(txin: &TxIn) -> Self {
         let issuance = &txin.asset_issuance;
-        let is_reissuance = issuance.asset_blinding_nonce != ZERO_TWEAK;
+        let is_reissuance = issuance.asset_blinding_nonce != [0u8; 32];
 
         let asset_entropy = get_issuance_entropy(txin).expect("invalid issuance");
         let asset_id = AssetId::from_entropy(asset_entropy);
@@ -49,7 +48,7 @@ impl From<&TxIn> for IssuanceValue {
             contract_hash: contract_hash.map(|h| h.to_hex()),
             is_reissuance,
             asset_blinding_nonce: if is_reissuance {
-                Some(hex::encode(issuance.asset_blinding_nonce.as_ref()))
+                Some(hex::encode(issuance.asset_blinding_nonce))
             } else {
                 None
             },
diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index 35e49f8de..8820b3f7a 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -915,11 +915,12 @@ impl ChainQuery {
         let blockid = self.tx_confirming_block(txid)?;
         let headerentry = self.header_by_hash(&blockid.hash)?;
         let block_txids = self.get_block_txids(&blockid.hash)?;
+        let match_txids = vec![*txid].into_iter().collect();
 
-        Some(MerkleBlock::from_header_txids_with_predicate(
+        Some(MerkleBlock::from_header_txids(
             headerentry.header(),
             &block_txids,
-            |t| t == txid,
+            &match_txids,
         ))
     }
 
diff --git a/src/rest.rs b/src/rest.rs
index 97f3ad790..72f20dcf9 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -427,12 +427,9 @@ impl From<Utxo> for UtxoValue {
                 _ => None,
             },
             #[cfg(feature = "liquid")]
-            surjection_proof: utxo
-                .witness
-                .surjection_proof
-                .map_or(vec![], |p| p.serialize()),
+            surjection_proof: utxo.witness.surjection_proof,
             #[cfg(feature = "liquid")]
-            range_proof: utxo.witness.rangeproof.map_or(vec![], |p| p.serialize()),
+            range_proof: utxo.witness.rangeproof,
         }
     }
 }

From b5b813f80b100197d14b2106bc8472954c80fb04 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Tue, 9 Nov 2021 08:52:38 +0200
Subject: [PATCH 39/47] Label P2TR outputs as such

---
 src/rest.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/rest.rs b/src/rest.rs
index 72f20dcf9..79eb6620a 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -11,6 +11,7 @@ use crate::util::{
 #[cfg(not(feature = "liquid"))]
 use {bitcoin::consensus::encode, std::str::FromStr};
 
+use bitcoin::blockdata::opcodes;
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::Error as HashError;
 use hex::{self, FromHexError};
@@ -318,6 +319,8 @@ impl TxOutValue {
             "v0_p2wpkh"
         } else if script.is_v0_p2wsh() {
             "v0_p2wsh"
+        } else if is_v1_p2tr(script) {
+            "v1_p2tr"
         } else if script.is_provably_unspendable() {
             "provably_unspendable"
         } else {
@@ -345,6 +348,12 @@ impl TxOutValue {
     }
 }
 
+fn is_v1_p2tr(script: &Script) -> bool {
+    script.len() == 34
+        && script[0] == opcodes::all::OP_PUSHNUM_1.into_u8()
+        && script[1] == opcodes::all::OP_PUSHBYTES_32.into_u8()
+}
+
 #[derive(Serialize)]
 struct UtxoValue {
     txid: Txid,

From 948429168772cd6bfc592c7eeadc3030b67eef59 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Tue, 9 Nov 2021 08:42:31 +0200
Subject: [PATCH 40/47] Upgrade rust-elements and rust-bitcoin back up

Using rust-elements from github, pending the release of
https://github.com/ElementsProject/rust-elements/pull/98

They were originally downgraded in e3a819e0743a1a18907646dd99f3e233163cb6ba.
---
 Cargo.lock              | 188 +++++++++++++++++++++++++++++++---------
 Cargo.toml              |   9 +-
 src/elements/asset.rs   |   5 +-
 src/elements/mod.rs     |   5 +-
 src/new_index/schema.rs |   5 +-
 src/rest.rs             |   7 +-
 6 files changed, 169 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d593d48e7..5a7062213 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,6 +53,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
@@ -89,12 +95,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
-[[package]]
-name = "bech32"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1"
-
 [[package]]
 name = "bech32"
 version = "0.8.1"
@@ -129,25 +129,13 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "bitcoin"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6742ec672d3f12506f4ac5c0d853926ff1f94e675f60ffd3224039972bf663f1"
-dependencies = [
- "bech32 0.7.3",
- "bitcoin_hashes 0.9.7",
- "secp256k1",
- "serde 1.0.127",
-]
-
 [[package]]
 name = "bitcoin"
 version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a427b27dae305157520d86673f2393b3eb08d880609abfcffc6e3c3c820e764"
 dependencies = [
- "bech32 0.8.1",
+ "bech32",
  "bitcoin_hashes 0.10.0",
  "secp256k1",
  "serde 1.0.127",
@@ -164,9 +152,6 @@ name = "bitcoin_hashes"
 version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
-dependencies = [
- "serde 1.0.127",
-]
 
 [[package]]
 name = "bitcoin_hashes"
@@ -282,6 +267,15 @@ dependencies = [
  "vec_map",
 ]
 
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.1"
@@ -366,7 +360,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin 0.26.2",
+ "bitcoin",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -407,7 +401,7 @@ name = "electrum-client"
 version = "0.8.0"
 source = "git+https://github.com/Blockstream/rust-electrum-client?rev=d3792352992a539afffbe11501d1aff9fd5b919d#d3792352992a539afffbe11501d1aff9fd5b919d"
 dependencies = [
- "bitcoin 0.27.0",
+ "bitcoin",
  "log",
  "rustls",
  "serde 1.0.127",
@@ -419,12 +413,12 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77124f1ecdbeb92691beae289c44553df24c94c86dd3bc07a7037c2064ac3d3"
+version = "0.18.0"
+source = "git+https://github.com/ElementsProject/rust-elements?rev=53d5729f8cdc3623f9f110edba86aeaa9059af5b#53d5729f8cdc3623f9f110edba86aeaa9059af5b"
 dependencies = [
- "bitcoin 0.26.2",
- "bitcoin_hashes 0.9.7",
+ "bitcoin",
+ "bitcoin_hashes 0.10.0",
+ "secp256k1-zkp",
  "serde 1.0.127",
  "serde_json 0.9.10",
  "slip21",
@@ -510,7 +504,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "proc-macro-hack",
  "proc-macro2",
  "quote",
@@ -529,7 +523,7 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "futures-core",
  "futures-macro",
  "futures-task",
@@ -799,7 +793,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -809,7 +803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -861,7 +855,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "num-traits 0.2.14",
 ]
 
@@ -880,7 +874,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
 ]
 
 [[package]]
@@ -1073,6 +1067,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+dependencies = [
+ "autocfg 0.1.7",
+ "libc",
+ "rand_chacha 0.1.1",
+ "rand_core 0.4.2",
+ "rand_hc 0.1.0",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg",
+ "rand_xorshift",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.4"
@@ -1080,9 +1093,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
- "rand_chacha",
+ "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc",
+ "rand_hc 0.3.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+dependencies = [
+ "autocfg 0.1.7",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
@@ -1119,6 +1142,15 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.3.1"
@@ -1128,13 +1160,66 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+dependencies = [
+ "libc",
+ "rand_core 0.4.2",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+dependencies = [
+ "autocfg 0.1.7",
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "rayon"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -1312,6 +1397,8 @@ version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
+ "bitcoin_hashes 0.9.7",
+ "rand 0.6.5",
  "secp256k1-sys",
  "serde 1.0.127",
 ]
@@ -1325,6 +1412,29 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-zkp"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e57b977141f57b224fc579c23dac5978b5f594281450fe8b5e2b6aa816d0fde"
+dependencies = [
+ "bitcoin_hashes 0.9.7",
+ "rand 0.6.5",
+ "secp256k1",
+ "secp256k1-zkp-sys",
+ "serde 1.0.127",
+]
+
+[[package]]
+name = "secp256k1-zkp-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b45a3c4e1291985397df9770f864ed88bd51ee684b13a384f49d2fedb29f86f0"
+dependencies = [
+ "cc",
+ "secp256k1-sys",
+]
+
 [[package]]
 name = "serde"
 version = "0.9.15"
@@ -1611,7 +1721,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
 dependencies = [
- "autocfg",
+ "autocfg 1.0.1",
  "libc",
  "mio",
  "num_cpus",
diff --git a/Cargo.toml b/Cargo.toml
index b8c9b60d3..a6452fc91 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,11 +22,11 @@ arraydeque = "0.4"
 arrayref = "0.3.6"
 base64 = "0.13.0"
 bincode = "1.3.1"
-bitcoin = { version = "0.26.0", features = [ "use-serde" ] }
+bitcoin = { version = "0.27", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
 dirs = "3.0.1"
-elements = { version = "0.16.0", features = [ "serde-feature" ], optional = true }
+elements = { version = "0.18", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
@@ -71,3 +71,8 @@ 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 = "53d5729f8cdc3623f9f110edba86aeaa9059af5b"
diff --git a/src/elements/asset.rs b/src/elements/asset.rs
index a8de53c11..44ee43625 100644
--- a/src/elements/asset.rs
+++ b/src/elements/asset.rs
@@ -4,6 +4,7 @@ use std::sync::{Arc, RwLock};
 use bitcoin::hashes::{hex::FromHex, sha256, Hash};
 use elements::confidential::{Asset, Value};
 use elements::encode::{deserialize, serialize};
+use elements::secp256k1_zkp::ZERO_TWEAK;
 use elements::{issuance::ContractHash, AssetId, AssetIssuance, OutPoint, Transaction, TxIn};
 
 use crate::chain::{BNetwork, BlockHash, Network, Txid};
@@ -278,7 +279,7 @@ fn index_tx_assets(
                 }),
             ));
         } else if txi.has_issuance() {
-            let is_reissuance = txi.asset_issuance.asset_blinding_nonce != [0u8; 32];
+            let is_reissuance = txi.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
 
             let asset_entropy = get_issuance_entropy(txi).expect("invalid issuance");
             let asset_id = AssetId::from_entropy(asset_entropy);
@@ -395,7 +396,7 @@ pub fn get_issuance_entropy(txin: &TxIn) -> Result<sha256::Midstate> {
         bail!("input has no issuance");
     }
 
-    let is_reissuance = txin.asset_issuance.asset_blinding_nonce != [0u8; 32];
+    let is_reissuance = txin.asset_issuance.asset_blinding_nonce != ZERO_TWEAK;
 
     Ok(if !is_reissuance {
         let contract_hash = ContractHash::from_slice(&txin.asset_issuance.asset_entropy)
diff --git a/src/elements/mod.rs b/src/elements/mod.rs
index 3da54f0d6..1e4a62425 100644
--- a/src/elements/mod.rs
+++ b/src/elements/mod.rs
@@ -1,4 +1,5 @@
 use bitcoin::hashes::{hex::ToHex, Hash};
+use elements::secp256k1_zkp::ZERO_TWEAK;
 use elements::{confidential::Value, encode::serialize, issuance::ContractHash, AssetId, TxIn};
 
 pub mod asset;
@@ -31,7 +32,7 @@ pub struct IssuanceValue {
 impl From<&TxIn> for IssuanceValue {
     fn from(txin: &TxIn) -> Self {
         let issuance = &txin.asset_issuance;
-        let is_reissuance = issuance.asset_blinding_nonce != [0u8; 32];
+        let is_reissuance = issuance.asset_blinding_nonce != ZERO_TWEAK;
 
         let asset_entropy = get_issuance_entropy(txin).expect("invalid issuance");
         let asset_id = AssetId::from_entropy(asset_entropy);
@@ -48,7 +49,7 @@ impl From<&TxIn> for IssuanceValue {
             contract_hash: contract_hash.map(|h| h.to_hex()),
             is_reissuance,
             asset_blinding_nonce: if is_reissuance {
-                Some(hex::encode(issuance.asset_blinding_nonce))
+                Some(hex::encode(issuance.asset_blinding_nonce.as_ref()))
             } else {
                 None
             },
diff --git a/src/new_index/schema.rs b/src/new_index/schema.rs
index 8820b3f7a..35e49f8de 100644
--- a/src/new_index/schema.rs
+++ b/src/new_index/schema.rs
@@ -915,12 +915,11 @@ impl ChainQuery {
         let blockid = self.tx_confirming_block(txid)?;
         let headerentry = self.header_by_hash(&blockid.hash)?;
         let block_txids = self.get_block_txids(&blockid.hash)?;
-        let match_txids = vec![*txid].into_iter().collect();
 
-        Some(MerkleBlock::from_header_txids(
+        Some(MerkleBlock::from_header_txids_with_predicate(
             headerentry.header(),
             &block_txids,
-            &match_txids,
+            |t| t == txid,
         ))
     }
 
diff --git a/src/rest.rs b/src/rest.rs
index 79eb6620a..639184c53 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -436,9 +436,12 @@ impl From<Utxo> for UtxoValue {
                 _ => None,
             },
             #[cfg(feature = "liquid")]
-            surjection_proof: utxo.witness.surjection_proof,
+            surjection_proof: utxo
+                .witness
+                .surjection_proof
+                .map_or(vec![], |p| p.serialize()),
             #[cfg(feature = "liquid")]
-            range_proof: utxo.witness.rangeproof,
+            range_proof: utxo.witness.rangeproof.map_or(vec![], |p| p.serialize()),
         }
     }
 }

From 703c6a20d52b61a234a18812503bd754d448992a Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Wed, 10 Nov 2021 02:40:02 +0200
Subject: [PATCH 41/47] Fix P2TR labeling in liquid mode

---
 src/rest.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/rest.rs b/src/rest.rs
index 639184c53..36c472542 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -11,7 +11,6 @@ use crate::util::{
 #[cfg(not(feature = "liquid"))]
 use {bitcoin::consensus::encode, std::str::FromStr};
 
-use bitcoin::blockdata::opcodes;
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::Error as HashError;
 use hex::{self, FromHexError};
@@ -348,11 +347,17 @@ impl TxOutValue {
     }
 }
 
+#[cfg(not(feature = "liquid"))]
 fn is_v1_p2tr(script: &Script) -> bool {
+    use bitcoin::blockdata::opcodes;
     script.len() == 34
         && script[0] == opcodes::all::OP_PUSHNUM_1.into_u8()
         && script[1] == opcodes::all::OP_PUSHBYTES_32.into_u8()
 }
+#[cfg(feature = "liquid")]
+fn is_v1_p2tr(_script: &Script) -> bool {
+    false
+}
 
 #[derive(Serialize)]
 struct UtxoValue {

From 54dcf494f95779480e0643bd52dc616e7b8c4416 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sun, 21 Nov 2021 04:00:00 +0200
Subject: [PATCH 42/47] Detect P2TR scripts in Liquid mode

---
 src/rest.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/rest.rs b/src/rest.rs
index 36c472542..eb5fc57a1 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -11,6 +11,7 @@ use crate::util::{
 #[cfg(not(feature = "liquid"))]
 use {bitcoin::consensus::encode, std::str::FromStr};
 
+use bitcoin::blockdata::opcodes;
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::hashes::Error as HashError;
 use hex::{self, FromHexError};
@@ -346,18 +347,15 @@ impl TxOutValue {
         }
     }
 }
-
-#[cfg(not(feature = "liquid"))]
 fn is_v1_p2tr(script: &Script) -> bool {
-    use bitcoin::blockdata::opcodes;
+    // This can be removed once https://github.com/ElementsProject/rust-elements/pull/102 makes it in.
+    #[cfg(feature = "liquid")]
+    let script = script.as_bytes();
+
     script.len() == 34
         && script[0] == opcodes::all::OP_PUSHNUM_1.into_u8()
         && script[1] == opcodes::all::OP_PUSHBYTES_32.into_u8()
 }
-#[cfg(feature = "liquid")]
-fn is_v1_p2tr(_script: &Script) -> bool {
-    false
-}
 
 #[derive(Serialize)]
 struct UtxoValue {

From 253040e346664976c12e6c214ee2858a4dad2e06 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Wed, 12 Jan 2022 22:16:32 +0200
Subject: [PATCH 43/47] Update rust-elements to current master

---
 Cargo.lock  | 77 +++++++++++++----------------------------------------
 Cargo.toml  |  2 +-
 src/rest.rs |  4 ---
 3 files changed, 20 insertions(+), 63 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a7062213..dfbaeb2bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,7 +107,7 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "serde 1.0.127",
+ "serde",
 ]
 
 [[package]]
@@ -138,7 +138,7 @@ dependencies = [
  "bech32",
  "bitcoin_hashes 0.10.0",
  "secp256k1",
- "serde 1.0.127",
+ "serde",
 ]
 
 [[package]]
@@ -159,7 +159,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0"
 dependencies = [
- "serde 1.0.127",
+ "serde",
 ]
 
 [[package]]
@@ -230,7 +230,7 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
  "libc",
  "num-integer",
- "num-traits 0.2.14",
+ "num-traits",
  "time 0.1.43",
  "winapi 0.3.9",
 ]
@@ -340,12 +340,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
 [[package]]
 name = "either"
 version = "1.6.1"
@@ -382,9 +376,9 @@ dependencies = [
  "rocksdb 0.12.4",
  "rocksdb 0.17.0",
  "rust-crypto",
- "serde 1.0.127",
+ "serde",
  "serde_derive",
- "serde_json 1.0.66",
+ "serde_json",
  "signal-hook",
  "socket2",
  "stderrlog",
@@ -404,8 +398,8 @@ dependencies = [
  "bitcoin",
  "log",
  "rustls",
- "serde 1.0.127",
- "serde_json 1.0.66",
+ "serde",
+ "serde_json",
  "socks",
  "webpki",
  "webpki-roots",
@@ -414,13 +408,13 @@ dependencies = [
 [[package]]
 name = "elements"
 version = "0.18.0"
-source = "git+https://github.com/ElementsProject/rust-elements?rev=53d5729f8cdc3623f9f110edba86aeaa9059af5b#53d5729f8cdc3623f9f110edba86aeaa9059af5b"
+source = "git+https://github.com/ElementsProject/rust-elements?rev=d988bd7ed9cf539b8fea0da042efa5a4e1eef86f#d988bd7ed9cf539b8fea0da042efa5a4e1eef86f"
 dependencies = [
  "bitcoin",
  "bitcoin_hashes 0.10.0",
  "secp256k1-zkp",
- "serde 1.0.127",
- "serde_json 0.9.10",
+ "serde",
+ "serde_json",
  "slip21",
 ]
 
@@ -586,7 +580,7 @@ checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 0.4.7",
+ "itoa",
 ]
 
 [[package]]
@@ -626,7 +620,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 0.4.7",
+ "itoa",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -677,12 +671,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itoa"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
-
 [[package]]
 name = "itoa"
 version = "0.4.7"
@@ -856,16 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
  "autocfg 1.0.1",
- "num-traits 0.2.14",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-dependencies = [
- "num-traits 0.2.14",
+ "num-traits",
 ]
 
 [[package]]
@@ -1400,7 +1379,7 @@ dependencies = [
  "bitcoin_hashes 0.9.7",
  "rand 0.6.5",
  "secp256k1-sys",
- "serde 1.0.127",
+ "serde",
 ]
 
 [[package]]
@@ -1422,7 +1401,7 @@ dependencies = [
  "rand 0.6.5",
  "secp256k1",
  "secp256k1-zkp-sys",
- "serde 1.0.127",
+ "serde",
 ]
 
 [[package]]
@@ -1435,12 +1414,6 @@ dependencies = [
  "secp256k1-sys",
 ]
 
-[[package]]
-name = "serde"
-version = "0.9.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
-
 [[package]]
 name = "serde"
 version = "1.0.127"
@@ -1461,27 +1434,15 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_json"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
-dependencies = [
- "dtoa",
- "itoa 0.3.4",
- "num-traits 0.1.43",
- "serde 0.9.15",
-]
-
 [[package]]
 name = "serde_json"
 version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
 dependencies = [
- "itoa 0.4.7",
+ "itoa",
  "ryu",
- "serde 1.0.127",
+ "serde",
 ]
 
 [[package]]
@@ -1683,7 +1644,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a776787d9c5d455bec3db044586ccdd8a9c74d5da5dc319fb80f3db08808fe6"
 dependencies = [
- "itoa 0.4.7",
+ "itoa",
  "libc",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index a6452fc91..9ab5cbf4b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,4 +75,4 @@ 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 = "53d5729f8cdc3623f9f110edba86aeaa9059af5b"
+rev = "d988bd7ed9cf539b8fea0da042efa5a4e1eef86f"
diff --git a/src/rest.rs b/src/rest.rs
index eb5fc57a1..515120efe 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -348,10 +348,6 @@ impl TxOutValue {
     }
 }
 fn is_v1_p2tr(script: &Script) -> bool {
-    // This can be removed once https://github.com/ElementsProject/rust-elements/pull/102 makes it in.
-    #[cfg(feature = "liquid")]
-    let script = script.as_bytes();
-
     script.len() == 34
         && script[0] == opcodes::all::OP_PUSHNUM_1.into_u8()
         && script[1] == opcodes::all::OP_PUSHBYTES_32.into_u8()

From 3483d23fc223fe8d847d2878b0786b5bec548a15 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 22 Apr 2022 07:09:52 +0300
Subject: [PATCH 44/47] Update crates

---
 Cargo.lock | 575 +++++++++++++++++++++++------------------------------
 Cargo.toml |   6 +-
 2 files changed, 257 insertions(+), 324 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dfbaeb2bb..5cb17a66d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,10 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
  "gimli",
 ]
@@ -17,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ansi_term"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -55,21 +57,24 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
+dependencies = [
+ "autocfg 1.1.0",
+]
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.61"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
+checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
 dependencies = [
  "addr2line",
  "cc",
@@ -112,9 +117,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.59.1"
+version = "0.59.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375"
+checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -131,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "bitcoin"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a427b27dae305157520d86673f2393b3eb08d880609abfcffc6e3c3c820e764"
+checksum = "9a41df6ad9642c5c15ae312dd3d074de38fd3eb7cc87ad4ce10f90292a83fe4d"
 dependencies = [
  "bech32",
  "bitcoin_hashes 0.10.0",
@@ -168,23 +173,11 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitvec"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "bumpalo"
-version = "3.7.0"
+version = "3.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
 
 [[package]]
 name = "byteorder"
@@ -194,24 +187,24 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "cc"
-version = "1.0.69"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
  "jobserver",
 ]
 
 [[package]]
 name = "cexpr"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
  "nom",
 ]
@@ -243,9 +236,9 @@ checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
 
 [[package]]
 name = "clang-sys"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
+checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21"
 dependencies = [
  "glob",
  "libc",
@@ -254,9 +247,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
  "ansi_term",
  "atty",
@@ -278,9 +271,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -299,10 +292,11 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
 dependencies = [
+ "autocfg 1.1.0",
  "cfg-if",
  "crossbeam-utils",
  "lazy_static",
@@ -312,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
 dependencies = [
  "cfg-if",
  "lazy_static",
@@ -322,18 +316,18 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "3.0.2"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
  "libc",
  "redox_users",
@@ -384,7 +378,7 @@ dependencies = [
  "stderrlog",
  "sysconf",
  "tempfile",
- "time 0.3.1",
+ "time 0.3.9",
  "tiny_http",
  "tokio",
  "url",
@@ -420,9 +414,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -431,11 +425,11 @@ dependencies = [
 
 [[package]]
 name = "errno-dragonfly"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
 dependencies = [
- "gcc",
+ "cc",
  "libc",
 ]
 
@@ -449,6 +443,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -471,35 +474,27 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
-[[package]]
-name = "funty"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
-
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
- "autocfg 1.0.1",
- "proc-macro-hack",
  "proc-macro2",
  "quote",
  "syn",
@@ -507,24 +502,21 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
- "autocfg 1.0.1",
  "futures-core",
  "futures-macro",
  "futures-task",
  "pin-project-lite",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab",
 ]
 
@@ -536,20 +528,20 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
+checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
 [[package]]
 name = "glob"
@@ -574,9 +566,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
  "bytes",
  "fnv",
@@ -585,9 +577,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
  "bytes",
  "http",
@@ -596,21 +588,21 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.5.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
+checksum = "6330e8a36bd8c859f3fa6d9382911fbb7147ec39807f63b923933a247240b9ba"
 
 [[package]]
 name = "httpdate"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
-version = "0.14.11"
+version = "0.14.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11"
+checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -655,27 +647,27 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
 name = "jobserver"
@@ -688,9 +680,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.53"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -719,15 +711,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.99"
+version = "0.2.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
 
 [[package]]
 name = "libloading"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
  "cfg-if",
  "winapi 0.3.9",
@@ -747,18 +739,19 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
+ "autocfg 1.1.0",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
 dependencies = [
  "cfg-if",
 ]
@@ -777,33 +770,39 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memoffset"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
-version = "0.4.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
 dependencies = [
  "adler",
- "autocfg 1.0.1",
 ]
 
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
 dependencies = [
  "libc",
  "log",
  "miow",
  "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "winapi 0.3.9",
 ]
 
@@ -818,21 +817,19 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "6.1.2"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
 dependencies = [
- "bitvec",
- "funty",
  "memchr",
- "version_check",
+ "minimal-lexical",
 ]
 
 [[package]]
 name = "ntapi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
 dependencies = [
  "winapi 0.3.9",
 ]
@@ -843,7 +840,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "num-traits",
 ]
 
@@ -853,33 +850,42 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
-version = "0.26.1"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c"
+checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
 name = "page_size"
@@ -893,9 +899,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
@@ -904,9 +910,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
 dependencies = [
  "cfg-if",
  "instant",
@@ -930,18 +936,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -950,9 +956,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -960,38 +966,20 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "prometheus"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c"
+checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504"
 dependencies = [
  "cfg-if",
  "fnv",
@@ -1004,25 +992,19 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.25.0"
+version = "2.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b"
+checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96"
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
-
 [[package]]
 name = "rand"
 version = "0.3.23"
@@ -1052,11 +1034,11 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
  "libc",
- "rand_chacha 0.1.1",
+ "rand_chacha",
  "rand_core 0.4.2",
- "rand_hc 0.1.0",
+ "rand_hc",
  "rand_isaac",
  "rand_jitter",
  "rand_os",
@@ -1065,38 +1047,16 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
- "rand_hc 0.3.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.3",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.3.1"
@@ -1112,15 +1072,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
@@ -1130,15 +1081,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -1179,7 +1121,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 dependencies = [
- "autocfg 0.1.7",
+ "autocfg 0.1.8",
  "rand_core 0.4.2",
 ]
 
@@ -1194,11 +1136,11 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "crossbeam-deque",
  "either",
  "rayon-core",
@@ -1206,14 +1148,13 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "lazy_static",
  "num_cpus",
 ]
 
@@ -1228,28 +1169,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom",
  "redox_syscall",
+ "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.5.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
 dependencies = [
  "regex-syntax",
 ]
@@ -1319,9 +1261,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustc-hash"
@@ -1350,9 +1292,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
 
 [[package]]
 name = "scopeguard"
@@ -1384,9 +1326,9 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827cb7cce42533829c792fc51b82fbf18b125b45a702ef2c8be77fce65463a7b"
+checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
 dependencies = [
  "cc",
 ]
@@ -1416,18 +1358,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.127"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.127"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1436,9 +1378,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.66"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
 dependencies = [
  "itoa",
  "ryu",
@@ -1447,15 +1389,15 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.9"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39"
+checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -1472,9 +1414,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
 
 [[package]]
 name = "slip21"
@@ -1487,15 +1429,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -1503,14 +1445,13 @@ dependencies = [
 
 [[package]]
 name = "socks"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30f86c7635fadf2814201a4f67efefb0007588ae7422ce299f354ab5c97f61ae"
+checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b"
 dependencies = [
  "byteorder",
  "libc",
- "winapi 0.2.8",
- "ws2_32-sys",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1540,9 +1481,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1561,21 +1502,15 @@ dependencies = [
  "winapi 0.2.8",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
  "cfg-if",
+ "fastrand",
  "libc",
- "rand 0.8.4",
  "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -1583,9 +1518,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
@@ -1601,18 +1536,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1640,32 +1575,40 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.1"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a776787d9c5d455bec3db044586ccdd8a9c74d5da5dc319fb80f3db08808fe6"
+checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
 dependencies = [
  "itoa",
  "libc",
+ "num_threads",
+ "time-macros",
 ]
 
+[[package]]
+name = "time-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+
 [[package]]
 name = "tiny_http"
-version = "0.8.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39"
+checksum = "e0d6ef4e10d23c1efb862eecad25c5054429a71958b4eeef85eb5e7170b477ca"
 dependencies = [
  "ascii",
- "chrono",
  "chunked_transfer",
  "log",
+ "time 0.3.9",
  "url",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.3.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1678,24 +1621,24 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.10.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
- "autocfg 1.0.1",
  "libc",
  "mio",
  "num_cpus",
  "pin-project-lite",
+ "socket2",
  "tokio-macros",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1710,9 +1653,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
  "cfg-if",
  "pin-project-lite",
@@ -1721,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.19"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
  "lazy_static",
 ]
@@ -1736,9 +1679,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
 [[package]]
 name = "unicode-normalization"
@@ -1751,9 +1694,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
@@ -1787,9 +1730,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "want"
@@ -1807,11 +1750,17 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.76"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1819,9 +1768,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.76"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -1834,9 +1783,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.76"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1844,9 +1793,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.76"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1857,15 +1806,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.76"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
 
 [[package]]
 name = "web-sys"
-version = "0.3.53"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1932,19 +1881,3 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
diff --git a/Cargo.toml b/Cargo.toml
index 9ab5cbf4b..94065b50e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ bincode = "1.3.1"
 bitcoin = { version = "0.27", features = [ "use-serde" ] }
 clap = "2.33.3"
 crossbeam-channel = "0.5.0"
-dirs = "3.0.1"
+dirs = "4.0.0"
 elements = { version = "0.18", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
@@ -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"

From 93fff344d45dd957097c4bcaad14362c4686bc04 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 22 Apr 2022 07:25:03 +0300
Subject: [PATCH 45/47] Update rust-bitcoin to v0.28

---
 Cargo.lock             | 45 +++++++++++++++++++++++++++++++++++-------
 Cargo.toml             |  2 +-
 src/new_index/fetch.rs |  2 +-
 src/rest.rs            |  4 ++--
 src/util/block.rs      |  2 +-
 src/util/fees.rs       |  2 +-
 src/util/script.rs     |  2 +-
 7 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5cb17a66d..b0ce648f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -142,7 +142,19 @@ checksum = "9a41df6ad9642c5c15ae312dd3d074de38fd3eb7cc87ad4ce10f90292a83fe4d"
 dependencies = [
  "bech32",
  "bitcoin_hashes 0.10.0",
- "secp256k1",
+ "secp256k1 0.20.3",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b2a9a8e3c7544f5ce2b475f2f56580a3102b37e0ee001558ad4faedcf56cf4"
+dependencies = [
+ "bech32",
+ "bitcoin_hashes 0.10.0",
+ "secp256k1 0.22.1",
  "serde",
 ]
 
@@ -348,7 +360,7 @@ dependencies = [
  "arrayref",
  "base64 0.13.0",
  "bincode",
- "bitcoin",
+ "bitcoin 0.28.0",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -389,7 +401,7 @@ name = "electrum-client"
 version = "0.8.0"
 source = "git+https://github.com/Blockstream/rust-electrum-client?rev=d3792352992a539afffbe11501d1aff9fd5b919d#d3792352992a539afffbe11501d1aff9fd5b919d"
 dependencies = [
- "bitcoin",
+ "bitcoin 0.27.1",
  "log",
  "rustls",
  "serde",
@@ -404,7 +416,7 @@ name = "elements"
 version = "0.18.0"
 source = "git+https://github.com/ElementsProject/rust-elements?rev=d988bd7ed9cf539b8fea0da042efa5a4e1eef86f#d988bd7ed9cf539b8fea0da042efa5a4e1eef86f"
 dependencies = [
- "bitcoin",
+ "bitcoin 0.27.1",
  "bitcoin_hashes 0.10.0",
  "secp256k1-zkp",
  "serde",
@@ -1320,7 +1332,17 @@ checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
  "bitcoin_hashes 0.9.7",
  "rand 0.6.5",
- "secp256k1-sys",
+ "secp256k1-sys 0.4.2",
+ "serde",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
+dependencies = [
+ "secp256k1-sys 0.5.0",
  "serde",
 ]
 
@@ -1333,6 +1355,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07b5b9d7322572e1f3aeed208668ce87789b3645dbb73082c5ce99a004103a35"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "secp256k1-zkp"
 version = "0.4.0"
@@ -1341,7 +1372,7 @@ checksum = "5e57b977141f57b224fc579c23dac5978b5f594281450fe8b5e2b6aa816d0fde"
 dependencies = [
  "bitcoin_hashes 0.9.7",
  "rand 0.6.5",
- "secp256k1",
+ "secp256k1 0.20.3",
  "secp256k1-zkp-sys",
  "serde",
 ]
@@ -1353,7 +1384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b45a3c4e1291985397df9770f864ed88bd51ee684b13a384f49d2fedb29f86f0"
 dependencies = [
  "cc",
- "secp256k1-sys",
+ "secp256k1-sys 0.4.2",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 94065b50e..ca8229402 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ 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 = "4.0.0"
diff --git a/src/new_index/fetch.rs b/src/new_index/fetch.rs
index 356407880..20d0bfde0 100644
--- a/src/new_index/fetch.rs
+++ b/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();
diff --git a/src/rest.rs b/src/rest.rs
index 515120efe..62836b645 100644
--- a/src/rest.rs
+++ b/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)),
         }
diff --git a/src/util/block.rs b/src/util/block.rs
index 76b593fdb..1f6b98508 100644
--- a/src/util/block.rs
+++ b/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,
         }
     }
diff --git a/src/util/fees.rs b/src/util/fees.rs
index 1e28ac784..828be6cd1 100644
--- a/src/util/fees.rs
+++ b/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,
diff --git a/src/util/script.rs b/src/util/script.rs
index 6991d9cea..28db5b257 100644
--- a/src/util/script.rs
+++ b/src/util/script.rs
@@ -56,7 +56,7 @@ 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)
+        witness.iter().last().map(Vec::from).map(Script::from)
     } else {
         None
     };

From 29245679ef9142e13d998bd826d12c14a69c245f Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sun, 5 Jun 2022 01:23:25 +0300
Subject: [PATCH 46/47] Update to rust-elements v0.19

And fix some compatibility issues with the changes introduced in
rust-bitcoin v0.28.
---
 Cargo.lock             | 30 ++++++++++++------------------
 Cargo.toml             |  7 +------
 src/elements/mod.rs    | 26 ++++++++++++++++++++++++++
 src/new_index/fetch.rs |  2 ++
 src/rest.rs            |  6 +++---
 src/util/block.rs      |  3 +++
 src/util/fees.rs       |  3 +++
 src/util/script.rs     |  9 ++++++++-
 8 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b0ce648f6..36b515d02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -164,12 +164,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b375d62f341cef9cd9e77793ec8f1db3fc9ce2e4d57e982c8fe697a2c16af3b6"
 
-[[package]]
-name = "bitcoin_hashes"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
-
 [[package]]
 name = "bitcoin_hashes"
 version = "0.10.0"
@@ -413,10 +407,11 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.18.0"
-source = "git+https://github.com/ElementsProject/rust-elements?rev=d988bd7ed9cf539b8fea0da042efa5a4e1eef86f#d988bd7ed9cf539b8fea0da042efa5a4e1eef86f"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dab52c515c0cb85d33267326da8fc8a0f8a523f13a0b4c3c73af4ad09cade"
 dependencies = [
- "bitcoin 0.27.1",
+ "bitcoin 0.28.0",
  "bitcoin_hashes 0.10.0",
  "secp256k1-zkp",
  "serde",
@@ -1330,8 +1325,6 @@ version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
- "bitcoin_hashes 0.9.7",
- "rand 0.6.5",
  "secp256k1-sys 0.4.2",
  "serde",
 ]
@@ -1342,6 +1335,8 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
 dependencies = [
+ "bitcoin_hashes 0.10.0",
+ "rand 0.6.5",
  "secp256k1-sys 0.5.0",
  "serde",
 ]
@@ -1366,25 +1361,24 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-zkp"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e57b977141f57b224fc579c23dac5978b5f594281450fe8b5e2b6aa816d0fde"
+checksum = "c724fda6aae465ed9a39320202bc6164e0adb3cdf9bc16d5af4be7eebaba75e5"
 dependencies = [
- "bitcoin_hashes 0.9.7",
  "rand 0.6.5",
- "secp256k1 0.20.3",
+ "secp256k1 0.22.1",
  "secp256k1-zkp-sys",
  "serde",
 ]
 
 [[package]]
 name = "secp256k1-zkp-sys"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45a3c4e1291985397df9770f864ed88bd51ee684b13a384f49d2fedb29f86f0"
+checksum = "e6f880412a627e79d3ce17355150ea1e0e76570efb7f0f70df51504cbe2582e3"
 dependencies = [
  "cc",
- "secp256k1-sys 0.4.2",
+ "secp256k1-sys 0.5.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ca8229402..737977c19 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/src/elements/mod.rs b/src/elements/mod.rs
index 1e4a62425..37dc034dd 100644
--- a/src/elements/mod.rs
+++ b/src/elements/mod.rs
@@ -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()
+    }
+}
\ No newline at end of file
diff --git a/src/new_index/fetch.rs b/src/new_index/fetch.rs
index 20d0bfde0..453da8a6a 100644
--- a/src/new_index/fetch.rs
+++ b/src/new_index/fetch.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;
diff --git a/src/rest.rs b/src/rest.rs
index 62836b645..160b218ef 100644
--- a/src/rest.rs
+++ b/src/rest.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()),
         }
     }
 }
diff --git a/src/util/block.rs b/src/util/block.rs
index 1f6b98508..91241ef49 100644
--- a/src/util/block.rs
+++ b/src/util/block.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)]
diff --git a/src/util/fees.rs b/src/util/fees.rs
index 828be6cd1..ea11d1fa5 100644
--- a/src/util/fees.rs
+++ b/src/util/fees.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 {
diff --git a/src/util/script.rs b/src/util/script.rs
index 28db5b257..61be03e65 100644
--- a/src/util/script.rs
+++ b/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().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
     };

From a808b51d0d9301fa82390b985c57551966001f9b Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Sat, 11 Jun 2022 03:57:49 +0300
Subject: [PATCH 47/47] Update to rust-elements v0.19.1

The EBCompact compatibility trait is no longer necessary, the `get`
prefix was removed in https://github.com/ElementsProject/rust-elements/pull/128
---
 Cargo.lock             |  4 ++--
 Cargo.toml             |  2 +-
 src/elements/mod.rs    | 26 --------------------------
 src/new_index/fetch.rs |  2 --
 src/rest.rs            |  2 +-
 src/util/block.rs      |  3 ---
 src/util/fees.rs       |  3 ---
 7 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36b515d02..7fef399bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -407,9 +407,9 @@ dependencies = [
 
 [[package]]
 name = "elements"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dab52c515c0cb85d33267326da8fc8a0f8a523f13a0b4c3c73af4ad09cade"
+checksum = "61c5ef61d480567b862631efcc22f704eeed7291dbf929ae008a8d5b7f5c4527"
 dependencies = [
  "bitcoin 0.28.0",
  "bitcoin_hashes 0.10.0",
diff --git a/Cargo.toml b/Cargo.toml
index 737977c19..7b8ec562c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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.19", features = [ "serde-feature" ], optional = true }
+elements = { version = "0.19.1", features = [ "serde-feature" ], optional = true }
 error-chain = "0.12.4"
 glob = "0.3"
 hex = "0.4.2"
diff --git a/src/elements/mod.rs b/src/elements/mod.rs
index 37dc034dd..a73e4d0ea 100644
--- a/src/elements/mod.rs
+++ b/src/elements/mod.rs
@@ -73,30 +73,4 @@ 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()
-    }
 }
\ No newline at end of file
diff --git a/src/new_index/fetch.rs b/src/new_index/fetch.rs
index 453da8a6a..20d0bfde0 100644
--- a/src/new_index/fetch.rs
+++ b/src/new_index/fetch.rs
@@ -4,8 +4,6 @@ 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;
diff --git a/src/rest.rs b/src/rest.rs
index 160b218ef..108215634 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -23,7 +23,7 @@ use hyperlocal::UnixServerExt;
 use std::fs;
 #[cfg(feature = "liquid")]
 use {
-    crate::elements::{peg::PegoutValue, AssetSorting, IssuanceValue, EBCompact},
+    crate::elements::{peg::PegoutValue, AssetSorting, IssuanceValue},
     elements::{
         confidential::{Asset, Nonce, Value},
         encode, AssetId,
diff --git a/src/util/block.rs b/src/util/block.rs
index 91241ef49..1f6b98508 100644
--- a/src/util/block.rs
+++ b/src/util/block.rs
@@ -9,9 +9,6 @@ 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)]
diff --git a/src/util/fees.rs b/src/util/fees.rs
index ea11d1fa5..828be6cd1 100644
--- a/src/util/fees.rs
+++ b/src/util/fees.rs
@@ -1,9 +1,6 @@
 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 {