feat: MOBILE-389 - add multi-chain support in wallet connection api (#716)

wlara · web-flow · commit 73f185c23298 · 2026-01-26T07:46:33.000-08:00
diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V85__WalletConnectionsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V85__WalletConnectionsUpdates.kt
@@ -0,0 +1,24 @@
+package io.newm.server.database.migration
+
+import org.flywaydb.core.api.migration.BaseJavaMigration
+import org.flywaydb.core.api.migration.Context
+import org.jetbrains.exposed.sql.transactions.transaction
+
+@Suppress("unused")
+class V85__WalletConnectionsUpdates : BaseJavaMigration() {
+    override fun migrate(context: Context?) {
+        transaction {
+            execInBatch(
+                listOf(
+                    "ALTER TABLE wallet_connections RENAME COLUMN stake_address TO address",
+                    "ALTER TABLE wallet_connections ADD COLUMN IF NOT EXISTS chain int",
+                    "UPDATE wallet_connections SET chain = 0 WHERE chain IS NULL",
+                    "ALTER TABLE wallet_connections ALTER COLUMN chain SET NOT NULL",
+                    "ALTER TABLE wallet_connections ADD COLUMN IF NOT EXISTS name TEXT",
+                    "UPDATE wallet_connections SET name = 'Cardano-' || right(address, 6) WHERE name IS NULL",
+                    "ALTER TABLE wallet_connections ALTER COLUMN name SET NOT NULL"
+                )
+            )
+        }
+    }
+}
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/cardano/repo/CardanoRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/cardano/repo/CardanoRepositoryImpl.kt
@@ -54,10 +54,10 @@ import io.newm.server.config.repo.ConfigRepository.Companion.CONFIG_KEY_NFTCDN_E
 import io.newm.server.features.cardano.database.KeyEntity
 import io.newm.server.features.cardano.database.KeyTable
 import io.newm.server.features.cardano.database.ScriptAddressWhitelistEntity
+import io.newm.server.features.cardano.model.CardanoNftSong
 import io.newm.server.features.cardano.model.EncryptionRequest
 import io.newm.server.features.cardano.model.GetWalletSongsResponse
 import io.newm.server.features.cardano.model.Key
-import io.newm.server.features.cardano.model.CardanoNftSong
 import io.newm.server.features.cardano.model.WalletSong
 import io.newm.server.features.cardano.parser.toNFTSongs
 import io.newm.server.features.cardano.parser.toResourceUrl
@@ -80,6 +80,7 @@ import io.newm.server.features.song.model.Song
 import io.newm.server.features.song.model.SongFilters
 import io.newm.server.features.song.repo.SongRepository
 import io.newm.server.features.walletconnection.database.WalletConnectionEntity
+import io.newm.server.features.walletconnection.model.WalletChain
 import io.newm.server.ktx.cborHexToUtxo
 import io.newm.server.ktx.sign
 import io.newm.server.model.FilterCriteria
@@ -91,12 +92,6 @@ import io.newm.txbuilder.ktx.fingerprint
 import io.newm.txbuilder.ktx.mergeAmounts
 import io.newm.txbuilder.ktx.toCborObject
 import io.newm.txbuilder.ktx.toNativeAssetMap
-import java.time.Duration
-import java.util.UUID
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-import kotlin.time.Duration.Companion.minutes
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -107,6 +102,12 @@ import software.amazon.awssdk.core.SdkBytes
 import software.amazon.awssdk.services.kms.KmsAsyncClient
 import software.amazon.awssdk.services.kms.model.DecryptRequest
 import software.amazon.awssdk.services.kms.model.EncryptRequest
+import java.time.Duration
+import java.util.UUID
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
+import kotlin.time.Duration.Companion.minutes
 
 internal class CardanoRepositoryImpl(
     private val client: NewmChainCoroutineStub,
@@ -623,7 +624,7 @@ internal class CardanoRepositoryImpl(
 
     private fun getStakeAddressesByUserId(userId: UserId): List<String> =
         transaction {
-            WalletConnectionEntity.getAllByUserId(userId).map { it.stakeAddress }
+            WalletConnectionEntity.getAllByUserIdAndWalletChain(userId, WalletChain.Cardano).map { it.address }
         }
 
     private suspend fun getWalletAssets(userId: UserId): List<NativeAsset> =
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/ethereum/repo/EthereumRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/ethereum/repo/EthereumRepositoryImpl.kt
@@ -12,7 +12,8 @@ import io.newm.server.features.ethereum.model.EthereumNft
 import io.newm.server.features.ethereum.model.EthereumNftSong
 import io.newm.server.features.ethereum.model.GetNftsByOwnerResponse
 import io.newm.server.features.ethereum.parser.parseSong
-import io.newm.server.features.user.database.UserEntity
+import io.newm.server.features.walletconnection.database.WalletConnectionEntity
+import io.newm.server.features.walletconnection.model.WalletChain
 import io.newm.server.ktx.checkedBody
 import io.newm.server.ktx.getSecureConfigString
 import io.newm.server.typealiases.UserId
@@ -28,23 +29,24 @@ internal class EthereumRepositoryImpl(
     override suspend fun getWalletNftSongs(userId: UserId): List<EthereumNftSong> {
         logger.debug { "getWalletNftSongs: userId = $userId" }
 
-        // Temporary test hook until Ethereum wallet connections are implemented
-        val email = transaction { UserEntity[userId].email }
-        if (!email.endsWith("@newm.io")) return emptyList()
-        val address = "0x89fd6e1e7a737293dc9ecaee118753b7abdf5e37"
-
+        val addresses = transaction {
+            WalletConnectionEntity.getAllByUserIdAndWalletChain(userId, WalletChain.Ethereum).map { it.address }
+        }
         val apiUrl = environment.getConfigString("alchemy.apiUrl")
         val apiKey = environment.getSecureConfigString("alchemy.apiKey")
-        return client
-            .get("$apiUrl/nft/v3/$apiKey/getNFTsForOwner") {
-                retry {
-                    maxRetries = 2
-                    delayMillis { 500L }
-                }
-                accept(ContentType.Application.Json)
-                parameter("owner", address)
-            }.checkedBody<GetNftsByOwnerResponse>()
-            .ownedNfts
-            .mapNotNull(EthereumNft::parseSong)
+        val endpointUrl = "$apiUrl/nft/v3/$apiKey/getNFTsForOwner"
+        return addresses.flatMap { address ->
+            client
+                .get(endpointUrl) {
+                    retry {
+                        maxRetries = 2
+                        delayMillis { 500L }
+                    }
+                    accept(ContentType.Application.Json)
+                    parameter("owner", address)
+                }.checkedBody<GetNftsByOwnerResponse>()
+                .ownedNfts
+                .mapNotNull(EthereumNft::parseSong)
+        }
     }
 }
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutes.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutes.kt
@@ -15,6 +15,7 @@ import io.newm.server.ktx.myUserId
 import io.newm.server.recaptcha.repo.RecaptchaRepository
 import io.newm.shared.ktx.delete
 import io.newm.shared.ktx.get
+import io.newm.shared.ktx.patch
 import io.newm.shared.ktx.post
 import org.koin.ktor.ext.inject
 
@@ -56,6 +57,12 @@ fun Routing.createWalletConnectionRoutes() {
                     }
                     respond(walletConnectionRepository.connect(connId, myUserId))
                 }
+
+                patch {
+                    walletConnectionRepository.updateUserConnection(connectionId, myUserId, receive())
+                    respond(HttpStatusCode.NoContent)
+                }
+
                 delete {
                     walletConnectionRepository.disconnect(connectionId, myUserId)
                     respond(HttpStatusCode.NoContent)
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionEntity.kt
@@ -1,5 +1,6 @@
 package io.newm.server.features.walletconnection.database
 
+import io.newm.server.features.walletconnection.model.WalletChain
 import io.newm.server.features.walletconnection.model.WalletConnection
 import io.newm.server.typealiases.UserId
 import org.jetbrains.exposed.dao.UUIDEntity
@@ -18,14 +19,19 @@ class WalletConnectionEntity(
     id: EntityID<UUID>
 ) : UUIDEntity(id) {
     val createdAt: LocalDateTime by WalletConnectionTable.createdAt
-    var stakeAddress: String by WalletConnectionTable.stakeAddress
+    var address: String by WalletConnectionTable.address
+    var chain: WalletChain by WalletConnectionTable.chain
+    var name: String by WalletConnectionTable.name
     var userId: EntityID<UserId>? by WalletConnectionTable.userId
 
     fun toModel(): WalletConnection =
         WalletConnection(
             id = id.value,
             createdAt = createdAt,
-            stakeAddress = stakeAddress
+            address = address,
+            chain = chain,
+            name = name,
+            stakeAddress = address // to be removed in future versions
         )
 
     companion object : UUIDEntityClass<WalletConnectionEntity>(WalletConnectionTable) {
@@ -37,13 +43,21 @@ class WalletConnectionEntity(
 
         fun deleteAllDuplicates(entity: WalletConnectionEntity) {
             WalletConnectionTable.deleteWhere {
-                (id neq entity.id) and (userId eq entity.userId) and (stakeAddress eq entity.stakeAddress)
+                (id neq entity.id) and (userId eq entity.userId) and (address eq entity.address)
             }
         }
 
         fun getAllByUserId(userId: UserId): SizedIterable<WalletConnectionEntity> =
             find {
                 WalletConnectionTable.userId eq userId
             }
+
+        fun getAllByUserIdAndWalletChain(
+            userId: UserId,
+            chain: WalletChain
+        ): SizedIterable<WalletConnectionEntity> =
+            find {
+                (WalletConnectionTable.userId eq userId) and (WalletConnectionTable.chain eq chain)
+            }
     }
 }
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionTable.kt
@@ -1,6 +1,7 @@
 package io.newm.server.features.walletconnection.database
 
 import io.newm.server.features.user.database.UserTable
+import io.newm.server.features.walletconnection.model.WalletChain
 import io.newm.server.typealiases.UserId
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.UUIDTable
@@ -12,6 +13,8 @@ import java.time.LocalDateTime
 
 object WalletConnectionTable : UUIDTable(name = "wallet_connections") {
     val createdAt: Column<LocalDateTime> = datetime("created_at").defaultExpression(CurrentDateTime)
-    val stakeAddress: Column<String> = text("stake_address")
+    val chain: Column<WalletChain> = enumeration("chain", WalletChain::class)
+    val address: Column<String> = text("address")
+    val name: Column<String> = text("name")
     val userId: Column<EntityID<UserId>?> = reference("user_id", UserTable, onDelete = ReferenceOption.NO_ACTION).nullable()
 }
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/model/WalletChain.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/model/WalletChain.kt
@@ -0,0 +1,6 @@
+package io.newm.server.features.walletconnection.model
+
+enum class WalletChain {
+    Cardano,
+    Ethereum
+}
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/model/WalletConnection.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/model/WalletConnection.kt
@@ -11,5 +11,9 @@ data class WalletConnection(
     val id: UUID,
     @Contextual
     val createdAt: LocalDateTime,
+    val address: String,
+    val chain: WalletChain,
+    val name: String,
+    @Deprecated("use address field instead, will be removed in future versions")
     val stakeAddress: String
 )
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/model/WalletConnectionUpdateRequest.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/model/WalletConnectionUpdateRequest.kt
@@ -0,0 +1,8 @@
+package io.newm.server.features.walletconnection.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class WalletConnectionUpdateRequest(
+    val name: String
+)
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepository.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepository.kt
@@ -2,9 +2,10 @@ package io.newm.server.features.walletconnection.repo
 
 import io.newm.server.features.walletconnection.model.AnswerChallengeRequest
 import io.newm.server.features.walletconnection.model.AnswerChallengeResponse
-import io.newm.server.features.walletconnection.model.WalletConnection
 import io.newm.server.features.walletconnection.model.GenerateChallengeRequest
 import io.newm.server.features.walletconnection.model.GenerateChallengeResponse
+import io.newm.server.features.walletconnection.model.WalletConnection
+import io.newm.server.features.walletconnection.model.WalletConnectionUpdateRequest
 import io.newm.server.typealiases.UserId
 import java.util.UUID
 
@@ -26,4 +27,10 @@ interface WalletConnectionRepository {
     )
 
     suspend fun getUserConnections(userId: UserId): List<WalletConnection>
+
+    suspend fun updateUserConnection(
+        connectionId: UUID,
+        userId: UserId,
+        request: WalletConnectionUpdateRequest
+    )
 }
diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepositoryImpl.kt
@@ -6,26 +6,34 @@ import com.google.iot.cbor.CborMap
 import com.google.iot.cbor.CborTextString
 import com.google.protobuf.kotlin.toByteString
 import io.github.oshai.kotlinlogging.KotlinLogging
-import io.ktor.server.application.*
-import io.ktor.utils.io.core.*
+import io.ktor.server.application.ApplicationEnvironment
+import io.ktor.utils.io.core.toByteArray
 import io.newm.chain.util.Bech32
 import io.newm.chain.util.Constants
 import io.newm.chain.util.toHexString
 import io.newm.server.features.cardano.repo.CardanoRepository
 import io.newm.server.features.user.database.UserTable
 import io.newm.server.features.walletconnection.database.WalletConnectionChallengeEntity
 import io.newm.server.features.walletconnection.database.WalletConnectionEntity
-import io.newm.server.features.walletconnection.model.*
+import io.newm.server.features.walletconnection.model.AnswerChallengeRequest
+import io.newm.server.features.walletconnection.model.AnswerChallengeResponse
+import io.newm.server.features.walletconnection.model.ChallengeMethod
+import io.newm.server.features.walletconnection.model.GenerateChallengeRequest
+import io.newm.server.features.walletconnection.model.GenerateChallengeResponse
+import io.newm.server.features.walletconnection.model.WalletChain
+import io.newm.server.features.walletconnection.model.WalletConnection
+import io.newm.server.features.walletconnection.model.WalletConnectionUpdateRequest
 import io.newm.server.typealiases.UserId
 import io.newm.shared.exception.HttpForbiddenException
 import io.newm.shared.exception.HttpNotFoundException
 import io.newm.shared.ktx.existsHavingId
 import io.newm.shared.ktx.getConfigLong
 import org.jetbrains.exposed.dao.id.EntityID
+import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import org.jetbrains.exposed.sql.transactions.transaction
 import qrcode.QRCode
 import qrcode.color.Colors
-import java.util.*
+import java.util.UUID
 
 internal class WalletConnectionRepositoryImpl(
     private val environment: ApplicationEnvironment,
@@ -158,7 +166,9 @@ internal class WalletConnectionRepositoryImpl(
         val connection =
             transaction {
                 WalletConnectionEntity.new {
-                    this.stakeAddress = stakeAddress
+                    this.address = stakeAddress
+                    this.chain = WalletChain.Cardano
+                    this.name = "Cardano-${stakeAddress.takeLast(6)}"
                 }
             }
         return AnswerChallengeResponse(
@@ -217,6 +227,21 @@ internal class WalletConnectionRepositoryImpl(
         }
     }
 
+    override suspend fun updateUserConnection(
+        connectionId: UUID,
+        userId: UserId,
+        request: WalletConnectionUpdateRequest
+    ) {
+        logger.debug { "updateUserConnection: connectionId = $connectionId, userId = $userId, request = $request" }
+
+        newSuspendedTransaction {
+            with(WalletConnectionEntity[connectionId]) {
+                if (this.userId?.value != userId) throw HttpForbiddenException("User doesn't own connection")
+                this.name = request.name
+            }
+        }
+    }
+
     private fun buildChallengeString(
         challengeId: UUID,
         stakeAddress: String
diff --git a/newm-server/src/test/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutesTest.kt b/newm-server/src/test/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutesTest.kt
