chore: update ocp protos to support new multi-mint give request

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

definitions/opencode/protos/src/main/proto/messaging/v1/messaging_service.proto

@@ -15,13 +15,16 @@ service Messaging {
     // and are eligible for deletion from the service. Clients should, however, handle
     // duplicate delivery of messages.
     //
-    // For grabbing a bill, the expected flow is as follows:
-    //   1. The payment sender creates a cash scan code
-    //   2. The payment sender calls OpenMessageStream on the rendezvous public key, which is
-    //      derived by using sha256(scan payload) as the keypair seed.
-    //   3. The payment recipient scans the code and uses SendMessage to send their account ID
-    //      back to the sender via the rendezvous public key.
-    //   4. The payment sender receives the message, submits the intent, and closes the stream.
+    // For giving/grabbing a bill, the expected flow is as follows:
+    //   1. The payment sender creates a multi-mint cash scan code.
+    //   2. The payment sender calls OpenMessageStream on the rendezvous public key.
+    //   3. The payment sender uses SendMessage to send the mint in a RequestToGiveBill message.
+    //   4. The payment sender shows the bill with the scan code containing the rendezvous public key.
+    //   5. The payment recipient scans the code.
+    //   6. The payment recipient uses PollMessages to get the RequestToGiveBill message from part 3.
+    //   7. The payment recipient sends the destination address in a RequestToGrabBill message.
+    //   8. The payment sender receives the RequestToGrabBill message in real time, submits the intent
+    //      for the payment to the provided destination, and then closes the stream.
     rpc OpenMessageStream(OpenMessageStreamRequest) returns (stream OpenMessageStreamResponse);
     // OpenMessageStreamWithKeepAlive is like OpenMessageStream, but enables a ping/pong
     // keepalive to determine the health of the stream at both the client and server.
@@ -134,10 +137,17 @@ message MessageId {
 //
 // This message type is only initiated by clients.
 message RequestToGrabBill {
-    // Requestor is the virtual core mint token account on the VM to which a
-    // payment should be sent.
+    // Requestor is the virtual token account on the VM to which a payment
+    // should be sent.
     common.v1.SolanaAccountId requestor_account = 1;
 }
+// Request that a bill be given in the desired mint
+//
+// This message type is only initiated by clients.
+message RequestToGiveBill {
+    // The mint that the bill will be received in
+    common.v1.SolanaAccountId mint = 1;
+}
 message Message {
     // MessageId is the Id of the message. This ID is generated by the
     // server, and will _always_ be set when receiving a message.
@@ -155,7 +165,8 @@ message Message {
         //
         // Section: Cash
         //
-        RequestToGrabBill     request_to_grab_bill     = 2;
+        RequestToGrabBill request_to_grab_bill = 2;
+        RequestToGiveBill request_to_give_bill = 13;
     }
     reserved 4;  // Deprecated AirdropReceived field
     reserved 5;  // Deprecated RequestToReceiveBill field

definitions/opencode/protos/src/main/proto/transaction/v2/transaction_service.proto

@@ -209,7 +209,7 @@ message CanWithdrawToAccountResponse {
     //
     // This will be set when requires_initialization = true
     //
-    // Note: The fee is always paid in the core mint.
+    // Note: The fee is always paid in the target mint.
     ExchangeDataWithoutRate fee_amount = 4;
 }
 message AirdropRequest {
@@ -345,7 +345,7 @@ message SendPublicPaymentMetadata {
 message ReceivePaymentsPubliclyMetadata {
     // The remote send gift card to receive funds from
     common.v1.SolanaAccountId source = 1;
-    // The exact amount of core mint quarks being received
+    // The exact amount of quarks being received
     uint64 quarks = 2;
     // Is the receipt of funds from a remote send gift card? Currently, this is
     // the only use case for this intent and validation enforces the flag to true.
@@ -443,7 +443,7 @@ message NoPrivacyTransferAction {
     common.v1.SolanaAccountId source = 2;
     // The destination account where funds are transferred to
     common.v1.SolanaAccountId destination = 3;
-    // The core mint quark amount to transfer
+    // The quark amount to transfer
     uint64 amount = 4;
     // The mint that this action will be operating against. For backwards
     // compatibility, if no mint is set, then it is assumed to be the core
@@ -458,7 +458,7 @@ message NoPrivacyWithdrawAction {
     common.v1.SolanaAccountId source = 2;
     // The destination account where funds are transferred to
     common.v1.SolanaAccountId destination = 3;
-    // The intended core mint quark amount to withdraw
+    // The quark amount to withdraw
     uint64 amount = 4;
     // Whether the account is closed afterwards. This is always true, since there
     // are no current se cases to leave it open.
@@ -484,7 +484,7 @@ message FeePaymentAction {
     common.v1.SolanaAccountId authority = 2;
     // The source account where funds are transferred from
     common.v1.SolanaAccountId source = 3;
-    // The core mint quark amount to transfer
+    // The quark amount to transfer
     uint64 amount = 4;
     // The mint that this action will be operating against. For backwards
     // compatibility, if no mint is set, then it is assumed to be the core

services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/mapping/MessageMapper.kt

@@ -21,6 +21,7 @@ internal class MessageMapper @Inject constructor():
             signature = signature,
             kind = when(from.kindCase) {
                 MessagingService.Message.KindCase.REQUEST_TO_GRAB_BILL -> from.requestToGrabBill.toMessageKind()
+                MessagingService.Message.KindCase.REQUEST_TO_GIVE_BILL -> from.requestToGiveBill.toMessageKind()
                 MessagingService.Message.KindCase.KIND_NOT_SET -> MessageKind.Unknown
                 else -> MessageKind.Unknown
             }

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

@@ -38,35 +38,16 @@ internal class MessagingApi @Inject constructor(
      *
      * <p>
      *
-     * For grabbing a bill, the expected flow is as follows:
-     *
-     * 1. The payment sender creates a cash scan code
-     * 2. The payment sender calls OpenMessageStream on the rendezvous public key, which is
-     * derived by using sha256(scan payload) as the keypair seed.
-     * 3. The payment recipient scans the code and uses SendMessage to send their account ID
-     * back to the sender via the rendezvous public key.
-     * 4. The payment sender receives the message, submits the intent, and closes the stream.
-     *
-     * <p>
-     *
-     * For receiving a bill of requested value, the expected flow is as follows:
-     *
-     * 1. The payment recipient uses SendMessage to send their account ID and payment amount to
-     * the sender via the rendezvous public key, which is derived by using sha256(scan payload)
-     * as the keypair seed.
-     * 2. The payment recipient calls OpenMessageStream on the rendezvous public key to listen
-     * for status messages generated by client/server. It must ignore the original message it sent
-     * as part of step 1.
-     * 3. The payment recipient creates a payment request scan code
-     * 4. The payment sender calls PollMessages on the rendezvous public key. This is ok because
-     * we know the message exists per step 1, and doesn't actually incur a long poll. This is a
-     * required hack because we don't have the infrastructure in place to allow multiple listens
-     * on the same stream, and the recipient needs real-time status updates.
-     * 5. The payment sender receives the message (any status messages are ignored), and submits the
-     * intent.
-     * 6. The payment recipient observes status message (eg. IntentSubmitted, ClientRejectedPayment,
-     * WebhookCalled) for payment state.
-     * 7. The payment recipient closes the stream once the payment hits a terminal state, or times out.
+     * For giving/grabbing a bill, the expected flow is as follows:
+     * 1. The payment sender creates a multi-mint cash scan code.
+     * 2. The payment sender calls OpenMessageStream on the rendezvous public key.
+     * 3. The payment sender uses SendMessage to send the mint in a RequestToGiveBill message.
+     * 4. The payment sender shows the bill with the scan code containing the rendezvous public key.
+     * 5. The payment recipient scans the code.
+     * 6. The payment recipient uses PollMessages to get the RequestToGiveBill message from part 3.
+     * 7. The payment recipient sends the destination address in a RequestToGrabBill message.
+     * 8. The payment sender receives the RequestToGrabBill message in real time, submits the intent
+     *    for the payment to the provided destination, and then closes the stream.
      *
      */
     fun openMessageStream(

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

@@ -2,6 +2,7 @@ package com.getcode.opencode.internal.network.extensions
 
 import com.codeinc.opencode.gen.common.v1.Model
 import com.codeinc.opencode.gen.messaging.v1.MessagingService
+import com.codeinc.opencode.gen.messaging.v1.requestToGiveBill
 import com.codeinc.opencode.gen.messaging.v1.requestToGrabBill
 import com.codeinc.opencode.gen.transaction.v2.TransactionService
 import com.codeinc.opencode.gen.transaction.v2.TransactionService.OpenAccountsMetadata.AccountSet
@@ -185,6 +186,12 @@ internal fun Message.asProtobufMessage(): MessagingService.Message {
             }
         }
 
+        is MessageKind.RequestToGiveBill -> {
+            builder.requestToGiveBill = requestToGiveBill {
+                mint = kind.mint.asSolanaAccountId()
+            }
+        }
+
         MessageKind.Unknown -> Unit
     }
 

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

@@ -52,6 +52,12 @@ internal fun MessagingService.RequestToGrabBill.toMessageKind(): MessageKind.Req
     )
 }
 
+internal fun MessagingService.RequestToGiveBill.toMessageKind(): MessageKind.RequestToGiveBill {
+    return MessageKind.RequestToGiveBill(
+        mint = mint.toPublicKey()
+    )
+}
+
 internal fun TransactionService.Metadata.toMetadata(): TransactionMetadata {
     return when (val case = typeCase) {
         TransactionService.Metadata.TypeCase.OPEN_ACCOUNTS -> TransactionMetadata.OpenAccount(openAccounts.accountSet.toAccountType())

services/opencode/src/main/kotlin/com/getcode/opencode/model/messaging/Message.kt

@@ -32,15 +32,26 @@ sealed interface MessageKind {
 
     // region Cash
     /**
-     * Represents a request to send a pulled out bill to the specified address.
+     * Represents a request that a pulled out bill be sent to the requested address.
      * <p>
      * This message type can only be initiated by clients.
      *
-     * @param requestor is the Kin token account on Solana to which a payment should be sent.
+     * @param requestor is the virtual token account on the VM to which a payment
      */
     data class RequestToGrabBill(
         val requestor: PublicKey
     ): MessageKind
+
+    /**
+     * Represents a request that a bill be given in the desired mint
+     * <p>
+     * This message type can only be initiated by clients.
+     *
+     * @param mint is the mint that the bill will be received in
+     */
+    data class RequestToGiveBill(
+        val mint: PublicKey
+    ): MessageKind
     // endregion
 
     data object Unknown: MessageKind