From ca87287c9bc8c59b515425254fd93548f6e54e14 Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Thu, 26 Sep 2024 16:35:00 -0600 Subject: [PATCH 1/3] regenerate addrbook.json --- server/start.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/start.go b/server/start.go index 7b923033540c..35b2409c2648 100644 --- a/server/start.go +++ b/server/start.go @@ -7,6 +7,7 @@ import ( "io" "net" "os" + "path/filepath" "runtime/pprof" "strings" "time" @@ -750,6 +751,17 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra return nil, err } + // Regenerate addrbook.json to prevent peers on old network from causing error logs. + addrBookPath := filepath.Join(config.RootDir, "config", "addrbook.json") + if err := os.Remove(addrBookPath); err != nil && !os.IsNotExist(err) { + return nil, fmt.Errorf("failed to remove existing addrbook.json: %w", err) + } + + emptyAddrBook := []byte("{}") + if err := os.WriteFile(addrBookPath, emptyAddrBook, 0644); err != nil { + return nil, fmt.Errorf("failed to create empty addrbook.json: %w", err) + } + // Load the comet genesis doc provider. genDocProvider := node.DefaultGenesisDocProviderFunc(config) From de70a7e109707efe9371de419e517e12281fa587 Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Thu, 26 Sep 2024 16:49:51 -0600 Subject: [PATCH 2/3] lint --- server/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/start.go b/server/start.go index 35b2409c2648..99526af2d932 100644 --- a/server/start.go +++ b/server/start.go @@ -758,7 +758,7 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra } emptyAddrBook := []byte("{}") - if err := os.WriteFile(addrBookPath, emptyAddrBook, 0644); err != nil { + if err := os.WriteFile(addrBookPath, emptyAddrBook, 0o644); err != nil { return nil, fmt.Errorf("failed to create empty addrbook.json: %w", err) } From f0ca64278d7f3f0a73eb40a3023e8962cae2d968 Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Thu, 26 Sep 2024 16:58:17 -0600 Subject: [PATCH 3/3] change perms --- server/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/start.go b/server/start.go index 99526af2d932..488ae0270735 100644 --- a/server/start.go +++ b/server/start.go @@ -758,7 +758,7 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra } emptyAddrBook := []byte("{}") - if err := os.WriteFile(addrBookPath, emptyAddrBook, 0o644); err != nil { + if err := os.WriteFile(addrBookPath, emptyAddrBook, 0o600); err != nil { return nil, fmt.Errorf("failed to create empty addrbook.json: %w", err) }