From 50178be6fa8d4faf3eeae53aaf0fa9323ad177a4 Mon Sep 17 00:00:00 2001
From: Bastien Teinturier <31281497+t-bast@users.noreply.github.com>
Date: Mon, 22 May 2023 10:04:43 +0200
Subject: [PATCH] Update to bitcoind 23.2 (#2664)

---
 README.md                                      |  2 +-
 eclair-core/pom.xml                            | 18 +++++++++---------
 .../blockchain/bitcoind/BitcoindService.scala  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 3533c7270..6281d9af8 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ This means that instead of re-implementing them, Eclair benefits from the verifi
 
 * Eclair needs a _synchronized_, _segwit-ready_, **_zeromq-enabled_**, _wallet-enabled_, _non-pruning_, _tx-indexing_ [Bitcoin Core](https://github.com/bitcoin/bitcoin) node.
 * You must configure your Bitcoin node to use `bech32` or `bech32m` (segwit) addresses. If your wallet has "non-segwit UTXOs" (outputs that are neither `p2sh-segwit`, `bech32` or `bech32m`), you must send them to a `bech32` or `bech32m` address before running Eclair.
-* Eclair requires Bitcoin Core 23.1 or higher. If you are upgrading an existing wallet, you may need to create a new address and send all your funds to that address.
+* Eclair requires Bitcoin Core 23.2 or higher. If you are upgrading an existing wallet, you may need to create a new address and send all your funds to that address.
 
 Run bitcoind with the following minimal `bitcoin.conf`:
 
diff --git a/eclair-core/pom.xml b/eclair-core/pom.xml
index aeb8c396b..0996863f2 100644
--- a/eclair-core/pom.xml
+++ b/eclair-core/pom.xml
@@ -88,9 +88,9 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-23.1/bitcoin-23.1-x86_64-linux-gnu.tar.gz</bitcoind.url>
-                <bitcoind.md5>7574f852c5af455ffc5f66b8c31c1caa</bitcoind.md5>
-                <bitcoind.sha1>4c9ca50f3b3fe4ef6c098ccd5db867b320ce289c</bitcoind.sha1>
+                <bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-23.2/bitcoin-23.2-x86_64-linux-gnu.tar.gz</bitcoind.url>
+                <bitcoind.md5>1ec6ca817c679f3b4b6daa8021e401c7</bitcoind.md5>
+                <bitcoind.sha1>089476b853d8e33a52f67ffc46197dc49aa8a656</bitcoind.sha1>
             </properties>
         </profile>
         <profile>
@@ -101,9 +101,9 @@
                 </os>
             </activation>
             <properties>
-                <bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-23.1/bitcoin-23.1-x86_64-apple-darwin.tar.gz</bitcoind.url>
-                <bitcoind.md5>4c8c5ed89dddc30e0e74dd092199b327</bitcoind.md5>
-                <bitcoind.sha1>0ea71fd87c5773825036600d2dca4970811e4bde</bitcoind.sha1>
+                <bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-23.2/bitcoin-23.2-x86_64-apple-darwin.tar.gz</bitcoind.url>
+                <bitcoind.md5>406feabaad970a70ba10991577536970</bitcoind.md5>
+                <bitcoind.sha1>37165f9ccc23a8bea6a1029cd1186090c01b737c</bitcoind.sha1>
             </properties>
         </profile>
         <profile>
@@ -114,9 +114,9 @@
                 </os>
             </activation>
             <properties>
-                <bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-23.1/bitcoin-23.1-win64.zip</bitcoind.url>
-                <bitcoind.md5>68cf94e1c047f88b306d58230c6c12e3</bitcoind.md5>
-                <bitcoind.sha1>db0aca0606802fcdb25a2d61cc4c2eac411ffd2c</bitcoind.sha1>
+                <bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-23.2/bitcoin-23.2-win64.zip</bitcoind.url>
+                <bitcoind.md5>ba46d7646039bfcaa13137d953ff58bf</bitcoind.md5>
+                <bitcoind.sha1>684c669b1c929485422c48f3db6e8bc8304e55f7</bitcoind.sha1>
             </properties>
         </profile>
     </profiles>
diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoindService.scala b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoindService.scala
index 498575aa8..60f58c5d6 100644
--- a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoindService.scala
+++ b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoindService.scala
@@ -57,7 +57,7 @@ trait BitcoindService extends Logging {
 
   val PATH_BITCOIND = sys.env.get("BITCOIND_DIR") match {
     case Some(customBitcoinDir) => new File(customBitcoinDir, "bitcoind")
-    case None => new File(TestUtils.BUILD_DIRECTORY, "bitcoin-23.1/bin/bitcoind")
+    case None => new File(TestUtils.BUILD_DIRECTORY, "bitcoin-23.2/bin/bitcoind")
   }
   logger.info(s"using bitcoind: $PATH_BITCOIND")
   val PATH_BITCOIND_DATADIR = new File(INTEGRATION_TMP_DIR, "datadir-bitcoin")