Skip to content

fix: path when genesis file already exists. #2361

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
tac0turtle merged 2 commits into from
Jun 11, 2025
Merged

fix: path when genesis file already exists. #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c837bb
Fix path when genesis file already exists.
adlerjohn Jun 10, 2025
1d0c7d9
Merge branch 'main' into adlerjohn/genesis-file-exists-error
tac0turtle Jun 10, 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
5 changes: 3 additions & 2 deletions apps/evm/based/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,18 @@ func InitCmd() *cobra.Command {

// Initialize genesis without app state
err = rollgenesis.CreateGenesis(homePath, chainID, 1, proposerAddress)
genesisPath := rollgenesis.GenesisPath(homePath)
if errors.Is(err, rollgenesis.ErrGenesisExists) {
// check if existing genesis file is valid
if genesis, err := rollgenesis.LoadGenesis(homePath); err == nil {
if genesis, err := rollgenesis.LoadGenesis(genesisPath); err == nil {
if err := genesis.Validate(); err != nil {
return fmt.Errorf("existing genesis file is invalid: %w", err)
}
} else {
return fmt.Errorf("error loading existing genesis file: %w", err)
}

cmd.Printf("Genesis file already exists at %s, skipping creation.\n", homePath)
cmd.Printf("Genesis file already exists at %s, skipping creation.\n", genesisPath)
} else if err != nil {
return fmt.Errorf("error initializing genesis file: %w", err)
}
Expand Down
5 changes: 3 additions & 2 deletions apps/evm/single/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,18 @@ func InitCmd() *cobra.Command {

// Initialize genesis without app state
err = rollgenesis.CreateGenesis(homePath, chainID, 1, proposerAddress)
genesisPath := rollgenesis.GenesisPath(homePath)
if errors.Is(err, rollgenesis.ErrGenesisExists) {
// check if existing genesis file is valid
if genesis, err := rollgenesis.LoadGenesis(homePath); err == nil {
if genesis, err := rollgenesis.LoadGenesis(genesisPath); err == nil {
if err := genesis.Validate(); err != nil {
return fmt.Errorf("existing genesis file is invalid: %w", err)
}
} else {
return fmt.Errorf("error loading existing genesis file: %w", err)
}

cmd.Printf("Genesis file already exists at %s, skipping creation.\n", homePath)
cmd.Printf("Genesis file already exists at %s, skipping creation.\n", genesisPath)
} else if err != nil {
return fmt.Errorf("error initializing genesis file: %w", err)
}
Expand Down
5 changes: 3 additions & 2 deletions apps/testapp/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,18 @@ func InitCmd() *cobra.Command {

// Initialize genesis without app state
err = rollgenesis.CreateGenesis(homePath, chainID, 1, proposerAddress)
genesisPath := rollgenesis.GenesisPath(homePath)
if errors.Is(err, rollgenesis.ErrGenesisExists) {
// check if existing genesis file is valid
if genesis, err := rollgenesis.LoadGenesis(homePath); err == nil {
if genesis, err := rollgenesis.LoadGenesis(genesisPath); err == nil {
if err := genesis.Validate(); err != nil {
return fmt.Errorf("existing genesis file is invalid: %w", err)
}
} else {
return fmt.Errorf("error loading existing genesis file: %w", err)
}

cmd.Printf("Genesis file already exists at %s, skipping creation.\n", homePath)
cmd.Printf("Genesis file already exists at %s, skipping creation.\n", genesisPath)
} else if err != nil {
return fmt.Errorf("error initializing genesis file: %w", err)
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/genesis/io.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@

var ErrGenesisExists = fmt.Errorf("genesis file already exists")

// GenesisPath returns the genesis file path from a home directory.
func GenesisPath(homePath string) string {
configDir := filepath.Join(homePath, "config")
return filepath.Join(configDir, "genesis.json")

Check warning on line 16 in pkg/genesis/io.go

View check run for this annotation

Codecov / codecov/patch

pkg/genesis/io.go#L14-L16 

Added lines #L14 - L16 were not covered by tests
}

// CreateGenesis creates and saves a genesis file with the given app state.
// If the genesis file already exists, it skips the creation and returns ErrGenesisExists.
// The genesis file is saved in the config directory of the specified home path.
Expand Down
Loading