Draft changes to be able to add a start-time in the future for a cont…

…inuous vesting acct

proto/cosmos/vesting/v1beta1/tx.proto

@@ -49,6 +49,8 @@ message MsgCreateVestingAccount {
   // end of vesting as unix time (in seconds).
   int64 end_time = 4;
   bool  delayed  = 5;
+  // start of vesting as unix time (in seconds).
+  int64 start_time = 6;
 }
 
 // MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type.

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

@@ -20,7 +20,8 @@ import (
 
 // Transaction command flags
 const (
-	FlagDelayed = "delayed"
+	FlagDelayed   = "delayed"
+	FlagStartTime = "start-time"
 )
 
 // GetTxCmd returns vesting module's transaction commands.
@@ -79,13 +80,18 @@ timestamp.`,
 			}
 
 			delayed, _ := cmd.Flags().GetBool(FlagDelayed)
+			startTime, err := cmd.Flags().GetInt64(FlagStartTime)
+			if err != nil {
+				return err
+			}
 
-			msg := types.NewMsgCreateVestingAccount(clientCtx.GetFromAddress(), toAddr, amount, endTime, delayed)
+			msg := types.NewMsgCreateVestingAccount(clientCtx.GetFromAddress(), toAddr, amount, startTime, endTime, delayed)
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
 	cmd.Flags().Bool(FlagDelayed, false, "Create a delayed vesting account if true")
+	cmd.Flags().Int64(FlagStartTime, 0, "Optional start time (as a UNIX epoch timestamp) for continuous vesting accounts. If 0 (default), the block's time of the block this tx is committed to will be used.")
 	flags.AddTxFlagsToCmd(cmd)
 
 	return cmd

x/auth/vesting/fuzz_test.go

@@ -52,13 +52,15 @@ func FuzzMsgServerCreateVestingAccount(f *testing.F) {
 			to2Addr,
 			sdk.Coins{fooCoin},
 			time.Now().Unix(),
+			time.Now().Unix()+1,
 			true,
 		),
 		vestingtypes.NewMsgCreateVestingAccount(
 			fromAddr,
 			to3Addr,
 			sdk.Coins{fooCoin},
 			time.Now().Unix(),
+			time.Now().Unix()+1,
 			false,
 		),
 	}

x/auth/vesting/msg_server.go

@@ -47,6 +47,10 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre
 		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid end time")
 	}
 
+	if msg.EndTime <= msg.StartTime {
+		return nil, errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "invalid start and end time (must be start < end)")
+	}
+
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	if err := s.BankKeeper.IsSendEnabledCoins(ctx, msg.Amount...); err != nil {
 		return nil, err
@@ -71,7 +75,11 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre
 	if msg.Delayed {
 		vestingAccount = types.NewDelayedVestingAccountRaw(baseVestingAccount)
 	} else {
-		vestingAccount = types.NewContinuousVestingAccountRaw(baseVestingAccount, ctx.BlockTime().Unix())
+		start := ctx.BlockTime().Unix()
+		if msg.StartTime != 0 {
+			start = msg.StartTime
+		}
+		vestingAccount = types.NewContinuousVestingAccountRaw(baseVestingAccount, start)
 	}
 
 	s.AccountKeeper.SetAccount(ctx, vestingAccount)

x/auth/vesting/msg_server_test.go

@@ -81,6 +81,7 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				to1Addr,
 				sdk.Coins{fooCoin},
 				time.Now().Unix(),
+				time.Now().Unix()+1,
 				true,
 			),
 			expErr:    true,
@@ -92,6 +93,7 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				[]byte{},
 				sdk.Coins{fooCoin},
 				time.Now().Unix(),
+				time.Now().Unix()+1,
 				true,
 			),
 			expErr:    true,
@@ -103,6 +105,7 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				to1Addr,
 				sdk.Coins{sdk.Coin{Denom: "stake", Amount: math.NewInt(-1)}},
 				time.Now().Unix(),
+				time.Now().Unix()+1,
 				true,
 			),
 			expErr:    true,
@@ -113,12 +116,25 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				fromAddr,
 				to1Addr,
 				sdk.Coins{fooCoin},
+				time.Now().Unix(),
 				-10,
-				true,
+				false,
 			),
 			expErr:    true,
 			expErrMsg: "invalid end time",
 		},
+		"invalid start/end time": {
+			input: vestingtypes.NewMsgCreateVestingAccount(
+				fromAddr,
+				to1Addr,
+				sdk.Coins{fooCoin},
+				time.Now().Unix()+1,
+				time.Now().Unix(),
+				true,
+			),
+			expErr:    true,
+			expErrMsg: "invalid start and end time (must be start < end)",
+		},
 		"create for existing account": {
 			preRun: func() {
 				toAcc := s.accountKeeper.NewAccountWithAddress(s.ctx, to1Addr)
@@ -131,6 +147,7 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				to1Addr,
 				sdk.Coins{fooCoin},
 				time.Now().Unix(),
+				time.Now().Unix()+1,
 				true,
 			),
 			expErr:    true,
@@ -147,6 +164,7 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				to2Addr,
 				sdk.Coins{fooCoin},
 				time.Now().Unix(),
+				time.Now().Unix()+1,
 				true,
 			),
 			expErr:    false,
@@ -163,6 +181,7 @@ func (s *VestingTestSuite) TestCreateVestingAccount() {
 				to3Addr,
 				sdk.Coins{fooCoin},
 				time.Now().Unix(),
+				time.Now().Unix()+1,
 				false,
 			),
 			expErr:    false,

x/auth/vesting/types/msgs.go

@@ -11,11 +11,12 @@ var (
 )
 
 // NewMsgCreateVestingAccount returns a reference to a new MsgCreateVestingAccount.
-func NewMsgCreateVestingAccount(fromAddr, toAddr sdk.AccAddress, amount sdk.Coins, endTime int64, delayed bool) *MsgCreateVestingAccount {
+func NewMsgCreateVestingAccount(fromAddr, toAddr sdk.AccAddress, amount sdk.Coins, startTime, endTime int64, delayed bool) *MsgCreateVestingAccount {
 	return &MsgCreateVestingAccount{
 		FromAddress: fromAddr.String(),
 		ToAddress:   toAddr.String(),
 		Amount:      amount,
+		StartTime:   startTime,
 		EndTime:     endTime,
 		Delayed:     delayed,
 	}

x/auth/vesting/types/vesting_account_test.go

@@ -111,6 +111,36 @@ func TestGetVestingCoinsContVestingAcc(t *testing.T) {
 	require.Equal(t, sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}, vestingCoins)
 }
 
+func TestGetVestingCoinsContVestingAccStartTimeInFuture(t *testing.T) {
+	now := tmtime.Now()
+	startTime := now.Add(24 * time.Hour)
+	endTime := startTime.Add(24 * time.Hour)
+
+	bacc, origCoins := initBaseAccount()
+	cva, err := types.NewContinuousVestingAccount(bacc, origCoins, startTime.Unix(), endTime.Unix())
+	require.NoError(t, err)
+
+	// require all coins vesting in the beginning of the vesting schedule
+	vestingCoins := cva.GetVestingCoins(now)
+	require.Equal(t, origCoins, vestingCoins)
+
+	// require all coins vesting before right start time of the vesting schedule
+	vestingCoins = cva.GetVestingCoins(startTime.Add(-1))
+	require.Equal(t, origCoins, vestingCoins)
+
+	// require no coins vesting at the end of the vesting schedule
+	vestingCoins = cva.GetVestingCoins(endTime)
+	require.Equal(t, emptyCoins, vestingCoins)
+
+	// require 50% of coins vesting
+	vestingCoins = cva.GetVestingCoins(startTime.Add(12 * time.Hour))
+	require.Equal(t, sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}, vestingCoins)
+
+	// require 50% of coins spendable
+	vestingCoins = cva.GetVestedCoins(startTime.Add(12 * time.Hour))
+	require.Equal(t, sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}, vestingCoins)
+}
+
 func TestSpendableCoinsContVestingAcc(t *testing.T) {
 	now := tmtime.Now()
 	endTime := now.Add(24 * time.Hour)