chore: add onFailure handling to all remaining transaction repository calls

bmc08gt · bmc08gt · commit 479d9c94b85f · 2026-03-31T17:44:38.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkState.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkState.kt
@@ -37,6 +37,7 @@ import com.getcode.solana.rpc.doesAccountExist
 import com.getcode.solana.rpc.sendTransaction
 import com.getcode.solana.rpc.simulateTransaction
 import com.getcode.solana.transactions.inspect
+import com.getcode.utils.ErrorUtils
 import com.getcode.utils.TraceType
 import com.getcode.utils.base64
 import com.getcode.utils.hexEncodedString
@@ -233,6 +234,7 @@ class ExternalWalletDeeplinkState(
                                 "message" to error.message
                             }
                         )
+                        ErrorUtils.handleError(error)
                         scope.launch {
                             errors.emit(
                                 DeeplinkOnRampError.FailedToSendTransaction(
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalSwapRepository.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalSwapRepository.kt
@@ -8,6 +8,7 @@ import com.getcode.opencode.model.transactions.Swap
 import com.getcode.opencode.model.transactions.SwapMetadata
 import com.getcode.opencode.model.transactions.SwapState
 import com.getcode.opencode.repositories.SwapRepository
+import com.getcode.utils.ErrorUtils
 import javax.inject.Inject
 
 internal class InternalSwapRepository @Inject constructor(
@@ -28,4 +29,5 @@ internal class InternalSwapRepository @Inject constructor(
         owner: Ed25519.KeyPair,
         targetState: SwapState
     ): Result<SwapMetadata> = swapPoller.pollUntil(swapId, owner, targetState)
+        .onFailure { ErrorUtils.handleError(it) }
 }
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
@@ -16,6 +16,7 @@ import com.getcode.opencode.repositories.TransactionRepository
 import com.getcode.opencode.solana.intents.IntentType
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.PublicKey
+import com.getcode.utils.ErrorUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.datetime.Instant
 import javax.inject.Inject
@@ -28,6 +29,7 @@ internal class InternalTransactionRepository @Inject constructor(
         intent: IntentType,
         owner: Ed25519.KeyPair
     ): Result<IntentType> = service.submitIntent(scope, intent, owner)
+        .onFailure { ErrorUtils.handleError(it) }
 
     override suspend fun getIntentMetadata(
         intentId: PublicKey,
@@ -48,6 +50,7 @@ internal class InternalTransactionRepository @Inject constructor(
         owner: Ed25519.KeyPair,
         giftCardVault: PublicKey
     ): Result<Unit> = service.voidGiftCard(owner, giftCardVault)
+        .onFailure { ErrorUtils.handleError(it) }
 
     override suspend fun buy(
         scope: CoroutineScope,
@@ -67,7 +70,7 @@ internal class InternalTransactionRepository @Inject constructor(
         verifiedState = verifiedState,
         source = source,
         fund = fund
-    )
+    ).onFailure { ErrorUtils.handleError(it) }
 
     override suspend fun sell(
         scope: CoroutineScope,
@@ -81,5 +84,5 @@ internal class InternalTransactionRepository @Inject constructor(
         of = of,
         owner = owner,
         verifiedState = verifiedState
-    )
+    ).onFailure { ErrorUtils.handleError(it) }
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/GrabBillTransactor.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/GrabBillTransactor.kt
@@ -11,7 +11,6 @@ import com.getcode.opencode.model.core.PayloadKind
 import com.getcode.opencode.model.transactions.TransactionMetadata
 import com.getcode.opencode.providers.TokenMetadataProvider
 import com.getcode.utils.CodeServerError
-import com.getcode.utils.ErrorUtils
 import com.getcode.utils.NotifiableError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
@@ -122,9 +121,6 @@ internal class GrabBillTransactor(
     }
 
     private fun handleGrabError(error: Throwable): Result<Nothing> {
-        if (error !is GrabTransactorError) {
-            ErrorUtils.handleError(error)
-        }
         return logAndFail(error)
     }
 
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/ReceiveGiftCardTransactor.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/ReceiveGiftCardTransactor.kt
@@ -15,7 +15,6 @@ import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.providers.TokenMetadataProvider
 import com.getcode.utils.CodeServerError
-import com.getcode.utils.ErrorUtils
 import com.getcode.utils.NotifiableError
 import com.getcode.utils.timedTraceSuspend
 
@@ -95,19 +94,9 @@ internal class ReceiveGiftCardTransactor(
 
             val info = accounts.values.first()
 
-            if (info.claimState == AccountInfo.ClaimState.Claimed) {
-                onStep("pre-claim checks")
-                return@timedTraceSuspend logAndFail(ReceiveGiftTransactorError.AlreadyClaimed())
-            }
-
-            if (info.claimState == AccountInfo.ClaimState.Expired || info.claimState == AccountInfo.ClaimState.Unknown) {
-                onStep("pre-claim checks")
-                return@timedTraceSuspend logAndFail(ReceiveGiftTransactorError.Expired())
-            }
-
-            if (info.isGiftCardIssuer && !claimIfOwned) {
+            validateClaimEligibility(info, claimIfOwned)?.let { error ->
                 onStep("pre-claim checks")
-                return@timedTraceSuspend Result.failure(ReceiveGiftTransactorError.UsersGiftCard())
+                return@timedTraceSuspend Result.failure(error)
             }
 
             val tokenMint = info.mint
@@ -150,9 +139,6 @@ internal class ReceiveGiftCardTransactor(
                 },
                 onFailure = {
                     onStep("intent")
-                    if (it !is ReceiveGiftTransactorError) {
-                        ErrorUtils.handleError(it)
-                    }
                     logAndFail(it)
                 }
             )
@@ -163,6 +149,29 @@ internal class ReceiveGiftCardTransactor(
         owner = null
         giftCardAccount = null
     }
+
+    companion object {
+        /**
+         * Validates whether a gift card account is eligible to be claimed.
+         *
+         * @return null if eligible, or the appropriate error if not.
+         */
+        fun validateClaimEligibility(
+            info: AccountInfo,
+            claimIfOwned: Boolean,
+        ): ReceiveGiftTransactorError? {
+            if (info.claimState == AccountInfo.ClaimState.Claimed) {
+                return ReceiveGiftTransactorError.AlreadyClaimed()
+            }
+            if (info.claimState == AccountInfo.ClaimState.Expired || info.claimState == AccountInfo.ClaimState.Unknown) {
+                return ReceiveGiftTransactorError.Expired()
+            }
+            if (info.isGiftCardIssuer && !claimIfOwned) {
+                return ReceiveGiftTransactorError.UsersGiftCard()
+            }
+            return null
+        }
+    }
 }
 
 sealed class ReceiveGiftTransactorError(
@@ -172,13 +181,13 @@ sealed class ReceiveGiftTransactorError(
     class FailedToQuery(
         override val message: String? = null,
         override val cause: Throwable? = null
-    ) : GrabTransactorError(message = message?.let { "Failed to query account - $it" } ?: "Failed to query account"), NotifiableError
-    class AlreadyClaimed : GrabTransactorError(message = "Already claimed")
-    class UsersGiftCard : GrabTransactorError(message = "User is gift card issuer")
-    class Expired : GrabTransactorError(message = "Expired")
+    ) : ReceiveGiftTransactorError(message = message?.let { "Failed to query account - $it" } ?: "Failed to query account"), NotifiableError
+    class AlreadyClaimed : ReceiveGiftTransactorError(message = "Already claimed")
+    class UsersGiftCard : ReceiveGiftTransactorError(message = "User is gift card issuer")
+    class Expired : ReceiveGiftTransactorError(message = "Expired")
 
     data class Other(
         override val message: String? = null,
         override val cause: Throwable? = null
-    ) : GrabTransactorError(message, cause), NotifiableError
+    ) : ReceiveGiftTransactorError(message, cause), NotifiableError
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/SendGiftCardTransactor.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/transactors/SendGiftCardTransactor.kt
@@ -12,7 +12,6 @@ import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.utils.nonce
 import com.getcode.utils.CodeServerError
-import com.getcode.utils.ErrorUtils
 import com.getcode.utils.NotifiableError
 
 internal class SendGiftCardTransactor(
@@ -79,9 +78,6 @@ internal class SendGiftCardTransactor(
             .fold(
                 onSuccess = { Result.success(it) },
                 onFailure = {
-                    if (it !is SendTransactorError)  {
-                        ErrorUtils.handleError(it)
-                    }
                     logAndFail(it)
                 }
             )
