From 2d3e101cfeabb2090c516de73489f3b955cb9e12 Mon Sep 17 00:00:00 2001
From: Goran Rojovic <100121253+goran-ethernal@users.noreply.github.com>
Date: Tue, 25 Jul 2023 11:19:59 +0200
Subject: [PATCH] Fix (#1744)

---
 jsonrpc/filter_manager.go      |  5 ++
 jsonrpc/filter_manager_test.go | 87 ++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/jsonrpc/filter_manager.go b/jsonrpc/filter_manager.go
index 489e1a3eb2..c7e703bbb8 100644
--- a/jsonrpc/filter_manager.go
+++ b/jsonrpc/filter_manager.go
@@ -678,6 +678,8 @@ func (f *FilterManager) appendLogsToFilters(header *block) error {
 		return nil
 	}
 
+	logIndex := uint64(0)
+
 	for indx, receipt := range receipts {
 		if receipt.TxHash == types.ZeroHash {
 			// Extract tx Hash
@@ -696,9 +698,12 @@ func (f *FilterManager) appendLogsToFilters(header *block) error {
 						TxHash:      receipt.TxHash,
 						TxIndex:     argUint64(indx),
 						Removed:     false,
+						LogIndex:    argUint64(logIndex),
 					})
 				}
 			}
+
+			logIndex++
 		}
 	}
 
diff --git a/jsonrpc/filter_manager_test.go b/jsonrpc/filter_manager_test.go
index e4aa1092a4..d0835fb363 100644
--- a/jsonrpc/filter_manager_test.go
+++ b/jsonrpc/filter_manager_test.go
@@ -715,3 +715,90 @@ func TestClosedFilterDeletion(t *testing.T) {
 	// false because filter was removed automatically
 	assert.False(t, m.Exists(id))
 }
+
+func Test_appendLogsToFilters(t *testing.T) {
+	t.Parallel()
+
+	numOfLogs := 4
+
+	block := &types.Block{
+		Header: &types.Header{Hash: types.StringToHash("someHash"), Number: 1},
+		Transactions: []*types.Transaction{
+			createTestTransaction(types.StringToHash("tx1")),
+			createTestTransaction(types.StringToHash("tx2")),
+			createTestTransaction(types.StringToHash("tx3")),
+		},
+	}
+
+	// setup test with block with 3 transactions and 4 logs
+	store := &mockBlockStore{
+		receipts: map[types.Hash][]*types.Receipt{
+			block.Header.Hash: {
+				{
+					// transaction 1 logs
+					Logs: []*types.Log{
+						{
+							Topics: []types.Hash{
+								hash1,
+							},
+						},
+						{
+							Topics: []types.Hash{
+								hash2,
+							},
+						},
+					},
+				},
+				{
+					// transaction 2 logs
+					Logs: []*types.Log{
+						{
+							Topics: []types.Hash{
+								hash3,
+							},
+						},
+					},
+				},
+				{
+					// transaction 3 logs
+					Logs: []*types.Log{
+						{
+							Topics: []types.Hash{
+								hash4,
+							},
+						},
+					},
+				},
+			},
+		}}
+
+	store.appendBlocksToStore([]*types.Block{block})
+
+	f := NewFilterManager(hclog.NewNullLogger(), store, 1000)
+
+	logFilter := &logFilter{
+		filterBase: newFilterBase(nil),
+		query: &LogQuery{
+			fromBlock: 1,
+			toBlock:   1,
+		},
+	}
+
+	f.filters = map[string]filter{
+		"test": logFilter,
+	}
+
+	t.Cleanup(func() {
+		defer f.Close()
+	})
+
+	b := toBlock(&types.Block{Header: block.Header}, false)
+	err := f.appendLogsToFilters(b)
+
+	require.NoError(t, err)
+	require.Len(t, logFilter.logs, numOfLogs)
+
+	for i := 0; i < numOfLogs; i++ {
+		require.Equal(t, uint64(i), uint64(logFilter.logs[i].LogIndex))
+	}
+}