feat(v2.11): smart accounts

app/ante/ante.go

@@ -5,6 +5,9 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	feesharekeeper "github.com/terra-money/core/v2/x/feeshare/keeper"
 
+	smartaccountante "github.com/terra-money/core/v2/x/smartaccount/ante"
+	smartaccountkeeper "github.com/terra-money/core/v2/x/smartaccount/keeper"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,19 +17,22 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
+	terrawasmkeeper "github.com/terra-money/core/v2/x/wasm/keeper"
 )
 
 // HandlerOptions extends the SDK's AnteHandler options by requiring the IBC
 // channel keeper.
 type HandlerOptions struct {
 	ante.HandlerOptions
 
-	IBCkeeper         *ibckeeper.Keeper
-	FeeShareKeeper    feesharekeeper.Keeper
-	BankKeeper        bankKeeper.Keeper
-	TxCounterStoreKey storetypes.StoreKey
-	WasmConfig        wasmTypes.WasmConfig
-	TxConfig          client.TxConfig
+	IBCkeeper          *ibckeeper.Keeper
+	FeeShareKeeper     feesharekeeper.Keeper
+	BankKeeper         bankKeeper.Keeper
+	SmartAccountKeeper *smartaccountkeeper.Keeper
+	WasmKeeper         *terrawasmkeeper.Keeper
+	TxCounterStoreKey  storetypes.StoreKey
+	WasmConfig         wasmTypes.WasmConfig
+	TxConfig           client.TxConfig
 }
 
 // NewAnteHandler returns an AnteHandler that checks and increments sequence
@@ -45,6 +51,14 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
 	}
 
+	if options.SmartAccountKeeper == nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "smart account keeper is required for ante builder")
+	}
+
+	if options.WasmKeeper == nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "wasm keeper is required for ante builder")
+	}
+
 	sigGasConsumer := options.SigGasConsumer
 	if sigGasConsumer == nil {
 		sigGasConsumer = ante.DefaultSigVerificationGasConsumer
@@ -60,11 +74,14 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
+		// TODO: remove the following line after the migration to the new signature verification decorator is done
 		// SetPubKeyDecorator must be called before all signature verification decorators
-		ante.NewSetPubKeyDecorator(options.AccountKeeper),
-		ante.NewValidateSigCountDecorator(options.AccountKeeper),
-		ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
-		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		// ante.NewSetPubKeyDecorator(options.AccountKeeper),
+		// ante.NewValidateSigCountDecorator(options.AccountKeeper),
+		// ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
+		// ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		smartaccountante.NewSmartAccountAuthDecorator(*options.SmartAccountKeeper, options.WasmKeeper, options.AccountKeeper, sigGasConsumer, options.SignModeHandler),
+		smartaccountante.NewPreTransactionHookDecorator(*options.SmartAccountKeeper, options.WasmKeeper),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewRedundantRelayDecorator(options.IBCkeeper),
 	}

app/app.go

@@ -258,21 +258,24 @@ func NewTerraApp(
 				SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
 				SigGasConsumer:  cosmosante.DefaultSigVerificationGasConsumer,
 			},
-			BankKeeper:        app.Keepers.BankKeeper,
-			FeeShareKeeper:    app.Keepers.FeeShareKeeper,
-			IBCkeeper:         app.Keepers.IBCKeeper,
-			TxCounterStoreKey: app.keys[wasmtypes.StoreKey],
-			WasmConfig:        wasmConfig,
+			BankKeeper:         app.Keepers.BankKeeper,
+			SmartAccountKeeper: &app.Keepers.SmartAccountKeeper,
+			WasmKeeper:         &app.Keepers.WasmKeeper,
+			FeeShareKeeper:     app.Keepers.FeeShareKeeper,
+			IBCkeeper:          app.Keepers.IBCKeeper,
+			TxCounterStoreKey:  app.keys[wasmtypes.StoreKey],
+			WasmConfig:         wasmConfig,
 		},
 	)
 	if err != nil {
 		panic(err)
 	}
 	postHandler := post.NewPostHandler(
 		post.HandlerOptions{
-			FeeShareKeeper: app.Keepers.FeeShareKeeper,
-			BankKeeper:     app.Keepers.BankKeeper,
-			WasmKeeper:     app.Keepers.WasmKeeper,
+			FeeShareKeeper:     app.Keepers.FeeShareKeeper,
+			BankKeeper:         app.Keepers.BankKeeper,
+			WasmKeeper:         app.Keepers.WasmKeeper,
+			SmartAccountKeeper: &app.Keepers.SmartAccountKeeper,
 		},
 	)
 

app/genesis.go

@@ -18,6 +18,7 @@ import (
 	govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	smartaccounttypes "github.com/terra-money/core/v2/x/smartaccount/types"
 )
 
 // GenesisState - The genesis state of the blockchain is represented here as a map of raw json
@@ -79,6 +80,12 @@ func (genState GenesisState) SetDefaultTerraConfig(cdc codec.JSONCodec) GenesisS
 	}
 	genState[icatypes.ModuleName] = cdc.MustMarshalJSON(&icaGenState)
 
+	var smartaccountGenState smartaccounttypes.GenesisState
+	cdc.MustUnmarshalJSON(genState[smartaccounttypes.ModuleName], &smartaccountGenState)
+	setting := smartaccounttypes.NewSetting("terra1tck9vx8vwu6l83zy76ssdkhnhw8dfcrt80hc6x")
+	smartaccountGenState.Settings = smartaccounttypes.NewSettings(&setting)
+	genState[smartaccounttypes.ModuleName] = cdc.MustMarshalJSON(&smartaccountGenState)
+
 	return genState
 }
 

app/genesis_test.go

@@ -2,6 +2,7 @@ package app_test
 
 import (
 	"encoding/json"
+	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -20,6 +21,7 @@ import (
 	"github.com/terra-money/alliance/x/alliance"
 	"github.com/terra-money/core/v2/app"
 	"github.com/terra-money/core/v2/x/feeshare"
+	"github.com/terra-money/core/v2/x/smartaccount"
 	"github.com/terra-money/core/v2/x/tokenfactory"
 
 	mocktestutils "github.com/cosmos/cosmos-sdk/testutil/mock"
@@ -224,6 +226,7 @@ func (s *AppGenesisTestSuite) TestMigration() {
 			"upgrade":                upgrade.AppModule{}.ConsensusVersion(),
 			"vesting":                vesting.AppModule{}.ConsensusVersion(),
 			"wasm":                   wasm.AppModule{}.ConsensusVersion(),
+			"smartaccount":           smartaccount.AppModule{}.ConsensusVersion(),
 		},
 	)
 	s.Require().NoError(err)
@@ -257,6 +260,7 @@ func (s *AppGenesisTestSuite) TestMigration() {
 		"upgrade":                2,
 		"vesting":                1,
 		"wasm":                   4,
+		"smartaccount":           1,
 	})
 }
 
@@ -685,6 +689,41 @@ func (s *AppGenesisTestSuite) TestGenesis() {
 			"redelegations": [],
 			"exported": false
 		},
+		"smartaccount": {
+			"params": {
+			},
+			"settings": [
+				{
+					"owner": "terra1tck9vx8vwu6l83zy76ssdkhnhw8dfcrt80hc6x",
+					"authorization": [],
+					"pre_transaction": [],
+					"post_transaction": [],
+					"fallback": true
+				}
+			]
+		},
+		"staking": {
+			"delegations": [
+			],
+			"exported": false,
+			"last_total_power": "0",
+			"last_validator_powers": [
+			],
+			"params": {
+				"bond_denom": "uluna",
+				"historical_entries": 10000,
+				"max_entries": 7,
+				"max_validators": 100,
+				"min_commission_rate": "0.000000000000000000",
+				"unbonding_time": "1814400s"
+			},
+			"redelegations": [
+			],
+			"unbonding_delegations": [
+			],
+			"validators": [
+			]
+		},
 		"tokenfactory": {
 			"params": {
 				"denom_creation_fee": [
@@ -721,5 +760,7 @@ func (s *AppGenesisTestSuite) TestGenesis() {
 			"sequences": []
 		}
 	}`
+	// write jsonGenState to file for debugging
+	ioutil.WriteFile("genesis1.json", jsonGenState, 0644)
 	s.Require().JSONEq(string(jsonGenState), expectedState)
 }

app/keepers/keepers.go

@@ -1,9 +1,6 @@
 package keepers
 
 import (
-
-	// #nosec G702
-
 	"path/filepath"
 
 	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router"
@@ -100,6 +97,9 @@ import (
 	feesharekeeper "github.com/terra-money/core/v2/x/feeshare/keeper"
 	feesharetypes "github.com/terra-money/core/v2/x/feeshare/types"
 
+	smartaccountkeeper "github.com/terra-money/core/v2/x/smartaccount/keeper"
+	smartaccounttypes "github.com/terra-money/core/v2/x/smartaccount/types"
+
 	terraappconfig "github.com/terra-money/core/v2/app/config"
 	// unnamed import of statik for swagger UI support
 	_ "github.com/terra-money/core/v2/client/docs/statik"
@@ -123,6 +123,7 @@ var maccPerms = map[string][]string{
 	tokenfactorytypes.ModuleName:   {authtypes.Burner, authtypes.Minter},
 	alliancetypes.ModuleName:       {authtypes.Burner, authtypes.Minter},
 	alliancetypes.RewardsPoolName:  nil,
+	smartaccounttypes.ModuleName:   nil,
 }
 
 type TerraAppKeepers struct {
@@ -157,6 +158,7 @@ type TerraAppKeepers struct {
 	AllianceKeeper        alliancekeeper.Keeper
 	FeeShareKeeper        feesharekeeper.Keeper
 	ICQKeeper             icqkeeper.Keeper
+	SmartAccountKeeper    smartaccountkeeper.Keeper
 
 	// IBC hooks
 	IBCHooksKeeper   *ibchookskeeper.Keeper
@@ -469,6 +471,12 @@ func NewTerraAppKeepers(
 		wasmOpts...,
 	)
 
+	keepers.SmartAccountKeeper = smartaccountkeeper.NewKeeper(
+		appCodec,
+		keys[smartaccounttypes.StoreKey],
+		keepers.WasmKeeper.Keeper,
+	)
+
 	keepers.Ics20WasmHooks.ContractKeeper = keepers.WasmKeeper.Keeper
 	// Setup the contract keepers.WasmKeeper before the
 	// hook for the BankKeeper othrwise the WasmKeeper
@@ -571,6 +579,7 @@ func (app *TerraAppKeepers) initParamsKeeper(appCodec codec.BinaryCodec, legacyA
 	paramsKeeper.Subspace(tokenfactorytypes.ModuleName).WithKeyTable(tokenfactorytypes.ParamKeyTable())
 	paramsKeeper.Subspace(feesharetypes.ModuleName).WithKeyTable(feesharetypes.ParamKeyTable())
 	paramsKeeper.Subspace(alliancetypes.ModuleName).WithKeyTable(alliancetypes.ParamKeyTable())
+	paramsKeeper.Subspace(smartaccounttypes.ModuleName).WithKeyTable(smartaccounttypes.ParamKeyTable())
 
 	return paramsKeeper
 }

app/keepers/keys.go

@@ -46,6 +46,8 @@ import (
 	alliancetypes "github.com/terra-money/alliance/x/alliance/types"
 	feesharetypes "github.com/terra-money/core/v2/x/feeshare/types"
 
+	smartaccounttypes "github.com/terra-money/core/v2/x/smartaccount/types"
+
 	// unnamed import of statik for swagger UI support
 	_ "github.com/terra-money/core/v2/client/docs/statik"
 )
@@ -61,6 +63,7 @@ func (keepers *TerraAppKeepers) GenerateKeys() {
 		consensusparamtypes.StoreKey, tokenfactorytypes.StoreKey, wasmtypes.StoreKey,
 		ibcfeetypes.StoreKey, ibchookstypes.StoreKey, crisistypes.StoreKey,
 		alliancetypes.StoreKey, feesharetypes.StoreKey, icqtypes.StoreKey,
+		smartaccounttypes.StoreKey,
 	)
 
 	keepers.tkeys = sdk.NewTransientStoreKeys(paramstypes.TStoreKey)

app/modules.go

@@ -21,6 +21,8 @@ import (
 	feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	"github.com/terra-money/core/v2/x/smartaccount"
+	smartaccounttypes "github.com/terra-money/core/v2/x/smartaccount/types"
 
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -117,6 +119,7 @@ var ModuleBasics = module.NewBasicManager(
 	alliance.AppModuleBasic{},
 	feeshare.AppModuleBasic{},
 	icq.AppModuleBasic{},
+	smartaccount.AppModuleBasic{},
 )
 
 // NOTE: Any module instantiated in the module manager that is later modified
@@ -154,6 +157,7 @@ func appModules(app *TerraApp, encodingConfig terrappsparams.EncodingConfig, ski
 		alliance.NewAppModule(app.appCodec, app.Keepers.AllianceKeeper, app.Keepers.StakingKeeper, app.Keepers.AccountKeeper, app.Keepers.BankKeeper, app.interfaceRegistry, app.GetSubspace(alliancetypes.ModuleName)),
 		feeshare.NewAppModule(app.Keepers.FeeShareKeeper, app.Keepers.AccountKeeper, app.GetSubspace(feesharetypes.ModuleName)),
 		icq.NewAppModule(app.Keepers.ICQKeeper),
+		smartaccount.NewAppModule(app.Keepers.SmartAccountKeeper, app.GetSubspace(smartaccounttypes.ModuleName)),
 	}
 }
 
@@ -191,6 +195,7 @@ var initGenesisOrder = []string{
 	feesharetypes.ModuleName,
 	consensusparamtypes.ModuleName,
 	icqtypes.ModuleName,
+	smartaccounttypes.ModuleName,
 }
 
 var beginBlockersOrder = []string{
@@ -223,6 +228,7 @@ var beginBlockersOrder = []string{
 	feesharetypes.ModuleName,
 	consensusparamtypes.ModuleName,
 	icqtypes.ModuleName,
+	smartaccounttypes.ModuleName,
 }
 
 var endBlockerOrder = []string{
@@ -255,4 +261,5 @@ var endBlockerOrder = []string{
 	feesharetypes.ModuleName,
 	consensusparamtypes.ModuleName,
 	icqtypes.ModuleName,
+	smartaccounttypes.ModuleName,
 }

app/post/post.go

@@ -2,6 +2,8 @@ package post
 
 import (
 	feesharepost "github.com/terra-money/core/v2/x/feeshare/post"
+	smartaccountkeeper "github.com/terra-money/core/v2/x/smartaccount/keeper"
+	smartaccountpost "github.com/terra-money/core/v2/x/smartaccount/post"
 	customwasmkeeper "github.com/terra-money/core/v2/x/wasm/keeper"
 	wasmpost "github.com/terra-money/core/v2/x/wasm/post"
 
@@ -12,13 +14,16 @@ type HandlerOptions struct {
 	FeeShareKeeper feesharepost.FeeShareKeeper
 	BankKeeper     feesharepost.BankKeeper
 	WasmKeeper     customwasmkeeper.Keeper
+
+	SmartAccountKeeper *smartaccountkeeper.Keeper
 }
 
 func NewPostHandler(options HandlerOptions) sdk.PostHandler {
 
 	postDecorators := []sdk.PostDecorator{
 		feesharepost.NewFeeSharePayoutDecorator(options.FeeShareKeeper, options.BankKeeper, options.WasmKeeper),
 		wasmpost.NewWasmdDecorator(options.WasmKeeper),
+		smartaccountpost.NewPostTransactionHookDecorator(options.SmartAccountKeeper, options.WasmKeeper),
 	}
 
 	return sdk.ChainPostDecorators(postDecorators...)