!chore(mod): use akash fork of cometbft

troian · troian · commit ef618798d391 · 2025-07-14T16:27:22.000-05:00
Signed-off-by: Artur Troian &lt;troian@users.noreply.github.com&gt;
diff --git a/go.mod b/go.mod
@@ -179,6 +179,8 @@ require (
 replace (
 	// use cosmos fork of keyring
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
+
+	github.com/cometbft/cometbft => github.com/akash-network/cometbft v0.38.17-akash.1
 	// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
diff --git a/go.sum b/go.sum
@@ -45,6 +45,8 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/
 github.com/adlio/schema v1.3.6 h1:k1/zc2jNfeiZBA5aFTRy37jlBIuCkXCm0XmvpzCKI9I=
 github.com/adlio/schema v1.3.6/go.mod h1:qkxwLgPBd1FgLRHYVCmQT/rrBr3JH38J9LjmVzWNudg=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
+github.com/akash-network/cometbft v0.38.17-akash.1 h1:0Kq5GhRYrRSYAFP7J6H+hy7KkKd93sqAlE9HOugRetA=
+github.com/akash-network/cometbft v0.38.17-akash.1/go.mod h1:5l0SkgeLRXi6bBfQuevXjKqML1jjfJJlvI1Ulp02/o4=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -137,8 +139,6 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ
 github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
 github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/cometbft/cometbft v0.38.17 h1:FkrQNbAjiFqXydeAO81FUzriL4Bz0abYxN/eOHrQGOk=
-github.com/cometbft/cometbft v0.38.17/go.mod h1:5l0SkgeLRXi6bBfQuevXjKqML1jjfJJlvI1Ulp02/o4=
 github.com/cometbft/cometbft-db v0.14.1 h1:SxoamPghqICBAIcGpleHbmoPqy+crij/++eZz3DlerQ=
 github.com/cometbft/cometbft-db v0.14.1/go.mod h1:KHP1YghilyGV/xjD5DP3+2hyigWx0WTp9X+0Gnx0RxQ=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
diff --git a/server/start.go b/server/start.go
@@ -412,14 +412,20 @@ func getAndValidateConfig(svrCtx *Context) (serverconfig.Config, error) {
 }
 
 // returns a function which returns the genesis doc from the genesis file.
-func getGenDocProvider(cfg *cmtcfg.Config) func() (*cmttypes.GenesisDoc, error) {
-	return func() (*cmttypes.GenesisDoc, error) {
+func getGenDocProvider(cfg *cmtcfg.Config) func() (node.ChecksummedGenesisDoc, error) {
+	return func() (node.ChecksummedGenesisDoc, error) {
 		appGenesis, err := genutiltypes.AppGenesisFromFile(cfg.GenesisFile())
 		if err != nil {
-			return nil, err
+			return node.ChecksummedGenesisDoc{}, err
 		}
 
-		return appGenesis.ToGenesisDoc()
+		genDoc, err := appGenesis.ToGenesisDoc()
+		if err != nil {
+			return node.ChecksummedGenesisDoc{}, err
+		}
+		return node.ChecksummedGenesisDoc{
+			GenesisDoc: genDoc,
+		}, nil
 	}
 }
 
@@ -786,7 +792,7 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra
 		DiscardABCIResponses: config.Storage.DiscardABCIResponses,
 	})
 
-	state, genDoc, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider)
+	state, genDoc, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider, "")
 	if err != nil {
 		return nil, err
 	}
diff --git a/testutil/network/util.go b/testutil/network/util.go
@@ -14,7 +14,6 @@ import (
 	pvm "github.com/cometbft/cometbft/privval"
 	"github.com/cometbft/cometbft/proxy"
 	"github.com/cometbft/cometbft/rpc/client/local"
-	cmttypes "github.com/cometbft/cometbft/types"
 	cmttime "github.com/cometbft/cometbft/types/time"
 	"golang.org/x/sync/errgroup"
 
@@ -47,17 +46,24 @@ func startInProcess(cfg Config, val *Validator) error {
 	app := cfg.AppConstructor(*val)
 	val.app = app
 
-	appGenesisProvider := func() (*cmttypes.GenesisDoc, error) {
+	appGenesisProvider := func() (node.ChecksummedGenesisDoc, error) {
 		appGenesis, err := genutiltypes.AppGenesisFromFile(cmtCfg.GenesisFile())
 		if err != nil {
-			return nil, err
+			return node.ChecksummedGenesisDoc{}, err
 		}
 
-		return appGenesis.ToGenesisDoc()
+		genDoc, err := appGenesis.ToGenesisDoc()
+		if err != nil {
+			return node.ChecksummedGenesisDoc{}, err
+		}
+		return node.ChecksummedGenesisDoc{
+			GenesisDoc: genDoc,
+		}, nil
 	}
 
 	cmtApp := server.NewCometABCIWrapper(app)
 	tmNode, err := node.NewNode( //resleak:notresource
+		context.Background(),
 		cmtCfg,
 		pvm.LoadOrGenFilePV(cmtCfg.PrivValidatorKeyFile(), cmtCfg.PrivValidatorStateFile()),
 		nodeKey,

Original file line number	Diff line number	Diff line change
`@@ -412,14 +412,20 @@ func getAndValidateConfig(svrCtx *Context) (serverconfig.Config, error) {`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`// returns a function which returns the genesis doc from the genesis file.`
`415`		`-func getGenDocProvider(cfg cmtcfg.Config) func() (cmttypes.GenesisDoc, error) {`
`416`		`- return func() (*cmttypes.GenesisDoc, error) {`
	`415`	`+func getGenDocProvider(cfg *cmtcfg.Config) func() (node.ChecksummedGenesisDoc, error) {`
	`416`	`+ return func() (node.ChecksummedGenesisDoc, error) {`
`417`	`417`	`appGenesis, err := genutiltypes.AppGenesisFromFile(cfg.GenesisFile())`
`418`	`418`	`if err != nil {`
`419`		`- return nil, err`
	`419`	`+ return node.ChecksummedGenesisDoc{}, err`
`420`	`420`	`}`
`421`	`421`
`422`		`- return appGenesis.ToGenesisDoc()`
	`422`	`+ genDoc, err := appGenesis.ToGenesisDoc()`
	`423`	`+ if err != nil {`
	`424`	`+ return node.ChecksummedGenesisDoc{}, err`
	`425`	`+ }`
	`426`	`+ return node.ChecksummedGenesisDoc{`
	`427`	`+ GenesisDoc: genDoc,`
	`428`	`+ }, nil`
`423`	`429`	`}`
`424`	`430`	`}`
`425`	`431`
`@@ -786,7 +792,7 @@ func testnetify(ctx *Context, testnetAppCreator types.AppCreator, db dbm.DB, tra`
`786`	`792`	`DiscardABCIResponses: config.Storage.DiscardABCIResponses,`
`787`	`793`	`})`
`788`	`794`
`789`		`- state, genDoc, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider)`
	`795`	`+ state, genDoc, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, genDocProvider, "")`
`790`	`796`	`if err != nil {`
`791`	`797`	`return nil, err`
`792`	`798`	`}`