Improve OpenAccounts intent no-op checking in error scenarios

Author: jeffyanta

pkg/code/server/transaction/intent_handler.go

@@ -130,16 +130,25 @@ func (h *OpenAccountsIntentHandler) IsNoop(ctx context.Context, intentRecord *in
 	}
 
 	var authorityToCheck *common.Account
+	var tokenAccountToCheck *common.Account
 	var expectedAccountType commonpb.AccountType
 	switch typedMetadata.AccountSet {
 	case transactionpb.OpenAccountsMetadata_USER:
 		authorityToCheck, err = common.NewAccountFromPublicKeyString(intentRecord.InitiatorOwnerAccount)
 		if err != nil {
 			return false, err
 		}
+		tokenAccountToCheck, err = common.NewAccountFromProto(openAction.Token)
+		if err != nil {
+			return false, err
+		}
 		expectedAccountType = commonpb.AccountType_PRIMARY
 	case transactionpb.OpenAccountsMetadata_POOL:
-		authorityToCheck, err = common.NewAccountFromProto(actions[0].GetOpenAccount().Authority)
+		authorityToCheck, err = common.NewAccountFromProto(openAction.Authority)
+		if err != nil {
+			return false, err
+		}
+		tokenAccountToCheck, err = common.NewAccountFromProto(openAction.Token)
 		if err != nil {
 			return false, err
 		}
@@ -158,7 +167,7 @@ func (h *OpenAccountsIntentHandler) IsNoop(ctx context.Context, intentRecord *in
 	if !ok {
 		return false, nil
 	}
-	return accountInfoRecord.AccountType == expectedAccountType, nil
+	return accountInfoRecord.TokenAccount == tokenAccountToCheck.PublicKey().ToBase58() && accountInfoRecord.AccountType == expectedAccountType, nil
 }
 
 func (h *OpenAccountsIntentHandler) GetBalanceLocks(ctx context.Context, intentRecord *intent.Record, metadata *transactionpb.Metadata) ([]*intentBalanceLock, error) {