refactor: cleanup and migrate akash-api to chain-sdk

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

Author: troian

app/app.go

@@ -49,7 +49,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -298,7 +297,7 @@ func orderBeginBlockers(_ []string) []string {
 		audittypes.ModuleName,
 		genutiltypes.ModuleName,
 		vestingtypes.ModuleName,
-		crisistypes.ModuleName,
+		//crisistypes.ModuleName,
 		authtypes.ModuleName,
 		authz.ModuleName,
 		taketypes.ModuleName,
@@ -308,7 +307,7 @@ func orderBeginBlockers(_ []string) []string {
 		slashingtypes.ModuleName,
 		evidencetypes.ModuleName,
 		stakingtypes.ModuleName,
-		astaking.ModuleName,
+		//astaking.ModuleName,
 		transfertypes.ModuleName,
 		ibchost.ModuleName,
 		feegrant.ModuleName,
@@ -318,7 +317,7 @@ func orderBeginBlockers(_ []string) []string {
 // OrderEndBlockers returns EndBlockers (crisis, govtypes, staking) with no relative order.
 func OrderEndBlockers(_ []string) []string {
 	return []string{
-		crisistypes.ModuleName,
+		//crisistypes.ModuleName,
 		govtypes.ModuleName,
 		stakingtypes.ModuleName,
 		astaking.ModuleName,

app/config.go

@@ -9,6 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
 	authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
 	"github.com/cosmos/cosmos-sdk/x/bank"
+	"github.com/cosmos/cosmos-sdk/x/consensus"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -56,6 +57,7 @@ var mbasics = module.NewBasicManager(
 		),
 		// chain parameters
 		params.AppModuleBasic{},
+		consensus.AppModuleBasic{},
 		crisis.AppModuleBasic{},
 		slashing.AppModuleBasic{},
 		ibclightclient.AppModuleBasic{},

app/modules.go

@@ -10,6 +10,7 @@ import (
 	authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	"github.com/cosmos/cosmos-sdk/x/consensus"
 	"github.com/cosmos/ibc-go/modules/capability"
 	"pkg.akt.dev/go/sdkutil"
 
@@ -144,11 +145,10 @@ func appModules(
 		params.NewAppModule(
 			app.Keepers.Cosmos.Params,
 		),
-		//crisis.NewAppModule(
-		//	app.Keepers.Cosmos.Crisis,
-		//	skipGenesisInvariants,
-		//	app.GetSubspace(crisistypes.ModuleName),
-		//),
+		consensus.NewAppModule(
+			cdc,
+			*app.Keepers.Cosmos.ConsensusParams,
+		),
 		// akash modules
 		take.NewAppModule(
 			app.cdc,
@@ -192,10 +192,6 @@ func appModules(
 			app.cdc,
 			app.Keepers.Akash.Cert,
 		),
-		//auction.NewAppModule(
-		//	app.cdc,
-		//	*app.Keepers.External.Auction,
-		//),
 	}
 }
 
@@ -283,6 +279,10 @@ func appSimModules(
 		params.NewAppModule(
 			app.Keepers.Cosmos.Params,
 		),
+		//consensus.NewAppModule(
+		//	app.cdc,
+		//	*app.Keepers.Cosmos.ConsensusParams,
+		//),
 		evidence.NewAppModule(
 			*app.Keepers.Cosmos.Evidence,
 		),
@@ -292,11 +292,6 @@ func appSimModules(
 		transfer.NewAppModule(
 			app.Keepers.Cosmos.Transfer,
 		),
-		// auction.NewAppModule(
-		// 	app.cdc,
-		// 	*app.Keepers.External.Auction,
-		// ),
-
 		// akash sim modules
 		take.NewAppModule(
 			app.cdc,

app/sim_test.go

@@ -15,7 +15,6 @@ import (
 	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
@@ -326,12 +325,6 @@ func TestAppImportExport(t *testing.T) {
 			appB,
 			[][]byte{},
 		},
-		{
-			crisistypes.StoreKey,
-			appA,
-			appB,
-			[][]byte{},
-		},
 		{
 			atypes.StoreKey,
 			appA,
@@ -469,8 +462,7 @@ func TestAppStateDeterminism(t *testing.T) {
 	}
 
 	encodingConfig := sdkutil.MakeEncodingConfig()
-
-	`akash.ModuleBasics().RegisterInterfaces(encodingConfig.InterfaceRegistry)`
+	akash.ModuleBasics().RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
 	config := sim.NewConfigFromFlags()
 	config.InitialBlockHeight = 1

app/types/app.go

@@ -58,13 +58,14 @@ import (
 	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
-	etypes "pkg.akt.dev/go/node/escrow/v1"
 
 	atypes "pkg.akt.dev/go/node/audit/v1"
 	ctypes "pkg.akt.dev/go/node/cert/v1"
 	dtypes "pkg.akt.dev/go/node/deployment/v1"
+	dv1beta "pkg.akt.dev/go/node/deployment/v1beta3"
+	etypes "pkg.akt.dev/go/node/escrow/v1"
 	agovtypes "pkg.akt.dev/go/node/gov/v1beta3"
-	mtypes "pkg.akt.dev/go/node/market/v1beta5"
+	mtypes "pkg.akt.dev/go/node/market/v1beta4"
 	ptypes "pkg.akt.dev/go/node/provider/v1beta4"
 	astakingtypes "pkg.akt.dev/go/node/staking/v1beta3"
 	ttypes "pkg.akt.dev/go/node/take/v1"
@@ -426,21 +427,6 @@ func (app *App) InitNormalKeepers(
 
 	app.Keepers.Cosmos.IBC.SetRouter(ibcRouter)
 
-	// initialize the auction keeper
-	//{
-	//
-	//	auctionKeeper := auctionkeeper.NewKeeper(
-	//		cdc,
-	//		app.keys[auctiontypes.StoreKey],
-	//		app.Keepers.Cosmos.Acct,
-	//		app.Keepers.Cosmos.Bank,
-	//		app.Keepers.Cosmos.Distr,
-	//		app.Keepers.Cosmos.Staking,
-	//		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	//	)
-	//	app.Keepers.External.Auction = &auctionKeeper
-	//}
-
 	app.Keepers.Akash.Take = tkeeper.NewKeeper(
 		cdc,
 		app.keys[ttypes.StoreKey],
@@ -531,8 +517,8 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(icahosttypes.SubModuleName)
 
 	// akash params subspaces
-	paramsKeeper.Subspace(dtypes.ModuleName)
-	paramsKeeper.Subspace(mtypes.ModuleName)
+	paramsKeeper.Subspace(dtypes.ModuleName).WithKeyTable(dv1beta.ParamKeyTable())
+	paramsKeeper.Subspace(mtypes.ModuleName).WithKeyTable(mtypes.ParamKeyTable())
 	paramsKeeper.Subspace(astakingtypes.ModuleName).WithKeyTable(astakingtypes.ParamKeyTable()) // nolint: staticcheck // SA1019
 	paramsKeeper.Subspace(agovtypes.ModuleName).WithKeyTable(agovtypes.ParamKeyTable())         // nolint: staticcheck // SA1019
 	paramsKeeper.Subspace(ttypes.ModuleName).WithKeyTable(ttypes.ParamKeyTable())               // nolint: staticcheck // SA1019

cmd/akash/cmd/genesis.go

@@ -19,7 +19,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -156,15 +155,15 @@ func PrepareGenesis(clientCtx client.Context, appState map[string]json.RawMessag
 	appState[govtypes.ModuleName] = govGenStateBz
 
 	// crisis module genesis
-	crisisGenState := crisistypes.DefaultGenesisState()
-	crisisGenState.ConstantFee = genesisParams.CrisisConstantFee
-	// TODO Set initial community pool
-	// distributionGenState.FeePool.CommunityPool = sdk.NewDecCoins()
-	crisisGenStateBz, err := cdc.MarshalJSON(crisisGenState)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to marshal crisis genesis state: %w", err)
-	}
-	appState[crisistypes.ModuleName] = crisisGenStateBz
+	//crisisGenState := crisistypes.DefaultGenesisState()
+	//crisisGenState.ConstantFee = genesisParams.CrisisConstantFee
+	//// TODO Set initial community pool
+	//// distributionGenState.FeePool.CommunityPool = sdk.NewDecCoins()
+	//crisisGenStateBz, err := cdc.MarshalJSON(crisisGenState)
+	//if err != nil {
+	//	return nil, nil, fmt.Errorf("failed to marshal crisis genesis state: %w", err)
+	//}
+	//appState[crisistypes.ModuleName] = crisisGenStateBz
 
 	// slashing module genesis
 	slashingGenState := slashingtypes.DefaultGenesisState()

cmd/akash/cmd/root.go

@@ -4,23 +4,24 @@ import (
 	"context"
 	"os"
 
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 	"pkg.akt.dev/go/cli"
 
 	cmtcfg "github.com/cometbft/cometbft/config"
 	cmtcli "github.com/cometbft/cometbft/libs/cli"
 
-	"github.com/cosmos/cosmos-sdk/client/pruning"
-	"github.com/cosmos/cosmos-sdk/client/snapshot"
-
+	_ "github.com/coinbase/rosetta-sdk-go/types"
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/debug"
 	"github.com/cosmos/cosmos-sdk/client/keys"
+	"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"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
+	rosettaCmd "github.com/cosmos/rosetta/cmd"
 
 	cflags "pkg.akt.dev/go/cli/flags"
 	"pkg.akt.dev/go/sdkutil"
@@ -131,7 +132,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig sdkutil.EncodingConfig)
 		genesisCommand(encodingConfig),
 		cmtcli.NewCompletionCmd(rootCmd, true),
 		debugCmd,
-		//rosettaCmd.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Codec),
+		rosettaCmd.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Codec),
 		pruning.Cmd(ac.newApp, home),
 		snapshot.Cmd(ac.newApp),
 		testnetCmd(app.ModuleBasics(), banktypes.GenesisBalancesIterator{}),

cmd/akash/cmd/testnetify/testnetify.go

@@ -2,6 +2,7 @@ package testnetify
 
 import (
 	"bufio"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -26,6 +27,7 @@ import (
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	"github.com/spf13/cobra"
+	"golang.org/x/sync/errgroup"
 
 	dbm "github.com/cosmos/cosmos-db"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -165,6 +167,15 @@ you want to test the upgrade handler itself.
 				return err
 			}
 
+			ctx, cancelFn := context.WithCancel(cmd.Context())
+
+			getCtx := func(svrCtx *server.Context, block bool) (*errgroup.Group, context.Context) {
+				g, ctx := errgroup.WithContext(ctx)
+				// listen for quit signals so the calling parent process can gracefully exit
+				server.ListenForQuitSignals(g, block, cancelFn, svrCtx.Logger)
+				return g, ctx
+			}
+
 			defer func() {
 				traceCleanupFn()
 				if localErr := app.Close(); localErr != nil {
@@ -174,11 +185,8 @@ you want to test the upgrade handler itself.
 
 			go func() {
 				defer func() {
-					if proc, err := os.FindProcess(os.Getpid()); err == nil {
-						_ = proc.Signal(os.Interrupt)
-					}
+					cancelFn()
 				}()
-				ctx := cmd.Context()
 
 				cctx, err := client.GetClientQueryContext(cmd)
 				if err != nil {
@@ -225,7 +233,9 @@ you want to test the upgrade handler itself.
 				}
 			}()
 
-			err = sdksrv.StartInProcess(sctx, srvCfg, cctx, app, metrics, sdksrv.StartCmdOptions{})
+			err = sdksrv.StartInProcess(sctx, srvCfg, cctx, app, metrics, sdksrv.StartCmdOptions{
+				GetCtx: getCtx,
+			})
 			if err != nil && !strings.Contains(err.Error(), "130") {
 				sctx.Logger.Error("testnetify finished with error", "err", err.Error())
 				return err