fix: use persistentPreRun from chain-sdk

Signed-off-by: Artur Troian <[email protected]>

Author: troian

cmd/akash/cmd/root.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"context"
-	"os"
 
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	"github.com/rs/zerolog"
@@ -18,7 +17,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/pruning"
 	"github.com/cosmos/cosmos-sdk/client/snapshot"
 	sdkserver "github.com/cosmos/cosmos-sdk/server"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	rosettaCmd "github.com/cosmos/rosetta/cmd"
 
@@ -27,7 +25,6 @@ import (
 
 	"pkg.akt.dev/node/app"
 	"pkg.akt.dev/node/cmd/akash/cmd/testnetify"
-	utilcli "pkg.akt.dev/node/util/cli"
 )
 
 // NewRootCmd creates a new root command for akash. It is called once in the
@@ -41,39 +38,14 @@ func NewRootCmd() (*cobra.Command, sdkutil.EncodingConfig) {
 		Short:             "Akash Blockchain Application",
 		Long:              "Akash CLI Utility.\n\nAkash is a peer-to-peer marketplace for computing resources and \na deployment platform for heavily distributed applications. \nFind out more at https://akash.network",
 		SilenceUsage:      true,
-		PersistentPreRunE: GetPersistentPreRunE(encodingConfig, []string{"AKASH"}),
+		PersistentPreRunE: cli.GetPersistentPreRunE(encodingConfig, []string{"AKASH"}, cli.DefaultHome),
 	}
 
 	initRootCmd(rootCmd, encodingConfig)
 
 	return rootCmd, encodingConfig
 }
 
-// GetPersistentPreRunE persistent prerun hook for root command
-func GetPersistentPreRunE(encodingConfig sdkutil.EncodingConfig, envPrefixes []string) func(*cobra.Command, []string) error {
-	return func(cmd *cobra.Command, _ []string) error {
-		if err := utilcli.InterceptConfigsPreRunHandler(cmd, envPrefixes, false, "", nil); err != nil {
-			return err
-		}
-
-		initClientCtx := sdkclient.Context{}.
-			WithCodec(encodingConfig.Codec).
-			WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
-			WithTxConfig(encodingConfig.TxConfig).
-			WithLegacyAmino(encodingConfig.Amino).
-			WithInput(os.Stdin).
-			WithAccountRetriever(authtypes.AccountRetriever{}).
-			WithBroadcastMode(cflags.BroadcastBlock).
-			WithHomeDir(app.DefaultHome)
-
-		if err := sdkclient.SetCmdClientContextHandler(initClientCtx, cmd); err != nil {
-			return err
-		}
-
-		return nil
-	}
-}
-
 // Execute executes the root command.
 func Execute(rootCmd *cobra.Command, envPrefix string) error {
 	// Create and set a client.Context on the command's Context. During the pre-run

go.mod

@@ -48,9 +48,9 @@ require (
 	google.golang.org/grpc v1.74.2
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.2
-	pkg.akt.dev/go v0.0.3-rc9
-	pkg.akt.dev/go/cli v0.0.3-rc4
-	pkg.akt.dev/go/sdl v0.0.2-rc3
+	pkg.akt.dev/go v0.0.3-rc10
+	pkg.akt.dev/go/cli v0.0.3-rc5
+	pkg.akt.dev/go/sdl v0.0.2-rc4
 )
 
 replace (
@@ -62,7 +62,7 @@ replace (
 	// use akash fork of cosmos sdk
 	github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.3-akash.4
 
-	github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.1
+	github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.2
 
 	// Use regen gogoproto fork
 	// To be replaced by cosmos/gogoproto in future versions

go.sum

@@ -1283,8 +1283,8 @@ github.com/akash-network/cometbft v0.38.17-akash.2 h1:ZSlROvuSOUd3f6Jld43Wp5cgAm
 github.com/akash-network/cometbft v0.38.17-akash.2/go.mod h1:5l0SkgeLRXi6bBfQuevXjKqML1jjfJJlvI1Ulp02/o4=
 github.com/akash-network/cosmos-sdk v0.53.3-akash.4 h1:MYT0kxrTomP5bF2qS6dRP4dsZrl8xZDLRw6YIDpddCE=
 github.com/akash-network/cosmos-sdk v0.53.3-akash.4/go.mod h1:KuyiP67EkMPTaEQfykEjExnDAI0zDYWLivkCDQ4gTM8=
-github.com/akash-network/gogoproto v1.7.0-akash.1 h1:1jSbG920b6K1yo51Se5s97ekthUw19ZpyPSR0yYR+2M=
-github.com/akash-network/gogoproto v1.7.0-akash.1/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
+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=
 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=
@@ -3276,12 +3276,12 @@ nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
-pkg.akt.dev/go v0.0.3-rc9 h1:/dlZxBOW4A38u5sCZ2EepfJRB724dhrAvhhIPwVc3ak=
-pkg.akt.dev/go v0.0.3-rc9/go.mod h1://FPz5fG2eSg1kPCcdXfLm+bf5U9HToh2w6lWv9H0LM=
-pkg.akt.dev/go/cli v0.0.3-rc4 h1:SCqHDT2CbJ9ksgWZxn5AjC+Ifwf/EyacL2HXVNnX6BQ=
-pkg.akt.dev/go/cli v0.0.3-rc4/go.mod h1:agbRVksu1qbbPAegFaD/Ap9cen/jSbgPkmVrCxExfVo=
-pkg.akt.dev/go/sdl v0.0.2-rc3 h1:KIzSUDsw4DHeADPnm8tDws2hdVOl6NgnMiiQ/9aRlGc=
-pkg.akt.dev/go/sdl v0.0.2-rc3/go.mod h1:2COp2dw0XPCPcYpYIOyNzrBSlsIa+11Dj9r8OxOcGuw=
+pkg.akt.dev/go v0.0.3-rc10 h1:sP3S2/rbA/ADzCDp7KkkkKQ7ZArY6QQLQc7oUCWrxNE=
+pkg.akt.dev/go v0.0.3-rc10/go.mod h1:LE8ZbMg+SWfFhg9PH38zndtvAaGuv/iFfGf5pqzq5l4=
+pkg.akt.dev/go/cli v0.0.3-rc5 h1:0i7i4dtQ/ZIRYew6BvAUpgvdQ0h4N6SoT3iJLho3E1A=
+pkg.akt.dev/go/cli v0.0.3-rc5/go.mod h1:Snp/sQhvyfTRexkaSqzgBEmm59DFdY7g1E4zBBVGlL0=
+pkg.akt.dev/go/sdl v0.0.2-rc4 h1:iubfBjg/Pw562KrkLUocTl5XqSLZl69ZYPzVw/M7W3c=
+pkg.akt.dev/go/sdl v0.0.2-rc4/go.mod h1:14QiKgzx6KKrjPmx5n/LyLG3h1qBiAueIrs3aiZm+z0=
 pkg.akt.dev/specs v0.0.1 h1:OP0zil3Fr4kcCuybFqQ8LWgSlSP2Yn7306meWpu6/S4=
 pkg.akt.dev/specs v0.0.1/go.mod h1:tiFuJAqzn+lkz662lf9qaEdjdrrDr882r3YMDnWkbp4=
 pkg.akt.dev/testdata v0.0.1 h1:yHfqF0Uxf7Rg7WdwSggnyBWMxACtAg5VpBUVFXU+uvM=