fix log without topics response (0xPolygonHermez#1970)

TrGHST · Mar 31, 2023 · 83a47f8 · 83a47f8
1 parent 9a30dc9
commit 83a47f8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/db/migrations/state/0003.sql b/db/migrations/state/0003.sql
@@ -3,5 +3,6 @@ ALTER TABLE state.log
 ALTER COLUMN topic0 DROP NOT NULL;
 
 -- +migrate Down
+DELETE FROM state.log WHERE topic0 IS NULL;
 ALTER TABLE state.log
 ALTER COLUMN topic0 SET NOT NULL;
diff --git a/state/pgstatestorage.go b/state/pgstatestorage.go
@@ -1357,8 +1357,9 @@ func scanLogs(rows pgx.Rows) ([]*types.Log, error) {
 			return nil, err
 		}
 
+		log.Topics = []common.Hash{}
 		if topic0 != nil {
-			log.Topics = []common.Hash{common.HexToHash(*topic0)}
+			log.Topics = append(log.Topics, common.HexToHash(*topic0))
 		}
 
 		if topic1 != nil {

diff --git a/state/state_test.go b/state/state_test.go
@@ -1100,10 +1100,11 @@ func TestExecutorLogs(t *testing.T) {
 	assert.Equal(t, scAddress, common.HexToAddress(string(processBatchResponse.Responses[0].CreateAddress)))
 
 	assert.Equal(t, 0, len(processBatchResponse.Responses[0].Logs))
-	assert.Equal(t, 3, len(processBatchResponse.Responses[1].Logs))
+	assert.Equal(t, 4, len(processBatchResponse.Responses[1].Logs))
 	assert.Equal(t, 4, len(processBatchResponse.Responses[1].Logs[0].Topics))
 	assert.Equal(t, 2, len(processBatchResponse.Responses[1].Logs[1].Topics))
 	assert.Equal(t, 1, len(processBatchResponse.Responses[1].Logs[2].Topics))
+	assert.Equal(t, 0, len(processBatchResponse.Responses[1].Logs[3].Topics))
 }
 
 func TestExecutorTransfer(t *testing.T) {

diff --git a/test/contracts/auto/EmitLog2.sol b/test/contracts/auto/EmitLog2.sol
@@ -8,6 +8,9 @@ contract EmitLog2 {
     event LogABCD(uint256 indexed a, uint256 indexed b, uint256 indexed c, uint256 d);
 
     function emitLogs() public {
+        assembly {
+            log0(0, 32)
+        }
         emit Log();
         emit LogA(1);
         emit LogABCD(1, 2, 3, 4);

diff --git a/test/contracts/bin/EmitLog2/EmitLog2.go b/test/contracts/bin/EmitLog2/EmitLog2.go
diff --git a/test/e2e/sc_test.go b/test/e2e/sc_test.go
@@ -63,14 +63,19 @@ func TestEmitLog2(t *testing.T) {
 			Addresses: []common.Address{scAddr},
 		})
 		require.NoError(t, err)
-		assert.Equal(t, 3, len(logs))
+		assert.Equal(t, 4, len(logs))
 
-		_, err = sc.ParseLog(logs[0])
+		log0 := logs[0]
+		assert.Equal(t, 0, len(log0.Topics))
+
+		_, err = sc.ParseLog(logs[1])
 		require.NoError(t, err)
-		logA, err := sc.ParseLogA(logs[1])
+
+		logA, err := sc.ParseLogA(logs[2])
 		require.NoError(t, err)
 		assert.Equal(t, big.NewInt(1), logA.A)
-		logABCD, err := sc.ParseLogABCD(logs[2])
+
+		logABCD, err := sc.ParseLogABCD(logs[3])
 		require.NoError(t, err)
 		assert.Equal(t, big.NewInt(1), logABCD.A)
 		assert.Equal(t, big.NewInt(2), logABCD.B)