From 55a9ecec4186f8f1c5f192bccefa740215bb04ba Mon Sep 17 00:00:00 2001 From: Arpit Temani Date: Mon, 5 Sep 2022 11:03:56 +0400 Subject: [PATCH] fix ci --- eth/filters/bor_filter.go | 5 ++++- params/config.go | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/eth/filters/bor_filter.go b/eth/filters/bor_filter.go index 3810d790aa..8590d79eb1 100644 --- a/eth/filters/bor_filter.go +++ b/eth/filters/bor_filter.go @@ -111,7 +111,9 @@ func (f *BorBlockLogsFilter) Logs(ctx context.Context) ([]*types.Log, error) { func (f *BorBlockLogsFilter) unindexedLogs(ctx context.Context, end uint64) ([]*types.Log, error) { var logs []*types.Log - for ; f.begin <= int64(end); f.begin = f.begin + int64(f.sprint) { + sprintLength := f.borConfig.CalculateSprint(uint64(f.begin)) + + for ; f.begin <= int64(end); f.begin = f.begin + int64(sprintLength) { header, err := f.backend.HeaderByNumber(ctx, rpc.BlockNumber(f.begin)) if header == nil || err != nil { return logs, err @@ -129,6 +131,7 @@ func (f *BorBlockLogsFilter) unindexedLogs(ctx context.Context, end uint64) ([]* return logs, err } logs = append(logs, found...) + sprintLength = f.borConfig.CalculateSprint(uint64(f.begin)) } return logs, nil } diff --git a/params/config.go b/params/config.go index 8123fe894b..13e3565f9d 100644 --- a/params/config.go +++ b/params/config.go @@ -444,8 +444,10 @@ var ( // adding flags to the config to also have to set these fields. AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, &BorConfig{BurntContract: map[string]string{"0": "0x000000000000000000000000000000000000dead"}}} - TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil, &BorConfig{Sprint: 4, BurntContract: map[string]string{"0": "0x000000000000000000000000000000000000dead"}}} - TestRules = TestChainConfig.Rules(new(big.Int), false) + TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil, &BorConfig{Sprint: map[string]uint64{ + "0": 4, + }, BurntContract: map[string]string{"0": "0x000000000000000000000000000000000000dead"}}} + TestRules = TestChainConfig.Rules(new(big.Int), false) ) // TrustedCheckpoint represents a set of post-processed trie roots (CHT and