Fixes for pool accounts

Author: jeffyanta

pkg/code/async/sequencer/fulfillment_handler.go

@@ -85,6 +85,10 @@ 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

pkg/code/common/owner.go

@@ -145,6 +145,17 @@ func GetLatestTokenAccountRecordsForOwner(ctx context.Context, data code_data.Pr
 				}
 			}
 
+			// Filter out account records for accounts that have completed their
+			// full lifecycle
+			//
+			// todo: This needs tests
+			switch generalRecord.AccountType {
+			case commonpb.AccountType_POOL:
+				if timelockRecord.IsClosed() {
+					continue
+				}
+			}
+
 			res[generalRecord.AccountType] = append(res[generalRecord.AccountType], &AccountRecords{
 				General:  generalRecord,
 				Timelock: timelockRecord,

pkg/code/server/account/server.go

@@ -21,6 +21,7 @@ import (
 	"github.com/code-payments/code-server/pkg/code/balance"
 	"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/account"
 	"github.com/code-payments/code-server/pkg/code/data/action"
 	"github.com/code-payments/code-server/pkg/grpc/client"
 	timelock_token_v1 "github.com/code-payments/code-server/pkg/solana/timelock/v1"
@@ -160,26 +161,16 @@ func (s *server) GetTokenAccountInfos(ctx context.Context, req *accountpb.GetTok
 		return nil, status.Error(codes.Internal, "")
 	}
 
-	nextPoolIndex := len(recordsByType[commonpb.AccountType_POOL])
-
-	// Filter out account records for accounts that have completed their full
-	// lifecycle
-	//
-	// todo: This needs tests
-	for accountType, batchRecords := range recordsByType {
-		switch accountType {
-		case commonpb.AccountType_POOL:
-		default:
-			continue
-		}
-
-		var filtered []*common.AccountRecords
-		for _, records := range batchRecords {
-			if records.IsTimelock() && !records.Timelock.IsClosed() {
-				filtered = append(filtered, records)
-			}
-		}
-		recordsByType[accountType] = filtered
+	var nextPoolIndex uint64
+	latestPoolAccountInfoRecord, err := s.data.GetLatestAccountInfoByOwnerAddressAndType(ctx, owner.PublicKey().ToBase58(), commonpb.AccountType_POOL)
+	switch err {
+	case nil:
+		nextPoolIndex = latestPoolAccountInfoRecord.Index + 1
+	case account.ErrAccountInfoNotFound:
+		nextPoolIndex = 0
+	default:
+		log.WithError(err).Warn("failure getting latest pool account record")
+		return nil, status.Error(codes.Internal, "")
 	}
 
 	// Trigger a deposit sync with the blockchain for the primary account, if it exists

pkg/code/server/transaction/intent_handler.go

@@ -258,7 +258,7 @@ func (h *OpenAccountsIntentHandler) validateActions(
 			return NewActionValidationErrorf(openAction, "account type must be %s", expectedAccountToOpen.Type)
 		}
 
-		if openAction.GetOpenAccount().Index != 0 {
+		if openAction.GetOpenAccount().Index != expectedAccountToOpen.Index {
 			return NewActionValidationErrorf(openAction, "index must be %d", expectedAccountToOpen.Index)
 		}
 
@@ -1142,7 +1142,7 @@ func (h *PublicDistributionIntentHandler) IsNoop(ctx context.Context, intentReco
 }
 
 func (h *PublicDistributionIntentHandler) GetBalanceLocks(ctx context.Context, intentRecord *intent.Record, metadata *transactionpb.Metadata) ([]*intentBalanceLock, error) {
-	poolVault, err := common.NewAccountFromPublicKeyString(intentRecord.ReceivePaymentsPubliclyMetadata.Source)
+	poolVault, err := common.NewAccountFromPublicKeyString(intentRecord.PublicDistributionMetadata.Source)
 	if err != nil {
 		return nil, err
 	}