RequestToGrabBillMessageHandler now enforces destination as a primary account

Author: Jeff Yanta

pkg/code/server/messaging/message_handler.go

@@ -60,7 +60,7 @@ func (h *RequestToGrabBillMessageHandler) Validate(ctx context.Context, rendezvo
 	}
 
 	//
-	// Part 1: Requestor account must be a latest temporary incoming account
+	// Part 1: Requestor account must be a primary account
 	//
 
 	requestorAccount, err := common.NewAccountFromProto(typedMessage.RequestorAccount)
@@ -69,19 +69,12 @@ func (h *RequestToGrabBillMessageHandler) Validate(ctx context.Context, rendezvo
 	}
 
 	accountInfoRecord, err := h.data.GetAccountInfoByTokenAddress(ctx, requestorAccount.PublicKey().ToBase58())
-	if err == account.ErrAccountInfoNotFound || (err == nil && accountInfoRecord.AccountType != commonpb.AccountType_TEMPORARY_INCOMING) {
-		return newMessageValidationError("requestor account must be a temporary incoming account")
+	if err == account.ErrAccountInfoNotFound || (err == nil && accountInfoRecord.AccountType != commonpb.AccountType_PRIMARY) {
+		return newMessageValidationError("requestor account must be a primary account")
 	} else if err != nil {
 		return err
 	}
 
-	latestAccountInfoRecord, err := h.data.GetLatestAccountInfoByOwnerAddressAndType(ctx, accountInfoRecord.OwnerAccount, commonpb.AccountType_TEMPORARY_INCOMING)
-	if err != nil {
-		return err
-	} else if accountInfoRecord.TokenAccount != latestAccountInfoRecord.TokenAccount {
-		return newMessageValidationErrorf("requestor account must be latest temporary incoming account %s", accountInfoRecord.TokenAccount)
-	}
-
 	return nil
 }
 

pkg/code/server/messaging/server_test.go

@@ -207,21 +207,14 @@ func TestSendMessage_RequestToGrabBill_Validation(t *testing.T) {
 	env.client1.resetConf()
 	env.client1.conf.simulateAccountNotCodeAccount = true
 	sendMessageCall := env.client1.sendRequestToGrabBillMessage(t, rendezvousKey)
-	sendMessageCall.assertInvalidMessageError(t, "requestor account must be a temporary incoming account")
+	sendMessageCall.assertInvalidMessageError(t, "requestor account must be a primary account")
 	env.server1.assertNoMessages(t, rendezvousKey)
 
 	env.client1.resetConf()
 	env.client1.conf.simulateInvalidAccountType = true
 	sendMessageCall = env.client1.sendRequestToGrabBillMessage(t, rendezvousKey)
-	sendMessageCall.assertInvalidMessageError(t, "requestor account must be a temporary incoming account")
+	sendMessageCall.assertInvalidMessageError(t, "requestor account must be a primary account")
 	env.server1.assertNoMessages(t, rendezvousKey)
-
-	env.client1.resetConf()
-	env.client1.conf.simulateStaleRequestorAccountType = true
-	sendMessageCall = env.client1.sendRequestToGrabBillMessage(t, rendezvousKey)
-	sendMessageCall.assertInvalidMessageError(t, "requestor account must be latest temporary incoming account")
-	env.server1.assertNoMessages(t, rendezvousKey)
-
 }
 
 /*

pkg/code/server/messaging/testutil.go

@@ -233,9 +233,8 @@ type cancellableStream struct {
 type clientConf struct {
 	// Simulations for invalid account
 
-	simulateStaleRequestorAccountType bool
-	simulateInvalidAccountType        bool
-	simulateAccountNotCodeAccount     bool
+	simulateInvalidAccountType    bool
+	simulateAccountNotCodeAccount bool
 
 	// Simulations for invalid exchange data
 
@@ -512,33 +511,23 @@ func (c *sendMessageCallMetadata) assertNoActiveStreamError(t *testing.T) {
 func (c *clientEnv) sendRequestToGrabBillMessage(t *testing.T, rendezvousKey *common.Account) *sendMessageCallMetadata {
 	destination := testutil.NewRandomAccount(t)
 
+	ownerAccount := testutil.NewRandomAccount(t)
 	accountInfoRecord := &account.Record{
-		OwnerAccount:     testutil.NewRandomAccount(t).PublicKey().ToBase58(),
-		AuthorityAccount: testutil.NewRandomAccount(t).PublicKey().ToBase58(),
+		OwnerAccount:     ownerAccount.PublicKey().ToBase58(),
+		AuthorityAccount: ownerAccount.PublicKey().ToBase58(),
 		TokenAccount:     destination.PublicKey().ToBase58(),
 		MintAccount:      common.CoreMintAccount.PublicKey().ToBase58(),
-		AccountType:      commonpb.AccountType_TEMPORARY_INCOMING,
+		AccountType:      commonpb.AccountType_PRIMARY,
 		Index:            0,
 	}
 	if c.conf.simulateInvalidAccountType {
-		accountInfoRecord.AccountType = commonpb.AccountType_TEMPORARY_OUTGOING
+		accountInfoRecord.AuthorityAccount = testutil.NewRandomAccount(t).PublicKey().ToBase58()
+		accountInfoRecord.AccountType = commonpb.AccountType_TEMPORARY_INCOMING
 	}
 	if !c.conf.simulateAccountNotCodeAccount {
 		require.NoError(t, c.directDataAccess.CreateAccountInfo(c.ctx, accountInfoRecord))
 	}
 
-	if c.conf.simulateStaleRequestorAccountType {
-		latestAccountInfoRecord := &account.Record{
-			OwnerAccount:     accountInfoRecord.OwnerAccount,
-			AuthorityAccount: testutil.NewRandomAccount(t).PublicKey().ToBase58(),
-			TokenAccount:     testutil.NewRandomAccount(t).PublicKey().ToBase58(),
-			MintAccount:      common.CoreMintAccount.PublicKey().ToBase58(),
-			AccountType:      commonpb.AccountType_TEMPORARY_INCOMING,
-			Index:            accountInfoRecord.Index + 1,
-		}
-		require.NoError(t, c.directDataAccess.CreateAccountInfo(c.ctx, latestAccountInfoRecord))
-	}
-
 	req := &messagingpb.SendMessageRequest{
 		Message: &messagingpb.Message{
 			Kind: &messagingpb.Message_RequestToGrabBill{