[CORE-794] enable authz module to allow granting privileges

protocol/app/app.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"encoding/json"
-	custommodule "github.com/dydxprotocol/v4-chain/protocol/app/module"
 	"io"
 	"math/big"
 	"net/http"
@@ -13,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	custommodule "github.com/dydxprotocol/v4-chain/protocol/app/module"
+
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	"cosmossdk.io/log"
@@ -53,6 +54,9 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	authz "github.com/cosmos/cosmos-sdk/x/authz"
+	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
+	authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -92,6 +96,7 @@ import (
 	"google.golang.org/grpc"
 
 	// App
+	appconstants "github.com/dydxprotocol/v4-chain/protocol/app/constants"
 	"github.com/dydxprotocol/v4-chain/protocol/app/flags"
 	"github.com/dydxprotocol/v4-chain/protocol/app/middleware"
 	"github.com/dydxprotocol/v4-chain/protocol/app/prepare"
@@ -207,7 +212,7 @@ func init() {
 		panic(err)
 	}
 
-	DefaultNodeHome = filepath.Join(userHomeDir, "."+AppName)
+	DefaultNodeHome = filepath.Join(userHomeDir, "."+appconstants.AppName)
 
 	// Set DefaultPowerReduction to 1e18 to avoid overflow whe calculating
 	// consensus power.
@@ -234,6 +239,7 @@ type App struct {
 
 	// keepers
 	AccountKeeper    authkeeper.AccountKeeper
+	AuthzKeeper      authzkeeper.Keeper
 	BankKeeper       bankkeeper.Keeper
 	CapabilityKeeper *capabilitykeeper.Keeper
 	StakingKeeper    *stakingkeeper.Keeper
@@ -340,17 +346,27 @@ func New(
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 	txConfig := encodingConfig.TxConfig
 
-	bApp := baseapp.NewBaseApp(AppName, logger, db, txConfig.TxDecoder(), baseAppOptions...)
+	bApp := baseapp.NewBaseApp(appconstants.AppName, logger, db, txConfig.TxDecoder(), baseAppOptions...)
 	bApp.SetCommitMultiStoreTracer(traceStore)
 	bApp.SetVersion(version.Version)
 	bApp.SetInterfaceRegistry(interfaceRegistry)
 	bApp.SetTxEncoder(txConfig.TxEncoder())
 
 	keys := storetypes.NewKVStoreKeys(
-		authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, crisistypes.StoreKey,
-		distrtypes.StoreKey, slashingtypes.StoreKey,
-		govtypes.StoreKey, paramstypes.StoreKey, consensusparamtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
-		ibcexported.StoreKey, ibctransfertypes.StoreKey,
+		authtypes.StoreKey,
+		authzkeeper.StoreKey,
+		banktypes.StoreKey,
+		stakingtypes.StoreKey,
+		crisistypes.StoreKey,
+		distrtypes.StoreKey,
+		slashingtypes.StoreKey,
+		govtypes.StoreKey,
+		paramstypes.StoreKey,
+		consensusparamtypes.StoreKey,
+		upgradetypes.StoreKey,
+		feegrant.StoreKey,
+		ibcexported.StoreKey,
+		ibctransfertypes.StoreKey,
 		ratelimitmoduletypes.StoreKey,
 		icacontrollertypes.StoreKey,
 		icahosttypes.StoreKey,
@@ -430,6 +446,14 @@ func New(
 		sdk.GetConfig().GetBech32AccountAddrPrefix(),
 		lib.GovModuleAddress.String(),
 	)
+
+	app.AuthzKeeper = authzkeeper.NewKeeper(
+		runtime.NewKVStoreService(keys[authzkeeper.StoreKey]),
+		appCodec,
+		app.MsgServiceRouter(),
+		app.AccountKeeper,
+	)
+
 	app.BankKeeper = bankkeeper.NewBaseKeeper(
 		appCodec,
 		runtime.NewKVStoreService(keys[banktypes.StoreKey]),
@@ -990,6 +1014,7 @@ func New(
 		),
 		auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.getSubspace(authtypes.ModuleName)),
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.getSubspace(banktypes.ModuleName)),
+		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
 		crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.getSubspace(crisistypes.ModuleName)),
@@ -1051,6 +1076,7 @@ func New(
 	// NOTE: staking module is required if HistoricalEntries param > 0
 	app.ModuleManager.SetOrderBeginBlockers(
 		blocktimemoduletypes.ModuleName, // Must be first
+		authz.ModuleName,                // Delete expired grants.
 		epochsmoduletypes.ModuleName,
 		capabilitytypes.ModuleName,
 		distrtypes.ModuleName,
@@ -1119,6 +1145,7 @@ func New(
 		rewardsmoduletypes.ModuleName,
 		epochsmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
+		authz.ModuleName,                // No-op.
 		blocktimemoduletypes.ModuleName, // Must be last
 	)
 
@@ -1160,6 +1187,7 @@ func New(
 		rewardsmoduletypes.ModuleName,
 		sendingmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
+		authz.ModuleName,
 	)
 
 	// NOTE: by default, set migration order here to be the same as init genesis order,
@@ -1197,6 +1225,7 @@ func New(
 		rewardsmoduletypes.ModuleName,
 		sendingmoduletypes.ModuleName,
 		delaymsgmoduletypes.ModuleName,
+		authz.ModuleName,
 
 		// Auth must be migrated after staking.
 		authtypes.ModuleName,

protocol/app/app_test.go

@@ -12,6 +12,7 @@ import (
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
+	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"
@@ -198,6 +199,7 @@ func TestModuleBasics(t *testing.T) {
 		upgrade.AppModuleBasic{},
 		transfer.AppModuleBasic{},
 		consensus.AppModuleBasic{},
+		authzmodule.AppModuleBasic{},
 
 		// Custom modules
 		pricesmodule.AppModuleBasic{},

protocol/app/basic_manager/basic_manager.go

@@ -6,6 +6,7 @@ import (
 	"cosmossdk.io/x/upgrade"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
+	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"
@@ -69,6 +70,7 @@ var (
 		evidence.AppModuleBasic{},
 		transfer.AppModuleBasic{},
 		consensus.AppModuleBasic{},
+		authzmodule.AppModuleBasic{},
 
 		// Custom modules
 		pricesmodule.AppModuleBasic{},

protocol/app/constants.go → protocol/app/constants/constants.go

@@ -1,4 +1,4 @@
-package app
+package constants
 
 const (
 	AppName       = "dydxprotocol"

protocol/app/datadog.go

@@ -10,6 +10,7 @@ import (
 
 	"cosmossdk.io/log"
 	"github.com/cosmos/cosmos-sdk/version"
+	"github.com/dydxprotocol/v4-chain/protocol/app/constants"
 	"github.com/dydxprotocol/v4-chain/protocol/app/flags"
 	errorspkg "github.com/pkg/errors"
 	"github.com/rs/zerolog"
@@ -28,9 +29,9 @@ func configureDatadogProfilerOptions(
 	err error,
 ) {
 	// Use a default application name unless overridden by the DD_SERVICE environment variable.
-	ddService = ServiceName
+	ddService = constants.ServiceName
 	if found := os.Getenv("DD_SERVICE"); found != "" {
-		logger.Info(fmt.Sprintf("DD_SERVICE defined, overriding default of '%s'.", ServiceName))
+		logger.Info(fmt.Sprintf("DD_SERVICE defined, overriding default of '%s'.", constants.ServiceName))
 		ddService = found
 	}
 

protocol/app/msgs/all_msgs.go

@@ -14,6 +14,15 @@ var (
 		"/cosmos.auth.v1beta1.ModuleCredential": {},
 		"/cosmos.auth.v1beta1.MsgUpdateParams":  {},
 
+		// authz
+		"/cosmos.authz.v1beta1.GenericAuthorization": {},
+		"/cosmos.authz.v1beta1.MsgExec":              {},
+		"/cosmos.authz.v1beta1.MsgExecResponse":      {},
+		"/cosmos.authz.v1beta1.MsgGrant":             {},
+		"/cosmos.authz.v1beta1.MsgGrantResponse":     {},
+		"/cosmos.authz.v1beta1.MsgRevoke":            {},
+		"/cosmos.authz.v1beta1.MsgRevokeResponse":    {},
+
 		// bank
 		"/cosmos.bank.v1beta1.MsgMultiSend":              {},
 		"/cosmos.bank.v1beta1.MsgMultiSendResponse":      {},

protocol/app/msgs/internal_msgs.go

@@ -36,8 +36,14 @@ var (
 	// InternalMsgSamplesGovAuth are msgs that are used only used internally.
 	// GovAuth means that these messages must originate from the gov module and
 	// signed by gov module account.
-	InternalMsgSamplesGovAuth = map[string]sdk.Msg{
-		// ------- CosmosSDK default modules
+	// InternalMsgSamplesAll are msgs that are used only used internally.
+	InternalMsgSamplesGovAuth = lib.MergeAllMapsMustHaveDistinctKeys(
+		InternalMsgSamplesDefault,
+		InternalMsgSamplesDydxCustom,
+	)
+
+	// CosmosSDK default modules
+	InternalMsgSamplesDefault = map[string]sdk.Msg{
 		// auth
 		"/cosmos.auth.v1beta1.MsgUpdateParams": &auth.MsgUpdateParams{},
 
@@ -81,7 +87,19 @@ var (
 		"/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade":         &upgrade.MsgSoftwareUpgrade{},
 		"/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse": nil,
 
-		// ------- Custom modules
+		// ibc
+		"/ibc.applications.interchain_accounts.host.v1.MsgUpdateParams":         &icahosttypes.MsgUpdateParams{},
+		"/ibc.applications.interchain_accounts.host.v1.MsgUpdateParamsResponse": nil,
+		"/ibc.applications.transfer.v1.MsgUpdateParams":                         &ibctransfer.MsgUpdateParams{},
+		"/ibc.applications.transfer.v1.MsgUpdateParamsResponse":                 nil,
+		"/ibc.core.client.v1.MsgUpdateParams":                                   &ibcclient.MsgUpdateParams{},
+		"/ibc.core.client.v1.MsgUpdateParamsResponse":                           nil,
+		"/ibc.core.connection.v1.MsgUpdateParams":                               &ibcconn.MsgUpdateParams{},
+		"/ibc.core.connection.v1.MsgUpdateParamsResponse":                       nil,
+	}
+
+	// Custom modules
+	InternalMsgSamplesDydxCustom = map[string]sdk.Msg{
 		// blocktime
 		"/dydxprotocol.blocktime.MsgUpdateDowntimeParams":         &blocktime.MsgUpdateDowntimeParams{},
 		"/dydxprotocol.blocktime.MsgUpdateDowntimeParamsResponse": nil,
@@ -149,15 +167,5 @@ var (
 		"/dydxprotocol.vest.MsgSetVestEntryResponse":    nil,
 		"/dydxprotocol.vest.MsgDeleteVestEntry":         &vest.MsgDeleteVestEntry{},
 		"/dydxprotocol.vest.MsgDeleteVestEntryResponse": nil,
-
-		// ibc
-		"/ibc.applications.interchain_accounts.host.v1.MsgUpdateParams":         &icahosttypes.MsgUpdateParams{},
-		"/ibc.applications.interchain_accounts.host.v1.MsgUpdateParamsResponse": nil,
-		"/ibc.applications.transfer.v1.MsgUpdateParams":                         &ibctransfer.MsgUpdateParams{},
-		"/ibc.applications.transfer.v1.MsgUpdateParamsResponse":                 nil,
-		"/ibc.core.client.v1.MsgUpdateParams":                                   &ibcclient.MsgUpdateParams{},
-		"/ibc.core.client.v1.MsgUpdateParamsResponse":                           nil,
-		"/ibc.core.connection.v1.MsgUpdateParams":                               &ibcconn.MsgUpdateParams{},
-		"/ibc.core.connection.v1.MsgUpdateParamsResponse":                       nil,
 	}
 )

protocol/app/msgs/nested_msgs.go

@@ -2,12 +2,17 @@ package msgs
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/authz"
 	gov "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 )
 
 var (
 	// NestedMsgSamples are msgs that have can include other arbitrary messages inside.
 	NestedMsgSamples = map[string]sdk.Msg{
+		// authz
+		"/cosmos.authz.v1beta1.MsgExec":         &authz.MsgExec{},
+		"/cosmos.authz.v1beta1.MsgExecResponse": nil,
+
 		// gov
 		"/cosmos.gov.v1.MsgSubmitProposal":         &gov.MsgSubmitProposal{},
 		"/cosmos.gov.v1.MsgSubmitProposalResponse": nil,

protocol/app/msgs/nested_msgs_test.go

@@ -11,6 +11,10 @@ import (
 
 func TestNestedMsgs_Key(t *testing.T) {
 	expectedMsgs := []string{
+		// authz
+		"/cosmos.authz.v1beta1.MsgExec",
+		"/cosmos.authz.v1beta1.MsgExecResponse",
+
 		// gov
 		"/cosmos.gov.v1.MsgSubmitProposal",
 		"/cosmos.gov.v1.MsgSubmitProposalResponse",

protocol/app/msgs/normal_msgs.go

@@ -4,6 +4,7 @@ import (
 	evidence "cosmossdk.io/x/evidence/types"
 	feegrant "cosmossdk.io/x/feegrant"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/authz"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/types"
 	crisis "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution/types"
@@ -15,18 +16,29 @@ import (
 	ibcclient "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck
 	ibcconn "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
 	ibccore "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
+	"github.com/dydxprotocol/v4-chain/protocol/lib"
 	clob "github.com/dydxprotocol/v4-chain/protocol/x/clob/types"
 	sending "github.com/dydxprotocol/v4-chain/protocol/x/sending/types"
 )
 
 var (
 	// NormalMsgs are messages that can be submitted by external users.
-	NormalMsgs = map[string]sdk.Msg{
+	NormalMsgs = lib.MergeAllMapsMustHaveDistinctKeys(NormalMsgsDefault, NormalMsgsDydxCustom)
+
+	// Default modules
+	NormalMsgsDefault = map[string]sdk.Msg{
 		// auth
 		"/cosmos.auth.v1beta1.BaseAccount":      nil,
 		"/cosmos.auth.v1beta1.ModuleAccount":    nil,
 		"/cosmos.auth.v1beta1.ModuleCredential": nil,
 
+		// authz
+		"/cosmos.authz.v1beta1.GenericAuthorization": nil,
+		"/cosmos.authz.v1beta1.MsgGrant":             &authz.MsgGrant{},
+		"/cosmos.authz.v1beta1.MsgGrantResponse":     nil,
+		"/cosmos.authz.v1beta1.MsgRevoke":            &authz.MsgRevoke{},
+		"/cosmos.authz.v1beta1.MsgRevokeResponse":    nil,
+
 		// bank
 		"/cosmos.bank.v1beta1.MsgMultiSend":         &bank.MsgMultiSend{},
 		"/cosmos.bank.v1beta1.MsgMultiSendResponse": nil,
@@ -124,24 +136,6 @@ var (
 		"/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal": nil,
 		"/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal":       nil,
 
-		// clob
-		"/dydxprotocol.clob.MsgCancelOrder":         &clob.MsgCancelOrder{},
-		"/dydxprotocol.clob.MsgCancelOrderResponse": nil,
-		"/dydxprotocol.clob.MsgPlaceOrder":          &clob.MsgPlaceOrder{},
-		"/dydxprotocol.clob.MsgPlaceOrderResponse":  nil,
-
-		// perpetuals
-
-		// prices
-
-		// sending
-		"/dydxprotocol.sending.MsgCreateTransfer":                 &sending.MsgCreateTransfer{},
-		"/dydxprotocol.sending.MsgCreateTransferResponse":         nil,
-		"/dydxprotocol.sending.MsgDepositToSubaccount":            &sending.MsgDepositToSubaccount{},
-		"/dydxprotocol.sending.MsgDepositToSubaccountResponse":    nil,
-		"/dydxprotocol.sending.MsgWithdrawFromSubaccount":         &sending.MsgWithdrawFromSubaccount{},
-		"/dydxprotocol.sending.MsgWithdrawFromSubaccountResponse": nil,
-
 		// ibc.applications
 		"/ibc.applications.transfer.v1.MsgTransfer":           &ibctransfer.MsgTransfer{},
 		"/ibc.applications.transfer.v1.MsgTransferResponse":   nil,
@@ -219,4 +213,25 @@ var (
 		// ica
 		"/ibc.applications.interchain_accounts.v1.InterchainAccount": nil,
 	}
+
+	// Custom modules
+	NormalMsgsDydxCustom = map[string]sdk.Msg{
+		// clob
+		"/dydxprotocol.clob.MsgCancelOrder":         &clob.MsgCancelOrder{},
+		"/dydxprotocol.clob.MsgCancelOrderResponse": nil,
+		"/dydxprotocol.clob.MsgPlaceOrder":          &clob.MsgPlaceOrder{},
+		"/dydxprotocol.clob.MsgPlaceOrderResponse":  nil,
+
+		// perpetuals
+
+		// prices
+
+		// sending
+		"/dydxprotocol.sending.MsgCreateTransfer":                 &sending.MsgCreateTransfer{},
+		"/dydxprotocol.sending.MsgCreateTransferResponse":         nil,
+		"/dydxprotocol.sending.MsgDepositToSubaccount":            &sending.MsgDepositToSubaccount{},
+		"/dydxprotocol.sending.MsgDepositToSubaccountResponse":    nil,
+		"/dydxprotocol.sending.MsgWithdrawFromSubaccount":         &sending.MsgWithdrawFromSubaccount{},
+		"/dydxprotocol.sending.MsgWithdrawFromSubaccountResponse": nil,
+	}
 )