feat: add start time to vesting

akashicrecords-projects · Aug 16, 2024 · dedf5f7 · dedf5f7
1 parent 7799bba
commit dedf5f7
Show file tree

Hide file tree

Showing 15 changed files with 712 additions and 561 deletions.
diff --git a/proto/cosmos/vesting/v1beta1/tx.proto b/proto/cosmos/vesting/v1beta1/tx.proto
@@ -42,6 +42,7 @@ message MsgCreateVestingAccount {
   // end of vesting as unix time (in seconds).
   int64 end_time = 4;
   bool  delayed  = 5;
+  int64 start_time = 6;
 }
 
 // MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type.

diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -33,7 +33,7 @@ done
 cd ..
 
 # generate codec/testdata proto code
-(cd testutil/testdata; buf generate)
+# (cd testutil/testdata; buf generate)
 
 # move proto files to the right places
 cp -r github.com/cosmos/cosmos-sdk/* ./

diff --git a/snapshots/types/snapshot.pb.go b/snapshots/types/snapshot.pb.go
diff --git a/types/query/pagination.pb.go b/types/query/pagination.pb.go
diff --git a/types/tx/service.pb.go b/types/tx/service.pb.go
diff --git a/types/tx/signing/signing.pb.go b/types/tx/signing/signing.pb.go
diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go
diff --git a/x/auth/vesting/client/cli/tx.go b/x/auth/vesting/client/cli/tx.go
@@ -18,6 +18,7 @@ import (
 // Transaction command flags
 const (
 	FlagDelayed = "delayed"
+	FlagStartTime = "start-time"
 )
 
 // GetTxCmd returns vesting module's transaction commands.
@@ -72,13 +73,15 @@ timestamp.`,
 			}
 
 			delayed, _ := cmd.Flags().GetBool(FlagDelayed)
+			startTime, _ := cmd.Flags().GetInt64(FlagStartTime)
 
-			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().Int64(FlagStartTime, 0, "Start time of a delayed vesting")
 	cmd.Flags().Bool(FlagDelayed, false, "Create a delayed vesting account if true")
 	flags.AddTxFlagsToCmd(cmd)
 

diff --git a/x/auth/vesting/msg_server.go b/x/auth/vesting/msg_server.go
@@ -52,6 +52,13 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre
 		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress)
 	}
 
+	startTime := ctx.BlockTime().Unix()
+	if (msg.StartTime > 0) && (msg.StartTime < startTime) {
+		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, " startTime[%d] < now[%d]", msg.StartTime, startTime)
+	}else if msg.StartTime > 0 {
+		startTime = msg.StartTime
+	}
+
 	baseAccount := authtypes.NewBaseAccountWithAddress(to)
 	baseAccount = ak.NewAccount(ctx, baseAccount).(*authtypes.BaseAccount)
 	baseVestingAccount := types.NewBaseVestingAccount(baseAccount, msg.Amount.Sort(), msg.EndTime)
@@ -60,7 +67,7 @@ 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())
+		vestingAccount = types.NewContinuousVestingAccountRaw(baseVestingAccount, startTime)
 	}
 
 	ak.SetAccount(ctx, vestingAccount)

diff --git a/x/auth/vesting/types/msgs.go b/x/auth/vesting/types/msgs.go
@@ -25,11 +25,12 @@ var _ sdk.Msg = &MsgCreatePeriodicVestingAccount{}
 // NewMsgCreateVestingAccount returns a reference to a new MsgCreateVestingAccount.
 //
 //nolint:interfacer
-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,
 	}
@@ -62,6 +63,10 @@ func (msg MsgCreateVestingAccount) ValidateBasic() error {
 		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid end time")
 	}
 
+	if msg.StartTime > msg.EndTime {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "invalid start time")
+	}
+
 	return nil
 }
 

diff --git a/x/auth/vesting/types/tx.pb.go b/x/auth/vesting/types/tx.pb.go