Merge pull request #260 from terra-money/revert-259-upgrade/v0.47.x

Revert "feat: upgrade terra to v0.47.x"

proto/cosmos/vesting/v1beta1/tx.proto

@@ -27,9 +27,6 @@ service Msg {
   //
   // Since: cosmos-sdk 0.46
   rpc CreatePeriodicVestingAccount(MsgCreatePeriodicVestingAccount) returns (MsgCreatePeriodicVestingAccountResponse);
-  // DonateAllVestingTokens defines a method that enables donating all vesting 
-  // tokens to community pool
-  rpc DonateAllVestingTokens(MsgDonateAllVestingTokens) returns (MsgDonateAllVestingTokensResponse);
 }
 
 // MsgCreateVestingAccount defines a message that enables creating a vesting
@@ -79,7 +76,7 @@ message MsgCreatePermanentLockedAccount {
 // Since: cosmos-sdk 0.46
 message MsgCreatePermanentLockedAccountResponse {}
 
-// MsgCreatePeriodicVestingAccount defines a message that enables creating a vesting
+// MsgCreateVestingAccount defines a message that enables creating a vesting
 // account.
 //
 // Since: cosmos-sdk 0.46
@@ -96,20 +93,8 @@ message MsgCreatePeriodicVestingAccount {
   repeated Period vesting_periods = 4 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
 }
 
-// MsgCreatePeriodicVestingAccountResponse defines the Msg/CreatePeriodicVestingAccount
+// MsgCreateVestingAccountResponse defines the Msg/CreatePeriodicVestingAccount
 // response type.
 //
 // Since: cosmos-sdk 0.46
 message MsgCreatePeriodicVestingAccountResponse {}
-
-// MsgDonateAllVestingTokens defines a message that enables donating all vesting
-// token to community pool.
-message MsgDonateAllVestingTokens {
-  option (gogoproto.equal) = false;
-
-  string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""];
-}
-
-// MsgDonateAllVestingTokensResponse defines the Msg/MsgDonateAllVestingTokens
-// response type.
-message MsgDonateAllVestingTokensResponse {}

scripts/protocgen.sh

@@ -31,3 +31,7 @@ cd ..
 # move proto files to the right places
 cp -r github.com/cosmos/cosmos-sdk/* ./
 rm -rf github.com
+
+go mod tidy
+
+./scripts/protocgen-pulsar.sh

simapp/app.go

@@ -400,7 +400,7 @@ func NewSimApp(
 			encodingConfig.TxConfig,
 		),
 		auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)),
-		vesting.NewAppModule(app.AccountKeeper, app.BankKeeper, app.DistrKeeper, app.StakingKeeper),
+		vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),

x/auth/migrations/v2/store_test.go

@@ -384,7 +384,7 @@ func TestMigrateVestingAccounts(t *testing.T) {
 			3666666670000,
 			3666666670000,
 			0,
-			1601042400,
+			1601042400 + 1,
 		},
 		{
 			"periodic vesting account, all has vested",
@@ -430,7 +430,7 @@ func TestMigrateVestingAccounts(t *testing.T) {
 			3666666670000,
 			0,
 			3666666670000,
-			1601042400 + 31536000 + 15897600 + 15897600,
+			1601042400 + 31536000 + 15897600 + 15897600 + 1,
 		},
 		{
 			"periodic vesting account, first period has vested",
@@ -476,7 +476,7 @@ func TestMigrateVestingAccounts(t *testing.T) {
 			3666666670000,
 			3666666670000 - 1833333335000,
 			1833333335000,
-			1601042400 + 31536000,
+			1601042400 + 31536000 + 1,
 		},
 		{
 			"periodic vesting account, first 2 period has vested",
@@ -522,7 +522,7 @@ func TestMigrateVestingAccounts(t *testing.T) {
 			3666666670000,
 			3666666670000 - 1833333335000 - 916666667500,
 			1833333335000 + 916666667500,
-			1601042400 + 31536000 + 15638400,
+			1601042400 + 31536000 + 15638400 + 1,
 		},
 		{
 			"vesting account has unbonding delegations in place",

x/auth/vesting/client/cli/tx.go

@@ -34,7 +34,6 @@ func GetTxCmd() *cobra.Command {
 		NewMsgCreateVestingAccountCmd(),
 		NewMsgCreatePermanentLockedAccountCmd(),
 		NewMsgCreatePeriodicVestingAccountCmd(),
-		NewMsgDonateAllVestingTokensCmd(),
 	)
 
 	return txCmd
@@ -142,20 +141,19 @@ func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command {
 		Where periods.json contains:
 
 		An array of coin strings and unix epoch times for coins to vest
-{ 
-	"start_time": 1625204910,
-	"periods":[
-		{
-			"coins": "10test",
-			"length_seconds":2592000
-		},
-		{
-			"coins": "10test",
-			"length_seconds":2592000 //30 days
-		}
-	]
-}
-`,
+{ "start_time": 1625204910,
+"periods":[
+ {
+  "coins": "10test",
+  "length_seconds":2592000 //30 days
+ },
+ {
+	"coins": "10test",
+	"length_seconds":2592000 //30 days
+ },
+]
+	}
+		`,
 		Args: cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
@@ -209,31 +207,3 @@ func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command {
 
 	return cmd
 }
-
-// NewMsgDonateAllVestingTokensCmd returns a CLI command handler for creating a
-// MsgDonateAllVestingTokens transaction.
-func NewMsgDonateAllVestingTokensCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "donate-all-vesting-tokens",
-		Short: "Donate all vesting tokens of a vesting account to community pool.",
-		Long: `Donate all vesting tokens of a vesting account to community pool. 
-		The account must not have any delegated vesting tokens to prevent complex
-		vesting logic changes. After donation, the account will be changed to normal 
-		"BaseAccount".`,
-		Args: cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx, err := client.GetClientTxContext(cmd)
-			if err != nil {
-				return err
-			}
-
-			msg := types.NewMsgDonateAllVestingTokens(clientCtx.GetFromAddress())
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-		},
-	}
-
-	flags.AddTxFlagsToCmd(cmd)
-
-	return cmd
-}

x/auth/vesting/module.go

@@ -19,7 +19,6 @@ import (
 	"cosmossdk.io/core/appmodule"
 
 	"github.com/cosmos/cosmos-sdk/x/auth/keeper"
-
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 )
@@ -81,22 +80,13 @@ type AppModule struct {
 
 	accountKeeper keeper.AccountKeeper
 	bankKeeper    types.BankKeeper
-	distrKeeper   types.DistrKeeper
-	stakingKeeper types.StakingKeeper
 }
 
-func NewAppModule(
-	ak keeper.AccountKeeper,
-	bk types.BankKeeper,
-	dk types.DistrKeeper,
-	sk types.StakingKeeper,
-) AppModule {
+func NewAppModule(ak keeper.AccountKeeper, bk types.BankKeeper) AppModule {
 	return AppModule{
 		AppModuleBasic: AppModuleBasic{},
 		accountKeeper:  ak,
 		bankKeeper:     bk,
-		distrKeeper:    dk,
-		stakingKeeper:  sk,
 	}
 }
 
@@ -113,15 +103,7 @@ func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {}
 
 // RegisterServices registers module services.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
-	types.RegisterMsgServer(
-		cfg.MsgServer(),
-		NewMsgServerImpl(
-			am.accountKeeper,
-			am.bankKeeper,
-			am.distrKeeper,
-			am.stakingKeeper,
-		),
-	)
+	types.RegisterMsgServer(cfg.MsgServer(), NewMsgServerImpl(am.accountKeeper, am.bankKeeper))
 }
 
 // InitGenesis performs a no-op.
@@ -152,8 +134,6 @@ type VestingInputs struct {
 
 	AccountKeeper keeper.AccountKeeper
 	BankKeeper    types.BankKeeper
-	// DistrKeeper   types.DistrKeeper
-	StakingKeeper types.StakingKeeper
 }
 
 type VestingOutputs struct {
@@ -163,7 +143,7 @@ type VestingOutputs struct {
 }
 
 func ProvideModule(in VestingInputs) VestingOutputs {
-	m := NewAppModule(in.AccountKeeper, in.BankKeeper, nil, in.StakingKeeper)
+	m := NewAppModule(in.AccountKeeper, in.BankKeeper)
 
 	return VestingOutputs{Module: m}
 }

x/auth/vesting/msg_server.go

@@ -2,8 +2,6 @@ package vesting
 
 import (
 	"context"
-	"fmt"
-	"math"
 
 	"github.com/armon/go-metrics"
 
@@ -12,26 +10,18 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/vesting/exported"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 )
 
 type msgServer struct {
 	keeper.AccountKeeper
 	types.BankKeeper
-	types.DistrKeeper
-	types.StakingKeeper
 }
 
 // NewMsgServerImpl returns an implementation of the vesting MsgServer interface,
 // wrapping the corresponding AccountKeeper and BankKeeper.
-func NewMsgServerImpl(
-	k keeper.AccountKeeper,
-	bk types.BankKeeper,
-	dk types.DistrKeeper,
-	sk types.StakingKeeper,
-) types.MsgServer {
-	return &msgServer{AccountKeeper: k, BankKeeper: bk, DistrKeeper: dk, StakingKeeper: sk}
+func NewMsgServerImpl(k keeper.AccountKeeper, bk types.BankKeeper) types.MsgServer {
+	return &msgServer{AccountKeeper: k, BankKeeper: bk}
 }
 
 var _ types.MsgServer = msgServer{}
@@ -203,78 +193,3 @@ func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *type
 
 	return &types.MsgCreatePeriodicVestingAccountResponse{}, nil
 }
-
-func (s msgServer) DonateAllVestingTokens(goCtx context.Context, msg *types.MsgDonateAllVestingTokens) (*types.MsgDonateAllVestingTokensResponse, error) {
-	ctx := sdk.UnwrapSDKContext(goCtx)
-
-	ak := s.AccountKeeper
-	dk := s.DistrKeeper
-	sk := s.StakingKeeper
-
-	from, err := sdk.AccAddressFromBech32(msg.FromAddress)
-	if err != nil {
-		return nil, err
-	}
-
-	acc := ak.GetAccount(ctx, from)
-	if acc == nil {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s not exists", msg.FromAddress)
-	}
-
-	// get all delegations of an account and undust those that have less than 1 uluna
-	delegations := sk.GetDelegatorDelegations(ctx, acc.GetAddress(), math.MaxUint16)
-	for _, delegation := range delegations {
-		validatorAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress)
-		if err != nil {
-			return nil, err
-		}
-		validator, found := sk.GetValidator(ctx, validatorAddr)
-		if !found {
-			return nil, fmt.Errorf("validator not found")
-		}
-		// Try to delete the dust delegation
-		_, removedTokens := sk.RemoveValidatorTokensAndShares(ctx, validator, delegation.Shares)
-		// If the delegation is not dust, return an error and stop the donation flow
-		if !removedTokens.IsZero() {
-			return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s has a non-zero staking entry", msg.FromAddress)
-		}
-
-		// Remove the dust delegation shares from the validator
-		err = sk.RemoveDelegation(ctx, delegation)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// check whether an account has any other type of staking entries
-	if len(sk.GetUnbondingDelegations(ctx, acc.GetAddress(), 1)) != 0 ||
-		len(sk.GetRedelegations(ctx, acc.GetAddress(), 1)) != 0 {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s has staking entry", msg.FromAddress)
-	}
-
-	vestingAcc, ok := acc.(exported.VestingAccount)
-	if !ok {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s is not a vesting account", msg.FromAddress)
-	}
-
-	vestingCoins := vestingAcc.GetVestingCoins(ctx.BlockTime())
-	if vestingCoins.IsZero() {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s has no vesting tokens", msg.FromAddress)
-	}
-
-	// Change the account as normal account
-	ak.SetAccount(ctx,
-		authtypes.NewBaseAccount(
-			acc.GetAddress(),
-			acc.GetPubKey(),
-			acc.GetAccountNumber(),
-			acc.GetSequence(),
-		),
-	)
-
-	if err := dk.FundCommunityPool(ctx, vestingCoins, from); err != nil {
-		return nil, err
-	}
-
-	return &types.MsgDonateAllVestingTokensResponse{}, nil
-}