refactor(ocp): introduce IntentStatelessSwap and rename swap request/response types

Add IntentStatelessSwap mirroring IntentSwap pattern — encapsulates
initiate and submit-signatures protobuf request building. Update
StatelessSwapExecutor to take the intent instead of raw params + lambda.

Create StatelessSwapRequest model and rename stateful counterparts:
SwapRequest -> StatefulSwapRequest, SwapResponseServerParameters ->
StatefulSwapResponseServerParameters, SwapResult -> StatefulSwapResult.

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

Author: bmc08gt

services/opencode/src/androidTest/kotlin/com/getcode/opencode/solana/swap/SwapTests.kt

@@ -23,7 +23,7 @@ import com.getcode.opencode.model.financial.LaunchpadMetadata
 import com.getcode.opencode.model.financial.MintMetadata
 import com.getcode.opencode.model.financial.VmMetadata
 import com.getcode.opencode.model.financial.usdf
-import com.getcode.opencode.model.transactions.SwapResponseServerParameters
+import com.getcode.opencode.model.transactions.StatefulSwapResponseServerParameters
 import com.getcode.opencode.tests.generateRandomPublicKeyForTest
 import com.getcode.opencode.utils.generate
 import com.getcode.solana.keys.Mint
@@ -89,7 +89,7 @@ class SwapInstructionsTest {
     )
 
     // Mock Server Response (Stateless for simplicity)
-    private val mockServerParams = SwapResponseServerParameters.ExistingCurrency(
+    private val mockServerParams = StatefulSwapResponseServerParameters.ExistingCurrency(
         payer = mockPayer,
         blockhash = mockRecentBlockhash,
         nonce = mockNonce,
@@ -337,7 +337,7 @@ class SwapInstructionsTest {
     private val mockNewCurrencyAuthority = generateRandomPublicKeyForTest()
     private val mockSeed = generateRandomPublicKeyForTest()
 
-    private val mockNewCurrencyServerParams = SwapResponseServerParameters.NewCurrency(
+    private val mockNewCurrencyServerParams = StatefulSwapResponseServerParameters.NewCurrency(
         payer = mockPayer,
         blockhash = mockRecentBlockhash,
         nonce = mockNonce,

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

@@ -24,7 +24,7 @@ import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.transactions.ExchangeData
 import com.getcode.opencode.model.transactions.SwapFundingSource
 import com.getcode.opencode.model.transactions.SwapMetadata
-import com.getcode.opencode.model.transactions.SwapRequest
+import com.getcode.opencode.model.transactions.StatefulSwapRequest
 import com.getcode.opencode.model.transactions.SwapState
 import com.getcode.opencode.model.transactions.TransactionMetadata
 import com.getcode.opencode.model.transactions.WithdrawalAvailability
@@ -269,7 +269,7 @@ class TransactionController @Inject constructor(
         swapId: SwapId?,
         of: Token,
         source: SwapFundingSource,
-        fund: (suspend (SwapRequest) -> Result<Unit>)?,
+        fund: (suspend (StatefulSwapRequest) -> Result<Unit>)?,
     ): Result<SwapId> {
         trace("Starting ${amount.localFiat.nativeAmount.formatted()} buy of ${of.symbol}")
         val tokenizedOwner = owner.withTimelockForToken(of)

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

@@ -9,7 +9,7 @@ import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.transactions.SwapFundingSource
 import com.getcode.opencode.model.transactions.SwapMetadata
-import com.getcode.opencode.model.transactions.SwapRequest
+import com.getcode.opencode.model.transactions.StatefulSwapRequest
 import com.getcode.opencode.model.transactions.SwapState
 import com.getcode.opencode.model.transactions.WithdrawalAvailability
 import com.getcode.opencode.solana.intents.IntentType
@@ -35,7 +35,7 @@ interface TransactionOperations {
         swapId: SwapId? = null,
         of: Token,
         source: SwapFundingSource = SwapFundingSource.SubmitIntent(),
-        fund: (suspend (SwapRequest) -> Result<Unit>)? = null,
+        fund: (suspend (StatefulSwapRequest) -> Result<Unit>)? = null,
     ): Result<SwapId>
 
     suspend fun sell(

services/opencode/src/main/kotlin/com/getcode/opencode/internal/domain/repositories/InternalTransactionRepository.kt

@@ -9,7 +9,7 @@ import com.getcode.opencode.model.financial.Limits
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.transactions.SwapFundingSource
-import com.getcode.opencode.model.transactions.SwapRequest
+import com.getcode.opencode.model.transactions.StatefulSwapRequest
 import com.getcode.opencode.model.transactions.TransactionMetadata
 import com.getcode.opencode.model.transactions.WithdrawalAvailability
 import com.getcode.opencode.model.core.errors.SubmitIntentError
@@ -73,7 +73,7 @@ internal class InternalTransactionRepository @Inject constructor(
         swapId: SwapId?,
         verifiedState: VerifiedState,
         source: SwapFundingSource,
-        fund: (suspend (SwapRequest) -> Result<Unit>)?
+        fund: (suspend (StatefulSwapRequest) -> Result<Unit>)?
     ): Result<SwapId> = service.buy(
         scope = scope,
         swapId = swapId,

…ternal/network/api/intents/IntentSwap.kt …etwork/api/intents/IntentStatefulSwap.ktservices/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentSwap.kt renamed to services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentStatefulSwap.kt services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentSwap.kt renamed to services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/api/intents/IntentStatefulSwap.kt

@@ -10,55 +10,55 @@ import com.getcode.opencode.internal.network.extensions.stablecoinParams
 import com.getcode.opencode.internal.network.extensions.verifiedMetadata
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.usdf
-import com.getcode.opencode.model.transactions.SwapRequest
-import com.getcode.opencode.model.transactions.SwapResponseServerParameters
+import com.getcode.opencode.model.transactions.StatefulSwapRequest
+import com.getcode.opencode.model.transactions.StatefulSwapResponseServerParameters
 import com.getcode.opencode.model.transactions.SwapStartKind
 import com.getcode.opencode.model.transactions.VerifiedSwapMetadata
 import com.getcode.opencode.solana.SolanaTransaction
 import com.getcode.opencode.solana.TransactionBuilder
 import com.getcode.solana.keys.Signature
 
-internal class IntentSwap(
-    val request: SwapRequest,
+internal class IntentStatefulSwap(
+    val request: StatefulSwapRequest,
     val metadata: VerifiedSwapMetadata,
 ){
-    var parameters: SwapResponseServerParameters? = null
+    var parameters: StatefulSwapResponseServerParameters? = null
 
-    fun sign(parameters: SwapResponseServerParameters): List<Signature> {
+    fun sign(parameters: StatefulSwapResponseServerParameters): List<Signature> {
         val transaction = transaction(parameters)
         return when (parameters) {
-            is SwapResponseServerParameters.ExistingCurrency -> {
+            is StatefulSwapResponseServerParameters.ExistingCurrency -> {
                 transaction.signatures(request.owner.authority.keyPair, request.swapAuthority)
             }
-            is SwapResponseServerParameters.NewCurrency -> {
+            is StatefulSwapResponseServerParameters.NewCurrency -> {
                 // For new currency, owner == swapAuthority, so only 1 unique signature needed
                 transaction.signatures(request.owner.authority.keyPair)
             }
 
-            is SwapResponseServerParameters.Stablecoin -> {
+            is StatefulSwapResponseServerParameters.Stablecoin -> {
                 transaction.signatures(request.owner.authority.keyPair, request.swapAuthority)
             }
         }
     }
 
-    fun transaction(parameters: SwapResponseServerParameters): SolanaTransaction {
+    fun transaction(parameters: StatefulSwapResponseServerParameters): SolanaTransaction {
         return when (parameters) {
-            is SwapResponseServerParameters.ExistingCurrency -> TransactionBuilder.swap(
+            is StatefulSwapResponseServerParameters.ExistingCurrency -> TransactionBuilder.swap(
                 response = parameters,
                 authority = request.owner.authorityPublicKey,
                 swapAuthority = request.swapAuthority.toPublicKey(),
                 direction = request.direction,
                 amount = request.swapAmount.underlyingTokenAmount.quarks,
             )
-            is SwapResponseServerParameters.NewCurrency -> TransactionBuilder.buyNewCurrency(
+            is StatefulSwapResponseServerParameters.NewCurrency -> TransactionBuilder.buyNewCurrency(
                 response = parameters,
                 authority = request.owner.authorityPublicKey,
                 coreMintMetadata = Token.usdf,
                 amount = request.swapAmount.underlyingTokenAmount.quarks,
                 feeAmount = request.feeAmount?.underlyingTokenAmount?.quarks,
             )
 
-            is SwapResponseServerParameters.Stablecoin -> TransactionBuilder.stablecoinSwap(
+            is StatefulSwapResponseServerParameters.Stablecoin -> TransactionBuilder.stablecoinSwap(
                 response = parameters,
                 authority = request.owner.authorityPublicKey,
                 swapAuthority = request.swapAuthority.toPublicKey(),

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

@@ -0,0 +1,57 @@
+package com.getcode.opencode.internal.network.api.intents
+
+import com.codeinc.opencode.gen.transaction.v1.TransactionService
+import com.getcode.opencode.internal.network.extensions.asSignature
+import com.getcode.opencode.internal.network.extensions.asSolanaAccountId
+import com.getcode.opencode.internal.network.extensions.sign
+import com.getcode.opencode.model.transactions.StatelessSwapRequest
+import com.getcode.opencode.model.transactions.StatelessSwapServerParameters
+import com.getcode.opencode.solana.SolanaTransaction
+import com.getcode.solana.keys.Signature
+
+internal class IntentStatelessSwap(
+    val request: StatelessSwapRequest,
+) {
+    var parameters: StatelessSwapServerParameters? = null
+
+    fun sign(parameters: StatelessSwapServerParameters): List<Signature> {
+        val transaction = transaction(parameters)
+        return transaction.signatures(request.owner.authority.keyPair)
+    }
+
+    fun transaction(parameters: StatelessSwapServerParameters): SolanaTransaction {
+        TODO("Stateless swap transaction building not yet implemented")
+    }
+
+    fun initiate(): TransactionService.StatelessSwapRequest {
+        val owner = request.owner.authority.keyPair
+        val initiate = TransactionService.StatelessSwapRequest.Initiate.newBuilder()
+            .setOwner(owner.asSolanaAccountId())
+            .setStablecoin(
+                TransactionService.StatelessSwapRequest.Initiate.CoinbaseStableSwapperClientParameters.newBuilder()
+                    .setFromMint(request.fromMint.asSolanaAccountId())
+                    .setToMint(request.toMint.asSolanaAccountId())
+                    .setSwapAmount(request.amount)
+                    .build()
+            )
+            .setWaitForFinalization(request.waitForFinalization)
+            .apply { setSignature(sign(owner)) }
+            .build()
+
+        return TransactionService.StatelessSwapRequest.newBuilder()
+            .setInitiate(initiate)
+            .build()
+    }
+
+    fun requestToSubmitSignatures(): TransactionService.StatelessSwapRequest {
+        val params = parameters ?: throw IllegalStateException("parameters not set")
+
+        return TransactionService.StatelessSwapRequest.newBuilder()
+            .setSubmitSignatures(
+                TransactionService.StatelessSwapRequest.SubmitSignatures.newBuilder()
+                    .addAllTransactionSignatures(sign(params).map { it.asSignature() })
+                    .build()
+            )
+            .build()
+    }
+}

…ternal/network/executors/SwapExecutor.kt …etwork/executors/StatefulSwapExecutor.ktservices/opencode/src/main/kotlin/com/getcode/opencode/internal/network/executors/SwapExecutor.kt renamed to services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/executors/StatefulSwapExecutor.kt services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/executors/SwapExecutor.kt renamed to services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/executors/StatefulSwapExecutor.kt

@@ -4,12 +4,12 @@ import com.codeinc.opencode.gen.transaction.v1.TransactionService
 import com.getcode.opencode.internal.bidi.BidirectionalStreamReference
 import com.getcode.opencode.internal.bidi.openBidirectionalStreamForResult
 import com.getcode.opencode.internal.network.api.TransactionApi
-import com.getcode.opencode.internal.network.api.intents.IntentSwap
+import com.getcode.opencode.internal.network.api.intents.IntentStatefulSwap
 import com.getcode.opencode.internal.network.extensions.toCode
 import com.getcode.opencode.internal.network.extensions.toProps
 import com.getcode.opencode.model.core.errors.SubmitIntentError
 import com.getcode.opencode.model.core.errors.SwapError
-import com.getcode.opencode.model.transactions.SwapRequest
+import com.getcode.opencode.model.transactions.StatefulSwapRequest
 import com.getcode.opencode.model.transactions.SwapResult
 import com.getcode.opencode.model.transactions.SwapStartKind
 import com.getcode.opencode.model.transactions.VerifiedSwapMetadata
@@ -27,7 +27,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlin.coroutines.resume
 
-typealias OcpSwapStreamReference = BidirectionalStreamReference<SwapRequest, TransactionService.StatefulSwapResponse>
+typealias OcpSwapStreamReference = BidirectionalStreamReference<StatefulSwapRequest, TransactionService.StatefulSwapResponse>
 
 
 /**
@@ -49,7 +49,7 @@ internal class SwapExecutor(
 
     suspend fun execute(
         scope: CoroutineScope,
-        request: SwapRequest,
+        request: StatefulSwapRequest,
     ): SwapResult = suspendCancellableCoroutine { cont ->
         trace(
             tag = "Swap",
@@ -81,7 +81,7 @@ internal class SwapExecutor(
             )
         }
 
-        val intent = IntentSwap(request = request, metadata = metadata)
+        val intent = IntentStatefulSwap(request = request, metadata = metadata)
 
         scope.launch {
             try {
@@ -120,7 +120,7 @@ internal class SwapExecutor(
 
     private suspend fun openSwapStream(
         streamRef: OcpSwapStreamReference,
-        intent: IntentSwap,
+        intent: IntentStatefulSwap,
     ): SwapResult = openBidirectionalStreamForResult(
         streamRef = streamRef,
         apiCall = api::swap,
@@ -172,7 +172,7 @@ internal class SwapExecutor(
 }
 
 private fun handleServerParameters(
-    intent: IntentSwap,
+    intent: IntentStatefulSwap,
     serverParameters: TransactionService.StatefulSwapResponse.ServerParameters?,
     requestChannel: (TransactionService.StatefulSwapRequest) -> Unit,
     onResult: (SwapResult) -> Unit,
@@ -217,7 +217,7 @@ private fun handleServerParameters(
 }
 
 private fun handleErrors(
-    intent: IntentSwap,
+    intent: IntentStatefulSwap,
     errorDetails: List<TransactionService.ErrorDetails>
 ): List<String> {
     val errors = mutableListOf<String>()