feat: update give/grab flow to passthrough VerifiedExchangeData

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/bill/BillController.kt

@@ -1,6 +1,7 @@
 package com.flipcash.app.core.internal.bill
 
 import com.flipcash.app.core.bill.BillState
+import com.flipcash.services.user.UserManager
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.managers.BillTransactionManager
 import com.getcode.opencode.model.accounts.GiftCardAccount
@@ -17,6 +18,7 @@ import javax.inject.Singleton
 @Singleton
 class BillController @Inject constructor(
     private val transactionManager: BillTransactionManager,
+    private val userManager: UserManager,
 ) {
     private val _state = MutableStateFlow(BillState.Default)
     val state: StateFlow<BillState>
@@ -41,7 +43,16 @@ class BillController @Inject constructor(
         onGrabbed: suspend (LocalFiat) -> Unit,
         onTimeout: () -> Unit,
         onError: (Throwable) -> Unit,
-    ) = transactionManager.awaitGrabFromRecipient(token, amount, owner, present, onGrabbed, onTimeout, onError)
+    ) = transactionManager.awaitGrabFromRecipient(
+        token = token,
+        amount = amount,
+        owner = owner,
+        billExchangeDataTimeout = userManager.userFlags?.billExchangeDataTimeout,
+        present = present,
+        onGrabbed = onGrabbed,
+        onTimeout = onTimeout,
+        onError = onError,
+    )
 
     fun cancelAwaitForGrab() = transactionManager.cancelAwaitForGrab()
 

definitions/flipcash/protos/src/main/proto/account/v1/flipcash_account_service.proto

@@ -4,6 +4,7 @@ option go_package = "github.com/code-payments/flipcash2-protobuf-api/generated/g
 option java_package = "com.codeinc.flipcash.gen.account.v1";
 option objc_class_prefix = "FPBAccountV1";
 import "common/v1/common.proto";
+import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 service Account {
@@ -105,4 +106,6 @@ message UserFlags {
 	// The minumum build number for this user. If their build number is less than the
 	// provided value, client should show a forced upgrade screen.
 	uint32 min_build_number = 6;
+	// Exchange data timeout for sequential give/grabs for bills
+	google.protobuf.Duration bill_exchange_data_timeout = 7;
 }

definitions/opencode/protos/src/main/proto/messaging/v1/messaging_service.proto

@@ -4,6 +4,7 @@ option go_package = "github.com/code-payments/ocp-protobuf-api/generated/go/mess
 option java_package = "com.codeinc.opencode.gen.messaging.v1";
 option objc_class_prefix = "CPBMessagingV1";
 import "common/v1/model.proto";
+import "transaction/v1/transaction_service.proto";
 
 service Messaging {
     // OpenMessageStream opens a stream of messages. Messages are routed using the
@@ -147,6 +148,10 @@ message RequestToGrabBill {
 message RequestToGiveBill {
     // The mint that the bill will be received in
     common.v1.SolanaAccountId mint = 1;
+    // The validated exchange data that was used to compute the fiat value of the give
+    // to support subsequent gives. Clients should be aware of timeouts and dismiss a
+    // bill if the threshold is met.
+    transaction.v1.VerifiedExchangeData exchange_data = 2;
 }
 message Message {
     // MessageId is the Id of the message. This ID is generated by the

services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/UserFlagsMapper.kt

@@ -6,6 +6,8 @@ import com.flipcash.services.internal.model.account.UserFlags
 import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.internal.model.thirdparty.OnRampType
 import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 internal class UserFlagsMapper @Inject constructor():
     Mapper<FlipcashAccountService.UserFlags, UserFlags> {
@@ -16,7 +18,8 @@ internal class UserFlagsMapper @Inject constructor():
             requiresIapForRegistration = from.requiresIapForRegistration,
             preferredOnRampProvider = from.preferredOnRampProvider.toDomain().takeIf { it != OnRampProvider.Unknown },
             supportedOnRampProviders = from.supportedOnRampProvidersList.map { it.toDomain() },
-            minimumVersion = from.minBuildNumber
+            minimumVersion = from.minBuildNumber,
+            billExchangeDataTimeout = from.billExchangeDataTimeout.seconds.toDuration(DurationUnit.SECONDS),
         )
     }
 }

services/flipcash/src/main/kotlin/com/flipcash/services/internal/model/account/UserFlags.kt

@@ -1,6 +1,7 @@
 package com.flipcash.services.internal.model.account
 
 import com.flipcash.services.internal.model.thirdparty.OnRampProvider
+import kotlin.time.Duration
 
 data class UserFlags(
     val isStaff: Boolean,
@@ -9,4 +10,5 @@ data class UserFlags(
     val preferredOnRampProvider: OnRampProvider?,
     val supportedOnRampProviders: List<OnRampProvider>,
     val minimumVersion: Int?,
+    val billExchangeDataTimeout: Duration?,
 )

services/opencode/src/main/kotlin/com/getcode/opencode/controllers/MessagingController.kt

@@ -1,39 +1,35 @@
 package com.getcode.opencode.controllers
 
 import com.codeinc.opencode.gen.messaging.v1.MessagingService
+import com.codeinc.opencode.gen.messaging.v1.exchangeDataOrNull
+import com.codeinc.opencode.gen.transaction.v1.TransactionService
+import com.codeinc.opencode.gen.transaction.v1.exchangeData
 import com.getcode.ed25519.Ed25519.KeyPair
 import com.getcode.opencode.internal.extensions.toPublicKey
+import com.getcode.opencode.internal.manager.VerifiedState
+import com.getcode.opencode.internal.network.extensions.asProtobufExchangeData
 import com.getcode.opencode.internal.network.extensions.asSolanaAccountId
 import com.getcode.opencode.internal.network.extensions.toMint
+import com.getcode.opencode.internal.network.extensions.toModel
 import com.getcode.opencode.internal.network.extensions.toPublicKey
 import com.getcode.opencode.internal.network.services.OcpMessageStreamReference
 import com.getcode.opencode.model.core.OpenCodePayload
-import com.getcode.opencode.model.financial.Token
+import com.getcode.opencode.model.transactions.ExchangeData
 import com.getcode.opencode.model.transactions.GiveRequest
 import com.getcode.opencode.model.transactions.GrabRequest
 import com.getcode.opencode.repositories.MessagingRepository
-import com.getcode.opencode.utils.flowInterval
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.PublicKey
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.fold
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.coroutines.resume
@@ -159,7 +155,7 @@ class MessagingController @Inject constructor(
 
     suspend fun pollForGiveRequest(
         rendezvous: KeyPair,
-    ): Result<Pair<PublicKey, Mint>>{
+    ): Result<GiveRequest>{
 
         return repository.pollMessages(rendezvous)
             .map { messages ->
@@ -170,17 +166,25 @@ class MessagingController @Inject constructor(
             }.mapCatching { messages ->
                 val message = messages.firstOrNull() ?: throw IllegalStateException("No message found")
                 val mint = message.requestToGiveBill.mint.toMint()
+                val exchangeData = message.requestToGiveBill.exchangeData.toModel()
 
-                (message.id.toPublicKey() to mint)
+                GiveRequest(
+                    messageId = message.id.toPublicKey(),
+                    mint = mint,
+                    exchangeData = exchangeData
+                )
             }
     }
 
     suspend fun sendRequestToGiveBill(
         tokenMint: Mint,
         rendezvous: KeyPair,
+        exchangeRate: ExchangeData.Verified,
     ): Result<PublicKey> {
         val paymentRequest = MessagingService.RequestToGiveBill.newBuilder()
             .setMint(tokenMint.asSolanaAccountId())
+            .setExchangeData(exchangeRate.asProtobufExchangeData())
+            .build()
 
         val message = MessagingService.Message.newBuilder()
             .setRequestToGiveBill(paymentRequest)

services/opencode/src/main/kotlin/com/getcode/opencode/controllers/TransactionController.kt

@@ -20,6 +20,7 @@ import com.getcode.opencode.model.financial.Limits
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 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.SwapMetadata
 import com.getcode.opencode.model.transactions.SwapRequest
@@ -120,17 +121,15 @@ class TransactionController @Inject constructor(
         destination: PublicKey,
         rendezvous: PublicKey,
         scope: CoroutineScope = this.scope,
+        exchangeData: ExchangeData.Verified,
     ): Result<IntentType> {
-        val verifiedState = verifiedStateManager.getVerifiedStateFor(amount.rate.currency, mint)
-            ?: return Result.failure(SwapError.Other(IllegalStateException("No verified state found")))
-
         val intent = IntentTransfer.create(
             amount = amount,
             mint = mint,
             sourceCluster = source,
             destination = destination,
             rendezvous = rendezvous,
-            verifiedState = verifiedState,
+            exchangeData = exchangeData,
         )
 
         return submitIntent(scope, intent, source.authority.keyPair)

services/opencode/src/main/kotlin/com/getcode/opencode/internal/extensions/VerifiedState.kt

@@ -0,0 +1,30 @@
+package com.getcode.opencode.internal.extensions
+
+import com.getcode.opencode.internal.manager.VerifiedState
+import com.getcode.opencode.model.financial.LocalFiat
+import com.getcode.opencode.model.transactions.ExchangeData
+import com.getcode.solana.keys.Mint
+import com.getcode.utils.TraceType
+import com.getcode.utils.trace
+import kotlin.time.Duration
+
+fun VerifiedState.exchangeDataFor(
+    amount: LocalFiat,
+    mint: Mint,
+    billExchangeDataTimeout: Duration?
+): ExchangeData.Verified? {
+    if (billExchangeDataTimeout == null) {
+        trace(
+            tag = "Transactor::Give",
+            message = "No bill exchange data timeout provided. This bill is not giveable.",
+            type = TraceType.Error
+        )
+        return null
+    }
+    return ExchangeData.Verified(
+        mint = mint,
+        nativeAmount = amount.nativeAmount.decimalValue,
+        quarks = amount.underlyingTokenAmount.quarks,
+        verifiedState = this,
+    )
+}

services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentTransfer.kt

@@ -1,6 +1,7 @@
 package com.getcode.opencode.internal.network.api.intents
 
 import com.codeinc.opencode.gen.transaction.v1.TransactionService
+import com.codeinc.opencode.gen.transaction.v1.exchangeData
 import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.model.VerifiedResponseData
 import com.getcode.opencode.internal.network.api.intents.actions.ActionPublicTransfer
@@ -9,6 +10,7 @@ import com.getcode.opencode.internal.network.extensions.asSolanaAccountId
 import com.getcode.opencode.internal.network.extensions.asExchangeData
 import com.getcode.opencode.internal.network.extensions.asProtobufMetadata
 import com.getcode.opencode.model.financial.LocalFiat
+import com.getcode.opencode.model.transactions.ExchangeData
 import com.getcode.opencode.model.transactions.TransactionMetadata
 import com.getcode.opencode.solana.intents.ActionGroup
 import com.getcode.opencode.solana.intents.IntentType
@@ -31,7 +33,7 @@ internal class IntentTransfer(
             sourceCluster: AccountCluster,
             destination: PublicKey,
             rendezvous: PublicKey,
-            verifiedState: VerifiedState,
+            exchangeData: ExchangeData.Verified,
         ): IntentTransfer {
             val transfer = ActionPublicTransfer.newInstance(
                 owner = sourceCluster.authority.keyPair,
@@ -50,7 +52,7 @@ internal class IntentTransfer(
                     mint = mint,
                     isRemoteSend = false,
                     isWithdrawal = false,
-                    verifiedState = verifiedState,
+                    exchangeData = exchangeData,
                 ),
                 actionGroup = ActionGroup().apply {
                     actions = listOf(transfer)

services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt

@@ -225,6 +225,7 @@ internal fun TransferRequest.asProtobufMessage(): MessagingService.Message {
                 MessagingService.RequestToGiveBill
                     .newBuilder()
                     .setMint(mint.asSolanaAccountId())
+                    .setExchangeData(exchangeData.asProtobufExchangeData())
             ).build()
 
         is GrabRequest -> MessagingService.Message