diff --git a/cmd/akash/cmd/testnetify/testnetify.go b/cmd/akash/cmd/testnetify/testnetify.go index f02074741..ab7853c22 100644 --- a/cmd/akash/cmd/testnetify/testnetify.go +++ b/cmd/akash/cmd/testnetify/testnetify.go @@ -17,7 +17,6 @@ import ( "golang.org/x/sync/errgroup" cmtcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/tmhash" "github.com/cometbft/cometbft/node" pvm "github.com/cometbft/cometbft/privval" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" @@ -303,7 +302,7 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type } // Load the comet genesis doc provider. - genDocProvider := node.DefaultGenesisDocProviderFunc(config) + genDocProvider := sdksrv.GetGenDocProvider(config) // Initialize blockStore and stateDB. blockStoreDB, err := cmtcfg.DefaultDBProvider(&cmtcfg.DBContext{ID: "blockstore", Config: config}) @@ -325,14 +324,17 @@ func testnetify(sctx *sdksrv.Context, tcfg TestnetConfig, testnetAppCreator type _ = stateDB.Close() }() - jsonBlob, err := os.ReadFile(config.GenesisFile()) - if err != nil { - return nil, fmt.Errorf("couldn't read GenesisDoc file: %w", err) + var updatedChecksum []byte + { + genDoc, err := genDocProvider() + if err != nil { + return nil, err + } + + updatedChecksum = genDoc.Sha256Checksum } // Since we modified the chainID, we set the new genesisDocHash in the stateDB. - updatedChecksum := tmhash.Sum(jsonBlob) - if err = stateDB.SetSync(node.GenesisDocHashKey, updatedChecksum); err != nil { return nil, node.ErrSaveGenesisDocHash{Err: err} } diff --git a/go.mod b/go.mod index c229c7642..339852b4a 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ replace ( // use akash fork of cometbft github.com/cometbft/cometbft => github.com/akash-network/cometbft v0.38.19-akash.1 // use akash fork of cosmos sdk - github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.4-akash.7 + github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10 github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.2 diff --git a/go.sum b/go.sum index 1c7925e48..617a7731c 100644 --- a/go.sum +++ b/go.sum @@ -1281,8 +1281,8 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= github.com/akash-network/cometbft v0.38.19-akash.1 h1:am45M/0vjs1FEwh1WiLv/cp92Yskj2Dls997phjnxso= github.com/akash-network/cometbft v0.38.19-akash.1/go.mod h1:UCu8dlHqvkAsmAFmWDRWNZJPlu6ya2fTWZlDrWsivwo= -github.com/akash-network/cosmos-sdk v0.53.4-akash.7 h1:Z/hD79JXHigTPsIDzTtcQl3hGYiPqy45pqKBVOqH9nI= -github.com/akash-network/cosmos-sdk v0.53.4-akash.7/go.mod h1:IZwPUVJ6FYETzU2GIZdYzCqi9IcXT6idNx6QcrtuG3M= +github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10 h1:zPQVFSuBQKE3orKGgePPLU6eWn7kTAMCfuqFFa1Gc3Y= +github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10/go.mod h1:gZcyUJu6h94FfxgJbuBpiW7RPCFEV/+GJdy4UAJ3Y1Q= github.com/akash-network/gogoproto v1.7.0-akash.2 h1:zY5seM6kBOLMBWn15t8vrY1ao4J1HjrhNaEeO/Soro0= github.com/akash-network/gogoproto v1.7.0-akash.2/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=