From 580fc29ab1c77c843938ee8eb6b9c10bea904598 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 5 Apr 2024 20:43:17 +0300
Subject: [PATCH] Update {bitcoin,elements,electrum}d to support nixpkg builds

See https://github.com/Blockstream/electrs/pull/73
---
 Cargo.lock | 23 ++++++++++++++++++-----
 Cargo.toml |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eb2b25dda..85ea58f28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -301,6 +301,19 @@ name = "bitcoind"
 version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f50548a349632abb9a2007d431a302bf0401a786c91f809ff31765fba87e2397"
+dependencies = [
+ "anyhow",
+ "bitcoincore-rpc",
+ "log",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "bitcoind"
+version = "0.35.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09db6b30b527263d2e3a8768a2c9299763858cb84d01a9d63d174b9f515e1a32"
 dependencies = [
  "anyhow",
  "bitcoin_hashes 0.13.0",
@@ -623,7 +636,7 @@ dependencies = [
  "base64 0.21.7",
  "bincode",
  "bitcoin 0.31.1",
- "bitcoind",
+ "bitcoind 0.35.1",
  "clap",
  "crossbeam-channel",
  "dirs",
@@ -679,7 +692,7 @@ dependencies = [
 [[package]]
 name = "electrumd"
 version = "0.1.0"
-source = "git+https://github.com/shesek/electrumd?rev=6eac0b7b1f2447472016e2c1473a6284f7f8648e#6eac0b7b1f2447472016e2c1473a6284f7f8648e"
+source = "git+https://github.com/shesek/electrumd?rev=996fe2a8e563bc1bde6bbc2e0c2a2f4421abcdbc#996fe2a8e563bc1bde6bbc2e0c2a2f4421abcdbc"
 dependencies = [
  "bitcoin_hashes 0.10.0",
  "home",
@@ -704,12 +717,12 @@ dependencies = [
 
 [[package]]
 name = "elementsd"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae67bd67005d700439d49468429ea4b4648f20fafe1192e528bda1b15bf164c"
+checksum = "f17022ca1a790518f66c46c40ab729cc275f8a009babad583972a946a851cadf"
 dependencies = [
  "bitcoin_hashes 0.12.0",
- "bitcoind",
+ "bitcoind 0.34.1",
  "flate2",
  "minreq",
  "tar",
diff --git a/Cargo.toml b/Cargo.toml
index 761421c94..9ae8f5490 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ electrum-client = { version = "0.8", optional = true }
 
 
 [dev-dependencies]
-bitcoind = { version = "0.34", features = [ "25_0" ] }
+bitcoind = { version = "0.35", features = [ "25_0" ] }
 elementsd = { version = "0.9", features = [ "22_1_1" ] }
 electrumd = { version = "0.1.0", features = [ "4_1_5" ] }
 ureq = { version = "2.9", default-features = false, features = [ "json" ] }
@@ -76,4 +76,4 @@ rev = "d3792352992a539afffbe11501d1aff9fd5b919d" # add-peer branch
 # not yet published on crates.io
 [patch.crates-io.electrumd]
 git = "https://github.com/shesek/electrumd"
-rev = "6eac0b7b1f2447472016e2c1473a6284f7f8648e"
+rev = "996fe2a8e563bc1bde6bbc2e0c2a2f4421abcdbc"