From 6e5bcf57f18615c513046657e17df2caa7f75641 Mon Sep 17 00:00:00 2001
From: miiu <mihai9625@gmail.com>
Date: Fri, 27 Dec 2024 13:34:11 +0200
Subject: [PATCH] fix missing tokens from es

---
 .../alteredaccounts/tokensProcessor.go        |  2 +-
 .../alteredaccounts/tokensProcessor_test.go   | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/outport/process/alteredaccounts/tokensProcessor.go b/outport/process/alteredaccounts/tokensProcessor.go
index 687c543bcdf..672a29fc7af 100644
--- a/outport/process/alteredaccounts/tokensProcessor.go
+++ b/outport/process/alteredaccounts/tokensProcessor.go
@@ -137,7 +137,7 @@ func (tp *tokensProcessor) processMultiTransferEvent(event data.EventHandler, ma
 
 		if string(tokenID) == vmcommon.EGLDIdentifier {
 			tp.processNativeEGLDTransferWithMultiTransfer(destinationAddress, markedAlteredAccounts)
-			return
+			continue
 		}
 
 		// process event for the sender address
diff --git a/outport/process/alteredaccounts/tokensProcessor_test.go b/outport/process/alteredaccounts/tokensProcessor_test.go
index af737a1de94..2ac172b88bf 100644
--- a/outport/process/alteredaccounts/tokensProcessor_test.go
+++ b/outport/process/alteredaccounts/tokensProcessor_test.go
@@ -97,3 +97,46 @@ func TestTokenProcessorProcessEventMultiTransferV2WithEGLD(t *testing.T) {
 	}
 	require.Equal(t, markedAccount2, markedAccounts["receiver"])
 }
+
+func TestTokenProcessorProcessEventMultiTransferV2WithEGLDAndMoreTokens(t *testing.T) {
+	t.Parallel()
+
+	tp := newTokensProcessor(&mock.ShardCoordinatorStub{})
+
+	markedAccounts := make(map[string]*markedAlteredAccount)
+	tp.processEvent(&transaction.Event{
+		Identifier: []byte(core.BuiltInFunctionMultiESDTNFTTransfer),
+		Address:    []byte("addr"),
+		Topics:     [][]byte{[]byte("token1"), big.NewInt(0).Bytes(), []byte("2"), []byte(vmcommon.EGLDIdentifier), big.NewInt(0).Bytes(), []byte("3"), []byte("token2"), big.NewInt(0).Bytes(), []byte("2"), []byte("receiver")},
+	}, markedAccounts)
+
+	require.Equal(t, 2, len(markedAccounts))
+	markedAccount1 := &markedAlteredAccount{
+		tokens: map[string]*markedAlteredAccountToken{
+			"token1": {
+				identifier: "token1",
+				nonce:      0,
+			},
+			"token2": {
+				identifier: "token2",
+				nonce:      0,
+			},
+		},
+	}
+	require.Equal(t, markedAccount1, markedAccounts["addr"])
+
+	markedAccount2 := &markedAlteredAccount{
+		balanceChanged: true,
+		tokens: map[string]*markedAlteredAccountToken{
+			"token1": {
+				identifier: "token1",
+				nonce:      0,
+			},
+			"token2": {
+				identifier: "token2",
+				nonce:      0,
+			},
+		},
+	}
+	require.Equal(t, markedAccount2, markedAccounts["receiver"])
+}