Skip to content

Commit 4702e35

Browse files
author
Jan Kalina
authored
Fix genesis tools after moving live state into live dir (#79)
1 parent 14c5910 commit 4702e35

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

cmd/opera/launcher/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ func mayMakeAllConfigs(ctx *cli.Context) (*config, error) {
657657
}
658658

659659
if ctx.GlobalBool(carmenEvmStoreFlag.Name) {
660-
evmStoreDir := filepath.Join(cfg.Node.DataDir, "carmen")
660+
evmStoreDir := filepath.Join(cfg.Node.DataDir, "carmen", "evmstore")
661661
err := os.MkdirAll(evmStoreDir, 0700)
662662
if err != nil {
663663
return nil, fmt.Errorf("failed to create carmen evmstore dir; %v", err)

cmd/opera/launcher/genesiscmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ func exportGenesis(ctx *cli.Context) error {
413413
return err
414414
}
415415

416-
err = mptIo.Export(filepath.Join(cfg.Node.DataDir, "carmen"), writer)
416+
err = mptIo.Export(filepath.Join(cfg.Node.DataDir, "carmen", "live"), writer)
417417
if err != nil {
418418
return err
419419
}

statedb/import.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,16 @@ func (m *StateDbManager) ImportWorldState(liveReader io.Reader, archiveReader io
4444
return fmt.Errorf("carmen state must be closed before the FWS data import")
4545
}
4646

47-
if err := os.MkdirAll(m.parameters.Directory, 0700); err != nil {
47+
liveDir := filepath.Join(m.parameters.Directory, "live")
48+
if err := os.MkdirAll(liveDir, 0700); err != nil {
4849
return fmt.Errorf("failed to create carmen dir during FWS import; %v", err)
4950
}
50-
if err := io2.ImportLiveDb(m.parameters.Directory, liveReader); err != nil {
51+
if err := io2.ImportLiveDb(liveDir, liveReader); err != nil {
5152
return fmt.Errorf("failed to import LiveDB; %v", err)
5253
}
5354

5455
if m.parameters.Archive == carmen.S5Archive {
55-
archiveDir := m.parameters.Directory + string(filepath.Separator) + "archive"
56+
archiveDir := filepath.Join(m.parameters.Directory, "archive")
5657
if err := os.MkdirAll(archiveDir, 0700); err != nil {
5758
return fmt.Errorf("failed to create carmen archive dir during FWS import; %v", err)
5859
}

statedb/verify.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ func (m *StateDbManager) VerifyWorldState(expectedBlockNum uint64, expectedHash
3232
m.logger.Log.Info("State hash matches the last block state root.")
3333

3434
// verify the live world state
35-
info, err := io.CheckMptDirectoryAndGetInfo(m.parameters.Directory)
35+
liveDir := filepath.Join(m.parameters.Directory, "live")
36+
info, err := io.CheckMptDirectoryAndGetInfo(liveDir)
3637
if err != nil {
3738
return fmt.Errorf("failed to check live state dir: %w", err)
3839
}
39-
if err := mpt.VerifyFileLiveTrie(m.parameters.Directory, info.Config, observer); err != nil {
40+
if err := mpt.VerifyFileLiveTrie(liveDir, info.Config, observer); err != nil {
4041
return fmt.Errorf("live state verification failed: %w", err)
4142
}
4243
m.logger.Log.Info("Live state verified successfully.")
@@ -45,7 +46,7 @@ func (m *StateDbManager) VerifyWorldState(expectedBlockNum uint64, expectedHash
4546
if m.parameters.Archive != carmen.S5Archive {
4647
return nil // skip archive checks when S5 archive is not used
4748
}
48-
archiveDir := m.parameters.Directory + string(filepath.Separator) + "archive"
49+
archiveDir := filepath.Join(m.parameters.Directory, "archive")
4950
archiveInfo, err := io.CheckMptDirectoryAndGetInfo(archiveDir)
5051
if err != nil {
5152
return fmt.Errorf("failed to check archive dir: %w", err)

0 commit comments

Comments
 (0)