Merge pull request #56 from lightsparkdev/release/crypto-v0.2.0

Merge release/crypto-v0.2.0 into main

Author: jklein24

.editorconfig

@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = true
 ktlint_code_style = official
 ktlint_function_signature_body_expression_wrapping = default
-ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = -1
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = unset
 ktlint_ignore_back_ticked_identifier = false
 ktlint_standard_trailing-comma-on-call-site = disabled
 max_line_length = 120

androidwalletdemo/src/main/java/com/lightspark/androidwalletdemo/requestpayment/RequestPaymentViewModel.kt

@@ -34,7 +34,7 @@ class RequestPaymentViewModel @Inject constructor(
                 invoice.data.let {
                     Lce.Content(
                         RequestPaymentUiState(
-                            invoice.data.encodedPaymentRequest,
+                            invoice.data.data.encodedPaymentRequest,
                             invoiceAmount.value,
                         ),
                     )

crypto/gradle.properties

@@ -1,7 +1,7 @@
 GROUP=com.lightspark
 POM_ARTIFACT_ID=lightspark-crypto
 # Don't bump this manually. Run `scripts/versions.main.kt <new_version>` to bump the version instead.
-VERSION_NAME=0.1.2
+VERSION_NAME=0.2.0
 
 POM_DESCRIPTION=The Lightspark shared crypto library.
 POM_INCEPTION_YEAR=2023

crypto/src/androidMain/jniLibs/arm64-v8a/libuniffi_lightspark_crypto.so

@@ -4,6 +4,7 @@ package com.lightspark.sdk.crypto
 
 import com.lightspark.sdk.crypto.internal.LightsparkSigner
 import com.lightspark.sdk.crypto.internal.Mnemonic
+import com.lightspark.sdk.crypto.internal.Network
 import com.lightspark.sdk.crypto.internal.Seed
 import com.lightspark.sdk.crypto.internal.use
 
@@ -20,53 +21,60 @@ object Signing {
             }
         }
 
-    fun ecdh(seedBytes: ByteArray, derivationPath: String, otherPubKey: String): ByteArray {
-        val signer = LightsparkSigner()
-        var seed: Seed? = null
-        try {
-            seed = Seed(seedBytes.toUByteArray().toList())
-            return signer.ecdh(seed, derivationPath, otherPubKey).toUByteArray().toByteArray()
-        } finally {
-            signer.close()
-            seed?.close()
+    fun ecdh(seedBytes: ByteArray, network: Network, otherPubKeyHex: String): ByteArray {
+        return withSeedAndSigner(seedBytes, network) { _, signer ->
+            val otherPubKeyBytes = otherPubKeyHex.hexToByteArray().toUByteArray().toList()
+            signer.ecdh(otherPubKeyBytes).toUByteArray().toByteArray()
         }
     }
 
-    fun derivePublicKey(seedBytes: ByteArray, derivationPath: String): String {
-        val signer = LightsparkSigner()
-        var seed: Seed? = null
-        try {
-            seed = Seed(seedBytes.toUByteArray().toList())
-            return signer.derivePublicKey(seed, derivationPath)
-        } finally {
-            signer.close()
-            seed?.close()
+    fun derivePublicKey(seedBytes: ByteArray, network: Network, derivationPath: String): String {
+        return withSeedAndSigner(seedBytes, network) { _, signer ->
+            signer.derivePublicKey(derivationPath)
         }
     }
 
     @JvmOverloads
     fun signMessage(
         message: ByteArray,
         seedBytes: ByteArray,
+        network: Network,
         derivationPath: String? = null,
+        isRaw: Boolean = false,
         multTweak: ByteArray? = null,
         addTweak: ByteArray? = null,
     ): ByteArray {
-        val signer = LightsparkSigner()
-        var seed: Seed? = null
-        try {
-            seed = Seed(seedBytes.toUByteArray().toList())
-            val signature = signer.deriveKeyAndSign(
-                seed,
+        return withSeedAndSigner(seedBytes, network) { _, signer ->
+            signer.deriveKeyAndSign(
                 message = message.toUByteArray().toList(),
                 derivationPath = derivationPath ?: "",
+                isRaw = isRaw,
                 mulTweak = multTweak?.toUByteArray()?.toList(),
                 addTweak = addTweak?.toUByteArray()?.toList(),
-            )
-            return  signature.toUByteArray().toByteArray()
+            ).toUByteArray().toByteArray()
+        }
+    }
+
+    private fun <T> withSeedAndSigner(seedBytes: ByteArray, network: Network, block: (Seed, LightsparkSigner) -> T): T {
+        var seed: Seed? = null
+        var signer: LightsparkSigner? = null
+        try {
+            seed = Seed(seedBytes.toUByteArray().toList())
+            signer = LightsparkSigner(seed, network)
+            return block(seed, signer)
         } finally {
-            signer.close()
+            signer?.close()
             seed?.close()
         }
     }
 }
+
+private fun String.hexToByteArray(): ByteArray {
+    check(length % 2 == 0) { "Must have an even length" }
+
+    val byteIterator = chunkedSequence(2)
+        .map { it.toInt(16).toByte() }
+        .iterator()
+
+    return ByteArray(length / 2) { byteIterator.next() }
+}