Skip to content
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

Jump to bottom

improve DS tool cache generation #3724

Merged
merged 1 commit into from
Jul 9, 2024
Merged

improve DS tool cache generation #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tools/datastreamer/config/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ EnableLog = false
MaxConns = 200

[MerkleTree]
URI = "localhost:50061"
URI = ""
MaxThreads = 0
CacheFile = ""

Expand Down
2 changes: 1 addition & 1 deletion tools/datastreamer/config/tool.config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EnableLog = false
MaxConns = 200

[MerkleTree]
URI = "localhost:50061"
URI = ""
MaxThreads = 0
CacheFile = "merkle_tree_cache.json"

Expand Down
25 changes: 24 additions & 1 deletion tools/datastreamer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,15 @@ func generate(cliCtx *cli.Context) error {

log.Init(c.Log)

// Check if config makes sense
if c.MerkleTree.MaxThreads > 0 && c.Offline.UpgradeEtrogBatchNumber == 0 {
log.Fatalf("MaxThreads is set to %d, but UpgradeEtrogBatchNumber is not set", c.MerkleTree.MaxThreads)
}

if c.MerkleTree.MaxThreads > 0 && c.MerkleTree.CacheFile == "" {
log.Warnf("MaxThreads is set to %d, but CacheFile is not set. Cache will not be persisted.", c.MerkleTree.MaxThreads)
}

streamServer, err := initializeStreamServer(c)
if err != nil {
log.Error(err)
Expand Down Expand Up @@ -282,6 +291,20 @@ func generate(cliCtx *cli.Context) error {
}

maxL2Block := lastL2BlockHeader.Number.Uint64()

// IM State Roots are only needed for l2 blocks previous to the etrog fork id
// So in case UpgradeEtrogBatchNumber is set, we will only calculate the IM State Roots for the
// blocks previous to the first in that batch
if c.Offline.UpgradeEtrogBatchNumber > 0 {
l2blocks, err := stateDB.GetL2BlocksByBatchNumber(cliCtx.Context, c.Offline.UpgradeEtrogBatchNumber, nil)
if err != nil {
log.Error(err)
os.Exit(1)
}

maxL2Block = l2blocks[0].Number().Uint64() - 1
}

imStateRoots = make(map[uint64][]byte, maxL2Block)

// Check if a cache file exists
Expand Down Expand Up @@ -316,7 +339,7 @@ func generate(cliCtx *cli.Context) error {
wg.Add(1)
go func(i int) {
defer wg.Done()
log.Debugf("Thread %d: Start: %d, End: %d, Total: %d", i, start, end, end-start)
log.Infof("Thread %d: Start: %d, End: %d, Total: %d", i, start, end, end-start)
getImStateRoots(cliCtx.Context, start, end, &imStateRoots, imStateRootsMux, stateDB)
}(x)
}
Expand Down
Loading