fix(flipcash): correct intent for distribution

bmc08gt · bmc08gt · commit fae774356812 · 2025-07-14T15:46:28.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/pools/PoolResolution.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/pools/PoolResolution.kt
@@ -1,10 +1,17 @@
 package com.flipcash.app.core.pools
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 sealed interface PoolResolution {
+    @Serializable
     data object NotSet: PoolResolution
 
     sealed interface DecisionMade
     sealed interface HasWinner: DecisionMade
+
+    @Serializable
     data class BooleanResolution(val value: Boolean): PoolResolution, HasWinner
+    @Serializable
     data object Refund: PoolResolution, DecisionMade
 }
diff --git a/apps/flipcash/core/src/main/res/values/strings.xml b/apps/flipcash/core/src/main/res/values/strings.xml
@@ -226,6 +226,13 @@
     <string name="error_title_resolvePoolFailed">Something Went Wrong</string>
     <string name="error_description_resolvePoolFailed">We were unable to resolve your pool. Please try again</string>
 
+    <string name="error_title_resolvePoolDistributionsFailed">Pool Distributions Failed</string>
+    <string name="error_description_resolvePoolDistributionsFailed">
+        The distributions for this pool could not be completed. Please try again
+        %1$s
+    </string>
+
+
     <string name="action_swipeToBuyIn">Swipe to Buy In</string>
 
     <string name="title_open">Open</string>
diff --git a/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/betting/PoolBettingScreenContent.kt b/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/betting/PoolBettingScreenContent.kt
@@ -49,8 +49,15 @@ private fun PoolBettingScreenContent(
             }
         },
         bottomBar = {
-            if (state.isLoaded && state.isDistributed != true && !state.isResolved) {
-                BettingBottomBar(state)
+            if (state.isLoaded) {
+                when {
+                    !state.isResolved -> {
+                        BettingBottomBar(state)
+                    }
+                    state.isDistributed == false -> {
+                        BettingBottomBar(state)
+                    }
+                }
             }
         }
     ) { innerPadding ->
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPaymentController.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPaymentController.kt
@@ -220,6 +220,7 @@ internal class InternalPaymentController(
                     }
                     is PaymentError.NoOwnerForDistribution -> presentPaymentFailedError()
                     is PaymentError.NoPoolBalance -> presentPaymentFailedError()
+                    is PaymentError.PoolDistributionFailed -> presentPaymentFailedError()
                 }
             }
 
@@ -260,4 +261,12 @@ sealed interface PaymentError {
         PaymentError, Throwable(message)
     data class NoOwnerForDistribution(override val message: String? = "No owner for distribution") : PaymentError, Throwable(message)
     data class NoPoolBalance(override val message: String? = "No pool balance") : PaymentError, Throwable(message)
+
+    data class PoolDistributionFailed(
+        override val message: String = "Failed to distribute funds",
+        override val cause: Throwable,
+    ): PaymentError, Throwable(
+        message = message,
+        cause = cause,
+    )
 }
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolBidDelegate.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolBidDelegate.kt
@@ -13,6 +13,7 @@ import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.solana.keys.PublicKey
 import com.getcode.utils.getPublicKeyBase58
+import com.getcode.utils.trace
 import javax.inject.Inject
 
 internal class InternalPoolBidDelegate @Inject constructor(
@@ -56,6 +57,19 @@ internal class InternalPoolBidDelegate @Inject constructor(
             balanceController.subtract(localizedAmount)
             onSuccess(it)
         }.onFailure {
+            trace(
+                tag = "Pool::bid",
+                message = "Failed to pay for bid",
+                error = it,
+                metadata = {
+                    "pool ID" to pool.id
+                    "pool derivation index" to pool.derivationIndex
+                    "user balance" to balance.formatted()
+                    "bid ID" to bidId
+                    "bid amount" to amount.formatted()
+                    "pool rendezvous" to rendezvous.getPublicKeyBase58()
+                }
+            )
             onError(it)
         }
     }
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolResolveDelegate.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolResolveDelegate.kt
@@ -4,13 +4,9 @@ import com.flipcash.app.activityfeed.ActivityFeedCoordinator
 import com.flipcash.app.core.pools.Pool
 import com.flipcash.app.core.pools.PoolBet
 import com.flipcash.app.core.pools.PoolBetOutcome
-import com.flipcash.app.core.pools.PoolBetSummary
 import com.flipcash.app.core.pools.PoolResolution
 import com.flipcash.app.core.pools.PoolWithBets
-import com.flipcash.app.payments.delegates.DelegateEvent
 import com.flipcash.app.payments.delegates.PoolResolveDelegate
-import com.flipcash.services.models.NetworkPoolBetOutcome
-import com.flipcash.services.models.NetworkPoolResolution
 import com.flipcash.services.user.UserManager
 import com.getcode.ed25519.Ed25519
 import com.getcode.opencode.controllers.AccountController
@@ -19,13 +15,14 @@ import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.accounts.AccountFilter
-import com.getcode.opencode.model.accounts.AccountType
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.core.RandomId
 import com.getcode.opencode.model.financial.Distribution
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
-import com.getcode.opencode.model.financial.toFiat
+import com.getcode.solana.keys.base58
+import com.getcode.utils.getPublicKeyBase58
+import com.getcode.utils.trace
 import javax.inject.Inject
 
 class InternalPoolResolveDelegate @Inject constructor(
@@ -89,7 +86,36 @@ class InternalPoolResolveDelegate @Inject constructor(
             activityFeedCoordinator.fetchSinceLatest()
             onSuccess(it)
         }.onFailure {
-            onError(it)
+            val error = PaymentError.PoolDistributionFailed(cause = it)
+            val metadata = buildMap {
+                put("pool name", pool.name)
+                put("pool resolution", resolution)
+                put("pool account authority", poolAccount.cluster.authorityPublicKey.base58())
+                put("pool funding destination", pool.fundingDestination.base58())
+                put("pool account vault", poolAccount.cluster.vaultPublicKey.base58())
+                put("pool derivation index", pool.derivationIndex)
+                put("winning bet count", distributions.count())
+                put("winning bet amount", distributions.firstOrNull()?.amount?.formatted())
+            }
+            trace(
+                tag = "Pool::resolve",
+                message = "Failed to distribute funds",
+                error = error,
+                metadata = {
+                    metadata.forEach { (k, v) ->
+                        k to v
+                    }
+                }
+            )
+
+            onError(
+                error.copy(
+                    message = """
+                        ---
+                DEBUG: ${metadata.entries.joinToString()}
+            """.trimIndent()
+                )
+            )
         }
     }
 
@@ -111,7 +137,7 @@ class InternalPoolResolveDelegate @Inject constructor(
                 usdc = pool.buyIn.convertingTo(rate),
                 converted = pool.buyIn,
             )
-            val distros =  paidBets.map {
+            val distros = paidBets.map {
                 Distribution(
                     destination = it.payoutDestination,
                     amount = localizedAmount.usdc,
@@ -158,7 +184,8 @@ class InternalPoolResolveDelegate @Inject constructor(
         }
 
         return DistributionList(
-            balanceIncrement = distros.firstOrNull()?.amount?.let { LocalFiat(usdc = it) }.takeIf { paidBets.any { it.userId == userManager.accountId } },
+            balanceIncrement = distros.firstOrNull()?.amount?.let { LocalFiat(usdc = it) }
+                .takeIf { paidBets.any { it.userId == userManager.accountId } },
             distributions = distros,
         )
     }
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/models/PoolMetadata.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/models/PoolMetadata.kt
@@ -6,6 +6,7 @@ import com.getcode.opencode.model.financial.Fiat
 import com.getcode.solana.keys.PublicKey
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
+import kotlinx.serialization.Serializable
 import javax.annotation.concurrent.Immutable
 
 /**
@@ -72,12 +73,16 @@ data class NetworkPool(
     val userSummary: NetworkPoolUserSummary?,
 )
 
+@Serializable
 sealed interface NetworkPoolResolution {
+    @Serializable
     data object NotSet : NetworkPoolResolution
 
+    @Serializable
     @Immutable
     data object Refund : NetworkPoolResolution
 
+    @Serializable
     @Immutable
     data class BooleanResolution(val value: Boolean) : NetworkPoolResolution
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentDistribution.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentDistribution.kt
@@ -43,7 +43,7 @@ internal class IntentDistribution(
                 distributions.dropLast(1).forEach { dist ->
                     add(
                         ActionPublicTransfer.newInstance(
-                            owner = owner.authority.keyPair,
+                            owner = source.authority.keyPair,
                             source = source.vaultPublicKey,
                             amount = dist.amount,
                             destination = dist.destination
@@ -54,7 +54,8 @@ internal class IntentDistribution(
                     add(
                         ActionPublicWithdraw.newInstance(
                             amount = dist.amount,
-                            sourceCluster = source,
+                            owner = source,
+                            source = source,
                             destination = dist.destination,
                             canAutoReturn = false
                         )
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentRemoteReceive.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentRemoteReceive.kt
@@ -2,9 +2,7 @@ package com.getcode.opencode.internal.network.api.intents
 
 import com.codeinc.opencode.gen.transaction.v2.TransactionService
 import com.getcode.opencode.internal.network.api.intents.actions.ActionPublicWithdraw
-import com.getcode.opencode.internal.network.extensions.asExchangeData
 import com.getcode.opencode.internal.network.extensions.asProtobufMetadata
-import com.getcode.opencode.internal.network.extensions.asSolanaAccountId
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.accounts.GiftCardAccount
 import com.getcode.opencode.model.financial.LocalFiat
@@ -33,7 +31,8 @@ internal class IntentRemoteReceive(
             // 1. Move all funds from the gift card to the primary account
             val withdrawFromGiftCard = ActionPublicWithdraw.newInstance(
                 amount = amount.usdc,
-                sourceCluster = giftCard.cluster,
+                owner = giftCard.cluster,
+                source = giftCard.cluster,
                 destination = owner.vaultPublicKey,
                 canAutoReturn = false,
             )
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
@@ -4,9 +4,7 @@ import com.codeinc.opencode.gen.transaction.v2.TransactionService
 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
-import com.getcode.opencode.internal.network.extensions.asExchangeData
 import com.getcode.opencode.internal.network.extensions.asProtobufMetadata
-import com.getcode.opencode.internal.network.extensions.asSolanaAccountId
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.accounts.GiftCardAccount
 import com.getcode.opencode.model.financial.LocalFiat
@@ -45,7 +43,8 @@ internal class IntentRemoteSend(
             // 3. Allow auto-returning back to the primary if not collected
             val withdrawToDestination = ActionPublicWithdraw.newInstance(
                 amount = amount.usdc,
-                sourceCluster = giftCard.cluster,
+                owner = giftCard.cluster,
+                source = giftCard.cluster,
                 destination = sourceCluster.vaultPublicKey,
                 canAutoReturn = true
             )
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/actions/ActionPublicWithdraw.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/actions/ActionPublicWithdraw.kt
@@ -44,7 +44,7 @@ class ActionPublicWithdraw(
                 TransactionService.NoPrivacyWithdrawAction.newBuilder()
                     .setSource(source.vaultPublicKey.asSolanaAccountId())
                     .setDestination(destination.asSolanaAccountId())
-                    .setAuthority(source.authority.keyPair.asSolanaAccountId())
+                    .setAuthority(signer.asSolanaAccountId())
                     .setAmount(amount.quarks)
                     .setShouldClose(true)
                     .setIsAutoReturn(canAutoReturn)
@@ -56,15 +56,16 @@ class ActionPublicWithdraw(
     internal companion object {
         fun newInstance(
             amount: Fiat,
-            sourceCluster: AccountCluster,
+            owner: AccountCluster,
+            source: AccountCluster,
             destination: PublicKey,
             canAutoReturn: Boolean,
         ): ActionPublicWithdraw {
             return ActionPublicWithdraw(
                 id = 0,
-                signer = sourceCluster.authority.keyPair,
+                signer = owner.authority.keyPair,
                 amount = amount,
-                source = sourceCluster,
+                source = source,
                 destination = destination,
                 canAutoReturn = canAutoReturn
             )

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,15 @@ private fun PoolBettingScreenContent(`
`49`	`49`	`}`
`50`	`50`	`},`
`51`	`51`	`bottomBar = {`
`52`		`- if (state.isLoaded && state.isDistributed != true && !state.isResolved) {`
`53`		`- BettingBottomBar(state)`
	`52`	`+ if (state.isLoaded) {`
	`53`	`+ when {`
	`54`	`+ !state.isResolved -> {`
	`55`	`+ BettingBottomBar(state)`
	`56`	`+ }`
	`57`	`+ state.isDistributed == false -> {`
	`58`	`+ BettingBottomBar(state)`
	`59`	`+ }`
	`60`	`+ }`
`54`	`61`	`}`
`55`	`62`	`}`
`56`	`63`	`) { innerPadding ->`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ internal class InternalPaymentController(`
`220`	`220`	`}`
`221`	`221`	`is PaymentError.NoOwnerForDistribution -> presentPaymentFailedError()`
`222`	`222`	`is PaymentError.NoPoolBalance -> presentPaymentFailedError()`
	`223`	`+ is PaymentError.PoolDistributionFailed -> presentPaymentFailedError()`
`223`	`224`	`}`
`224`	`225`	`}`
`225`	`226`
`@@ -260,4 +261,12 @@ sealed interface PaymentError {`
`260`	`261`	`PaymentError, Throwable(message)`
`261`	`262`	`data class NoOwnerForDistribution(override val message: String? = "No owner for distribution") : PaymentError, Throwable(message)`
`262`	`263`	`data class NoPoolBalance(override val message: String? = "No pool balance") : PaymentError, Throwable(message)`
	`264`	`+`
	`265`	`+ data class PoolDistributionFailed(`
	`266`	`+ override val message: String = "Failed to distribute funds",`
	`267`	`+ override val cause: Throwable,`
	`268`	`+ ): PaymentError, Throwable(`
	`269`	`+ message = message,`
	`270`	`+ cause = cause,`
	`271`	`+ )`
`263`	`272`	`}`