Skip to content

small improvements for submitter #727

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

Merged
WorldDogs merged 3 commits into from
Mar 3, 2025
Merged

small improvements for submitter #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e3f2b1
Add eventInfoStorage.Load() and log backward indexing
Mar 3, 2025
557e95f
fix log for feesum
Mar 3, 2025
cedcd32
check err after Load
Mar 3, 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
4 changes: 4 additions & 0 deletions tx-submitter/entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ func Main() func(ctx *cli.Context) error {
return fmt.Errorf("failed to connect leveldb: %w", err)
}
eventInfoStorage := event.NewEventInfoStorage(ldb)
err = eventInfoStorage.Load()
if err != nil {
return err
}
eventIndexer := event.NewEventIndexer(l1Client, new(big.Int).SetUint64(cfg.L1StakingDeployedBlockNumber), filter, cfg.EventIndexStep, eventInfoStorage)
// new rotator
rotator := services.NewRotator(common.HexToAddress(cfg.L2SequencerAddress), common.HexToAddress(cfg.L2GovAddress), eventIndexer)
Expand Down
4 changes: 4 additions & 0 deletions tx-submitter/event/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ func (ei *EventIndexer) index(client *ethclient.Client, fromBlock, toBlock *big.
endBlock := toBlock.Uint64()
startBlock := endBlock - ei.indexStep
lastProcessedBlock := fromBlock.Uint64()
if startBlock < lastProcessedBlock {
startBlock = lastProcessedBlock
}
logFilter := ei.GetFilter()

// Find the last unprocessed log
Expand Down Expand Up @@ -123,6 +126,7 @@ func (ei *EventIndexer) index(client *ethclient.Client, fromBlock, toBlock *big.
}
}
}
log.Info("backward indexing", "block_num", startBlock, "target_num", lastProcessedBlock)
// update query range
endBlock = startBlock
if endBlock <= lastProcessedBlock+ei.indexStep {
Expand Down
6 changes: 3 additions & 3 deletions tx-submitter/services/rollup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@ func (r *Rollup) InitFeeMetricsSum() error {
return fmt.Errorf("get data from leveldb faild, key: %s, %w", rollupSumKey, err)
}
}
log.Info("rollupFeeSum: %f", rollupFeeSum)
log.Info(fmt.Sprintf("rollupFeeSum: %f", rollupFeeSum))
finalizeFeeSum, err := r.ldb.GetFloat(finalizeSumKey)
if err != nil {
log.Warn("read finalizeFeeSum from leveldb failed", "error", err)
Expand All @@ -1361,7 +1361,7 @@ func (r *Rollup) InitFeeMetricsSum() error {
return fmt.Errorf("get data from leveldb faild, key: %s, %w", finalizeSumKey, err)
}
}
log.Info("finalizeFeeSum: %f", finalizeFeeSum)
log.Info(fmt.Sprintf("finalizeFeeSum: %f", finalizeFeeSum))
collectedL1FeeSum, err := r.ldb.GetFloat(collectedL1FeeSumKey)
if err != nil {
log.Warn("read collectedL1FeeSum from leveldb failed", "error", err)
Expand All @@ -1375,7 +1375,7 @@ func (r *Rollup) InitFeeMetricsSum() error {
}
}
r.collectedL1FeeSum = collectedL1FeeSum
log.Info("collectedL1FeeSum: %f", collectedL1FeeSum)
log.Info(fmt.Sprintf("collectedL1FeeSum: %f", collectedL1FeeSum))

r.rollupFeeSum = rollupFeeSum
r.finalizeFeeSum = finalizeFeeSum
Expand Down