reduce interval to search forkID events

0xPolygonHermez · May 4, 2023 · 0c75fba · 0c75fba
1 parent e3cd4ff
commit 0c75fba
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/cmd/run.go b/cmd/run.go
@@ -118,7 +118,7 @@ func start(cliCtx *cli.Context) error {
 		log.Fatal(err)
 	}
 	// Read Fork ID FROM POE SC
-	forkIDIntervals, err := etherman.GetForks(cliCtx.Context)
+	forkIDIntervals, err := etherman.GetForks(cliCtx.Context, c.NetworkConfig.Genesis.GenesisBlockNum)
 	if err != nil || len(forkIDIntervals) == 0 {
 		log.Fatal("error getting forks: ", err)
 	}

diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -220,10 +220,10 @@ func (etherMan *Client) VerifyGenBlockNumber(ctx context.Context, genBlockNumber
 }
 
 // GetForks returns fork information
-func (etherMan *Client) GetForks(ctx context.Context) ([]state.ForkIDInterval, error) {
+func (etherMan *Client) GetForks(ctx context.Context, genBlockNumber uint64) ([]state.ForkIDInterval, error) {
 	// Filter query
 	query := ethereum.FilterQuery{
-		FromBlock: new(big.Int).SetUint64(1),
+		FromBlock: new(big.Int).SetUint64(genBlockNumber),
 		Addresses: etherMan.SCAddresses,
 		Topics:    [][]common.Hash{{updateZkEVMVersionSignatureHash}},
 	}

diff --git a/etherman/etherman_test.go b/etherman/etherman_test.go
@@ -398,7 +398,7 @@ func TestGetForks(t *testing.T) {
 	// Set up testing environment
 	etherman, _, _, _, _ := newTestingEnv()
 	ctx := context.Background()
-	forks, err := etherman.GetForks(ctx)
+	forks, err := etherman.GetForks(ctx, 0)
 	require.NoError(t, err)
 	assert.Equal(t, 1, len(forks))
 	assert.Equal(t, uint64(1), forks[0].ForkId)

diff --git a/synchronizer/interfaces.go b/synchronizer/interfaces.go
@@ -22,7 +22,7 @@ type ethermanInterface interface {
 	GetLatestBatchNumber() (uint64, error)
 	GetTrustedSequencerURL() (string, error)
 	VerifyGenBlockNumber(ctx context.Context, genBlockNumber uint64) (bool, error)
-	GetForks(ctx context.Context) ([]state.ForkIDInterval, error)
+	GetForks(ctx context.Context, genBlockNumber uint64) ([]state.ForkIDInterval, error)
 }
 
 // stateInterface gathers the methods required to interact with the state.

diff --git a/synchronizer/mock_etherman.go b/synchronizer/mock_etherman.go
diff --git a/synchronizer/synchronizer.go b/synchronizer/synchronizer.go
@@ -565,7 +565,7 @@ func (s *ClientSynchronizer) processForkID(forkID etherman.ForkID, blockNumber u
 	}
 	if latestBatchNumber < forkID.BatchNumber { //If the forkID will start in a future batch
 		// Read Fork ID FROM POE SC
-		forkIDIntervals, err := s.etherMan.GetForks(s.ctx)
+		forkIDIntervals, err := s.etherMan.GetForks(s.ctx, s.genesis.GenesisBlockNum)
 		if err != nil || len(forkIDIntervals) == 0 {
 			log.Error("error getting all forkIDs: ", err)
 			rollbackErr := dbTx.Rollback(s.ctx)
@@ -597,7 +597,7 @@ func (s *ClientSynchronizer) processForkID(forkID etherman.ForkID, blockNumber u
 	}
 
 	// Read Fork ID FROM POE SC
-	forkIDIntervals, err := s.etherMan.GetForks(s.ctx)
+	forkIDIntervals, err := s.etherMan.GetForks(s.ctx, s.genesis.GenesisBlockNum)
 	if err != nil || len(forkIDIntervals) == 0 {
 		log.Error("error getting all forkIDs: ", err)
 		rollbackErr := dbTx.Rollback(s.ctx)