fix(server(/v2)): fix fallback genesis path (backport #22564) (#22572)

Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
mergify[bot] 2024-11-20 16:18:49 +01:00 committed by GitHub
parent 756d4bbaf1
commit 8f7fbf6cd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions

View File

@ -507,7 +507,12 @@ func DefaultBaseappOptions(appOpts types.AppOptions) []func(*baseapp.BaseApp) {
chainID := cast.ToString(appOpts.Get(flags.FlagChainID))
if chainID == "" {
// fallback to genesis chain-id
reader, err := os.Open(filepath.Join(homeDir, "config", "genesis.json"))
genesisPathCfg := appOpts.GetString("genesis_file")
if genesisPathCfg == "" {
genesisPathCfg = filepath.Join("config", "genesis.json")
}
reader, err := os.Open(filepath.Join(homeDir, genesisPathCfg))
if err != nil {
panic(err)
}

View File

@ -94,7 +94,7 @@ func New[T transaction.Tx](
chainID, _ := cfg[FlagChainID].(string)
if chainID == "" {
// fallback to genesis chain-id
reader, err := os.Open(filepath.Join(home, "config", "genesis.json"))
reader, err := os.Open(srv.config.ConfigTomlConfig.GenesisFile())
if err != nil {
return nil, fmt.Errorf("failed to open genesis file: %w", err)
}