From e7644b7ddb6075147904e1747a50361a5fcccd77 Mon Sep 17 00:00:00 2001 From: Fabrice Drouin Date: Wed, 22 Sep 2021 15:22:05 +0200 Subject: [PATCH] Upgrade to kotlin 1.5 (#27) * Upgrade to kotlin 1.5.31 * Upgrade dokka gradle plugins to 1.5.30 --- build.gradle.kts | 17 +-- .../kotlin/fr/acinq/secp256k1/jni/OSInfo.kt | 2 +- .../kotlin/fr/acinq/secp256k1/Secp256k1Jvm.kt | 8 +- .../fr/acinq/secp256k1/Secp256k1Test.kt | 104 +++++++++--------- 4 files changed, 61 insertions(+), 70 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cfa10a7..af9f6de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,10 @@ -import org.apache.http.impl.client.HttpClients -import org.apache.http.client.methods.HttpPost -import org.apache.http.entity.ContentType -import org.apache.http.entity.StringEntity -import org.apache.http.impl.auth.BasicScheme -import org.apache.http.auth.UsernamePasswordCredentials import org.gradle.internal.os.OperatingSystem import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.dokka.Platform plugins { - kotlin("multiplatform") version "1.4.32" - id("org.jetbrains.dokka") version "1.4.30" + kotlin("multiplatform") version "1.5.31" + id("org.jetbrains.dokka") version "1.5.30" `maven-publish` } @@ -18,21 +12,19 @@ buildscript { repositories { google() mavenCentral() - jcenter() } dependencies { classpath("com.android.tools.build:gradle:4.0.2") - classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30") + classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.30") } } allprojects { group = "fr.acinq.secp256k1" - version = "0.5.3-SNAPSHOT" + version = "0.6.0-SNAPSHOT" repositories { - jcenter() google() mavenCentral() } @@ -79,7 +71,6 @@ kotlin { sourceSets.all { languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") } - } // Disable cross compilation diff --git a/jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/OSInfo.kt b/jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/OSInfo.kt index d120542..93ebe0e 100644 --- a/jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/OSInfo.kt +++ b/jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/OSInfo.kt @@ -154,7 +154,7 @@ internal object OSInfo { if (systemOsArch.startsWith("arm")) { resolveArmArchType() } else { - val lc = systemOsArch.toLowerCase(Locale.US) + val lc = systemOsArch.lowercase(Locale.US) if (archMapping.containsKey(lc)) return archMapping[lc] systemOsArch } diff --git a/src/jvmMain/kotlin/fr/acinq/secp256k1/Secp256k1Jvm.kt b/src/jvmMain/kotlin/fr/acinq/secp256k1/Secp256k1Jvm.kt index e27ad8d..5f34f2e 100644 --- a/src/jvmMain/kotlin/fr/acinq/secp256k1/Secp256k1Jvm.kt +++ b/src/jvmMain/kotlin/fr/acinq/secp256k1/Secp256k1Jvm.kt @@ -20,12 +20,12 @@ import java.util.* private fun tryLoad(platform: String): Secp256k1? { - try { - val cls = Class.forName("fr.acinq.secp256k1.jni.NativeSecp256k1${platform.capitalize(Locale.ROOT)}Loader") + return try { + val cls = Class.forName("fr.acinq.secp256k1.jni.NativeSecp256k1${platform.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }}Loader") val load = cls.getMethod("load") - return load.invoke(null) as Secp256k1 + load.invoke(null) as Secp256k1 } catch (ex: ClassNotFoundException) { - return null + null } } diff --git a/tests/src/commonTest/kotlin/fr/acinq/secp256k1/Secp256k1Test.kt b/tests/src/commonTest/kotlin/fr/acinq/secp256k1/Secp256k1Test.kt index 2bdb3ef..e5dbf85 100644 --- a/tests/src/commonTest/kotlin/fr/acinq/secp256k1/Secp256k1Test.kt +++ b/tests/src/commonTest/kotlin/fr/acinq/secp256k1/Secp256k1Test.kt @@ -13,12 +13,12 @@ class Secp256k1Test { @Test fun testVerifyPos() { var result: Boolean - val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()) //sha256hash of "testing" - val sig: ByteArray = Hex.decode("3044022079BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980220294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".toLowerCase()) - val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase()) + val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".lowercase()) //sha256hash of "testing" + val sig: ByteArray = Hex.decode("3044022079BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980220294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".lowercase()) + val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".lowercase()) result = Secp256k1.verify(sig, data, pub) assertTrue(result, "testVerifyPos") - val sigCompact: ByteArray = Hex.decode("79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".toLowerCase()) + val sigCompact: ByteArray = Hex.decode("79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".lowercase()) result = Secp256k1.verify(sigCompact, data, pub) assertTrue(result, "testVerifyPos") } @@ -26,9 +26,9 @@ class Secp256k1Test { @Test fun testVerifyNeg() { var result: Boolean - val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A91".toLowerCase()) //sha256hash of "testing" - val sig: ByteArray = Hex.decode("3044022079BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980220294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".toLowerCase()) - val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase()) + val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A91".lowercase()) //sha256hash of "testing" + val sig: ByteArray = Hex.decode("3044022079BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980220294F14E883B3F525B5367756C2A11EF6CF84B730B36C17CB0C56F0AAB2C98589".lowercase()) + val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".lowercase()) result = Secp256k1.verify(sig, data, pub) assertFalse(result, "testVerifyNeg") } @@ -36,7 +36,7 @@ class Secp256k1Test { @Test fun testSecKeyVerifyPos() { var result: Boolean - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) result = Secp256k1.secKeyVerify(sec) assertTrue(result, "testSecKeyVerifyPos") } @@ -44,16 +44,16 @@ class Secp256k1Test { @Test fun testSecKeyVerifyNeg() { var result: Boolean - val sec: ByteArray = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase()) + val sec: ByteArray = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".lowercase()) result = Secp256k1.secKeyVerify(sec) assertFalse(result, "testSecKeyVerifyNeg") } @Test fun testPubKeyCreatePos() { - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) val resultArr: ByteArray = Secp256k1.pubkeyCreate(sec) - val pubkeyString: String = Hex.encode(resultArr).toUpperCase() + val pubkeyString: String = Hex.encode(resultArr).uppercase() assertEquals( "04C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D2103ED494718C697AC9AEBCFD19612E224DB46661011863ED2FC54E71861E2A6", pubkeyString, @@ -63,7 +63,7 @@ class Secp256k1Test { @Test fun testPubKeyCreateNeg() { - val sec: ByteArray = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase()) + val sec: ByteArray = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".lowercase()) assertFailsWith { Secp256k1.pubkeyCreate(sec) } @@ -73,21 +73,21 @@ class Secp256k1Test { fun testPubkeyCompress() { val pub = Hex.decode("04C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D2103ED494718C697AC9AEBCFD19612E224DB46661011863ED2FC54E71861E2A6") val compressed = Secp256k1.pubKeyCompress(pub) - assertEquals("02C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D", Hex.encode(compressed).toUpperCase()) + assertEquals("02C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D", Hex.encode(compressed).uppercase()) } @Test fun testPubKeyNegatePos() { - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) val pubkey: ByteArray = Secp256k1.pubkeyCreate(sec) - val pubkeyString: String = Hex.encode(pubkey).toUpperCase() + val pubkeyString: String = Hex.encode(pubkey).uppercase() assertEquals( "04C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D2103ED494718C697AC9AEBCFD19612E224DB46661011863ED2FC54E71861E2A6", pubkeyString, "testPubKeyCreatePos" ) val pubkey1: ByteArray = Secp256k1.pubKeyNegate(pubkey) - val pubkeyString1: String = Hex.encode(pubkey1).toUpperCase() + val pubkeyString1: String = Hex.encode(pubkey1).uppercase() assertEquals( "04C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2DDEFC12B6B8E73968536514302E69ED1DDB24B999EFEE79C12D03AB17E79E1989", pubkeyString1, @@ -97,9 +97,9 @@ class Secp256k1Test { @Test fun testPubKeyParse() { - val pub: ByteArray = Hex.decode("02C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D".toLowerCase()) + val pub: ByteArray = Hex.decode("02C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D".lowercase()) val resultArr: ByteArray = Secp256k1.pubkeyParse(pub) - val pubkeyString: String = Hex.encode(resultArr).toUpperCase() + val pubkeyString: String = Hex.encode(resultArr).uppercase() assertEquals( "04C591A8FF19AC9C4E4E5793673B83123437E975285E7B442F4EE2654DFFCA5E2D2103ED494718C697AC9AEBCFD19612E224DB46661011863ED2FC54E71861E2A6", pubkeyString, @@ -109,10 +109,10 @@ class Secp256k1Test { @Test fun testPubKeyAdd() { - val pub1: ByteArray = Hex.decode("041b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f70beaf8f588b541507fed6a642c5ab42dfdf8120a7f639de5122d47a69a8e8d1".toLowerCase()) - val pub2: ByteArray = Hex.decode("044d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d07662a3eada2d0fe208b6d257ceb0f064284662e857f57b66b54c198bd310ded36d0".toLowerCase()) + val pub1: ByteArray = Hex.decode("041b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f70beaf8f588b541507fed6a642c5ab42dfdf8120a7f639de5122d47a69a8e8d1".lowercase()) + val pub2: ByteArray = Hex.decode("044d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d07662a3eada2d0fe208b6d257ceb0f064284662e857f57b66b54c198bd310ded36d0".lowercase()) val pub3: ByteArray = Secp256k1.pubKeyAdd(pub1, pub2) - val pubkeyString: String = Hex.encode(pub3).toUpperCase() + val pubkeyString: String = Hex.encode(pub3).uppercase() assertEquals( "04531FE6068134503D2723133227C867AC8FA6C83C537E9A44C3C5BDBDCB1FE3379E92C265E71E481BA82A84675A47AC705A200FCD524E92D93B0E7386F26A5458", pubkeyString, @@ -122,10 +122,10 @@ class Secp256k1Test { @Test fun testSignPos() { - val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()) //sha256hash of "testing" - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".lowercase()) //sha256hash of "testing" + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) val resultArr: ByteArray = Secp256k1.sign(data, sec) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A21C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9", sigString, @@ -135,9 +135,9 @@ class Secp256k1Test { @Test fun testSignatureNormalize() { - val data: ByteArray = Hex.decode("30440220182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A202201C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9".toLowerCase()) + val data: ByteArray = Hex.decode("30440220182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A202201C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9".lowercase()) val (resultArr, isHighS) = Secp256k1.signatureNormalize(data) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A21C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9", sigString, @@ -148,8 +148,8 @@ class Secp256k1Test { @Test fun testSignNeg() { - val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()) //sha256hash of "testing" - val sec: ByteArray = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".toLowerCase()) + val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".lowercase()) //sha256hash of "testing" + val sec: ByteArray = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".lowercase()) assertFailsWith { Secp256k1.sign(data, sec) } @@ -157,10 +157,10 @@ class Secp256k1Test { @Test fun testSignCompactPos() { - val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()) //sha256hash of "testing" - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".lowercase()) //sha256hash of "testing" + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) val resultArr: ByteArray = Secp256k1.sign(data, sec) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A21C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9", sigString, @@ -170,11 +170,11 @@ class Secp256k1Test { @Test fun testPrivKeyTweakNegate() { - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) val sec1: ByteArray = Secp256k1.privKeyNegate(sec) assertEquals( "981A9A7DD677A622518DA068D66D5F824E5F22F084B8A0E2F195B5662F300C11", - Hex.encode(sec1).toUpperCase(), + Hex.encode(sec1).uppercase(), "testPrivKeyNegate" ) val sec2: ByteArray = Secp256k1.privKeyNegate(sec1) @@ -183,10 +183,10 @@ class Secp256k1Test { @Test fun testPrivKeyTweakAdd_1() { - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) - val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()) //sha256hash of "tweak" + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) + val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".lowercase()) //sha256hash of "tweak" val resultArr: ByteArray = Secp256k1.privKeyTweakAdd(sec, data) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "A168571E189E6F9A7E2D657A4B53AE99B909F7E712D1C23CED28093CD57C88F3", sigString, @@ -196,10 +196,10 @@ class Secp256k1Test { @Test fun testPrivKeyTweakMul_1() { - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) - val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()) //sha256hash of "tweak" + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) + val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".lowercase()) //sha256hash of "tweak" val resultArr: ByteArray = Secp256k1.privKeyTweakMul(sec, data) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "97F8184235F101550F3C71C927507651BD3F1CDB4A5A33B8986ACF0DEE20FFFC", sigString, @@ -209,10 +209,10 @@ class Secp256k1Test { @Test fun testPrivKeyTweakAdd_2() { - val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase()) - val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()) //sha256hash of "tweak" + val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".lowercase()) + val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".lowercase()) //sha256hash of "tweak" val resultArr: ByteArray = Secp256k1.pubKeyTweakAdd(pub, data) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "0411C6790F4B663CCE607BAAE08C43557EDC1A4D11D88DFCB3D841D0C6A941AF525A268E2A863C148555C48FB5FBA368E88718A46E205FABC3DBA2CCFFAB0796EF", sigString, @@ -222,10 +222,10 @@ class Secp256k1Test { @Test fun testPrivKeyTweakMul_2() { - val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase()) - val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".toLowerCase()) //sha256hash of "tweak" + val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".lowercase()) + val data: ByteArray = Hex.decode("3982F19BEF1615BCCFBB05E321C10E1D4CBA3DF0E841C2E41EEB6016347653C3".lowercase()) //sha256hash of "tweak" val resultArr: ByteArray = Secp256k1.pubKeyTweakMul(pub, data) - val sigString: String = Hex.encode(resultArr).toUpperCase() + val sigString: String = Hex.encode(resultArr).uppercase() assertEquals( "04E0FE6FE55EBCA626B98A807F6CAF654139E14E5E3698F01A9A658E21DC1D2791EC060D4F412A794D5370F672BC94B722640B5F76914151CFCA6E712CA48CC589", sigString, @@ -235,10 +235,10 @@ class Secp256k1Test { @Test fun testCreateECDHSecret() { - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) - val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".toLowerCase()) + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) + val pub: ByteArray = Hex.decode("040A629506E1B65CD9D2E0BA9C75DF9C4FED0DB16DC9625ED14397F0AFC836FAE595DC53F8B0EFE61E703075BD9B143BAC75EC0E19F82A2208CAEB32BE53414C40".lowercase()) val resultArr: ByteArray = Secp256k1.ecdh(sec, pub) - val ecdhString: String = Hex.encode(resultArr).toUpperCase() + val ecdhString: String = Hex.encode(resultArr).uppercase() assertEquals( "2A2A67007A926E6594AF3EB564FC74005B37A9C8AEF2033C4552051B5C87F043", ecdhString, @@ -248,8 +248,8 @@ class Secp256k1Test { @Test fun testEcdsaRecover() { - val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".toLowerCase()) //sha256hash of "testing" - val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".toLowerCase()) + val data: ByteArray = Hex.decode("CF80CD8AED482D5D1527D7DC72FCEFF84E6326592848447D2DC0B0E87DFC9A90".lowercase()) //sha256hash of "testing" + val sec: ByteArray = Hex.decode("67E56582298859DDAE725F972992A07C6C4FB9F62A8FFF58CE3CA926A1063530".lowercase()) val pub: ByteArray = Secp256k1.pubkeyCreate(sec) val sig: ByteArray = Secp256k1.sign(data, sec) val pub0: ByteArray = Secp256k1.ecdsaRecover(sig, data, 0) @@ -259,11 +259,11 @@ class Secp256k1Test { @Test fun testCompactToDER() { - val sig: ByteArray = Hex.decode("182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A21C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9".toLowerCase()) //sha256hash of "testing" + val sig: ByteArray = Hex.decode("182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A21C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9".lowercase()) //sha256hash of "testing" val der: ByteArray = Secp256k1.compact2der(sig) assertEquals( "30440220182A108E1448DC8F1FB467D06A0F3BB8EA0533584CB954EF8DA112F1D60E39A202201C66F36DA211C087F3AF88B50EDF4F9BDAA6CF5FD6817E74DCA34DB12390C6E9", - Hex.encode(der).toUpperCase(), + Hex.encode(der).uppercase(), ) }