Add support for linux arm64 target (#769)

* Add support for linux arm64 target

* added platform-specific http-client config (#777)

This is useful to work around an issue with the curl client on Linux
Arm64.

* Use bitcoin-kmp 0.22.2 and secp256k1-kmp 0.17.3

---------

Co-authored-by: Pierre-Marie Padiou <[email protected]>

Author: sstone

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ kotlinx-coroutines = "1.10.1"
 kotlinx-datetime = "0.6.2"
 kotlinx-serialization = "1.8.0"
 ktor = "3.1.0"
-bitcoinkmp = "0.22.1" # when upgrading bitcoin-kmp, keep secpjnijvm in sync!
-secpjnijvm = "0.17.1"
+bitcoinkmp = "0.22.2" # when upgrading bitcoin-kmp, keep secpjnijvm in sync!
+secpjnijvm = "0.17.3"
 kermit = "2.0.5"
 slf4j = "2.0.16"
 

modules/core/build.gradle.kts

@@ -24,6 +24,8 @@ kotlin {
 
     linuxX64()
 
+    linuxArm64()
+
     if (currentOs.isMacOsX) {
         macosX64()
 

modules/core/src/appleMain/kotlin/fr/acinq/lightning/io/MyHttpClient.apple.kt

@@ -0,0 +1,5 @@
+package fr.acinq.lightning.io
+
+import io.ktor.client.*
+
+actual fun MyHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(block)

modules/core/src/commonMain/kotlin/fr/acinq/lightning/blockchain/mempool/MempoolSpaceClient.kt

@@ -5,27 +5,26 @@ import fr.acinq.bitcoin.TxId
 import fr.acinq.lightning.blockchain.Feerates
 import fr.acinq.lightning.blockchain.IClient
 import fr.acinq.lightning.blockchain.fee.FeeratePerByte
+import fr.acinq.lightning.io.MyHttpClient
 import fr.acinq.lightning.logging.LoggerFactory
 import fr.acinq.lightning.logging.debug
 import fr.acinq.lightning.logging.warning
 import fr.acinq.lightning.utils.sat
-import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.plugins.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 
 class MempoolSpaceClient(val mempoolUrl: Url, loggerFactory: LoggerFactory) : IClient {
 
     private val logger = loggerFactory.newLogger(this::class)
 
-    val client = HttpClient {
+    val client = MyHttpClient {
         install(ContentNegotiation) {
             json(json = Json {
                 prettyPrint = true

modules/core/src/commonMain/kotlin/fr/acinq/lightning/io/MyHttpClient.kt

@@ -0,0 +1,9 @@
+package fr.acinq.lightning.io
+
+import io.ktor.client.*
+
+// This allows setting platform and engine-specific parameters for the client.
+// It is particularly useful as a workaround for https://github.com/ktorio/ktor/pull/4758
+expect fun MyHttpClient(
+    block: HttpClientConfig<*>.() -> Unit = {}
+): HttpClient

modules/core/src/commonTest/kotlin/fr/acinq/lightning/tests/bitcoind/BitcoinJsonRPCClient.kt

@@ -1,9 +1,9 @@
 package fr.acinq.lightning.tests.bitcoind
 
-import fr.acinq.lightning.logging.*
+import fr.acinq.lightning.io.MyHttpClient
+import fr.acinq.lightning.logging.debug
 import fr.acinq.lightning.tests.utils.testLoggerFactory
 import fr.acinq.lightning.utils.JsonRPCResponse
-import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.plugins.auth.*
 import io.ktor.client.plugins.auth.providers.*
@@ -23,7 +23,7 @@ object BitcoinJsonRPCClient {
     private val scheme = if (ssl) "https" else "http"
     private val serviceUri = "$scheme://$host:$port/wallet/" // wallet/ specifies to use the default bitcoind wallet, named ""
 
-    private val httpClient = HttpClient {
+    private val httpClient = MyHttpClient {
         install(ContentNegotiation) {
             json()
         }

modules/core/src/jvmMain/kotlin/fr/acinq/lightning/io/MyHttpClient.jvm.kt

@@ -0,0 +1,5 @@
+package fr.acinq.lightning.io
+
+import io.ktor.client.*
+
+actual fun MyHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(block)

modules/core/src/linuxArm64Main/kotlin/fr/acinq/lightning/io/MyHttpClient.linuxArm64.kt

@@ -0,0 +1,14 @@
+package fr.acinq.lightning.io
+
+import io.ktor.client.*
+import io.ktor.client.engine.curl.*
+
+actual fun MyHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient {
+    engine {
+        // Workaround for https://github.com/ktorio/ktor/pull/4758
+        if (this is CurlClientEngineConfig) {
+            caPath = "/etc/ssl/certs"
+        }
+    }
+    block(this)
+}

modules/core/src/linuxX64Main/kotlin/fr/acinq/lightning/io/MyHttpClient.linuxX64.kt

@@ -0,0 +1,5 @@
+package fr.acinq.lightning.io
+
+import io.ktor.client.*
+
+actual fun MyHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(block)

publishing/lightning-kmp-snapshot-deploy.sh

@@ -21,7 +21,7 @@ mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/conte
   -Djavadoc=$ARTIFACT_ID_BASE-$VERSION-javadoc.jar
 popd
 pushd .
-for i in iosarm64 iossimulatorarm64 iosx64 jvm macosarm64 macosx64 linuxx64; do
+for i in iosarm64 iossimulatorarm64 iosx64 jvm macosarm64 macosx64 linuxarm64 linuxx64; do
   cd fr/acinq/lightning/$ARTIFACT_ID_BASE-$i/$VERSION
   case $i in
     iosarm64 | iossimulatorarm64 | iosx64)
@@ -44,7 +44,7 @@ for i in iosarm64 iossimulatorarm64 iosx64 jvm macosarm64 macosx64 linuxx64; do
         -Dsources=$ARTIFACT_ID_BASE-$i-$VERSION-sources.jar \
         -Djavadoc=$ARTIFACT_ID_BASE-$i-$VERSION-javadoc.jar
       ;;
-    linuxx64)
+    linuxx64 | linuxarm64)
       mvn deploy:deploy-file -DrepositoryId=ossrh -Durl=https://oss.sonatype.org/content/repositories/snapshots/ \
         -DpomFile=$ARTIFACT_ID_BASE-$i-$VERSION.pom \
         -Dfile=$ARTIFACT_ID_BASE-$i-$VERSION.klib \