From 8cc8e1af785e256b15193cf7bb3cae9c53d3cedd Mon Sep 17 00:00:00 2001 From: jonathansumner Date: Mon, 10 Jun 2024 13:03:02 +0100 Subject: [PATCH] chore: amend loading blockstore --- server/export.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/server/export.go b/server/export.go index 948eb3f94..86a0cf39b 100644 --- a/server/export.go +++ b/server/export.go @@ -6,11 +6,12 @@ import ( "errors" "fmt" "github.com/spf13/cobra" + cfg "github.com/tendermint/tendermint/config" tmjson "github.com/tendermint/tendermint/libs/json" + tmnode "github.com/tendermint/tendermint/node" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmstore "github.com/tendermint/tendermint/store" + "github.com/tendermint/tendermint/store" tmtypes "github.com/tendermint/tendermint/types" - tmdb "github.com/tendermint/tm-db" "os" "github.com/cosmos/cosmos-sdk/client/flags" @@ -25,14 +26,20 @@ const ( ) // GetLatestBlockHeaderFromDB returns the latest block header from the blockstore database -func GetLatestBlockHeaderFromDB(blockStoreDB tmdb.DB) (*tmtypes.Header, error) { +func GetLatestBlockHeaderFromDB() (*tmtypes.Header, error) { // Load the blockstore - blockStore := tmstore.NewBlockStore(blockStoreDB) + blockStoreDB, err := tmnode.DefaultDBProvider(&tmnode.DBContext{ID: "blockstore", Config: cfg.DefaultConfig()}) + if err != nil { + return nil, err + } defer blockStoreDB.Close() + blockStore := store.NewBlockStore(blockStoreDB) + // Get the latest block meta latestHeight := blockStore.Height() blockMeta := blockStore.LoadBlockMeta(latestHeight) + if blockMeta == nil { return nil, errors.New("latest block metadata not found in blockstore") } @@ -95,7 +102,7 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com return err } - latestBlockHeader, err := GetLatestBlockHeaderFromDB(db) + latestBlockHeader, err := GetLatestBlockHeaderFromDB() if err != nil { return err }