Merge pull request #3 from AllInBetsCom/remove-gasless

Remove custom gasless module

app/ante.go

@@ -12,17 +12,19 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/dymensionxyz/rollapp-wasm/x/gasless"
-	gaslesskeeper "github.com/dymensionxyz/rollapp-wasm/x/gasless/keeper"
+	// TODO: revisit
+	// "github.com/dymensionxyz/rollapp-wasm/x/gasless"
+	// gaslesskeeper "github.com/dymensionxyz/rollapp-wasm/x/gasless/keeper"
 )
 
 // HandlerOptions are the options required for constructing a default SDK AnteHandler.
 type HandlerOptions struct {
 	ante.HandlerOptions
 
 	IBCKeeper         *ibckeeper.Keeper
-	GaslessKeeper     gaslesskeeper.Keeper
-	BankKeeper        gasless.BankKeeper
+	// TODO: revisit
+	// GaslessKeeper     gaslesskeeper.Keeper
+	// BankKeeper        gasless.BankKeeper
 	WasmConfig        *wasmtypes.WasmConfig
 	TxCounterStoreKey storetypes.StoreKey
 }
@@ -44,7 +46,8 @@ func GetAnteDecorators(options HandlerOptions) []sdk.AnteDecorator {
 
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
-		gasless.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker, options.GaslessKeeper),
+		// TODO: revisit
+		// gasless.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker, options.GaslessKeeper),
 		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
 		ante.NewSetPubKeyDecorator(options.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),

app/app.go

@@ -131,10 +131,11 @@ import (
 	cronkeeper "github.com/dymensionxyz/rollapp-wasm/x/cron/keeper"
 	crontypes "github.com/dymensionxyz/rollapp-wasm/x/cron/types"
 
-	"github.com/dymensionxyz/rollapp-wasm/x/gasless"
-	gaslessclient "github.com/dymensionxyz/rollapp-wasm/x/gasless/client"
-	gaslesskeeper "github.com/dymensionxyz/rollapp-wasm/x/gasless/keeper"
-	gaslesstypes "github.com/dymensionxyz/rollapp-wasm/x/gasless/types"
+	// TODO: revisit
+	// "github.com/dymensionxyz/rollapp-wasm/x/gasless"
+	// gaslessclient "github.com/dymensionxyz/rollapp-wasm/x/gasless/client"
+	// gaslesskeeper "github.com/dymensionxyz/rollapp-wasm/x/gasless/keeper"
+	// gaslesstypes "github.com/dymensionxyz/rollapp-wasm/x/gasless/types"
 )
 
 const (
@@ -155,7 +156,8 @@ var (
 		wasmtypes.StoreKey,
 		denommetadatamoduletypes.StoreKey,
 		crontypes.StoreKey,
-		gaslesstypes.StoreKey,
+		// TODO: revisit
+		// gaslesstypes.StoreKey,
 	}
 )
 
@@ -169,7 +171,8 @@ func getGovProposalHandlers() []govclient.ProposalHandler {
 		ibcclientclient.UpdateClientProposalHandler,
 		ibcclientclient.UpgradeProposalHandler,
 	)
-	govProposalHandlers = append(govProposalHandlers, gaslessclient.GaslessProposalHandler...)
+	// TODO: revisit
+	// govProposalHandlers = append(govProposalHandlers, gaslessclient.GaslessProposalHandler...)
 
 	return govProposalHandlers
 }
@@ -203,7 +206,8 @@ var (
 		wasm.AppModuleBasic{},
 		denommetadata.AppModuleBasic{},
 		cron.AppModuleBasic{},
-		gasless.AppModuleBasic{},
+		// TODO: revisit
+		// gasless.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -220,7 +224,8 @@ var (
 		hubgentypes.ModuleName:              {authtypes.Burner},
 		denommetadatamoduletypes.ModuleName: nil,
 		crontypes.ModuleName:                nil,
-		gaslesstypes.ModuleName:             nil,
+		// TODO: revisit
+		// gaslesstypes.ModuleName:             nil,
 	}
 )
 
@@ -274,7 +279,8 @@ type App struct {
 	WasmKeeper       wasmkeeper.Keeper
 	FeeGrantKeeper   feegrantkeeper.Keeper
 	CronKeeper       cronkeeper.Keeper
-	GaslessKeeper    gaslesskeeper.Keeper
+	// TODO: revisit
+	// GaslessKeeper    gaslesskeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
@@ -451,8 +457,9 @@ func NewRollapp(
 		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
 		AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
-		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
-		AddRoute(gaslesstypes.RouterKey, gasless.NewGaslessProposalHandler(app.GaslessKeeper))
+		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper))
+		// TODO: revisit
+		// AddRoute(gaslesstypes.RouterKey, gasless.NewGaslessProposalHandler(app.GaslessKeeper))
 
 	govConfig := govtypes.DefaultConfig()
 	/*
@@ -512,15 +519,16 @@ func NewRollapp(
 		&app.WasmKeeper,
 	)
 
-	app.GaslessKeeper = gaslesskeeper.NewKeeper(
-		appCodec,
-		app.keys[gaslesstypes.StoreKey],
-		app.GetSubspace(gaslesstypes.ModuleName),
-		app.interfaceRegistry,
-		app.AccountKeeper,
-		app.BankKeeper,
-		&app.WasmKeeper,
-	)
+	// TODO: revisit
+	// app.GaslessKeeper = gaslesskeeper.NewKeeper(
+	// 	appCodec,
+	// 	app.keys[gaslesstypes.StoreKey],
+	// 	app.GetSubspace(gaslesstypes.ModuleName),
+	// 	app.interfaceRegistry,
+	// 	app.AccountKeeper,
+	// 	app.BankKeeper,
+	// 	&app.WasmKeeper,
+	// )
 
 	wasmDir := filepath.Join(homePath, "wasm")
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
@@ -594,7 +602,8 @@ func NewRollapp(
 		hubgenesis.NewAppModule(appCodec, app.HubGenesisKeeper, app.AccountKeeper),
 		denommetadata.NewAppModule(app.DenomMetadataKeeper, app.BankKeeper),
 		cron.NewAppModule(appCodec, app.CronKeeper, app.AccountKeeper, app.BankKeeper, app.WasmKeeper),
-		gasless.NewAppModule(appCodec, app.GaslessKeeper, app.AccountKeeper, app.BankKeeper),
+		// TODO: revisit
+		// gasless.NewAppModule(appCodec, app.GaslessKeeper, app.AccountKeeper, app.BankKeeper),
 	}
 
 	app.mm = module.NewManager(modules...)
@@ -626,7 +635,8 @@ func NewRollapp(
 		denommetadatamoduletypes.ModuleName,
 		wasm.ModuleName,
 		crontypes.ModuleName,
-		gaslesstypes.ModuleName,
+		// TODO: revisit
+		// gaslesstypes.ModuleName,
 	}
 	app.mm.SetOrderBeginBlockers(beginBlockersList...)
 
@@ -652,7 +662,8 @@ func NewRollapp(
 		denommetadatamoduletypes.ModuleName,
 		wasm.ModuleName,
 		crontypes.ModuleName,
-		gaslesstypes.ModuleName,
+		// TODO: revisit
+		// gaslesstypes.ModuleName,
 	}
 	app.mm.SetOrderEndBlockers(endBlockersList...)
 
@@ -684,7 +695,8 @@ func NewRollapp(
 		denommetadatamoduletypes.ModuleName,
 		wasm.ModuleName,
 		crontypes.ModuleName,
-		gaslesstypes.ModuleName,
+		// TODO: revisit
+		// gaslesstypes.ModuleName,
 	}
 	app.mm.SetOrderInitGenesis(initGenesisList...)
 
@@ -774,8 +786,9 @@ func (app *App) setAnteHandler(txConfig client.TxConfig, wasmConfig wasmtypes.Wa
 				SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
 			},
 			IBCKeeper:         app.IBCKeeper,
-			GaslessKeeper:     app.GaslessKeeper,
-			BankKeeper:        app.BankKeeper,
+			// TODO: revisit
+			// GaslessKeeper:     app.GaslessKeeper,
+			// BankKeeper:        app.BankKeeper,
 			WasmConfig:        &wasmConfig,
 			TxCounterStoreKey: app.keys[wasmtypes.StoreKey],
 		},
@@ -1020,6 +1033,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 
 	paramsKeeper.Subspace(wasmtypes.ModuleName)
 	paramsKeeper.Subspace(crontypes.ModuleName)
-	paramsKeeper.Subspace(gaslesstypes.ModuleName)
+	// TODO: revisit
+	// paramsKeeper.Subspace(gaslesstypes.ModuleName)
 	return paramsKeeper
 }