kotlin 1.4.31 (#231)

* Upgrade to kotlin 1.4.31
* Remove bintray repositories and update dependencies 
* set version to snapshot and remove the optional environment variable that we used to publish to bintray from our CI scripts.

Co-authored-by: sstone <[email protected]>

Author: Romain Boisselle

build.gradle.kts

@@ -2,22 +2,19 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 
 plugins {
-    kotlin("multiplatform") version "1.4.10"
-    kotlin("plugin.serialization") version "1.4.10"
+    kotlin("multiplatform") version "1.4.31"
+    kotlin("plugin.serialization") version "1.4.30"
     `maven-publish`
 }
 
 allprojects {
     group = "fr.acinq.lightning"
-    version = "1.0-beta11"
+    version = "snapshot"
 
     repositories {
         mavenLocal()
-        maven("https://dl.bintray.com/kotlin/kotlinx")
-        maven("https://dl.bintray.com/kotlin/ktor")
-        maven("https://dl.bintray.com/kodein-framework/kodein-dev")
-        maven("https://dl.bintray.com/kodein-framework/Kodein-Memory")
-        maven("https://dl.bintray.com/acinq/libs")
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        mavenCentral()
         google()
         jcenter()
     }
@@ -26,17 +23,17 @@ allprojects {
 val currentOs = org.gradle.internal.os.OperatingSystem.current()
 
 kotlin {
-    val ktorVersion: String by extra { "1.4.1" }
+    val ktorVersion: String by extra { "1.5.3" }
     fun ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion"
-    val secp256k1Version = "0.4.1"
-    val serializationVersion = "1.0.0"
-    val coroutineVersion = "1.4.2-native-mt"
+    val secp256k1Version = "0.5.1"
+    val serializationVersion = "1.1.0" 
+    val coroutineVersion = "1.4.3-native-mt"
 
     val commonMain by sourceSets.getting {
         dependencies {
-            api("fr.acinq.bitcoin:bitcoin-kmp:0.6.1")
+            api("fr.acinq.bitcoin:bitcoin-kmp:0.7.0")
             api("fr.acinq.secp256k1:secp256k1-kmp:$secp256k1Version")
-            api("org.kodein.log:kodein-log:0.7.0")
+            api("org.kodein.log:kodein-log:0.10.1")
             api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
             api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
             api("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serializationVersion")
@@ -47,7 +44,7 @@ kotlin {
         dependencies {
             implementation(kotlin("test-common"))
             implementation(kotlin("test-annotations-common"))
-            implementation("org.kodein.memory:kodein-memory-files:0.4.1")
+            implementation("org.kodein.memory:kodein-memory-files:0.8.1")
             implementation(project(":lightning-kmp-test-fixtures"))
         }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Fri Apr 03 11:05:42 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/SHA256HashFunctions.kt

@@ -1,6 +1,6 @@
 package fr.acinq.lightning.crypto.noise
 
-import fr.acinq.bitcoin.crypto.Sha256
+import fr.acinq.bitcoin.crypto.Digest
 import kotlin.experimental.xor
 
 object SHA256HashFunctions : HashFunctions {
@@ -11,7 +11,7 @@ object SHA256HashFunctions : HashFunctions {
     override fun blockLen() = 64
 
     override fun hash(data: ByteArray): ByteArray {
-        val sha = Sha256()
+        val sha = Digest.sha256()
         sha.update(data, 0, data.size)
         val output = ByteArray(32)
         sha.doFinal(output, 0)

src/commonMain/kotlin/fr/acinq/lightning/crypto/sphinx/Sphinx.kt

@@ -2,8 +2,8 @@ package fr.acinq.lightning.crypto.sphinx
 
 import fr.acinq.bitcoin.*
 import fr.acinq.bitcoin.Script.tail
-import fr.acinq.bitcoin.crypto.HMac
-import fr.acinq.bitcoin.crypto.Sha256
+import fr.acinq.bitcoin.crypto.Digest
+import fr.acinq.bitcoin.crypto.hmac
 import fr.acinq.bitcoin.io.ByteArrayInput
 import fr.acinq.bitcoin.io.ByteArrayOutput
 import fr.acinq.lightning.crypto.ChaCha20
@@ -37,7 +37,7 @@ object Sphinx {
     /** Secp256k1's base point. */
     private val CurveG = PublicKey(ByteVector("0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"))
 
-    fun mac(key: ByteArray, message: ByteArray): ByteVector32 = HMac.hmac(key, message, Sha256(), 64).toByteVector32()
+    fun mac(key: ByteArray, message: ByteArray): ByteVector32 = Digest.sha256().hmac(key, message, 64).toByteVector32()
 
     fun mac(key: ByteVector, message: ByteVector): ByteVector32 = mac(key.toByteArray(), message.toByteArray())
 

src/commonTest/kotlin/fr/acinq/lightning/channel/HelpersTestsCommon.kt

@@ -1,6 +1,9 @@
 package fr.acinq.lightning.channel
 
 import fr.acinq.bitcoin.*
+import fr.acinq.bitcoin.Bitcoin.computeP2PkhAddress
+import fr.acinq.bitcoin.Bitcoin.computeP2ShOfP2WpkhAddress
+import fr.acinq.bitcoin.Bitcoin.computeP2WpkhAddress
 import fr.acinq.lightning.tests.utils.LightningTestSuite
 import fr.acinq.secp256k1.Hex
 import kotlin.test.Test

src/commonTest/kotlin/fr/acinq/lightning/channel/states/ClosingTestsCommon.kt

@@ -1,6 +1,8 @@
 package fr.acinq.lightning.channel.states
 
 import fr.acinq.bitcoin.*
+import fr.acinq.bitcoin.Bitcoin.computeBIP84Address
+import fr.acinq.bitcoin.Bitcoin.computeP2PkhAddress
 import fr.acinq.lightning.CltvExpiryDelta
 import fr.acinq.lightning.Lightning
 import fr.acinq.lightning.blockchain.*

src/commonTest/kotlin/fr/acinq/lightning/channel/states/NormalTestsCommon.kt

@@ -1648,7 +1648,7 @@ class NormalTestsCommon : LightningTestSuite() {
     }
 
     @Test
-    fun `recv BITCOIN_FUNDING_SPENT (their *next* commit with htlc)`() {
+    fun `recv BITCOIN_FUNDING_SPENT (their next commit with htlc)`() {
         val (alice0, bob0) = reachNormal()
 
         val (nodes0, _, _) = addHtlc(250_000_000.msat, payer = alice0, payee = bob0)

src/commonTest/kotlin/fr/acinq/lightning/transactions/AnchorOutputsTestsCommon.kt

@@ -279,9 +279,9 @@ class AnchorOutputsTestsCommon {
 
         val format = Json { ignoreUnknownKeys = true }
         val json = run {
-            val resourceDir = Environment.findVariable("TEST_RESOURCES_PATH")?.let { Path(it) } ?: FileSystem.currentDirectory.resolve("src/commonTest/resources")
+            val resourceDir = Environment.findVariable("TEST_RESOURCES_PATH")?.let { Path(it) } ?: FileSystem.workingDir().resolve("src/commonTest/resources")
             val file = resourceDir.resolve("bolt3_anchor_outputs_test_vectors.json")
-            file.openReadableFile().readString()
+            file.openReadableFile().run { readString(sizeBytes = remaining) }
         }
         val testCases = format.decodeFromString<Array<TestCase>>(json)
     }