Skip to content

Commit 04a0ddf

Browse files
committed
Update Bitcoin Core to v30.2
This release contains improvements for v3 transactions, which we want for #3192.
1 parent c24c3a7 commit 04a0ddf

5 files changed

Lines changed: 14 additions & 9 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ This means that instead of re-implementing them, Eclair benefits from the verifi
6262

6363
* Eclair needs a _synchronized_, _segwit-ready_, **_zeromq-enabled_**, _wallet-enabled_, _non-pruning_, _tx-indexing_ [Bitcoin Core](https://github.com/bitcoin/bitcoin) node.
6464
* 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.
65-
* Eclair requires Bitcoin Core 29 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.
65+
* Eclair requires Bitcoin Core 30 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.
6666

6767
Run bitcoind with the following minimal `bitcoin.conf`:
6868

docs/release-notes/eclair-vnext.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
## Major changes
66

7+
### Update minimal version of Bitcoin Core
8+
9+
With this release, eclair requires using Bitcoin Core 30.x.
10+
Newer versions of Bitcoin Core may be used, but have not been extensively tested.
11+
712
### Remove support for non-anchor channels
813

914
We remove the code used to support legacy channels that don't use anchor outputs or taproot.

eclair-core/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
<activeByDefault>true</activeByDefault>
8888
</activation>
8989
<properties>
90-
<bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-29.2/bitcoin-29.2-x86_64-linux-gnu.tar.gz</bitcoind.url>
91-
<bitcoind.sha256>1fd58d0ae94b8a9e21bbaeab7d53395a44976e82bd5492b0a894826c135f9009</bitcoind.sha256>
90+
<bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-30.2/bitcoin-30.2-x86_64-linux-gnu.tar.gz</bitcoind.url>
91+
<bitcoind.sha256>6aa7bb4feb699c4c6262dd23e4004191f6df7f373b5d5978b5bcdd4bb72f75d8</bitcoind.sha256>
9292
</properties>
9393
</profile>
9494
<profile>
@@ -99,8 +99,8 @@
9999
</os>
100100
</activation>
101101
<properties>
102-
<bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-29.2/bitcoin-29.2-x86_64-apple-darwin.tar.gz</bitcoind.url>
103-
<bitcoind.sha256>69ca05fbe838123091cf4d6d2675352f36cf55f49e2e6fb3b52fcf32b5e8dd9f</bitcoind.sha256>
102+
<bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-30.2/bitcoin-30.2-x86_64-apple-darwin.tar.gz</bitcoind.url>
103+
<bitcoind.sha256>99d5cee9b9c37be506396c30837a4b98e320bfea71c474d6120a7e8eb6075c7b</bitcoind.sha256>
104104
</properties>
105105
</profile>
106106
<profile>
@@ -111,8 +111,8 @@
111111
</os>
112112
</activation>
113113
<properties>
114-
<bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-29.2/bitcoin-29.2-win64.zip</bitcoind.url>
115-
<bitcoind.sha256>83f90a5bab1fc30849862aa1db88906b91e0730b78993c085f9e547a1c3cce79</bitcoind.sha256>
114+
<bitcoind.url>https://bitcoincore.org/bin/bitcoin-core-30.2/bitcoin-30.2-win64.zip</bitcoind.url>
115+
<bitcoind.sha256>0d7e1f16f8823aa26d29b44855ff6dbac11c03d75631a6c1d2ea5fab3a84fdf8</bitcoind.sha256>
116116
</properties>
117117
</profile>
118118
</profiles>

eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class Setup(val datadir: File,
195195
await(getBitcoinStatus(bitcoinClient), 30 seconds, "bitcoind did not respond after 30 seconds")
196196
}
197197
logger.info(s"bitcoind version=${bitcoinStatus.version}")
198-
assert(bitcoinStatus.version >= 290000, "Eclair requires Bitcoin Core 29 or higher")
198+
assert(bitcoinStatus.version >= 300000, "Eclair requires Bitcoin Core 30 or higher")
199199
bitcoinStatus.unspentAddresses.foreach { address =>
200200
val isSegwit = addressToPublicKeyScript(bitcoinStatus.chainHash, address).map(script => Script.isNativeWitnessScript(script)).getOrElse(false)
201201
assert(isSegwit, s"Your wallet contains non-segwit UTXOs (e.g. address=$address). You must send those UTXOs to a segwit address to use Eclair (check out our README for more details).")

eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoindService.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ trait BitcoindService extends Logging {
6262

6363
val PATH_BITCOIND = sys.env.get("BITCOIND_DIR") match {
6464
case Some(customBitcoinDir) => new File(customBitcoinDir, "bitcoind")
65-
case None => new File(TestUtils.BUILD_DIRECTORY, "bitcoin-29.2/bin/bitcoind")
65+
case None => new File(TestUtils.BUILD_DIRECTORY, "bitcoin-30.2/bin/bitcoind")
6666
}
6767
logger.info(s"using bitcoind: $PATH_BITCOIND")
6868
val PATH_BITCOIND_DATADIR = new File(INTEGRATION_TMP_DIR, "datadir-bitcoin")

0 commit comments

Comments
 (0)