From 70a79790d24df5d020dc4d3d7cadab57e4941954 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 19 Nov 2024 23:46:34 +0100 Subject: [PATCH 1/3] fix(server(/v2): fix fallback genesis path --- server/util.go | 7 ++++++- server/v2/cometbft/server.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/util.go b/server/util.go index bb54bdd1dc00..31544ed15e4a 100644 --- a/server/util.go +++ b/server/util.go @@ -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")) + genesisPath := filepath.Join(homeDir, "config", "genesis.json") + if _, err := os.Stat(genesisPath); os.IsNotExist(err) { + genesisPath = filepath.Join(homeDir, appOpts.GetString("genesis_file")) + } + + reader, err := os.Open(genesisPath) if err != nil { panic(err) } diff --git a/server/v2/cometbft/server.go b/server/v2/cometbft/server.go index a8269317fad7..58eb7b442577 100644 --- a/server/v2/cometbft/server.go +++ b/server/v2/cometbft/server.go @@ -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) } From 1403280407330e2bac56388053d4d01331997ecf Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 20 Nov 2024 14:17:06 +0100 Subject: [PATCH 2/3] simplify --- server/util.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/util.go b/server/util.go index 31544ed15e4a..ccca867ea834 100644 --- a/server/util.go +++ b/server/util.go @@ -507,12 +507,7 @@ func DefaultBaseappOptions(appOpts types.AppOptions) []func(*baseapp.BaseApp) { chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) if chainID == "" { // fallback to genesis chain-id - genesisPath := filepath.Join(homeDir, "config", "genesis.json") - if _, err := os.Stat(genesisPath); os.IsNotExist(err) { - genesisPath = filepath.Join(homeDir, appOpts.GetString("genesis_file")) - } - - reader, err := os.Open(genesisPath) + reader, err := os.Open(filepath.Join(homeDir, appOpts.GetString("genesis_file"))) if err != nil { panic(err) } From a6b7e9c5e8bfeaae7ce6105b777bfe4e4a5b36fa Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 20 Nov 2024 15:48:05 +0100 Subject: [PATCH 3/3] updates --- server/util.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/util.go b/server/util.go index ccca867ea834..ca28fc568a3b 100644 --- a/server/util.go +++ b/server/util.go @@ -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, appOpts.GetString("genesis_file"))) + 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) }