fix(ocp): properly support passthrough of verifiedState from grab => give while bill is still active

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

Author: bmc08gt

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

@@ -5,6 +5,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.flipcash.core.R
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
@@ -122,6 +123,7 @@ sealed interface Bill {
         override val confirmationDelay: Duration = Duration.ZERO,
         override val data: List<Byte> = emptyList(),
         val kind: Kind = Kind.cash,
+        val verifiedState: VerifiedState? = null,
     ) : Bill {
         override val canFlip: Boolean = false
     }

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

@@ -2,6 +2,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.internal.manager.VerifiedState
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.managers.BillTransactionManager
 import com.getcode.opencode.model.accounts.GiftCardAccount
@@ -39,6 +40,7 @@ class BillController @Inject constructor(
         amount: LocalFiat,
         token: Token,
         owner: AccountCluster,
+        verifiedState: VerifiedState?,
         present: (List<Byte>) -> Unit,
         onGrabbed: suspend (LocalFiat) -> Unit,
         onTimeout: () -> Unit,
@@ -47,6 +49,7 @@ class BillController @Inject constructor(
         token = token,
         amount = amount,
         owner = owner,
+        verifiedState = verifiedState,
         billExchangeDataTimeout = userManager.userFlags?.billExchangeDataTimeout,
         present = present,
         onGrabbed = onGrabbed,
@@ -59,7 +62,7 @@ class BillController @Inject constructor(
     fun attemptGrab(
         owner: AccountCluster,
         payload: OpenCodePayload,
-        onGrabbed: suspend (Token, LocalFiat) -> Unit,
+        onGrabbed: suspend (Token, LocalFiat, VerifiedState?) -> Unit,
         onError: (Throwable) -> Unit,
     ) = transactionManager.attemptGrabFromSender(owner, payload, onGrabbed, onError)
 
@@ -76,7 +79,7 @@ class BillController @Inject constructor(
         entropy: String,
         owner: AccountCluster,
         claimIfOwned: Boolean,
-        onReceived: suspend (Token, LocalFiat) -> Unit,
+        onReceived: suspend (Token, LocalFiat,) -> Unit,
         onError: (Throwable) -> Unit,
     ) = transactionManager.receiveGiftCard(owner, entropy, claimIfOwned, onReceived, onError)
 }

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt

@@ -237,7 +237,7 @@ class RealSessionController @Inject constructor(
      * Specifically, it clears the bottom bar, cancels any pending bill grab actions, and cancels
      * any ongoing send operations if:
      * - The share sheet is not currently checking for a share action, OR
-     * - There is an active bill and it has not yet been received.
+     * - There is an active bill, and it has not yet been received.
      */
     override fun onAppInBackground() {
         stopPolling()
@@ -414,6 +414,7 @@ class RealSessionController @Inject constructor(
         billController.awaitGrab(
             amount = bill.amount,
             token = bill.token,
+            verifiedState = (bill as? Bill.Cash)?.verifiedState,
             owner = owner,
             onGrabbed = { amount ->
                 tokenCoordinator.subtract(bill.token, amount)
@@ -425,11 +426,6 @@ class RealSessionController @Inject constructor(
             },
             onTimeout = {
                 dismissBill(action = PutInWallet)
-//                analytics.billTimeoutReached(
-//                    bill.amount.kin,
-//                    bill.amount.rate.currency,
-//                    CodeAnalyticsManager.BillPresentationStyle.Slide
-//                )
             },
             onError = {
                 analytics.transfer(
@@ -733,7 +729,11 @@ class RealSessionController @Inject constructor(
                 analytics.transfer(Analytics.Transfer.ClaimedCashLink, amount = amount)
                 toastController.enqueue(amount, isDeposit = true)
                 showBill(
-                    bill = Bill.Cash(amount = amount, token = token, didReceive = true),
+                    bill = Bill.Cash(
+                        amount = amount,
+                        token = token,
+                        didReceive = true,
+                    ),
                 )
                 checkPendingItemsInFeed()
                 bringActivityFeedCurrent()
@@ -819,15 +819,20 @@ class RealSessionController @Inject constructor(
         billController.attemptGrab(
             owner = owner,
             payload = payload,
-            onGrabbed = { token, amount ->
+            onGrabbed = { token, amount, verifiedState ->
                 tokenCoordinator.add(token, amount)
                 val grabStart = scannedRendezvous[payload.rendezvous.publicKey]
                 val grabTime = grabStart?.let {
                     Clock.System.now().toEpochMilliseconds() - it
                 }
 
                 showBill(
-                    bill = Bill.Cash(amount = amount, token = token, didReceive = true),
+                    bill = Bill.Cash(
+                        amount = amount,
+                        token = token,
+                        didReceive = true,
+                        verifiedState = verifiedState
+                    ),
                 )
 
                 analytics.transfer(Analytics.Transfer.GrabBill(grabTime), amount)
@@ -860,6 +865,7 @@ class RealSessionController @Inject constructor(
                     didReceive = bill.didReceive,
                     confirmationDelay = bill.confirmationDelay,
                     token = bill.token,
+                    verifiedState = (bill as? Bill.Cash)?.verifiedState,
                 ),
                 valuation = PaymentValuation(bill.amount.nativeAmount),
             )

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

@@ -4,6 +4,7 @@ import com.codeinc.opencode.gen.common.v1.Model
 import com.codeinc.opencode.gen.currency.v1.CurrencyService
 import com.codeinc.opencode.gen.messaging.v1.MessagingService
 import com.codeinc.opencode.gen.transaction.v1.TransactionService
+import com.codeinc.opencode.gen.transaction.v1.clientExchangeDataOrNull
 import com.codeinc.opencode.gen.transaction.v1.destinationOrNull
 import com.getcode.opencode.internal.extensions.toHash
 import com.getcode.opencode.internal.extensions.toMint
@@ -102,6 +103,7 @@ internal fun TransactionService.Metadata.toMetadata(): TransactionMetadata {
             destination = sendPublicPayment.destination.toPublicKey(),
             destinationOwner = sendPublicPayment.destinationOrNull?.toPublicKey(),
             exchangeData = sendPublicPayment.serverExchangeData.toModel(),
+            verifiedExchangeData = sendPublicPayment.clientExchangeDataOrNull?.toModel(),
             isRemoteSend = sendPublicPayment.isRemoteSend,
             isWithdrawal = sendPublicPayment.isWithdrawal,
         )

services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/GiveBillTransactor.kt

@@ -6,6 +6,7 @@ import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.internal.extensions.exchangeDataFor
 import com.getcode.opencode.internal.extensions.toPublicKey
 import com.getcode.opencode.internal.manager.VerifiedProtoManager
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.network.extensions.asProtobufMessage
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.core.OpenCodePayload
@@ -28,7 +29,7 @@ internal class GiveBillTransactor(
     private val transactionController: TransactionController,
     private val scope: CoroutineScope,
     private val verifiedProtoManager: VerifiedProtoManager,
-): Transactor<GiveBillTransactor.GiveTransactorError>("Transactor::Give") {
+) : Transactor<GiveBillTransactor.GiveTransactorError>("Transactor::Give") {
     private var token: Token? = null
     private var amount: LocalFiat? = null
     private var exchangeDataTimeout: Duration? = null
@@ -37,15 +38,24 @@ internal class GiveBillTransactor(
     private var rendezvousKey: KeyPair? = null
     private var receivingAccount: PublicKey? = null
 
+    private var providedVerifiedState: VerifiedState? = null
+
     private var payload: OpenCodePayload = OpenCodePayload.Empty
     var data: List<Byte> = emptyList()
         private set
 
-    fun with(token: Token, amount: LocalFiat, owner: AccountCluster, billExchangeDataTimeout: Duration?) {
+    fun with(
+        token: Token,
+        amount: LocalFiat,
+        owner: AccountCluster,
+        billExchangeDataTimeout: Duration?,
+        verifiedState: VerifiedState?
+    ) {
         this.token = token
         this.amount = amount
         this.exchangeDataTimeout = billExchangeDataTimeout
         this.owner = owner
+        this.providedVerifiedState = verifiedState
 
         receivingAccount = null
 
@@ -70,11 +80,20 @@ internal class GiveBillTransactor(
         val sendingAmount = amount
             ?: return logAndFail(GiveTransactorError.Other(message = "No amount. Did you call with() first?"))
 
-        val verifiedState = verifiedProtoManager.getVerifiedStateFor(sendingAmount.rate.currency, desiredToken.address)
-            ?: return logAndFail(GiveTransactorError.Other(message = "No verified state found"))
-
-        val exchangeData = verifiedState.exchangeDataFor(amount = sendingAmount, mint = desiredToken.address, billExchangeDataTimeout = exchangeDataTimeout)
-            ?: return logAndFail(GiveTransactorError.ExchangeRateExpiredException())
+        val verifiedState = if (providedVerifiedState != null) {
+            providedVerifiedState
+        } else {
+            verifiedProtoManager.getVerifiedStateFor(
+                sendingAmount.rate.currency,
+                desiredToken.address
+            )
+        } ?: return logAndFail(GiveTransactorError.Other(message = "No verified state found"))
+
+        val exchangeData = verifiedState.exchangeDataFor(
+            amount = sendingAmount,
+            mint = desiredToken.address,
+            billExchangeDataTimeout = exchangeDataTimeout
+        ) ?: return logAndFail(GiveTransactorError.ExchangeRateExpiredException())
 
         // 1. Send request to "give" the bill to the recipient
         // This provides the recipient with the desired token mint of the cash

services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/GrabBillTransactor.kt

@@ -64,7 +64,7 @@ internal class GrabBillTransactor(
     private suspend fun handleMultiMintScan(
         ownerKey: AccountCluster,
         data: OpenCodePayload
-    ): Result<TransactionMetadata.PublicPayment> {
+    ): Result<TransactionMetadata.SendPublicPayment> {
         // 1. Wait for the give request from the sender so we can determine what mint we are operating on
         val (messageId, giveRequestMint, exchangeData) = messagingController.pollForGiveRequest(data.rendezvous)
             .getOrNull()
@@ -97,11 +97,14 @@ internal class GrabBillTransactor(
         }.fold(
             onSuccess = {
                 // 5. Wait for confirmation
-                transactionController.pollIntentMetadata<TransactionMetadata.PublicPayment>(
+                transactionController.pollIntentMetadata<TransactionMetadata.SendPublicPayment>(
                     owner = tokenizedCluster.authority.keyPair,
                     intentId = data.rendezvous.toPublicKey(),
                     debugLogs = true
-                ).onSuccess {
+                ).map {
+                    // copy in exchange data we received from querying for give request
+                    it.copy(verifiedExchangeData = exchangeData)
+                }.onSuccess {
                     // 6. Ack the receipt of the give request to clear it from the stream
                     messagingController.ackMessages(data.rendezvous, listOf(messageId))
                 }

services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/ReceiveGiftCardTransactor.kt

@@ -5,6 +5,7 @@ import com.getcode.crypt.DerivedKey
 import com.getcode.crypt.MnemonicPhrase
 import com.getcode.opencode.controllers.AccountController
 import com.getcode.opencode.controllers.TransactionController
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.managers.GiftCardManager
 import com.getcode.opencode.managers.MnemonicManager
 import com.getcode.opencode.model.accounts.AccountCluster

services/opencode/src/main/kotlin/com/getcode/opencode/managers/BillTransactionManager.kt

@@ -4,6 +4,7 @@ import com.getcode.opencode.controllers.AccountController
 import com.getcode.opencode.controllers.MessagingController
 import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.internal.manager.VerifiedProtoManager
+import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.internal.transactors.GiveBillTransactor
 import com.getcode.opencode.internal.transactors.GrabBillTransactor
 import com.getcode.opencode.internal.transactors.ReceiveGiftCardTransactor
@@ -55,6 +56,7 @@ class BillTransactionManager @Inject constructor(
         token: Token,
         amount: LocalFiat,
         owner: AccountCluster,
+        verifiedState: VerifiedState?,
         billExchangeDataTimeout: Duration?,
         present:  (List<Byte>) -> Unit,
         onGrabbed: suspend (LocalFiat) -> Unit,
@@ -72,7 +74,7 @@ class BillTransactionManager @Inject constructor(
                 childScope,
                 verifiedProtoManager,
             ).apply {
-                with(token, amount, owner, billExchangeDataTimeout)
+                with(token, amount, owner, billExchangeDataTimeout, verifiedState)
             }
 
             giveTransactor = transactor
@@ -95,7 +97,7 @@ class BillTransactionManager @Inject constructor(
     fun attemptGrabFromSender(
         owner: AccountCluster,
         payload: OpenCodePayload,
-        onGrabbed: suspend (Token, LocalFiat) -> Unit,
+        onGrabbed: suspend (Token, LocalFiat, VerifiedState?) -> Unit,
         onError: (Throwable) -> Unit,
     ) {
         grabTransactor?.dispose()
@@ -136,7 +138,9 @@ class BillTransactionManager @Inject constructor(
                         tag = "Bill",
                         message = "Grabbed ${amount.nativeAmount.formatted()} of ${token.symbol} from sender"
                     )
-                    onGrabbed(token, amount)
+
+                    val verifiedState = metadata.verifiedExchangeData?.verifiedState
+                    onGrabbed(token, amount, verifiedState)
                     sharedScope.launch {
                         transactionController.updateLimits(owner, force = true)
                     }