Merge pull request #82 from 0xPolygon/v3.3.2-beta-candidate

v3.3.2 candidate

Author: marcello33

db/version/app.go

@@ -31,7 +31,7 @@ var (
 const (
 	Major                    = 3             // Major version component of the current release
 	Minor                    = 3             // Minor version component of the current release
-	Micro                    = 1             // Micro version component of the current release
+	Micro                    = 2             // Micro version component of the current release
 	Modifier                 = ""            // Modifier component of the current release
 	DefaultSnapshotGitBranch = "release/3.2" // Branch of erigontech/erigon-snapshot to use in OtterSync
 	VersionKeyCreated        = "ErigonVersionCreated"

rpc/jsonrpc/eth_receipts.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sort"
 
 	"github.com/RoaringBitmap/roaring/v2"
 
@@ -166,8 +165,9 @@ func (api *APIImpl) GetLogs(ctx context.Context, crit filters.FilterCriteria) (t
 	}
 
 	// For a whole block query (blockHash set, no address/topics filters),
-	// normalize logIndex to be continuous 0..N-1 in canonical order.
-	if isWholeBlockUnfiltered(crit) && len(rpcLogs) > 0 {
+	// normalize logIndex (if required) to be continuous 0..N-1 in canonical order.
+	/* TODO deactivated for memory spike, although already optimizated with `needsRenumber` addition
+	if isWholeBlockUnfiltered(crit) && len(rpcLogs) > 0 && needsRenumber(rpcLogs) {
 		sort.Slice(rpcLogs, func(i, j int) bool {
 			if rpcLogs[i].BlockNumber == rpcLogs[j].BlockNumber {
 				if rpcLogs[i].TxIndex == rpcLogs[j].TxIndex {
@@ -178,7 +178,6 @@ func (api *APIImpl) GetLogs(ctx context.Context, crit filters.FilterCriteria) (t
 			return rpcLogs[i].BlockNumber < rpcLogs[j].BlockNumber
 		})
 
-		// Now renumber per block so logIndex is 0..N-1 with no gaps.
 		currentBlock := rpcLogs[0].BlockHash
 		var idx uint
 		idx = 0
@@ -191,6 +190,7 @@ func (api *APIImpl) GetLogs(ctx context.Context, crit filters.FilterCriteria) (t
 			idx++
 		}
 	}
+	*/
 
 	return rpcLogs, nil
 }
@@ -645,3 +645,25 @@ func isWholeBlockUnfiltered(crit filters.FilterCriteria) bool {
 	}
 	return true
 }
+
+// needsRenumber checks if the log indexes are continuous 0..N-1 per block.
+func needsRenumber(rpcLogs types.RPCLogs) bool {
+	if len(rpcLogs) == 0 {
+		return false
+	}
+	curBlock := rpcLogs[0].BlockHash
+	var expected uint
+	expected = 0
+
+	for _, l := range rpcLogs {
+		if l.BlockHash != curBlock {
+			curBlock = l.BlockHash
+			expected = 0
+		}
+		if l.Index != expected {
+			return true
+		}
+		expected++
+	}
+	return false
+}

rpc/requests/block.go

@@ -107,9 +107,9 @@ func (b *Block) UnmarshalJSON(input []byte) error {
 	b.Transactions = bd.Transactions
 
 	if bd.Transactions != nil {
-		b.TransactionHashes = make([]common.Hash, len(b.Transactions))
-		for _, t := range bd.Transactions {
-			b.TransactionHashes = append(b.TransactionHashes, t.Hash)
+		b.TransactionHashes = make([]common.Hash, len(bd.Transactions))
+		for i, t := range bd.Transactions {
+			b.TransactionHashes[i] = t.Hash
 		}
 	}