eliminate dependency on go1.21

scroll-tech · Mar 4, 2024 · e3ce0b8 · e3ce0b8
1 parent 1c03ff0
commit e3ce0b8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/common/network/network.go b/common/network/network.go
@@ -3,7 +3,7 @@ package network
 import (
 	"fmt"
 	"math/big"
-	"slices"
+	"sort"
 
 	"github.com/scroll-tech/go-ethereum/params"
 )
@@ -40,8 +40,8 @@ func (n Network) GenesisConfig() *params.ChainConfig {
 }
 
 // CollectSortedForkHeights returns a sorted set of block numbers that one or more forks are activated on
-func CollectSortedForkHeights(config *params.ChainConfig) []uint64 {
-	var forkHeights []uint64
+func CollectSortedForkHeights(config *params.ChainConfig) ([]uint64, map[uint64]bool) {
+	forkHeightsMap := make(map[uint64]bool)
 	for _, fork := range []*big.Int{
 		config.HomesteadBlock,
 		config.DAOForkBlock,
@@ -62,9 +62,16 @@ func CollectSortedForkHeights(config *params.ChainConfig) []uint64 {
 		if fork == nil {
 			continue
 		} else if height := fork.Uint64(); height != 0 {
-			forkHeights = append(forkHeights, height)
+			forkHeightsMap[height] = true
 		}
 	}
-	slices.Sort(forkHeights)
-	return slices.Compact(forkHeights) // Remove duplicates
+
+	var forkHeights []uint64
+	for height := range forkHeightsMap {
+		forkHeights = append(forkHeights, height)
+	}
+	sort.Slice(forkHeights, func(i, j int) bool {
+		return forkHeights[i] < forkHeights[j]
+	})
+	return forkHeights, forkHeightsMap
 }
diff --git a/common/network/network_test.go b/common/network/network_test.go
@@ -9,13 +9,18 @@ import (
 )
 
 func TestCollectSortedForkBlocks(t *testing.T) {
-	require.Equal(t, CollectSortedForkHeights(&params.ChainConfig{
+	l, m := CollectSortedForkHeights(&params.ChainConfig{
 		EIP155Block:         big.NewInt(4),
 		EIP158Block:         big.NewInt(3),
 		ByzantiumBlock:      big.NewInt(3),
 		ConstantinopleBlock: big.NewInt(0),
-	}), []uint64{
+	})
+	require.Equal(t, l, []uint64{
 		3,
 		4,
 	})
+	require.Equal(t, map[uint64]bool{
+		3: true,
+		4: true,
+	}, m)
 }
diff --git a/rollup/internal/controller/watcher/batch_proposer.go b/rollup/internal/controller/watcher/batch_proposer.go
@@ -3,7 +3,6 @@ package watcher
 import (
 	"context"
 	"fmt"
-	"slices"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -33,7 +32,7 @@ type BatchProposer struct {
 	maxL1CommitCalldataSizePerBatch uint32
 	batchTimeoutSec                 uint64
 	gasCostIncreaseMultiplier       float64
-	forkHeights                     []uint64
+	forkMap                         map[uint64]bool
 
 	batchProposerCircleTotal           prometheus.Counter
 	proposeBatchFailureTotal           prometheus.Counter
@@ -48,7 +47,7 @@ type BatchProposer struct {
 
 // NewBatchProposer creates a new BatchProposer instance.
 func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, chainCfg *params.ChainConfig, db *gorm.DB, reg prometheus.Registerer) *BatchProposer {
-	forkHeights := network.CollectSortedForkHeights(chainCfg)
+	forkHeights, forkMap := network.CollectSortedForkHeights(chainCfg)
 	log.Debug("new batch proposer",
 		"maxChunkNumPerBatch", cfg.MaxChunkNumPerBatch,
 		"maxL1CommitGasPerBatch", cfg.MaxL1CommitGasPerBatch,
@@ -68,7 +67,7 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, chai
 		maxL1CommitCalldataSizePerBatch: cfg.MaxL1CommitCalldataSizePerBatch,
 		batchTimeoutSec:                 cfg.BatchTimeoutSec,
 		gasCostIncreaseMultiplier:       cfg.GasCostIncreaseMultiplier,
-		forkHeights:                     forkHeights,
+		forkMap:                         forkMap,
 
 		batchProposerCircleTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Name: "rollup_propose_batch_circle_total",
@@ -203,7 +202,7 @@ func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, *types.BatchMeta, er
 	maxChunksThisBatch := p.maxChunkNumPerBatch
 	for i, chunk := range dbChunks {
 		// if a chunk is starting at a fork boundary, only consider earlier chunks
-		if i != 0 && slices.Index(p.forkHeights, chunk.StartBlockNumber) != -1 {
+		if i != 0 && p.forkMap[chunk.StartBlockNumber] {
 			dbChunks = dbChunks[:i]
 			if uint64(len(dbChunks)) < maxChunksThisBatch {
 				maxChunksThisBatch = uint64(len(dbChunks))

diff --git a/rollup/internal/controller/watcher/chunk_proposer.go b/rollup/internal/controller/watcher/chunk_proposer.go
@@ -78,7 +78,7 @@ type ChunkProposer struct {
 
 // NewChunkProposer creates a new ChunkProposer instance.
 func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, chainCfg *params.ChainConfig, db *gorm.DB, reg prometheus.Registerer) *ChunkProposer {
-	forkHeights := network.CollectSortedForkHeights(chainCfg)
+	forkHeights, _ := network.CollectSortedForkHeights(chainCfg)
 	log.Debug("new chunk proposer",
 		"maxTxNumPerChunk", cfg.MaxTxNumPerChunk,
 		"maxL1CommitGasPerChunk", cfg.MaxL1CommitGasPerChunk,