certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #3651: Add JSON struct tags to vesting accounts

This commit is contained in:
Jack Zampolin 2019-02-14 08:40:26 -08:00 committed by GitHub
parent fb2d902c43 afd90f88c1
commit f72a7c3829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PENDING.md
View File

@ -42,6 +42,7 @@ IMPROVEMENTS
JSON ABCI log.
* [\#3620](https://github.com/cosmos/cosmos-sdk/pull/3620) Version command shows build tags
* [\#3638] Add Bcrypt benchmarks & justification of security parameter choice
* [\#3648] Add JSON struct tags to vesting accounts.
* Tendermint
* [\#3618] Upgrade to Tendermint 0.30.03

10
x/auth/account.go
View File

@ -183,11 +183,11 @@ func (acc *BaseAccount) SpendableCoins(_ time.Time) sdk.Coins {
type BaseVestingAccount struct {
*BaseAccount
OriginalVesting sdk.Coins // coins in account upon initialization
DelegatedFree sdk.Coins // coins that are vested and delegated
DelegatedVesting sdk.Coins // coins that vesting and delegated
OriginalVesting sdk.Coins `json:"original_vesting"` // coins in account upon initialization
DelegatedFree sdk.Coins `json:"delegated_free"` // coins that are vested and delegated
DelegatedVesting sdk.Coins `json:"delegated_vesting"` // coins that vesting and delegated
EndTime int64 // when the coins become unlocked
EndTime int64 `json:"end_time"` // when the coins become unlocked
}
// String implements fmt.Stringer
@ -343,7 +343,7 @@ var _ VestingAccount = (*ContinuousVestingAccount)(nil)
type ContinuousVestingAccount struct {
*BaseVestingAccount
StartTime int64 // when the coins start to vest
StartTime int64 `json:"start_time"` // when the coins start to vest
}
// NewContinuousVestingAccount returns a new ContinuousVestingAccount