Use bitcoin-lib 0.33 (#2822)

ACINQ · Feb 29, 2024 · 82dbbdb · 82dbbdb
1 parent 145d0f4
commit 82dbbdb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/PackageSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/PackageSpec.scala
@@ -16,6 +16,7 @@
 
 package fr.acinq.eclair
 
+import fr.acinq.bitcoin.BitcoinError.ChainHashMismatch
 import fr.acinq.bitcoin.scalacompat.Crypto.PrivateKey
 import fr.acinq.bitcoin.scalacompat.{Block, ByteVector32, Crypto, Script, TxHash, TxId, addressToPublicKeyScript}
 import fr.acinq.bitcoin.{Base58, Base58Check, Bech32}
@@ -56,7 +57,7 @@ class PackageSpec extends AnyFunSuite {
 
     // wrong chain
     val Left(failure) = addressToPublicKeyScript(Block.TestnetGenesisBlock.hash, Base58Check.encode(Base58.Prefix.PubkeyAddress, pub.hash160))
-    assert(failure.toString.contains("chain hash mismatch"))
+    assert(failure.isInstanceOf[ChainHashMismatch])
 
     assert(addressToPublicKeyScript(Block.TestnetGenesisBlock.hash, Base58Check.encode(Base58.Prefix.PubkeyAddress, pub.hash160)).isLeft)
     assert(addressToPublicKeyScript(Block.RegtestGenesisBlock.hash, Base58Check.encode(Base58.Prefix.PubkeyAddress, pub.hash160)).isLeft)

diff --git a/eclair-node/pom.xml b/eclair-node/pom.xml
@@ -123,6 +123,13 @@
             <groupId>io.kamon</groupId>
             <artifactId>kamon-prometheus_${scala.version.short}</artifactId>
             <version>${kamon.version}</version>
+            <!-- depends on a old version of okhttp that depends on kotlin 1.5, which conflicts with kotlin 1.9 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- test dependencies -->
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
         <akka.version>2.6.20</akka.version>
         <akka.http.version>10.2.7</akka.http.version>
         <sttp.version>3.8.16</sttp.version>
-        <bitcoinlib.version>0.31</bitcoinlib.version>
+        <bitcoinlib.version>0.33</bitcoinlib.version>
         <guava.version>32.1.1-jre</guava.version>
         <kamon.version>2.6.3</kamon.version>
     </properties>