Merge pull request #66 from agoric-labs/zaki-add-starting-vesting-msg

Add support start time to periodic vesting messages

docs/core/proto-docs.md

@@ -8148,6 +8148,7 @@ account.
 | ----- | ---- | ----- | ----------- |
 | `from_address` | [string](#string) |  |  |
 | `to_address` | [string](#string) |  |  |
+| `start_time` | [int64](#int64) |  |  |
 | `vesting_periods` | [Period](#cosmos.vesting.v1beta1.Period) | repeated |  |
 
 

proto/cosmos/vesting/v1beta1/tx.proto

@@ -40,5 +40,6 @@ message MsgCreatePeriodicVestingAccount {
 
   string   from_address                    = 1 [(gogoproto.moretags) = "yaml:\"from_address\""];
   string   to_address                      = 2 [(gogoproto.moretags) = "yaml:\"to_address\""];
-  repeated Period vesting_periods = 3 [(gogoproto.nullable) = false];
+  int64    start_time                      = 3 [(gogoproto.moretags) = "yaml:\"start_time\""];
+  repeated Period vesting_periods = 4 [(gogoproto.nullable) = false];
 }

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

@@ -93,7 +93,7 @@ type InputPeriod struct {
 // MsgCreateVestingAccount transaction.
 func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "create-periodic-vesting-account [to_address] [periods_json_file]",
+		Use:   "create-periodic-vesting-account [start_time_unix] [to_address] [periods_json_file]",
 		Short: "Create a new vesting account funded with an allocation of tokens.",
 		Long: `A sequence of coins and period length in seconds. Periods are sequential, in that the duration of of a period only starts at the end of the previous period. The duration of the first period starts upon account creation. For instance, the following periods.json file shows 20 "test" coins vesting 30 days apart from each other.
 		Where periods.json contains:
@@ -117,19 +117,25 @@ func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			toAddr, err := sdk.AccAddressFromBech32(args[0])
+
+			startTime, err := strconv.ParseInt(args[0], 10, 64)
+
+			if err != nil {
+				return err
+			}
+			toAddr, err := sdk.AccAddressFromBech32(args[1])
 			if err != nil {
 				return err
 			}
 
-			contents, err := ioutil.ReadFile(args[1])
+			contents, err := ioutil.ReadFile(args[2])
 			if err != nil {
 				return err
 			}
 
 			var inputPeriods []InputPeriod
 
-			err = json.Unmarshal(contents, inputPeriods)
+			err = json.Unmarshal(contents, &inputPeriods)
 			if err != nil {
 				return err
 			}
@@ -150,7 +156,7 @@ func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command {
 				periods = append(periods, period)
 			}
 
-			msg := types.NewMsgCreatePeriodicVestingAccount(clientCtx.GetFromAddress(), toAddr, periods)
+			msg := types.NewMsgCreatePeriodicVestingAccount(clientCtx.GetFromAddress(), toAddr, startTime, periods)
 			if err := msg.ValidateBasic(); err != nil {
 				return err
 			}

x/auth/vesting/msg_server.go

@@ -121,6 +121,7 @@ func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *type
 	if acc := ak.GetAccount(ctx, to); acc != nil {
 		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress)
 	}
+
 	var totalCoins sdk.Coins
 
 	for _, period := range msg.VestingPeriods {
@@ -129,7 +130,7 @@ func (s msgServer) CreatePeriodicVestingAccount(goCtx context.Context, msg *type
 
 	baseAccount := ak.NewAccountWithAddress(ctx, to)
 
-	types.NewPeriodicVestingAccount(baseAccount.(*authtypes.BaseAccount), totalCoins.Sort(), ctx.BlockTime().Unix(), msg.VestingPeriods)
+	types.NewPeriodicVestingAccount(baseAccount.(*authtypes.BaseAccount), totalCoins.Sort(), msg.StartTime, msg.VestingPeriods)
 
 	err = bk.SendCoins(ctx, from, to, totalCoins)
 	if err != nil {

x/auth/vesting/types/msgs.go

@@ -85,10 +85,11 @@ func (msg MsgCreateVestingAccount) GetSigners() []sdk.AccAddress {
 
 // NewMsgCreateVestingAccount returns a reference to a new MsgCreateVestingAccount.
 //nolint:interfacer
-func NewMsgCreatePeriodicVestingAccount(fromAddr, toAddr sdk.AccAddress, periods []Period) *MsgCreatePeriodicVestingAccount {
+func NewMsgCreatePeriodicVestingAccount(fromAddr, toAddr sdk.AccAddress, startTime int64, periods []Period) *MsgCreatePeriodicVestingAccount {
 	return &MsgCreatePeriodicVestingAccount{
 		FromAddress:    fromAddr.String(),
 		ToAddress:      toAddr.String(),
+		StartTime:      startTime,
 		VestingPeriods: periods,
 	}
 }