fix(services/opencode): allow bill grabbing to grab all public payments (sent/receive)

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

Author: bmc08gt

services/flipcash/src/main/kotlin/com/flipcash/services/models/Errors.kt

@@ -9,7 +9,7 @@ sealed class LoginError(
     class InvalidTimestamp : LoginError("Invalid timestamp")
     class Denied : LoginError("Denied")
     class Unrecognized : LoginError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : LoginError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : LoginError(message = cause?.message, cause = cause)
 }
 
 sealed class RegisterError(
@@ -19,7 +19,7 @@ sealed class RegisterError(
     class InvalidSignature : RegisterError("Invalid signature")
     class Denied: RegisterError("Denied")
     class Unrecognized : RegisterError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : RegisterError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : RegisterError(message = cause?.message, cause = cause)
 }
 
 sealed class GetUserFlagsError(
@@ -28,7 +28,7 @@ sealed class GetUserFlagsError(
 ) : CodeServerError(message, cause) {
     class Unrecognized : GetUserFlagsError("Unrecognized")
     class Denied : GetUserFlagsError("Denied")
-    data class Other(override val cause: Throwable? = null) : GetUserFlagsError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : GetUserFlagsError(message = cause?.message, cause = cause)
 }
 
 sealed class PurchaseAckError(
@@ -39,7 +39,7 @@ sealed class PurchaseAckError(
     class Denied : PurchaseAckError("Denied")
     class InvalidReceipt: PurchaseAckError("Invalid receipt")
     class InvalidMetadata: PurchaseAckError("Invalid metadata")
-    data class Other(override val cause: Throwable? = null) : PurchaseAckError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : PurchaseAckError(message = cause?.message, cause = cause)
 }
 
 sealed class AddTokenError(
@@ -48,15 +48,15 @@ sealed class AddTokenError(
 ) : CodeServerError(message, cause) {
     class InvalidPushToken : AddTokenError("Invalid push token")
     class Unrecognized : AddTokenError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : AddTokenError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : AddTokenError(message = cause?.message, cause = cause)
 }
 
 sealed class DeleteTokenError(
     override val message: String? = null,
     override val cause: Throwable? = null
 ) : CodeServerError(message, cause) {
     class Unrecognized : DeleteTokenError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : DeleteTokenError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : DeleteTokenError(message = cause?.message, cause = cause)
 }
 
 sealed class GetActivityFeedMessagesError(
@@ -66,5 +66,5 @@ sealed class GetActivityFeedMessagesError(
     class Denied : GetActivityFeedMessagesError("Denied")
     class Unrecognized : GetActivityFeedMessagesError("Unrecognized")
     class NotFound: GetActivityFeedMessagesError("Not found")
-    data class Other(override val cause: Throwable? = null) : GetActivityFeedMessagesError(cause = cause)
+    data class Other(override val cause: Throwable? = null) : GetActivityFeedMessagesError(message = cause?.message, cause = cause)
 }

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

@@ -2,6 +2,7 @@ package com.getcode.opencode.controllers
 
 import com.getcode.ed25519.Ed25519.KeyPair
 import com.getcode.opencode.events.Events
+import com.getcode.opencode.internal.extensions.generate
 import com.getcode.opencode.internal.network.api.intents.IntentRemoteReceive
 import com.getcode.opencode.internal.network.api.intents.IntentRemoteSend
 import com.getcode.opencode.internal.network.api.intents.IntentTransfer
@@ -16,7 +17,6 @@ import com.getcode.opencode.model.transactions.WithdrawalAvailability
 import com.getcode.opencode.repositories.TransactionRepository
 import com.getcode.opencode.solana.intents.IntentType
 import com.getcode.opencode.utils.flowInterval
-import com.getcode.opencode.internal.extensions.generate
 import com.getcode.solana.keys.PublicKey
 import com.getcode.utils.TraceType
 import com.getcode.utils.base64

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

@@ -75,7 +75,7 @@ internal class MessagingService @Inject constructor(
                 }
             },
             responseHandler = { response, onResult, requestChannel ->
-                when (val result = response.responseOrPingCase) {
+                when (response.responseOrPingCase) {
                     MessagingService.OpenMessageStreamWithKeepAliveResponse.ResponseOrPingCase.RESPONSE -> {
                         onResult(Result.success(response.response.messagesList))
                     }
@@ -99,6 +99,12 @@ internal class MessagingService @Inject constructor(
                             type = TraceType.Error,
                         )
                     }
+
+                    else -> {
+                        trace(
+                            message = "Pong Message Stream sent null response. This is unexpected.",
+                        )
+                    }
                 }
             }
         ).fold(

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

@@ -24,7 +24,7 @@ internal class GrabBillTransactor(
         this.payload = payload
     }
 
-    suspend fun start(): Result<TransactionMetadata.SendPublicPayment> {
+    suspend fun start(): Result<TransactionMetadata.PublicPayment> {
         val ownerKey = owner ?: return Result.failure(GrabTransactorError.Other(message = "No owner key. Did you call with() first?"))
         val destination = ownerKey.vaultPublicKey
         val data = payload

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

@@ -110,7 +110,7 @@ class BillTransactionManager @Inject constructor(
                 .onSuccess { metadata ->
                     trace(
                         tag = "Bill",
-                        message = "attemptGrabFromSender: ReceivePublicPayment => ${metadata.exchangeData}"
+                        message = "attemptGrabFromSender: ${metadata.javaClass.simpleName} => ${metadata.exchangeData}"
                     )
 
                     val amount = LocalFiat(metadata.exchangeData)
@@ -220,6 +220,7 @@ class BillTransactionManager @Inject constructor(
     }
 
     fun cancelAwaitForGrab() {
+        cancelBillTimeout()
         giveTransactor?.dispose()
         giveTransactor = null
     }

services/opencode/src/main/kotlin/com/getcode/opencode/model/core/errors/Errors.kt

@@ -11,7 +11,7 @@ sealed class CodeAccountCheckError(
     class NotFound : CodeAccountCheckError("Not found")
     class UnlockedTimelockAccount : CodeAccountCheckError("Unlocked timelock account")
     class Unrecognized : CodeAccountCheckError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : CodeAccountCheckError()
+    data class Other(override val cause: Throwable? = null) : CodeAccountCheckError(message = cause?.message, cause = cause)
 }
 
 sealed class GetAccountsError(
@@ -20,7 +20,7 @@ sealed class GetAccountsError(
 ) : CodeServerError(message, cause) {
     class NotFound : GetAccountsError("Not found")
     class Unrecognized : GetAccountsError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : GetAccountsError()
+    data class Other(override val cause: Throwable? = null) : GetAccountsError(message = cause?.message, cause = cause)
 }
 
 sealed class LinkAccountsError(
@@ -37,7 +37,7 @@ sealed class LinkAccountsError(
      */
     class InvalidAccount : LinkAccountsError("Invalid account")
     class Unrecognized : LinkAccountsError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : LinkAccountsError()
+    data class Other(override val cause: Throwable? = null) : LinkAccountsError(message = cause?.message, cause = cause)
 }
 
 sealed class GetRatesError(
@@ -49,29 +49,29 @@ sealed class GetRatesError(
      */
     class MissingData : GetRatesError("Missing data")
     class Unrecognized : GetRatesError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : GetRatesError()
+    data class Other(override val cause: Throwable? = null) : GetRatesError(message = cause?.message, cause = cause)
 }
 
 sealed class OpenMessageStreamError(
     override val message: String? = null,
     override val cause: Throwable? = null
 ) : CodeServerError(message, cause) {
-    data class Other(override val cause: Throwable? = null) : OpenMessageStreamError()
+    data class Other(override val cause: Throwable? = null) : OpenMessageStreamError(message = cause?.message, cause = cause)
 }
 
 sealed class PollMessagesError(
     override val message: String? = null,
     override val cause: Throwable? = null
 ) : CodeServerError(message, cause) {
-    data class Other(override val cause: Throwable? = null) : PollMessagesError()
+    data class Other(override val cause: Throwable? = null) : PollMessagesError(message = cause?.message, cause = cause)
 }
 
 sealed class AckMessagesError(
     override val message: String? = null,
     override val cause: Throwable? = null
 ) : CodeServerError(message, cause) {
     class Unrecognized : AckMessagesError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : AckMessagesError()
+    data class Other(override val cause: Throwable? = null) : AckMessagesError(message = cause?.message, cause = cause)
 }
 
 sealed class SendMessageError(
@@ -80,7 +80,7 @@ sealed class SendMessageError(
 ) : CodeServerError(message, cause) {
     class NoActiveStream : SendMessageError("No active stream")
     class Unrecognized : SendMessageError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : SendMessageError()
+    data class Other(override val cause: Throwable? = null) : SendMessageError(message = cause?.message, cause = cause)
 }
 
 enum class DeniedReason {
@@ -111,8 +111,8 @@ sealed class SubmitIntentError(
     data class Denied(private val reasons: List<DeniedReason>) :
         SubmitIntentError(message = reasons.joinToString())
 
-    class Unrecognized : SubmitIntentError()
-    data class Other(override val cause: Throwable? = null) : SubmitIntentError()
+    class Unrecognized : SubmitIntentError("Unrecognized")
+    data class Other(override val cause: Throwable? = null) : SubmitIntentError(message = cause?.message, cause = cause)
 
     companion object {
         fun typed(proto: SubmitIntentResponse.Error): SubmitIntentError {
@@ -150,22 +150,22 @@ sealed class GetIntentMetadataError(
 ) : CodeServerError(message, cause) {
     class NotFound : GetIntentMetadataError("Not found")
     class Unrecognized : GetIntentMetadataError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : GetIntentMetadataError()
+    data class Other(override val cause: Throwable? = null) : GetIntentMetadataError(message = cause?.message, cause = cause)
 }
 
 sealed class GetLimitsError(
     override val message: String? = null,
     override val cause: Throwable? = null
 ) : CodeServerError(message, cause) {
     class Unrecognized : GetIntentMetadataError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : GetIntentMetadataError()
+    data class Other(override val cause: Throwable? = null) : GetIntentMetadataError(message = cause?.message, cause = cause)
 }
 
 sealed class WithdrawalAvailabilityError(
     override val message: String? = null,
     override val cause: Throwable? = null
 ) : CodeServerError(message, cause) {
-    data class Other(override val cause: Throwable? = null) : WithdrawalAvailabilityError()
+    data class Other(override val cause: Throwable? = null) : WithdrawalAvailabilityError(message = cause?.message, cause = cause)
 }
 
 sealed class AirdropError(
@@ -175,7 +175,7 @@ sealed class AirdropError(
     class Unavailable: AirdropError("Unavailable")
     class AlreadyClaimed: AirdropError("Already claimed")
     class Unrecognized: AirdropError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : AirdropError()
+    data class Other(override val cause: Throwable? = null) : AirdropError(message = cause?.message, cause = cause)
 }
 
 sealed class VoidGiftCardError(
@@ -186,6 +186,6 @@ sealed class VoidGiftCardError(
     class NotFound: VoidGiftCardError("Not found")
     class AlreadyClaimed: VoidGiftCardError("Already claimed")
     class Unrecognized: VoidGiftCardError("Unrecognized")
-    data class Other(override val cause: Throwable? = null) : VoidGiftCardError()
+    data class Other(override val cause: Throwable? = null) : VoidGiftCardError(message = cause?.message, cause = cause)
 }
 

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

@@ -16,6 +16,11 @@ sealed interface TransactionMetadata {
      */
     data object OpenAccounts: TransactionMetadata
 
+    sealed interface PublicPayment {
+        val source: PublicKey
+        val exchangeData: ExchangeData.WithRate
+    }
+
     /**
      * Send a payment to a destination account publicly.
      *
@@ -35,11 +40,11 @@ sealed interface TransactionMetadata {
      * @param isWithdrawal Is the payment a withdrawal?
      */
     data class SendPublicPayment(
-        val source: PublicKey,
+        override val source: PublicKey,
         val destination: PublicKey,
-        val exchangeData: ExchangeData.WithRate,
+        override val exchangeData: ExchangeData.WithRate,
         val isWithdrawal: Boolean
-    ): TransactionMetadata
+    ): TransactionMetadata, PublicPayment
 
     /**
      * Receives funds into a user-owned account publicly. All use cases of this intent close the
@@ -52,9 +57,8 @@ sealed interface TransactionMetadata {
      * Action Specification (Remote Send):
      * actions = [NoPrivacyWithdrawAction(REMOTE_SEND_GIFT_CARD, TEMPORARY_INCOMING[latest_index], quarks)]
      * ```
-     * <p>
      *
-     * <b>TODO:</b> This requires a new implementation for the VM
+     * <p>
      *
      * @param source The remote send gift card to receive funds from
      * @param quarks The exact amount of Kin in quarks being received
@@ -65,11 +69,11 @@ sealed interface TransactionMetadata {
      * SubmitIntent will disallow this being set.
      */
     data class ReceivePublicPayment(
-        val source: PublicKey,
+        override val source: PublicKey,
         val quarks: Long,
         val isRemoteSend: Boolean = true,
-        val exchangeData: ExchangeData.WithRate,
-    ): TransactionMetadata
+        override val exchangeData: ExchangeData.WithRate,
+    ): TransactionMetadata, PublicPayment
 
     data object Unknown: TransactionMetadata
 }