lightsparkdev · jklein24 · Jul 9, 2024 · Sep 20, 2023 · Sep 22, 2023 · Sep 22, 2023
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.SonatypeHost
+import java.net.URL
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import java.net.URL
 
 buildscript {
     dependencies {

diff --git a/crypto/src/commonMain/kotlin/com/lightspark/sdk/crypto/Secp256k1.kt b/crypto/src/commonMain/kotlin/com/lightspark/sdk/crypto/Secp256k1.kt
@@ -2,6 +2,7 @@ package com.lightspark.sdk.crypto
 
 import com.lightspark.sdk.crypto.internal.toByteArray
 
+@OptIn(ExperimentalUnsignedTypes::class)
 object Secp256k1 {
     fun signEcdsa(message: ByteArray, privateKey: ByteArray): ByteArray {
         return com.lightspark.sdk.crypto.internal.signEcdsa(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ ktlint = "11.3.1"
 ktor = "2.3.7"
 lightsparkCore = "0.6.0"
 lightsparkCrypto = "0.6.0"
-uma = "0.8.1"
+uma = "1.1.1"
 mavenPublish = "0.25.2"
 mockitoCore = "5.5.0"
 taskTree = "2.1.1"
@@ -115,7 +115,7 @@ mlkit-barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version
 lightspark-composeqrcode = { module = "com.lightspark:compose-qr-code", version.ref = "qrCode" }
 lightspark-core = { module = "com.lightspark:lightspark-core", version.ref = "lightsparkCore" }
 lightspark-crypto = { module = "com.lightspark:lightspark-crypto", version.ref = "lightsparkCrypto" }
-uma = { module = "me.uma:uma-sdk", version.ref = "uma" }
+uma = { module = "me.uma:uma-sdk-jvm", version.ref = "uma" }
 
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,7 +11,6 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven { url = uri("https://repo.repsy.io/mvn/chrynan/public") }
     }
 }
 

diff --git a/umaserverdemo/README.md b/umaserverdemo/README.md
@@ -5,6 +5,7 @@ An example UMA VASP server implementation using kotlin.
 ## Running the server
 
 Configuration parameters (API keys, etc.) and information on how to set them can be found in `UmaConfig.kt`.
+For instructions on how to generate the necessary certificates and keys, see [UMA documentation](https://docs.uma.me/uma-standard/keys-authentication-encryption).
 To run locally on your machine, from the kotlin-sdk directory, run:
 
 ```bash
@@ -28,8 +29,10 @@ docker run -p 8080:8080 \
 -e LIGHTSPARK_API_TOKEN_CLIENT_SECRET=$LIGHTSPARK_API_TOKEN_CLIENT_SECRET \
 -e LIGHTSPARK_UMA_NODE_ID=$LIGHTSPARK_UMA_NODE_ID \
 -e LIGHTSPARK_UMA_RECEIVER_USER=$LIGHTSPARK_UMA_RECEIVER_USER \
+-e LIGHTSPARK_UMA_ENCRYPTION_CERT_CHAIN=$LIGHTSPARK_UMA_ENCRYPTION_CERT_CHAIN \
 -e LIGHTSPARK_UMA_ENCRYPTION_PUBKEY=$LIGHTSPARK_UMA_ENCRYPTION_PUBKEY \
 -e LIGHTSPARK_UMA_ENCRYPTION_PRIVKEY=$LIGHTSPARK_UMA_ENCRYPTION_PRIVKEY \
+-e LIGHTSPARK_UMA_SIGNING_CERT_CHAIN=$LIGHTSPARK_UMA_SIGNING_CERT_CHAIN \
 -e LIGHTSPARK_UMA_SIGNING_PUBKEY=$LIGHTSPARK_UMA_SIGNING_PUBKEY \
 -e LIGHTSPARK_UMA_SIGNING_PRIVKEY=$LIGHTSPARK_UMA_SIGNING_PRIVKEY \
 uma-linux-amd64

diff --git a/umaserverdemo/build.gradle.kts b/umaserverdemo/build.gradle.kts
@@ -35,3 +35,9 @@ dependencies {
     testImplementation("io.ktor:ktor-server-tests-jvm")
     testImplementation(libs.kotlin.test.junit)
 }
+
+configurations.all {
+    resolutionStrategy {
+        cacheChangingModulesFor(0, "seconds")
+    }
+}
diff --git a/umaserverdemo/src/main/kotlin/com/lightspark/LightsparkClientUmaInvoiceCreator.kt b/umaserverdemo/src/main/kotlin/com/lightspark/LightsparkClientUmaInvoiceCreator.kt
@@ -3,10 +3,10 @@ package com.lightspark
 import com.lightspark.sdk.ClientConfig
 import com.lightspark.sdk.LightsparkCoroutinesClient
 import com.lightspark.sdk.auth.AccountApiTokenAuthProvider
-import me.uma.UmaInvoiceCreator
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.future.future
+import me.uma.UmaInvoiceCreator
 
 class LightsparkClientUmaInvoiceCreator(
     private val client: LightsparkCoroutinesClient,

diff --git a/umaserverdemo/src/main/kotlin/com/lightspark/PubKeyHandler.kt b/umaserverdemo/src/main/kotlin/com/lightspark/PubKeyHandler.kt
@@ -8,9 +8,9 @@ suspend fun handlePubKeyRequest(call: ApplicationCall, config: UmaConfig): Strin
     val twoWeeksFromNowMs = System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 14
 
     val response = PubKeyResponse(
-        signingPubKey = config.umaSigningPubKey,
-        encryptionPubKey = config.umaEncryptionPubKey,
-        expirationTimestamp = twoWeeksFromNowMs / 1000,
+        signingCertChain = config.umaSigningCertChain,
+        encryptionCertChain = config.umaEncryptionCertChain,
+        expirationTs = twoWeeksFromNowMs / 1000,
     )
 
     call.respond(response)

diff --git a/umaserverdemo/src/main/kotlin/com/lightspark/ReceivingCurrencies.kt b/umaserverdemo/src/main/kotlin/com/lightspark/ReceivingCurrencies.kt
@@ -0,0 +1,37 @@
+package com.lightspark
+
+import me.uma.protocol.Currency
+import me.uma.protocol.createCurrency
+
+// In real life, this would come from some actual exchange rate API.
+private const val MSATS_PER_USD_CENT = 22883.56
+
+fun getSatsCurrency(senderVersion: String): Currency {
+    return createCurrency(
+        code = "SAT",
+        name = "Satoshis",
+        symbol = "SAT",
+        millisatoshiPerUnit = 1000.0,
+        minSendable = 1,
+        maxSendable = 100_000_000, // 1 BTC
+        decimals = 0,
+        senderUmaVersion = senderVersion,
+    )
+}
+
+fun getReceivingCurrencies(senderUmaVersion: String): List<Currency> {
+    val satsCurrency = getSatsCurrency(senderUmaVersion)
+    return listOf(
+        createCurrency(
+            code = "USD",
+            name = "US Dollar",
+            symbol = "$",
+            millisatoshiPerUnit = MSATS_PER_USD_CENT,
+            minSendable = 1,
+            maxSendable = 1_000_000,
+            decimals = 2,
+            senderUmaVersion = senderUmaVersion,
+        ),
+        satsCurrency,
+    )
+}
diff --git a/umaserverdemo/src/main/kotlin/com/lightspark/UmaConfig.kt b/umaserverdemo/src/main/kotlin/com/lightspark/UmaConfig.kt
@@ -6,12 +6,14 @@ data class UmaConfig(
     val apiClientID: String,
     val apiClientSecret: String,
     val nodeID: String,
+    val username: String,
     val oskNodePassword: String?,
     val remoteSigningNodeKeyHex: String?,
-    val username: String,
     val userID: String,
+    val umaEncryptionCertChain: String,
     val umaEncryptionPubKeyHex: String,
     val umaEncryptionPrivKeyHex: String,
+    val umaSigningCertChain: String,
     val umaSigningPubKeyHex: String,
     val umaSigningPrivKeyHex: String,
     val clientBaseURL: String?,
@@ -46,10 +48,14 @@ data class UmaConfig(
                     ?: error("LIGHTSPARK_UMA_RECEIVER_USER not set"),
                 // Static UUID so that callback URLs are always the same.
                 userID = "4b41ae03-01b8-4974-8d26-26a35d28851b",
+                umaEncryptionCertChain = System.getenv("LIGHTSPARK_UMA_ENCRYPTION_CERT_CHAIN")
+                    ?: error("LIGHTSPARK_UMA_ENCRYPTION_CERT_CHAIN not set"),
                 umaEncryptionPubKeyHex = System.getenv("LIGHTSPARK_UMA_ENCRYPTION_PUBKEY")
                     ?: error("LIGHTSPARK_UMA_ENCRYPTION_PUBKEY not set"),
                 umaEncryptionPrivKeyHex = System.getenv("LIGHTSPARK_UMA_ENCRYPTION_PRIVKEY")
                     ?: error("LIGHTSPARK_UMA_ENCRYPTION_PRIVKEY not set"),
+                umaSigningCertChain = System.getenv("LIGHTSPARK_UMA_SIGNING_CERT_CHAIN")
+                    ?: error("LIGHTSPARK_UMA_SIGNING_CERT_CHAIN not set"),
                 umaSigningPubKeyHex = System.getenv("LIGHTSPARK_UMA_SIGNING_PUBKEY")
                     ?: error("LIGHTSPARK_UMA_SIGNING_PUBKEY not set"),
                 umaSigningPrivKeyHex = System.getenv("LIGHTSPARK_UMA_SIGNING_PRIVKEY")