Update remote send backend worker flows

Author: jeffyanta

pkg/code/async/account/gift_card.go

@@ -209,7 +209,8 @@ func (p *service) initiateProcessToCleanupGiftCardAutoReturn(ctx context.Context
 		return err
 	}
 
-	return markFulfillmentAsRevoked(ctx, p.data, autoReturnFulfillment[0])
+	// The sequencer will handle state transition and any cleanup
+	return markFulfillmentAsActivelyScheduled(ctx, p.data, autoReturnFulfillment[0])
 }
 
 func markAutoReturnCheckComplete(ctx context.Context, data code_data.Provider, record *account.Record) error {
@@ -340,24 +341,6 @@ func markFulfillmentAsActivelyScheduled(ctx context.Context, data code_data.Prov
 	return data.MarkFulfillmentAsActivelyScheduled(ctx, fulfillmentRecord.Id)
 }
 
-func markFulfillmentAsRevoked(ctx context.Context, data code_data.Provider, fulfillmentRecord *fulfillment.Record) error {
-	if fulfillmentRecord.Id == 0 {
-		return errors.New("fulfillment id is zero")
-	}
-
-	if fulfillmentRecord.State == fulfillment.StateRevoked {
-		return nil
-	}
-
-	if fulfillmentRecord.State != fulfillment.StateUnknown {
-		return errors.New("expected fulfillment in unknown state")
-	}
-
-	fulfillmentRecord.State = fulfillment.StateRevoked
-
-	return data.UpdateFulfillment(ctx, fulfillmentRecord)
-}
-
 // Must be unique, but consistent for idempotency, and ideally fit in a 32
 // byte buffer.
 func getAutoReturnIntentId(originalIntentId string) string {

pkg/code/async/account/testutil.go

@@ -231,11 +231,11 @@ func (e *testEnv) assertGiftCardNotAutoReturned(t *testing.T, giftCard *testGift
 	assert.EqualValues(t, math.MaxInt64, fulfillmentRecord.IntentOrderingIndex)
 	assert.EqualValues(t, 0, fulfillmentRecord.ActionOrderingIndex)
 	assert.EqualValues(t, 0, fulfillmentRecord.FulfillmentOrderingIndex)
-	assert.True(t, fulfillmentRecord.DisableActiveScheduling)
+	assert.Equal(t, fulfillment.StateUnknown, fulfillmentRecord.State)
 	if isRemovedFromWorkerQueue {
-		assert.Equal(t, fulfillment.StateRevoked, fulfillmentRecord.State)
+		assert.False(t, fulfillmentRecord.DisableActiveScheduling)
 	} else {
-		assert.Equal(t, fulfillment.StateUnknown, fulfillmentRecord.State)
+		assert.True(t, fulfillmentRecord.DisableActiveScheduling)
 	}
 
 	_, err = e.data.GetIntent(e.ctx, giftCardAutoReturnIntentPrefix+giftCard.issuedIntentRecord.IntentId)

pkg/code/async/sequencer/fulfillment_handler.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/code-payments/code-server/pkg/code/common"
 	code_data "github.com/code-payments/code-server/pkg/code/data"
+	"github.com/code-payments/code-server/pkg/code/data/action"
 	"github.com/code-payments/code-server/pkg/code/data/cvm/storage"
 	"github.com/code-payments/code-server/pkg/code/data/fulfillment"
 	"github.com/code-payments/code-server/pkg/code/data/timelock"
@@ -550,7 +551,12 @@ func (h *NoPrivacyWithdrawFulfillmentHandler) OnSuccess(ctx context.Context, ful
 		return errors.New("invalid fulfillment type")
 	}
 
-	return onVirtualAccountDeleted(ctx, h.data, fulfillmentRecord.Source)
+	err := onVirtualAccountDeleted(ctx, h.data, fulfillmentRecord.Source)
+	if err != nil {
+		return err
+	}
+
+	return markTimelockClosed(ctx, h.data, fulfillmentRecord.Source, txnRecord.Slot)
 }
 
 func (h *NoPrivacyWithdrawFulfillmentHandler) OnFailure(ctx context.Context, fulfillmentRecord *fulfillment.Record, txnRecord *transaction.Record) (recovered bool, err error) {
@@ -567,7 +573,14 @@ func (h *NoPrivacyWithdrawFulfillmentHandler) IsRevoked(ctx context.Context, ful
 		return false, false, errors.New("invalid fulfillment type")
 	}
 
-	return false, false, nil
+	// Auto-return actions might be revoked, check the action record that would've
+	// been updated by the gift card return worker.
+	actionRecord, err := h.data.GetActionById(ctx, fulfillmentRecord.Intent, fulfillmentRecord.ActionId)
+	if err != nil {
+		return false, false, err
+	}
+
+	return actionRecord.State == action.StateRevoked, false, nil
 }
 
 type CloseEmptyTimelockAccountFulfillmentHandler struct {

pkg/code/async/sequencer/timelock.go

@@ -28,3 +28,22 @@ func markTimelockLocked(ctx context.Context, data code_data.Provider, vault stri
 	}
 	return err
 }
+
+func markTimelockClosed(ctx context.Context, data code_data.Provider, vault string, slot uint64) error {
+	record, err := data.GetTimelockByVault(ctx, vault)
+	if err != nil {
+		return err
+	}
+
+	record.VaultState = timelock_token_v1.StateClosed
+	if record.Block > slot {
+		// Potential conflict with unlock state detection, force a move to close at the next block
+		//
+		// todo: Better way of handling this
+		record.Block += 1
+	} else {
+		record.Block = slot
+	}
+
+	return data.SaveTimelock(ctx, record)
+}