vtxo+round+wallet: purify VTXO FSM and move intent composition to wallet

arkrpc/indexer.proto

@@ -202,9 +202,9 @@ enum VTXOStatus {
     // VTXO_STATUS_LIVE indicates the VTXO is active and can be spent.
     VTXO_STATUS_LIVE = 2;
 
-    // VTXO_STATUS_REFRESH_REQUESTED indicates a refresh has been requested
-    // but not yet completed via a new round.
-    VTXO_STATUS_REFRESH_REQUESTED = 3;
+    // VTXO_STATUS_PENDING_FORFEIT indicates the VTXO has been committed
+    // to cooperative consumption and is awaiting forfeit details.
+    VTXO_STATUS_PENDING_FORFEIT = 3;
 
     // VTXO_STATUS_FORFEITING indicates the VTXO is being forfeited in a
     // round.
@@ -217,9 +217,9 @@ enum VTXOStatus {
     // transaction (terminal).
     VTXO_STATUS_SPENT = 6;
 
-    // VTXO_STATUS_EXPIRING indicates the VTXO is close to expiry and has been
-    // escalated to chain resolution (terminal for the VTXO actor).
-    VTXO_STATUS_EXPIRING = 7;
+    // VTXO_STATUS_UNILATERAL_EXIT indicates the VTXO has reached critical expiry
+    // and is being resolved on-chain (terminal for the VTXO actor).
+    VTXO_STATUS_UNILATERAL_EXIT = 7;
 
     // VTXO_STATUS_FAILED indicates an unrecoverable error (terminal).
     VTXO_STATUS_FAILED = 8;

daemonrpc/daemon.proto

@@ -192,9 +192,9 @@ enum VTXOStatus {
     // VTXO_STATUS_LIVE indicates the VTXO is active and spendable.
     VTXO_STATUS_LIVE = 1;
 
-    // VTXO_STATUS_REFRESH_REQUESTED indicates a refresh has been queued
-    // but the forfeit transaction has not yet been signed.
-    VTXO_STATUS_REFRESH_REQUESTED = 2;
+    // VTXO_STATUS_PENDING_FORFEIT indicates the VTXO has been committed
+    // to cooperative consumption and is awaiting forfeit details.
+    VTXO_STATUS_PENDING_FORFEIT = 2;
 
     // VTXO_STATUS_FORFEITING indicates the forfeit transaction has been
     // signed and the VTXO is awaiting confirmation of the new round.
@@ -208,9 +208,9 @@ enum VTXOStatus {
     // out-of-round transfer.
     VTXO_STATUS_SPENT = 5;
 
-    // VTXO_STATUS_EXPIRING is terminal: the VTXO is being resolved
-    // on-chain via the unilateral exit path.
-    VTXO_STATUS_EXPIRING = 6;
+    // VTXO_STATUS_UNILATERAL_EXIT is terminal: the VTXO has reached critical
+    // expiry and is being resolved on-chain.
+    VTXO_STATUS_UNILATERAL_EXIT = 6;
 
     // VTXO_STATUS_FAILED is terminal: an unrecoverable error occurred.
     VTXO_STATUS_FAILED = 7;

darepod/rpc_server.go

@@ -278,8 +278,8 @@ func protoStatusToDomain(
 	case daemonrpc.VTXOStatus_VTXO_STATUS_LIVE:
 		return vtxo.VTXOStatusLive, nil
 
-	case daemonrpc.VTXOStatus_VTXO_STATUS_REFRESH_REQUESTED:
-		return vtxo.VTXOStatusRefreshRequested, nil
+	case daemonrpc.VTXOStatus_VTXO_STATUS_PENDING_FORFEIT:
+		return vtxo.VTXOStatusPendingForfeit, nil
 
 	case daemonrpc.VTXOStatus_VTXO_STATUS_FORFEITING:
 		return vtxo.VTXOStatusForfeiting, nil
@@ -290,8 +290,8 @@ func protoStatusToDomain(
 	case daemonrpc.VTXOStatus_VTXO_STATUS_SPENT:
 		return vtxo.VTXOStatusSpent, nil
 
-	case daemonrpc.VTXOStatus_VTXO_STATUS_EXPIRING:
-		return vtxo.VTXOStatusExpiring, nil
+	case daemonrpc.VTXOStatus_VTXO_STATUS_UNILATERAL_EXIT:
+		return vtxo.VTXOStatusUnilateralExit, nil
 
 	case daemonrpc.VTXOStatus_VTXO_STATUS_FAILED:
 		return vtxo.VTXOStatusFailed, nil
@@ -307,8 +307,8 @@ func vtxoStatusToProto(s vtxo.VTXOStatus) daemonrpc.VTXOStatus {
 	case vtxo.VTXOStatusLive:
 		return daemonrpc.VTXOStatus_VTXO_STATUS_LIVE
 
-	case vtxo.VTXOStatusRefreshRequested:
-		return daemonrpc.VTXOStatus_VTXO_STATUS_REFRESH_REQUESTED
+	case vtxo.VTXOStatusPendingForfeit:
+		return daemonrpc.VTXOStatus_VTXO_STATUS_PENDING_FORFEIT
 
 	case vtxo.VTXOStatusForfeiting:
 		return daemonrpc.VTXOStatus_VTXO_STATUS_FORFEITING
@@ -319,8 +319,8 @@ func vtxoStatusToProto(s vtxo.VTXOStatus) daemonrpc.VTXOStatus {
 	case vtxo.VTXOStatusSpent:
 		return daemonrpc.VTXOStatus_VTXO_STATUS_SPENT
 
-	case vtxo.VTXOStatusExpiring:
-		return daemonrpc.VTXOStatus_VTXO_STATUS_EXPIRING
+	case vtxo.VTXOStatusUnilateralExit:
+		return daemonrpc.VTXOStatus_VTXO_STATUS_UNILATERAL_EXIT
 
 	case vtxo.VTXOStatusFailed:
 		return daemonrpc.VTXOStatus_VTXO_STATUS_FAILED

db/vtxo_store_test.go

@@ -224,7 +224,7 @@ func TestVTXOPersistenceStoreListLiveVTXOs(t *testing.T) {
 
 	// Mark vtxo3 as RefreshRequested (non-terminal, should still be live).
 	err = vtxoStore.UpdateVTXOStatus(
-		ctx, vtxo3.Outpoint, vtxo.VTXOStatusRefreshRequested,
+		ctx, vtxo3.Outpoint, vtxo.VTXOStatusPendingForfeit,
 	)
 	require.NoError(t, err)
 
@@ -262,13 +262,13 @@ func TestVTXOPersistenceStoreStatusTransitions(t *testing.T) {
 
 	// Transition to RefreshRequested.
 	err = vtxoStore.UpdateVTXOStatus(
-		ctx, desc.Outpoint, vtxo.VTXOStatusRefreshRequested,
+		ctx, desc.Outpoint, vtxo.VTXOStatusPendingForfeit,
 	)
 	require.NoError(t, err)
 
 	fetched, err = vtxoStore.GetVTXO(ctx, desc.Outpoint)
 	require.NoError(t, err)
-	require.Equal(t, vtxo.VTXOStatusRefreshRequested, fetched.Status)
+	require.Equal(t, vtxo.VTXOStatusPendingForfeit, fetched.Status)
 
 	// Transition to Forfeiting via MarkForfeiting.
 	forfeitRoundID := testRoundIDDB("forfeit-round")
@@ -528,7 +528,7 @@ func TestVTXOPersistenceStoreMultipleVTXOsLifecycle(t *testing.T) {
 	// VTXO 0: stays live (no changes).
 	// VTXO 1: goes to RefreshRequested (still live).
 	err = vtxoStore.UpdateVTXOStatus(
-		ctx, vtxos[1].Outpoint, vtxo.VTXOStatusRefreshRequested,
+		ctx, vtxos[1].Outpoint, vtxo.VTXOStatusPendingForfeit,
 	)
 	require.NoError(t, err)
 
@@ -577,7 +577,7 @@ func TestVTXOPersistenceStoreMultipleVTXOsLifecycle(t *testing.T) {
 
 	fetched1, err := vtxoStore.GetVTXO(ctx, vtxos[1].Outpoint)
 	require.NoError(t, err)
-	require.Equal(t, vtxo.VTXOStatusRefreshRequested, fetched1.Status)
+	require.Equal(t, vtxo.VTXOStatusPendingForfeit, fetched1.Status)
 
 	fetched2, err := vtxoStore.GetVTXO(ctx, vtxos[2].Outpoint)
 	require.NoError(t, err)