Merge pull request #702 from code-payments/feat/notify-server-swap-before-gpay

feat(onramp): notify server of swap before Google Pay is presented

Author: bmc08gt

apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/internal/OnRampViewModel.kt

@@ -176,7 +176,6 @@ internal class OnRampViewModel @Inject constructor(
                         dispatchEvent(Event.UpdateOrderLookupState())
                     }
                     is CoinbaseOnRampState.Paying -> dispatchEvent(Event.UpdateOrderLookupState(loading = true))
-                    is CoinbaseOnRampState.Processing -> dispatchEvent(Event.UpdateOrderLookupState(loading = true))
                 }
             }
             .launchIn(viewModelScope)

apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampController.kt

@@ -25,8 +25,6 @@ import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.usdf
 import com.getcode.opencode.model.transactions.SwapFundingSource
 import com.getcode.solana.keys.base58
-import com.getcode.utils.network.pollUntil
-import com.getcode.vendor.Base58
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.onramp.internal.CoinbaseOnRampWebError
 import com.getcode.utils.CodeServerError
@@ -46,9 +44,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 import retrofit2.HttpException
-import java.security.SecureRandom
 import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 
 typealias OrderWithPaymentLink = Pair<String, OnRampPurchaseResponse.PaymentLink>
 
@@ -79,15 +75,15 @@ class CoinbaseOnRampController @Inject constructor(
         _pendingNavigation.tryEmit(route)
     }
 
-    fun startPayment(order: OnrampOrder, token: Token, amount: VerifiedFiat) {
-        _state.value = CoinbaseOnRampState.Paying(order, token, amount)
+    fun startPayment(order: OnrampOrder, token: Token, amount: VerifiedFiat, swapId: SwapId) {
+        _state.value = CoinbaseOnRampState.Paying(order, token, amount, swapId)
     }
 
     fun onPaymentSuccess(orderId: String) {
         val current = _state.value
         if (current is CoinbaseOnRampState.Paying) {
             _state.update {
-                CoinbaseOnRampState.Processing(orderId, current.token, current.amount)
+                CoinbaseOnRampState.Completed(current.swapId, current.token, current.amount)
             }
         }
     }
@@ -118,56 +114,20 @@ class CoinbaseOnRampController @Inject constructor(
         }
 
         return placeOrderInclusiveOfFees(amount)
-            .map { (orderId, paymentLink) ->
-                val order = OnrampOrder(orderId, paymentLink.url)
-                startPayment(order, token, verifiedFiat)
-            }
-    }
-
-    suspend fun processPayment(): Result<SwapId> {
-        val current = _state.value
-        if (current !is CoinbaseOnRampState.Processing) {
-            return Result.failure(IllegalStateException("Not in Processing state"))
-        }
-
-        return pollUntil(
-                call = { lookupOrder(current.orderId).getOrThrow() },
-                required = { order -> order.txHash != null },
-                maxAttempts = 100,
-                interval = 3.seconds,
-                tag = "CoinbaseOrderPoller",
-            ).mapCatching { order ->
-                order.txHash ?: throw IllegalStateException("No hash provided from provider")
-            }.mapCatching { txHash ->
+            .mapCatching { (orderId, paymentLink) ->
                 val owner = userManager.accountCluster
                     ?: throw IllegalStateException("No account cluster")
 
-                transactionController.buy(
+                val swapId = transactionController.buy(
                     owner = owner,
-                    amount = current.amount,
-                    of = current.token,
-                    source = SwapFundingSource.ExternalWallet(
-                        transactionSignature = runCatching { Base58.decode(txHash) }
-                            .getOrElse { ByteArray(64).also { SecureRandom().nextBytes(it) } }
-                            .toList()
-                    ),
+                    amount = verifiedFiat,
+                    of = token,
+                    source = SwapFundingSource.CoinbaseOnramp(orderId = orderId),
                     fund = { Result.success(Unit) }
                 ).getOrThrow()
-            }
-            .onSuccess { swapId ->
-                _state.update { CoinbaseOnRampState.Completed(swapId,  current.token, current.amount) }
-            }
-            .onFailure { error ->
-                trace(
-                    message = "Payment processing failed",
-                    tag = "OnRamp",
-                    metadata = {
-                        "orderId" to current.orderId
-                        "errorType" to error::class.simpleName.orEmpty()
-                    },
-                    error = error,
-                )
-                reset()
+
+                val order = OnrampOrder(orderId, paymentLink.url)
+                startPayment(order, token, verifiedFiat, swapId)
             }
     }
 

apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampHandler.kt

@@ -37,19 +37,6 @@ fun CoinbaseOnRampHandler(
             )
         }
 
-        is CoinbaseOnRampState.Processing -> {
-            LaunchedEffect(current) {
-                delay(400) // let the system payment sheet finish its dismiss animation
-                controller.processPayment()
-                    .onFailure {
-                        BottomBarManager.showError(
-                            title = "Something Went Wrong",
-                            message = "Failed to complete purchase. Please try again",
-                        )
-                    }
-            }
-        }
-
         is CoinbaseOnRampState.Completed -> {
             LaunchedEffect(current) {
                 controller.emitPendingNavigation(

apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampState.kt

@@ -16,8 +16,7 @@ data class OnrampOrder(
 
 sealed interface CoinbaseOnRampState {
     data object Idle : CoinbaseOnRampState
-    data class Paying(val order: OnrampOrder, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState
-    data class Processing(val orderId: String, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState
+    data class Paying(val order: OnrampOrder, val token: Token, val amount: VerifiedFiat, val swapId: SwapId) : CoinbaseOnRampState
     data class Completed(val swapId: SwapId, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState
     data class Failed(val error: CoinbaseOnRampWebError) : CoinbaseOnRampState
 }

services/opencode/src/main/kotlin/com/getcode/opencode/model/transactions/SwapRequest.kt

@@ -18,10 +18,11 @@ data class SwapRequest(
     val swapId: SwapId,
     val verifiedState: VerifiedState,
 ) {
-    val fundingIntentId = when (kind) {
-        is SwapStartKind.Reserve -> kind.fundingIntentId
-        is SwapStartKind.Stablecoin -> kind.fundingIntentId
-    }
+    val fundingIntentId: List<Byte>
+        get() = when (kind) {
+            is SwapStartKind.Reserve -> kind.fundingIntentId
+            is SwapStartKind.Stablecoin -> kind.fundingIntentId
+        }
 
     val totalTransferAmount: LocalFiat
         get() {
@@ -52,7 +53,9 @@ sealed interface SwapStartKind {
             get() = when (fundingSource) {
                 is SwapFundingSource.ExternalWallet -> fundingSource.transactionSignature
                 is SwapFundingSource.SubmitIntent -> fundingSource.id
-                is SwapFundingSource.CoinbaseOnramp -> fundingSource.orderId
+                is SwapFundingSource.CoinbaseOnramp -> throw IllegalArgumentException(
+                    "Coinbase onramp does not use a funding intent"
+                )
                 SwapFundingSource.Unknown -> throw IllegalArgumentException("Invalid funding source")
             }
     }