fix(ocp): properly provide verifiedState for buys; fix remote sends missing verified state

bmc08gt · bmc08gt · commit 32a2d75959f8 · 2026-01-28T09:48:31.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/RepositoryFactory.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/RepositoryFactory.kt
@@ -39,9 +39,8 @@ object RepositoryFactory {
         val transactionApi = TransactionApi(module.provideManagedChannel(context, config))
         val service = AccountService(api)
         val transactionMetadataMapper = TransactionMetadataMapper()
-        val verifiedStateManager = ManagerFactory.createVerifiedStateManager()
         val swapFunding = SwapFunding(transactionApi)
-        val transactionService = TransactionService(transactionApi, transactionMetadataMapper, swapFunding, verifiedStateManager)
+        val transactionService = TransactionService(transactionApi, transactionMetadataMapper, swapFunding)
         return module.providesAccountRepository(service, transactionService)
     }
 
@@ -97,9 +96,8 @@ object RepositoryFactory {
 
         val api = TransactionApi(module.provideManagedChannel(context, config))
         val transactionMetadataMapper = TransactionMetadataMapper()
-        val verifiedStateManager = ManagerFactory.createVerifiedStateManager()
         val swapFunding = SwapFunding(api)
-        val service = TransactionService(api, transactionMetadataMapper, swapFunding, verifiedStateManager)
+        val service = TransactionService(api, transactionMetadataMapper, swapFunding)
         return module.providesTransactionRepository(service)
     }
 
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/TransactionController.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/TransactionController.kt
@@ -169,13 +169,18 @@ class TransactionController @Inject constructor(
         rendezvous: PublicKey,
         scope: CoroutineScope = this.scope,
     ): Result<IntentType> {
+        val verifiedState =
+            verifiedStateManager.getVerifiedStateFor(amount.rate.currency, token.address)
+                ?: return Result.failure(SwapError.Other(IllegalStateException("No verified state found")))
+
         val intent = IntentRemoteSend.create(
             amount = amount,
             token = token,
             owner = owner,
             source = source,
             giftCard = giftCard,
-            rendezvous = rendezvous
+            rendezvous = rendezvous,
+            verifiedState = verifiedState,
         )
 
         return submitIntent(scope, intent, owner.authority.keyPair)
@@ -260,6 +265,9 @@ class TransactionController @Inject constructor(
             Result.success(Unit)
         }
 
+        val verifiedState = verifiedStateManager.getVerifiedStateFor(amount.rate.currency, Mint.usdf)
+            ?: return Result.failure(SwapError.Other(IllegalStateException("No verified state found")))
+
         return accountResult.fold(
             onSuccess = {
                 repository.buy(
@@ -269,7 +277,9 @@ class TransactionController @Inject constructor(
                     amount = amount,
                     of = of,
                     source = source,
-                    fund = fund
+                    fund = fund,
+                    verifiedState = verifiedState,
+
                 )
             },
             onFailure = { error ->
@@ -288,15 +298,27 @@ class TransactionController @Inject constructor(
         owner: AccountCluster,
         amount: LocalFiat,
         of: Token,
-    ): Result<Unit> = repository.sell(scope = scope, owner = owner, amount = amount, of = of)
-        .onFailure { error ->
-            trace(
-                tag = "TransactionController",
-                message = error.message.orEmpty(),
-                type = TraceType.Error,
-                error = error
-            )
-        }
+    ): Result<Unit> {
+        val verifiedState =
+            verifiedStateManager.getVerifiedStateFor(amount.rate.currency, of.address)
+                ?: return Result.failure(SwapError.Other(IllegalStateException("No verified state found")))
+
+        return repository.sell(
+            scope = scope,
+            owner = owner,
+            amount = amount,
+            of = of,
+            verifiedState = verifiedState
+        )
+            .onFailure { error ->
+                trace(
+                    tag = "TransactionController",
+                    message = error.message.orEmpty(),
+                    type = TraceType.Error,
+                    error = error
+                )
+            }
+    }
 
     internal suspend fun submitIntent(
         scope: CoroutineScope,
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt
@@ -1,7 +1,7 @@
 package com.getcode.opencode.internal.domain.repositories
 
 import com.getcode.ed25519.Ed25519
-import com.getcode.opencode.internal.network.executors.IntentExecutor
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.network.services.TransactionService
 import com.getcode.opencode.internal.solana.model.SwapId
 import com.getcode.opencode.model.accounts.AccountCluster
@@ -12,7 +12,6 @@ import com.getcode.opencode.model.transactions.AirdropType
 import com.getcode.opencode.model.transactions.ExchangeData
 import com.getcode.opencode.model.transactions.SwapFundingSource
 import com.getcode.opencode.model.transactions.SwapRequest
-import com.getcode.opencode.model.transactions.SwapResult
 import com.getcode.opencode.model.transactions.TransactionMetadata
 import com.getcode.opencode.model.transactions.WithdrawalAvailability
 import com.getcode.opencode.repositories.TransactionRepository
@@ -63,14 +62,31 @@ internal class InternalTransactionRepository @Inject constructor(
         amount: LocalFiat,
         of: Token,
         swapId: SwapId?,
+        verifiedState: VerifiedState,
         source: SwapFundingSource,
         fund: (suspend (SwapRequest) -> Result<Unit>)?
-    ): Result<Unit> = service.buy(scope, swapId, amount, of, owner, source, fund)
+    ): Result<Unit> = service.buy(
+        scope = scope,
+        swapId = swapId,
+        amount = amount,
+        of = of,
+        owner = owner,
+        verifiedState = verifiedState,
+        source = source,
+        fund = fund
+    )
 
     override suspend fun sell(
         scope: CoroutineScope,
         owner: AccountCluster,
         amount: LocalFiat,
-        of: Token
-    ): Result<Unit> = service.sell(scope, amount, of, owner)
+        of: Token,
+        verifiedState: VerifiedState,
+    ): Result<Unit> = service.sell(
+        scope = scope,
+        amount = amount,
+        of = of,
+        owner = owner,
+        verifiedState = verifiedState
+    )
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentRemoteSend.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentRemoteSend.kt
@@ -1,6 +1,7 @@
 package com.getcode.opencode.internal.network.api.intents
 
 import com.codeinc.opencode.gen.transaction.v1.TransactionService
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.network.api.intents.actions.ActionOpenAccount
 import com.getcode.opencode.internal.network.api.intents.actions.ActionPublicTransfer
 import com.getcode.opencode.internal.network.api.intents.actions.ActionPublicWithdraw
@@ -32,6 +33,7 @@ internal class IntentRemoteSend(
             giftCard: GiftCardAccount,
             amount: LocalFiat,
             token: Token,
+            verifiedState: VerifiedState,
         ): IntentRemoteSend {
             // 1. Open gift card account
             val openGiftCardAccount = ActionOpenAccount.createGiftCard(giftCard.cluster, token.address)
@@ -71,7 +73,8 @@ internal class IntentRemoteSend(
                     amount = amount,
                     mint = token.address,
                     isRemoteSend = true,
-                    isWithdrawal = false
+                    isWithdrawal = false,
+                    verifiedState = verifiedState,
                 ),
                 actionGroup = actions
             )
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt
@@ -146,6 +146,7 @@ internal fun TransactionMetadata.asProtobufMetadata(): TransactionService.Metada
                     .setSource(source.asSolanaAccountId())
                     .setMint(exchangeData.mint.asSolanaAccountId())
                     .apply {
+                        println("verifiedExchangeData: $verifiedExchangeData")
                         if (verifiedExchangeData != null) {
                             setClientExchangeData(verifiedExchangeData.asProtobufExchangeData())
                         }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/TransactionService.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/services/TransactionService.kt
@@ -6,6 +6,7 @@ import com.getcode.ed25519.Ed25519
 import com.getcode.ed25519.Ed25519.KeyPair
 import com.getcode.opencode.internal.domain.mapping.TransactionMetadataMapper
 import com.getcode.opencode.internal.manager.VerifiedProtoManager
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.network.api.TransactionApi
 import com.getcode.opencode.internal.network.executors.IntentExecutor
 import com.getcode.opencode.internal.network.executors.SwapExecutor
@@ -45,7 +46,6 @@ internal class TransactionService @Inject constructor(
     private val api: TransactionApi,
     private val transactionMetadataMapper: TransactionMetadataMapper,
     private val swapFunding: SwapFunding,
-    private val verifiedStateManager: VerifiedProtoManager,
 ) {
     suspend fun submitIntent(
         scope: CoroutineScope,
@@ -195,12 +195,10 @@ internal class TransactionService @Inject constructor(
         amount: LocalFiat,
         of: Token,
         owner: AccountCluster,
+        verifiedState: VerifiedState,
         source: SwapFundingSource = SwapFundingSource.SubmitIntent(),
         fund: (suspend (SwapRequest) -> Result<Unit>)?,
     ): Result<Unit> {
-        val verifiedState = verifiedStateManager.getVerifiedStateFor(amount.rate.currency, of.address)
-            ?: return Result.failure(SwapError.Other(IllegalStateException("No verified state found")))
-
         val request = SwapRequest(
             owner = owner,
             swapAuthority = Ed25519.createKeyPair(),
@@ -226,10 +224,9 @@ internal class TransactionService @Inject constructor(
         of: Token,
         owner: AccountCluster,
         source: SwapFundingSource = SwapFundingSource.SubmitIntent(),
+        verifiedState: VerifiedState,
     ): Result<Unit> {
         val tokenCluster = owner.withTimelockForToken(of)
-        val verifiedState = verifiedStateManager.getVerifiedStateFor(amount.rate.currency, of.address)
-            ?: return Result.failure(SwapError.Other(IllegalStateException("No verified state found")))
 
         val request = SwapRequest(
             owner = tokenCluster,
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/TransactionRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/repositories/TransactionRepository.kt
@@ -1,6 +1,7 @@
 package com.getcode.opencode.repositories
 
 import com.getcode.ed25519.Ed25519.KeyPair
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.solana.model.SwapId
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.financial.Limits
@@ -57,6 +58,7 @@ interface TransactionRepository {
         amount: LocalFiat,
         of: Token,
         swapId: SwapId? = null,
+        verifiedState: VerifiedState,
         source: SwapFundingSource = SwapFundingSource.SubmitIntent(),
         fund: (suspend (SwapRequest) -> Result<Unit>)? = null,
     ): Result<Unit>
@@ -65,6 +67,7 @@ interface TransactionRepository {
         scope: CoroutineScope,
         owner: AccountCluster,
         amount: LocalFiat,
-        of: Token
+        of: Token,
+        verifiedState: VerifiedState,
     ): Result<Unit>
 }

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ internal fun TransactionMetadata.asProtobufMetadata(): TransactionService.Metada`
`146`	`146`	`.setSource(source.asSolanaAccountId())`
`147`	`147`	`.setMint(exchangeData.mint.asSolanaAccountId())`
`148`	`148`	`.apply {`
	`149`	`+ println("verifiedExchangeData: $verifiedExchangeData")`
`149`	`150`	`if (verifiedExchangeData != null) {`
`150`	`151`	`setClientExchangeData(verifiedExchangeData.asProtobufExchangeData())`
`151`	`152`	`}`