Cleanup deprecated account types

Author: Jeff Yanta

go.mod

@@ -6,7 +6,7 @@ require (
 	filippo.io/edwards25519 v1.1.0
 	github.com/aws/aws-sdk-go-v2 v0.17.0
 	github.com/bits-and-blooms/bloom/v3 v3.1.0
-	github.com/code-payments/code-protobuf-api v1.19.1-0.20250826182502-883828ea83bd
+	github.com/code-payments/code-protobuf-api v1.19.1-0.20250827160012-3edaffb82d79
 	github.com/code-payments/code-vm-indexer v0.1.11-0.20241028132209-23031e814fba
 	github.com/emirpasic/gods v1.12.0
 	github.com/envoyproxy/protoc-gen-validate v1.2.1

go.sum

@@ -80,16 +80,8 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250825171158-5f02a8a5924b h1:dwgr/zhcF7eZsBgRAX+AAjOhBdk9fEs1oO2csc0lI0U=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250825171158-5f02a8a5924b/go.mod h1:ee6TzKbgMS42ZJgaFEMG3c4R3dGOiffHSu6MrY7WQvs=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250825175528-dab522122ad6 h1:5OUwxIX95ReOieQGdeihVRiQajpZhmN5dsY6HgseZf8=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250825175528-dab522122ad6/go.mod h1:ee6TzKbgMS42ZJgaFEMG3c4R3dGOiffHSu6MrY7WQvs=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250825175844-b5a79ae87f0a h1:oVponiCqodzMIR/9gucEbxG4pCQSFwcUQnydJjPv01U=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250825175844-b5a79ae87f0a/go.mod h1:ee6TzKbgMS42ZJgaFEMG3c4R3dGOiffHSu6MrY7WQvs=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250826132123-e79bc35cff0f h1:ujiDkjcrsk4wZOUQuaYytSQowUnOpT2icmCi6tVc8eY=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250826132123-e79bc35cff0f/go.mod h1:ee6TzKbgMS42ZJgaFEMG3c4R3dGOiffHSu6MrY7WQvs=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250826182502-883828ea83bd h1:nK1+vHCOTtAL1ouC53yP0sYISKR0uuEsoaYJmZAg4uA=
-github.com/code-payments/code-protobuf-api v1.19.1-0.20250826182502-883828ea83bd/go.mod h1:ee6TzKbgMS42ZJgaFEMG3c4R3dGOiffHSu6MrY7WQvs=
+github.com/code-payments/code-protobuf-api v1.19.1-0.20250827160012-3edaffb82d79 h1:Td/jOwNQCuSaTL6NZstWSMxgjcyVhkC1Q/BmVRqY6qo=
+github.com/code-payments/code-protobuf-api v1.19.1-0.20250827160012-3edaffb82d79/go.mod h1:ee6TzKbgMS42ZJgaFEMG3c4R3dGOiffHSu6MrY7WQvs=
 github.com/code-payments/code-vm-indexer v0.1.11-0.20241028132209-23031e814fba h1:Bkp+gmeb6Y2PWXfkSCTMBGWkb2P1BujRDSjWeI+0j5I=
 github.com/code-payments/code-vm-indexer v0.1.11-0.20241028132209-23031e814fba/go.mod h1:jSiifpiBpyBQ8q2R0MGEbkSgWC6sbdRTyDBntmW+j1E=
 github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 h1:NmTXa/uVnDyp0TY5MKi197+3HWcnYWfnHGyaFthlnGw=

pkg/code/common/owner.go

@@ -163,10 +163,6 @@ func GetLatestTokenAccountRecordsForOwner(ctx context.Context, data code_data.Pr
 		}
 	}
 
-	// The record should never exist, but this is precautionary. Pre-privacy timelock
-	// accounts should only be used in a migration.
-	delete(res, commonpb.AccountType_LEGACY_PRIMARY_2022)
-
 	return res, nil
 }
 

pkg/code/common/owner_test.go

@@ -131,20 +131,16 @@ func TestGetLatestTokenAccountRecordsForOwner(t *testing.T) {
 	require.NoError(t, err)
 	assert.Empty(t, actual)
 
-	authority1 := newRandomTestAccount(t)
+	authority1 := owner
 	authority2 := newRandomTestAccount(t)
 	authority3 := newRandomTestAccount(t)
 	authority4 := newRandomTestAccount(t)
-	authority5 := newRandomTestAccount(t)
-	authority6 := newRandomTestAccount(t)
-	authority7 := newRandomTestAccount(t)
 
 	for _, authorityAndType := range []struct {
 		account     *Account
 		accountType commonpb.AccountType
 	}{
-		{authority1, commonpb.AccountType_BUCKET_1_KIN},
-		{authority2, commonpb.AccountType_BUCKET_10_KIN},
+		{authority1, commonpb.AccountType_PRIMARY},
 	} {
 		timelockAccounts, err := authorityAndType.account.GetTimelockAccounts(vmAccount, coreMintAccount)
 		require.NoError(t, err)
@@ -162,14 +158,11 @@ func TestGetLatestTokenAccountRecordsForOwner(t *testing.T) {
 		require.NoError(t, data.CreateAccountInfo(ctx, accountInfoRecord))
 	}
 
-	for _, authorityAndRelationship := range []struct {
-		account *Account
-		domain  string
-	}{
-		{authority3, "app1.com"},
-		{authority4, "app2.com"},
+	for i, authority := range []*Account{
+		authority2,
+		authority3,
 	} {
-		timelockAccounts, err := authorityAndRelationship.account.GetTimelockAccounts(vmAccount, coreMintAccount)
+		timelockAccounts, err := authority.GetTimelockAccounts(vmAccount, coreMintAccount)
 		require.NoError(t, err)
 
 		timelockRecord := timelockAccounts.ToDBRecord()
@@ -180,101 +173,56 @@ func TestGetLatestTokenAccountRecordsForOwner(t *testing.T) {
 			AuthorityAccount: timelockRecord.VaultOwner,
 			TokenAccount:     timelockRecord.VaultAddress,
 			MintAccount:      coreMintAccount.PublicKey().ToBase58(),
-			AccountType:      commonpb.AccountType_RELATIONSHIP,
-			RelationshipTo:   &authorityAndRelationship.domain,
+			AccountType:      commonpb.AccountType_POOL,
+			Index:            uint64(i),
 		}
 		require.NoError(t, data.CreateAccountInfo(ctx, accountInfoRecord))
 	}
 
-	swapAta, err := owner.ToAssociatedTokenAccount(authority5)
+	swapAta, err := owner.ToAssociatedTokenAccount(authority4)
 	require.NoError(t, err)
 	swapAccountInfoRecord := &account.Record{
 		OwnerAccount:     owner.PublicKey().ToBase58(),
-		AuthorityAccount: authority5.PublicKey().ToBase58(),
+		AuthorityAccount: authority4.PublicKey().ToBase58(),
 		TokenAccount:     swapAta.PublicKey().ToBase58(),
 		MintAccount:      swapMintAccount.PublicKey().ToBase58(),
 		AccountType:      commonpb.AccountType_SWAP,
 	}
 	require.NoError(t, data.CreateAccountInfo(ctx, swapAccountInfoRecord))
 
-	for i, authority := range []*Account{
-		authority6,
-		authority7,
-	} {
-		timelockAccounts, err := authority.GetTimelockAccounts(vmAccount, coreMintAccount)
-		require.NoError(t, err)
-
-		timelockRecord := timelockAccounts.ToDBRecord()
-		require.NoError(t, data.SaveTimelock(ctx, timelockRecord))
-
-		accountInfoRecord := &account.Record{
-			OwnerAccount:     owner.PublicKey().ToBase58(),
-			AuthorityAccount: timelockRecord.VaultOwner,
-			TokenAccount:     timelockRecord.VaultAddress,
-			MintAccount:      coreMintAccount.PublicKey().ToBase58(),
-			AccountType:      commonpb.AccountType_POOL,
-			Index:            uint64(i),
-		}
-		require.NoError(t, data.CreateAccountInfo(ctx, accountInfoRecord))
-	}
-
 	actual, err = GetLatestTokenAccountRecordsForOwner(ctx, data, owner)
 	require.NoError(t, err)
-	require.Len(t, actual, 5)
+	require.Len(t, actual, 3)
 
-	records, ok := actual[commonpb.AccountType_BUCKET_1_KIN]
+	records, ok := actual[commonpb.AccountType_PRIMARY]
 	require.True(t, ok)
 	require.Len(t, records, 1)
 	assert.Equal(t, records[0].General.AuthorityAccount, authority1.PublicKey().ToBase58())
-	assert.Equal(t, records[0].General.AccountType, commonpb.AccountType_BUCKET_1_KIN)
+	assert.Equal(t, records[0].General.AccountType, commonpb.AccountType_PRIMARY)
 	assert.Equal(t, records[0].Timelock.VaultOwner, authority1.PublicKey().ToBase58())
 	assert.Equal(t, records[0].General.TokenAccount, records[0].Timelock.VaultAddress)
 
-	records, ok = actual[commonpb.AccountType_BUCKET_10_KIN]
-	require.True(t, ok)
-	require.Len(t, records, 1)
-	assert.Equal(t, records[0].General.AuthorityAccount, authority2.PublicKey().ToBase58())
-	assert.Equal(t, records[0].General.AccountType, commonpb.AccountType_BUCKET_10_KIN)
-	assert.Equal(t, records[0].Timelock.VaultOwner, authority2.PublicKey().ToBase58())
-	assert.Equal(t, records[0].General.TokenAccount, records[0].Timelock.VaultAddress)
-
-	records, ok = actual[commonpb.AccountType_RELATIONSHIP]
-	require.True(t, ok)
-	require.Len(t, records, 2)
-
-	assert.Equal(t, records[0].General.AuthorityAccount, authority3.PublicKey().ToBase58())
-	assert.Equal(t, records[0].General.AccountType, commonpb.AccountType_RELATIONSHIP)
-	assert.Equal(t, records[0].Timelock.VaultOwner, authority3.PublicKey().ToBase58())
-	assert.Equal(t, records[0].General.TokenAccount, records[0].Timelock.VaultAddress)
-	assert.Equal(t, *records[0].General.RelationshipTo, "app1.com")
-
-	assert.Equal(t, records[1].General.AuthorityAccount, authority4.PublicKey().ToBase58())
-	assert.Equal(t, records[1].General.AccountType, commonpb.AccountType_RELATIONSHIP)
-	assert.Equal(t, records[1].Timelock.VaultOwner, authority4.PublicKey().ToBase58())
-	assert.Equal(t, records[1].General.TokenAccount, records[1].Timelock.VaultAddress)
-	assert.Equal(t, *records[1].General.RelationshipTo, "app2.com")
-
 	records, ok = actual[commonpb.AccountType_SWAP]
 	require.True(t, ok)
 	require.Len(t, records, 1)
 	assert.Nil(t, records[0].Timelock)
-	assert.Equal(t, records[0].General.AuthorityAccount, authority5.PublicKey().ToBase58())
+	assert.Equal(t, records[0].General.AuthorityAccount, authority4.PublicKey().ToBase58())
 	assert.Equal(t, records[0].General.TokenAccount, swapAta.PublicKey().ToBase58())
 	assert.Equal(t, records[0].General.AccountType, commonpb.AccountType_SWAP)
 
 	records, ok = actual[commonpb.AccountType_POOL]
 	require.True(t, ok)
 	require.Len(t, records, 2)
 
-	assert.Equal(t, records[0].General.AuthorityAccount, authority6.PublicKey().ToBase58())
+	assert.Equal(t, records[0].General.AuthorityAccount, authority2.PublicKey().ToBase58())
 	assert.Equal(t, records[0].General.AccountType, commonpb.AccountType_POOL)
-	assert.Equal(t, records[0].Timelock.VaultOwner, authority6.PublicKey().ToBase58())
+	assert.Equal(t, records[0].Timelock.VaultOwner, authority2.PublicKey().ToBase58())
 	assert.Equal(t, records[0].General.TokenAccount, records[0].Timelock.VaultAddress)
 	assert.EqualValues(t, records[0].General.Index, 0)
 
-	assert.Equal(t, records[1].General.AuthorityAccount, authority7.PublicKey().ToBase58())
+	assert.Equal(t, records[1].General.AuthorityAccount, authority3.PublicKey().ToBase58())
 	assert.Equal(t, records[1].General.AccountType, commonpb.AccountType_POOL)
-	assert.Equal(t, records[1].Timelock.VaultOwner, authority7.PublicKey().ToBase58())
+	assert.Equal(t, records[1].Timelock.VaultOwner, authority3.PublicKey().ToBase58())
 	assert.Equal(t, records[1].General.TokenAccount, records[1].Timelock.VaultAddress)
 	assert.EqualValues(t, records[1].General.Index, 1)
 }

pkg/code/data/account/acccount_info.go

@@ -6,25 +6,13 @@ import (
 	"github.com/pkg/errors"
 
 	commonpb "github.com/code-payments/code-protobuf-api/generated/go/common/v1"
-
-	"github.com/code-payments/code-server/pkg/pointer"
 )
 
 var AllAccountTypes = []commonpb.AccountType{
 	commonpb.AccountType_PRIMARY,
-	commonpb.AccountType_TEMPORARY_INCOMING,
-	commonpb.AccountType_TEMPORARY_OUTGOING,
-	commonpb.AccountType_BUCKET_1_KIN,
-	commonpb.AccountType_BUCKET_10_KIN,
-	commonpb.AccountType_BUCKET_100_KIN,
-	commonpb.AccountType_BUCKET_1_000_KIN,
-	commonpb.AccountType_BUCKET_10_000_KIN,
-	commonpb.AccountType_BUCKET_100_000_KIN,
-	commonpb.AccountType_BUCKET_1_000_000_KIN,
 	commonpb.AccountType_REMOTE_SEND_GIFT_CARD,
-	commonpb.AccountType_RELATIONSHIP,
-	commonpb.AccountType_SWAP,
 	commonpb.AccountType_POOL,
+	commonpb.AccountType_SWAP,
 }
 
 type Record struct {
@@ -35,9 +23,8 @@ type Record struct {
 	TokenAccount     string
 	MintAccount      string
 
-	AccountType    commonpb.AccountType
-	Index          uint64
-	RelationshipTo *string
+	AccountType commonpb.AccountType
+	Index       uint64
 
 	RequiresDepositSync  bool
 	DepositsLastSyncedAt time.Time
@@ -50,21 +37,6 @@ type Record struct {
 	CreatedAt time.Time
 }
 
-func (r *Record) IsBucket() bool {
-	switch r.AccountType {
-	case commonpb.AccountType_BUCKET_1_KIN,
-		commonpb.AccountType_BUCKET_10_KIN,
-		commonpb.AccountType_BUCKET_100_KIN,
-		commonpb.AccountType_BUCKET_1_000_KIN,
-		commonpb.AccountType_BUCKET_10_000_KIN,
-		commonpb.AccountType_BUCKET_100_000_KIN,
-		commonpb.AccountType_BUCKET_1_000_000_KIN:
-		return true
-	}
-
-	return false
-}
-
 func (r *Record) Clone() Record {
 	return Record{
 		Id:                      r.Id,
@@ -74,7 +46,6 @@ func (r *Record) Clone() Record {
 		MintAccount:             r.MintAccount,
 		AccountType:             r.AccountType,
 		Index:                   r.Index,
-		RelationshipTo:          pointer.StringCopy(r.RelationshipTo),
 		RequiresDepositSync:     r.RequiresDepositSync,
 		DepositsLastSyncedAt:    r.DepositsLastSyncedAt,
 		RequiresAutoReturnCheck: r.RequiresAutoReturnCheck,
@@ -92,7 +63,6 @@ func (r *Record) CopyTo(dst *Record) {
 	dst.MintAccount = r.MintAccount
 	dst.AccountType = r.AccountType
 	dst.Index = r.Index
-	dst.RelationshipTo = pointer.StringCopy(dst.RelationshipTo)
 	dst.RequiresDepositSync = r.RequiresDepositSync
 	dst.DepositsLastSyncedAt = r.DepositsLastSyncedAt
 	dst.RequiresAutoReturnCheck = r.RequiresAutoReturnCheck
@@ -123,8 +93,6 @@ func (r *Record) Validate() error {
 	}
 
 	switch r.AccountType {
-	case commonpb.AccountType_LEGACY_PRIMARY_2022:
-		return errors.New("cannot store legacy primary 2022 account")
 	case commonpb.AccountType_PRIMARY:
 		if r.Index != 0 {
 			return errors.New("index must be 0 for primary account")
@@ -141,37 +109,9 @@ func (r *Record) Validate() error {
 		if r.OwnerAccount != r.AuthorityAccount {
 			return errors.New("owner must be authority of remote send gift card account")
 		}
-	case commonpb.AccountType_RELATIONSHIP:
-		if r.Index != 0 {
-			return errors.New("index must be 0 for relationship account")
-		}
-
-		if r.OwnerAccount == r.AuthorityAccount {
-			return errors.New("owner cannot be authority for relationship account")
-		}
-
-		if r.RelationshipTo == nil || len(*r.RelationshipTo) == 0 {
-			return errors.New("relationship metadata required for relationship account")
-		}
-	case commonpb.AccountType_BUCKET_1_KIN,
-		commonpb.AccountType_BUCKET_10_KIN,
-		commonpb.AccountType_BUCKET_100_KIN,
-		commonpb.AccountType_BUCKET_1_000_KIN,
-		commonpb.AccountType_BUCKET_10_000_KIN,
-		commonpb.AccountType_BUCKET_100_000_KIN,
-		commonpb.AccountType_BUCKET_1_000_000_KIN:
-
-		if r.Index != 0 {
-			return errors.New("index must be 0 for bucket account")
-		}
-
-		if r.OwnerAccount == r.AuthorityAccount {
-			return errors.New("owner cannot be authority for bucket account")
-		}
-	case commonpb.AccountType_TEMPORARY_INCOMING,
-		commonpb.AccountType_TEMPORARY_OUTGOING:
+	case commonpb.AccountType_POOL:
 		if r.OwnerAccount == r.AuthorityAccount {
-			return errors.New("owner cannot be authority for temporary rotating account")
+			return errors.New("owner cannot be authority pool account")
 		}
 	case commonpb.AccountType_SWAP:
 		if r.Index != 0 {
@@ -181,12 +121,8 @@ func (r *Record) Validate() error {
 		if r.OwnerAccount == r.AuthorityAccount {
 			return errors.New("owner cannot be authority for swap account")
 		}
-	case commonpb.AccountType_POOL:
-		if r.OwnerAccount == r.AuthorityAccount {
-			return errors.New("owner cannot be authority pool account")
-		}
 	default:
-		return errors.Errorf("unhandled account type: %s", r.AccountType.String())
+		return errors.Errorf("unsupported account type: %s", r.AccountType.String())
 	}
 
 	if r.TokenAccount == r.OwnerAccount || r.TokenAccount == r.AuthorityAccount {
@@ -201,10 +137,6 @@ func (r *Record) Validate() error {
 		return errors.New("only swap accounts can require swap retries")
 	}
 
-	if r.RelationshipTo != nil && r.AccountType != commonpb.AccountType_RELATIONSHIP {
-		return errors.New("only relationship accounts can have a relationship metadata")
-	}
-
 	return nil
 }