Support unlock state detection for lazy loaded Timelock accounts on the blockchain

Author: Jeff Yanta

pkg/code/async/geyser/backup.go

@@ -21,7 +21,7 @@ import (
 // the case? Real time updates. Backup workers likely won't be able to guarantee
 // real time (or near real time) updates at scale.
 
-func (p *service) backupTimelockStateWorker(serviceCtx context.Context, interval time.Duration) error {
+func (p *service) backupTimelockStateWorker(serviceCtx context.Context, state timelock_token.TimelockState, interval time.Duration) error {
 	log := p.log.WithField("method", "backupTimelockStateWorker")
 	log.Debug("worker started")
 
@@ -52,7 +52,7 @@ func (p *service) backupTimelockStateWorker(serviceCtx context.Context, interval
 
 				timelockRecords, err := p.data.GetAllTimelocksByState(
 					tracedCtx,
-					timelock_token.StateLocked,
+					state,
 					query.WithDirection(query.Ascending),
 					query.WithCursor(cursor),
 					query.WithLimit(256),

pkg/code/async/geyser/service.go

@@ -8,6 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	geyserpb "github.com/code-payments/code-server/pkg/code/async/geyser/api/gen"
+	timelock_token "github.com/code-payments/code-server/pkg/solana/timelock/v1"
 	indexerpb "github.com/code-payments/code-vm-indexer/generated/indexer/v1"
 
 	"github.com/code-payments/code-server/pkg/code/async"
@@ -63,7 +64,13 @@ func New(data code_data.Provider, vmIndexerClient indexerpb.IndexerClient, integ
 func (p *service) Start(ctx context.Context, _ time.Duration) error {
 	// Start backup workers to catch missed events
 	go func() {
-		err := p.backupTimelockStateWorker(ctx, p.conf.backupTimelockWorkerInterval.Get(ctx))
+		err := p.backupTimelockStateWorker(ctx, timelock_token.StateLocked, p.conf.backupTimelockWorkerInterval.Get(ctx))
+		if err != nil && err != context.Canceled {
+			p.log.WithError(err).Warn("timelock backup worker terminated unexpectedly")
+		}
+	}()
+	go func() {
+		err := p.backupTimelockStateWorker(ctx, timelock_token.StateUnknown, p.conf.backupTimelockWorkerInterval.Get(ctx))
 		if err != nil && err != context.Canceled {
 			p.log.WithError(err).Warn("timelock backup worker terminated unexpectedly")
 		}

pkg/code/async/geyser/timelock.go

@@ -13,12 +13,6 @@ import (
 )
 
 func updateTimelockAccountRecord(ctx context.Context, data code_data.Provider, timelockRecord *timelock.Record) error {
-	// Wait for Timelock account initialization before monitoring state
-	// to avoid conflicting with the sequencer
-	if timelockRecord.VaultState == timelock_token.StateUnknown || timelockRecord.Block == 0 {
-		return nil
-	}
-
 	unlockState, slot, err := getTimelockUnlockState(ctx, data, timelockRecord)
 	if err != nil {
 		return err

pkg/code/async/sequencer/fulfillment_handler.go

@@ -85,10 +85,6 @@ func (h *InitializeLockedTimelockAccountFulfillmentHandler) CanSubmitToBlockchai
 		return false, errors.New("invalid fulfillment type")
 	}
 
-	// todo: Fix unlock state detection for Timelock accounts that won't be
-	//       initialized immediately
-	return true, nil
-
 	accountInfoRecord, err := h.data.GetAccountInfoByTokenAddress(ctx, fulfillmentRecord.Source)
 	if err != nil {
 		return false, err
@@ -101,7 +97,9 @@ func (h *InitializeLockedTimelockAccountFulfillmentHandler) CanSubmitToBlockchai
 
 	// Every other account type needs to be used in a transfer of funds to be opened
 	nextScheduledFulfillment, err := h.data.GetNextSchedulableFulfillmentByAddress(ctx, fulfillmentRecord.Source, fulfillmentRecord.IntentOrderingIndex, fulfillmentRecord.ActionId, fulfillmentRecord.FulfillmentOrderingIndex)
-	if err != nil {
+	if err == fulfillment.ErrFulfillmentNotFound {
+		return false, nil
+	} else if err != nil {
 		return false, err
 	}
 

pkg/code/async/sequencer/timelock.go

@@ -19,7 +19,11 @@ func markTimelockLocked(ctx context.Context, data code_data.Provider, vault stri
 		return err
 	}
 
-	if record.VaultState == timelock_token_v1.StateLocked {
+	switch record.VaultState {
+	case timelock_token_v1.StateLocked, timelock_token_v1.StateWaitingForTimeout, timelock_token_v1.StateUnlocked:
+		return nil
+	}
+	if record.Block <= slot {
 		return nil
 	}
 

pkg/code/server/transaction/action_handler.go

@@ -166,6 +166,7 @@ func (h *OpenAccountActionHandler) GetFulfillmentMetadata(
 			source:                   h.timelockAccounts.Vault,
 			destination:              nil,
 			fulfillmentOrderingIndex: 0,
+			disableActiveScheduling:  h.accountType != commonpb.AccountType_PRIMARY, // Non-primary accounts are created on demand after first usage
 		}, nil
 	default:
 		return nil, errors.New("invalid virtual ixn index")