Skip to content

fix(l1 follower, rollup verifier): blockhash mismatch #1192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: jt/export-headers-toolkit
Choose a base branch
from
Open

fix(l1 follower, rollup verifier): blockhash mismatch #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4561826
implement missing header fields reader and manager
jonastheis May 29, 2025
a47ccd8
chore: auto version bump [bot]
jonastheis May 29, 2025
5774441
increase download timeout
jonastheis May 29, 2025
66f0aef
sanitize BaseFee when executing blocks from DA
jonastheis May 29, 2025
7a48a92
initialize and pass missing header manager to DA syncing pipeline
jonastheis May 29, 2025
30d5a46
Merge branch 'jt/export-headers-toolkit' into fix-blockhash-mismatch
jonastheis May 29, 2025
2ef390e
add state root to deduplicated header
jonastheis May 29, 2025
de651d9
overwrite state root if given via missing header file
jonastheis May 29, 2025
3e33a8a
Merge branch 'jt/export-headers-toolkit' into fix-blockhash-mismatch
jonastheis May 29, 2025
7d8bb01
fix test
jonastheis May 30, 2025
b90e909
set correct links and missing header file hashes
jonastheis Jun 2, 2025
51d5c7d
allow reading of previous headers by resetting file and buffer to sup…
jonastheis Jun 2, 2025
eaad65b
Merge branch 'jt/export-headers-toolkit' into fix-blockhash-mismatch
jonastheis Jun 2, 2025
2ee9190
address review comments
jonastheis Jun 5, 2025
56cc282
Merge branch 'jt/export-headers-toolkit' into fix-blockhash-mismatch
jonastheis Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,12 @@ var (
Name: "da.sync",
Usage: "Enable node syncing from DA",
}
DAMissingHeaderFieldsBaseURLFlag = cli.StringFlag{
Name: "da.missingheaderfields.baseurl",
Usage: "Base URL for fetching missing header fields for pre-EuclidV2 blocks",
Value: "https://scroll-block-missing-metadata.s3.us-west-2.amazonaws.com/",
}

DABlobScanAPIEndpointFlag = cli.StringFlag{
Name: "da.blob.blobscan",
Usage: "BlobScan blob API endpoint",
Expand Down Expand Up @@ -1382,6 +1388,11 @@ func SetNodeConfig(ctx *cli.Context, cfg *node.Config) {
cfg.DaSyncingEnabled = ctx.Bool(DASyncEnabledFlag.Name)
}

cfg.DAMissingHeaderFieldsBaseURL = DAMissingHeaderFieldsBaseURLFlag.Value
if ctx.GlobalIsSet(DAMissingHeaderFieldsBaseURLFlag.Name) {
cfg.DAMissingHeaderFieldsBaseURL = ctx.GlobalString(DAMissingHeaderFieldsBaseURLFlag.Name)
}
Comment on lines +1391 to +1394
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cfg.DAMissingHeaderFieldsBaseURL = DAMissingHeaderFieldsBaseURLFlag.Value
if ctx.GlobalIsSet(DAMissingHeaderFieldsBaseURLFlag.Name) {
cfg.DAMissingHeaderFieldsBaseURL = ctx.GlobalString(DAMissingHeaderFieldsBaseURLFlag.Name)
}
cfg.DAMissingHeaderFieldsBaseURL = ctx.GlobalString(DAMissingHeaderFieldsBaseURLFlag.Name)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might work the same way.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to work.

WARN [06-05|08:47:48.245] syncing pipeline step failed due to unrecoverable error, stopping pipeline worker err="failed to get blocks from entry: failed to get missing header fields for block 1: failed to initialize missing header reader: failed to download file: failed to download file: Get \"534352.bin\": unsupported protocol scheme \"\""

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I think it's because the flag is not added to the node's flag set here: https://github.com/scroll-tech/go-ethereum/blob/scroll-v5.8.52/cmd/geth/main.go#L275-L279
Have you tried assigning it to another URL and seeing if it works?


if ctx.GlobalIsSet(ExternalSignerFlag.Name) {
cfg.ExternalSigner = ctx.GlobalString(ExternalSignerFlag.Name)
}
Expand Down
14 changes: 10 additions & 4 deletions core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1880,15 +1880,17 @@ func (bc *BlockChain) BuildAndWriteBlock(parentBlock *types.Block, header *types

header.ParentHash = parentBlock.Hash()

// sanitize base fee
if header.BaseFee != nil && header.BaseFee.Cmp(common.Big0) == 0 {
header.BaseFee = nil
}

tempBlock := types.NewBlockWithHeader(header).WithBody(txs, nil)
receipts, logs, gasUsed, err := bc.processor.Process(tempBlock, statedb, bc.vmConfig)
if err != nil {
return nil, NonStatTy, fmt.Errorf("error processing block: %w", err)
}

// TODO: once we have the extra and difficulty we need to verify the signature of the block with Clique
// This should be done with https://github.com/scroll-tech/go-ethereum/pull/913.

if sign {
// Prevent Engine from overriding timestamp.
originalTime := header.Time
Expand All @@ -1901,7 +1903,11 @@ func (bc *BlockChain) BuildAndWriteBlock(parentBlock *types.Block, header *types

// finalize and assemble block as fullBlock: replicates consensus.FinalizeAndAssemble()
header.GasUsed = gasUsed
header.Root = statedb.IntermediateRoot(bc.chainConfig.IsEIP158(header.Number))

// state root might be set from partial header. If it is not set, we calculate it.
if header.Root == (common.Hash{}) {
header.Root = statedb.IntermediateRoot(bc.chainConfig.IsEIP158(header.Number))
}

fullBlock := types.NewBlock(header, txs, nil, receipts, trie.NewStackTrie(nil))

Expand Down
27 changes: 26 additions & 1 deletion eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import (
"errors"
"fmt"
"math/big"
"net/url"
"path"
"path/filepath"
"runtime"
"sync"
"sync/atomic"
Expand Down Expand Up @@ -61,6 +64,7 @@ import (
"github.com/scroll-tech/go-ethereum/rollup/ccc"
"github.com/scroll-tech/go-ethereum/rollup/da_syncer"
"github.com/scroll-tech/go-ethereum/rollup/l1"
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
"github.com/scroll-tech/go-ethereum/rollup/rollup_sync_service"
"github.com/scroll-tech/go-ethereum/rollup/sync_service"
"github.com/scroll-tech/go-ethereum/rpc"
Expand Down Expand Up @@ -241,7 +245,12 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client) (*Ether
if config.EnableDASyncing {
// Do not start syncing pipeline if we are producing blocks for permissionless batches.
if !config.DA.ProduceBlocks {
eth.syncingPipeline, err = da_syncer.NewSyncingPipeline(context.Background(), eth.blockchain, chainConfig, eth.chainDb, l1Client, stack.Config().L1DeploymentBlock, config.DA)
missingHeaderFieldsManager, err := createMissingHeaderFieldsManager(stack, chainConfig)
if err != nil {
return nil, fmt.Errorf("cannot create missing header fields manager: %w", err)
}

eth.syncingPipeline, err = da_syncer.NewSyncingPipeline(context.Background(), eth.blockchain, chainConfig, eth.chainDb, l1Client, stack.Config().L1DeploymentBlock, config.DA, missingHeaderFieldsManager)
if err != nil {
return nil, fmt.Errorf("cannot initialize da syncer: %w", err)
}
Expand Down Expand Up @@ -337,6 +346,22 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client) (*Ether
return eth, nil
}

func createMissingHeaderFieldsManager(stack *node.Node, chainConfig *params.ChainConfig) (*missing_header_fields.Manager, error) {
downloadURL, err := url.Parse(stack.Config().DAMissingHeaderFieldsBaseURL)
if err != nil {
return nil, fmt.Errorf("invalid DAMissingHeaderFieldsBaseURL: %w", err)
}
downloadURL.Path = path.Join(downloadURL.Path, chainConfig.ChainID.String()+".bin")

expectedSHA256Checksum := chainConfig.Scroll.MissingHeaderFieldsSHA256
if expectedSHA256Checksum == nil {
return nil, fmt.Errorf("missing expected SHA256 checksum for missing header fields file in chain config")
}

filePath := filepath.Join(stack.Config().DataDir, fmt.Sprintf("missing-header-fields-%s-%s", chainConfig.ChainID, expectedSHA256Checksum.Hex()))
return missing_header_fields.NewManager(context.Background(), filePath, downloadURL.String(), *expectedSHA256Checksum), nil
}

func makeExtraData(extra []byte) []byte {
if len(extra) == 0 {
// create default extradata
Expand Down
2 changes: 2 additions & 0 deletions node/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ type Config struct {
L1DisableMessageQueueV2 bool `toml:",omitempty"`
// Is daSyncingEnabled
DaSyncingEnabled bool `toml:",omitempty"`
// Base URL for missing header fields file
DAMissingHeaderFieldsBaseURL string `toml:",omitempty"`
}

// IPCEndpoint resolves an IPC endpoint based on a configured value, taking into
Expand Down
40 changes: 26 additions & 14 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ import (

// Genesis hashes to enforce below configs on.
var (
MainnetGenesisHash = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")
RopstenGenesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d")
SepoliaGenesisHash = common.HexToHash("0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9")
RinkebyGenesisHash = common.HexToHash("0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177")
GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
ScrollAlphaGenesisHash = common.HexToHash("0xa4fc62b9b0643e345bdcebe457b3ae898bef59c7203c3db269200055e037afda")
ScrollSepoliaGenesisHash = common.HexToHash("0xaa62d1a8b2bffa9e5d2368b63aae0d98d54928bd713125e3fd9e5c896c68592c")
ScrollMainnetGenesisHash = common.HexToHash("0xbbc05efd412b7cd47a2ed0e5ddfcf87af251e414ea4c801d78b6784513180a80")
ScrollSepoliaGenesisState = common.HexToHash("0x20695989e9038823e35f0e88fbc44659ffdbfa1fe89fbeb2689b43f15fa64cb5")
ScrollMainnetGenesisState = common.HexToHash("0x08d535cc60f40af5dd3b31e0998d7567c2d568b224bed2ba26070aeb078d1339")
MainnetGenesisHash = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")
RopstenGenesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d")
SepoliaGenesisHash = common.HexToHash("0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9")
RinkebyGenesisHash = common.HexToHash("0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177")
GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
ScrollAlphaGenesisHash = common.HexToHash("0xa4fc62b9b0643e345bdcebe457b3ae898bef59c7203c3db269200055e037afda")
ScrollSepoliaGenesisHash = common.HexToHash("0xaa62d1a8b2bffa9e5d2368b63aae0d98d54928bd713125e3fd9e5c896c68592c")
ScrollMainnetGenesisHash = common.HexToHash("0xbbc05efd412b7cd47a2ed0e5ddfcf87af251e414ea4c801d78b6784513180a80")
ScrollSepoliaGenesisState = common.HexToHash("0x20695989e9038823e35f0e88fbc44659ffdbfa1fe89fbeb2689b43f15fa64cb5")
ScrollMainnetGenesisState = common.HexToHash("0x08d535cc60f40af5dd3b31e0998d7567c2d568b224bed2ba26070aeb078d1339")
ScrollMainnetMissingHeaderFieldsSHA256 = common.HexToHash("0x9062e2fa1200dca63bee1d18d429572f134f5f0c98cb4852f62fc394e33cf6e6")
ScrollSepoliaMissingHeaderFieldsSHA256 = common.HexToHash("0x3629f5e53250a526ffc46806c4d74b9c52c9209a6d45ecdfebdef5d596bb3f40")
)

func newUint64(val uint64) *uint64 { return &val }
Expand Down Expand Up @@ -353,7 +355,8 @@ var (
ScrollChainAddress: common.HexToAddress("0x2D567EcE699Eabe5afCd141eDB7A4f2D0D6ce8a0"),
L2SystemConfigAddress: common.HexToAddress("0xF444cF06A3E3724e20B35c2989d3942ea8b59124"),
},
GenesisStateRoot: &ScrollSepoliaGenesisState,
GenesisStateRoot: &ScrollSepoliaGenesisState,
MissingHeaderFieldsSHA256: &ScrollSepoliaMissingHeaderFieldsSHA256,
},
}

Expand Down Expand Up @@ -404,7 +407,8 @@ var (
ScrollChainAddress: common.HexToAddress("0xa13BAF47339d63B743e7Da8741db5456DAc1E556"),
L2SystemConfigAddress: common.HexToAddress("0x331A873a2a85219863d80d248F9e2978fE88D0Ea"),
},
GenesisStateRoot: &ScrollMainnetGenesisState,
GenesisStateRoot: &ScrollMainnetGenesisState,
MissingHeaderFieldsSHA256: &ScrollMainnetMissingHeaderFieldsSHA256,
},
}

Expand Down Expand Up @@ -706,6 +710,9 @@ type ScrollConfig struct {

// Genesis State Root for MPT clients
GenesisStateRoot *common.Hash `json:"genesisStateRoot,omitempty"`

// MissingHeaderFieldsSHA256 is the SHA256 hash of the missing header fields file.
MissingHeaderFieldsSHA256 *common.Hash `json:"missingHeaderFieldsSHA256,omitempty"`
}

// L1Config contains the l1 parameters needed to sync l1 contract events (e.g., l1 messages, commit/revert/finalize batches) in the sequencer
Expand Down Expand Up @@ -756,8 +763,13 @@ func (s ScrollConfig) String() string {
genesisStateRoot = fmt.Sprintf("%v", *s.GenesisStateRoot)
}

return fmt.Sprintf("{useZktrie: %v, maxTxPerBlock: %v, MaxTxPayloadBytesPerBlock: %v, feeVaultAddress: %v, l1Config: %v, genesisStateRoot: %v}",
s.UseZktrie, maxTxPerBlock, maxTxPayloadBytesPerBlock, s.FeeVaultAddress, s.L1Config.String(), genesisStateRoot)
missingHeaderFieldsSHA256 := "<nil>"
if s.MissingHeaderFieldsSHA256 != nil {
missingHeaderFieldsSHA256 = fmt.Sprintf("%v", *s.MissingHeaderFieldsSHA256)
}

return fmt.Sprintf("{useZktrie: %v, maxTxPerBlock: %v, MaxTxPayloadBytesPerBlock: %v, feeVaultAddress: %v, l1Config: %v, genesisStateRoot: %v, missingHeaderFieldsSHA256: %v}",
s.UseZktrie, maxTxPerBlock, maxTxPayloadBytesPerBlock, s.FeeVaultAddress, s.L1Config.String(), genesisStateRoot, missingHeaderFieldsSHA256)
}

// IsValidTxCount returns whether the given block's transaction count is below the limit.
Expand Down
15 changes: 9 additions & 6 deletions rollup/da_syncer/block_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@ import (

"github.com/scroll-tech/go-ethereum/core/rawdb"
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/da"
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
)

// BlockQueue is a pipeline stage that reads batches from BatchQueue, extracts all da.PartialBlock from it and
// provides them to the next stage one-by-one.
type BlockQueue struct {
batchQueue *BatchQueue
blocks []*da.PartialBlock
batchQueue *BatchQueue
blocks []*da.PartialBlock
missingHeaderFieldsManager *missing_header_fields.Manager
}

func NewBlockQueue(batchQueue *BatchQueue) *BlockQueue {
func NewBlockQueue(batchQueue *BatchQueue, missingHeaderFieldsManager *missing_header_fields.Manager) *BlockQueue {
return &BlockQueue{
batchQueue: batchQueue,
blocks: make([]*da.PartialBlock, 0),
batchQueue: batchQueue,
blocks: make([]*da.PartialBlock, 0),
missingHeaderFieldsManager: missingHeaderFieldsManager,
}
}

Expand All @@ -40,7 +43,7 @@ func (bq *BlockQueue) getBlocksFromBatch(ctx context.Context) error {
return err
}

bq.blocks, err = entryWithBlocks.Blocks()
bq.blocks, err = entryWithBlocks.Blocks(bq.missingHeaderFieldsManager)
if err != nil {
return fmt.Errorf("failed to get blocks from entry: %w", err)
}
Expand Down
17 changes: 12 additions & 5 deletions rollup/da_syncer/da/commitV0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/scroll-tech/go-ethereum/log"
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/serrors"
"github.com/scroll-tech/go-ethereum/rollup/l1"
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
)

type CommitBatchDAV0 struct {
Expand Down Expand Up @@ -109,7 +110,7 @@ func (c *CommitBatchDAV0) CompareTo(other Entry) int {
return 0
}

func (c *CommitBatchDAV0) Blocks() ([]*PartialBlock, error) {
func (c *CommitBatchDAV0) Blocks(manager *missing_header_fields.Manager) ([]*PartialBlock, error) {
l1Txs, err := getL1Messages(c.db, c.parentTotalL1MessagePopped, c.skippedL1MessageBitmap, c.l1MessagesPopped)
if err != nil {
return nil, fmt.Errorf("failed to get L1 messages for v0 batch %d: %w", c.batchIndex, err)
Expand All @@ -120,7 +121,7 @@ func (c *CommitBatchDAV0) Blocks() ([]*PartialBlock, error) {

curL1TxIndex := c.parentTotalL1MessagePopped
for _, chunk := range c.chunks {
for blockId, daBlock := range chunk.Blocks {
for blockIndex, daBlock := range chunk.Blocks {
// create txs
txs := make(types.Transactions, 0, daBlock.NumTransactions())
// insert l1 msgs
Expand All @@ -132,16 +133,22 @@ func (c *CommitBatchDAV0) Blocks() ([]*PartialBlock, error) {
curL1TxIndex += uint64(daBlock.NumL1Messages())

// insert l2 txs
txs = append(txs, chunk.Transactions[blockId]...)
txs = append(txs, chunk.Transactions[blockIndex]...)

difficulty, stateRoot, extraData, err := manager.GetMissingHeaderFields(daBlock.Number())
if err != nil {
return nil, fmt.Errorf("failed to get missing header fields for block %d: %w", daBlock.Number(), err)
}

block := NewPartialBlock(
&PartialHeader{
Number: daBlock.Number(),
Time: daBlock.Timestamp(),
BaseFee: daBlock.BaseFee(),
GasLimit: daBlock.GasLimit(),
Difficulty: 10, // TODO: replace with real difficulty
ExtraData: []byte{1, 2, 3, 4, 5, 6, 7, 8}, // TODO: replace with real extra data
Difficulty: difficulty,
ExtraData: extraData,
StateRoot: stateRoot,
},
txs)
blocks = append(blocks, block)
Expand Down
3 changes: 2 additions & 1 deletion rollup/da_syncer/da/commitV7.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/serrors"
"github.com/scroll-tech/go-ethereum/rollup/l1"
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto/kzg4844"
Expand Down Expand Up @@ -113,7 +114,7 @@ func (c *CommitBatchDAV7) Event() l1.RollupEvent {
return c.event
}

func (c *CommitBatchDAV7) Blocks() ([]*PartialBlock, error) {
func (c *CommitBatchDAV7) Blocks(_ *missing_header_fields.Manager) ([]*PartialBlock, error) {
initialL1MessageIndex := c.parentTotalL1MessagePopped

l1Txs, err := getL1MessagesV7(c.db, c.blobPayload.Blocks(), initialL1MessageIndex)
Expand Down
5 changes: 4 additions & 1 deletion rollup/da_syncer/da/da.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/rollup/l1"
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
)

type Type int
Expand All @@ -34,7 +35,7 @@ type Entry interface {

type EntryWithBlocks interface {
Entry
Blocks() ([]*PartialBlock, error)
Blocks(manager *missing_header_fields.Manager) ([]*PartialBlock, error)
Version() encoding.CodecVersion
Chunks() []*encoding.DAChunkRawTx
BlobVersionedHashes() []common.Hash
Expand All @@ -53,6 +54,7 @@ type PartialHeader struct {
GasLimit uint64
Difficulty uint64
ExtraData []byte
StateRoot common.Hash
}

func (h *PartialHeader) ToHeader() *types.Header {
Expand All @@ -63,6 +65,7 @@ func (h *PartialHeader) ToHeader() *types.Header {
GasLimit: h.GasLimit,
Difficulty: new(big.Int).SetUint64(h.Difficulty),
Extra: h.ExtraData,
Root: h.StateRoot,
}
}

Expand Down
5 changes: 3 additions & 2 deletions rollup/da_syncer/syncing_pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/serrors"
"github.com/scroll-tech/go-ethereum/rollup/l1"
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
)

// Config is the configuration parameters of data availability syncing.
Expand Down Expand Up @@ -50,7 +51,7 @@ type SyncingPipeline struct {
daQueue *DAQueue
}

func NewSyncingPipeline(ctx context.Context, blockchain *core.BlockChain, genesisConfig *params.ChainConfig, db ethdb.Database, ethClient l1.Client, l1DeploymentBlock uint64, config Config) (*SyncingPipeline, error) {
func NewSyncingPipeline(ctx context.Context, blockchain *core.BlockChain, genesisConfig *params.ChainConfig, db ethdb.Database, ethClient l1.Client, l1DeploymentBlock uint64, config Config, missingHeaderFieldsManager *missing_header_fields.Manager) (*SyncingPipeline, error) {
l1Reader, err := l1.NewReader(ctx, l1.Config{
ScrollChainAddress: genesisConfig.Scroll.L1Config.ScrollChainAddress,
L1MessageQueueAddress: genesisConfig.Scroll.L1Config.L1MessageQueueAddress,
Expand Down Expand Up @@ -124,7 +125,7 @@ func NewSyncingPipeline(ctx context.Context, blockchain *core.BlockChain, genesi

daQueue := NewDAQueue(lastProcessedBatchMeta.L1BlockNumber, dataSourceFactory)
batchQueue := NewBatchQueue(daQueue, db, lastProcessedBatchMeta)
blockQueue := NewBlockQueue(batchQueue)
blockQueue := NewBlockQueue(batchQueue, missingHeaderFieldsManager)
daSyncer := NewDASyncer(blockchain, config.L2EndBlock)

ctx, cancel := context.WithCancel(ctx)
Expand Down
Loading
Loading