smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-27 00:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Periodic Vesting Account JSON for Trust Wallet (#630)

Browse Source 
* massage vesting account json to match cosmos-sdk/Account json for trust
wallet

* remove comment
This commit is contained in:
Nick DeLuca 2020-08-20 12:33:21 -05:00 committed by GitHub
parent e14466547d
commit 60d7f522e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migrate/rest_v0_3/rest.go
View File

@ -239,6 +239,7 @@ func makeCodecV03() *codec.Codec {
v0_3valvesting.RegisterCodec(v0_3Codec) v0_3valvesting.RegisterCodec(v0_3Codec)
return v0_3Codec return v0_3Codec
} }
func rollbackAccountType(newAccount authexported.Account) v18de63auth.Account { func rollbackAccountType(newAccount authexported.Account) v18de63auth.Account {
switch acc := newAccount.(type) { switch acc := newAccount.(type) {

52
migrate/v0_8/sdk/auth/v18de63/vesting_account.go
View File

@ -1,6 +1,12 @@
package v18de63 package v18de63
import ( import (
"encoding/json"
"strconv"
"github.com/tendermint/tendermint/crypto"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
) )
@ -31,6 +37,52 @@ type PeriodicVestingAccount struct {
VestingPeriods Periods `json:"vesting_periods" yaml:"vesting_periods"` // the vesting schedule VestingPeriods Periods `json:"vesting_periods" yaml:"vesting_periods"` // the vesting schedule
} }
type prettyPublicKey struct {
PubKey crypto.PubKey
}
func (p prettyPublicKey) MarshalJSON() ([]byte, error) {
cdc := codec.New()
codec.RegisterCrypto(cdc)
return cdc.MarshalJSON(p.PubKey)
}
type vestingAccountPretty struct {
Address sdk.AccAddress `json:"address" yaml:"address"`
Coins sdk.Coins `json:"coins" yaml:"coins"`
PubKey prettyPublicKey `json:"public_key" yaml:"public_key"`
AccountNumber string `json:"account_number" yaml:"account_number"`
Sequence string `json:"sequence" yaml:"sequence"`
OriginalVesting sdk.Coins `json:"original_vesting" yaml:"original_vesting"`
DelegatedFree sdk.Coins `json:"delegated_free" yaml:"delegated_free"`
DelegatedVesting sdk.Coins `json:"delegated_vesting" yaml:"delegated_vesting"`
EndTime int64 `json:"end_time" yaml:"end_time"`
// custom fields based on concrete vesting type which can be omitted
StartTime int64 `json:"start_time,omitempty" yaml:"start_time,omitempty"`
VestingPeriods Periods `json:"vesting_periods,omitempty" yaml:"vesting_periods,omitempty"`
}
func (pva PeriodicVestingAccount) MarshalJSON() ([]byte, error) {
pubKey := prettyPublicKey{PubKey: pva.PubKey}
alias := vestingAccountPretty{
Address: pva.Address,
Coins: pva.Coins,
PubKey: pubKey,
AccountNumber: strconv.FormatUint(pva.AccountNumber, 10),
Sequence: strconv.FormatUint(pva.Sequence, 10),
OriginalVesting: pva.OriginalVesting,
DelegatedFree: pva.DelegatedFree,
DelegatedVesting: pva.DelegatedVesting,
EndTime: pva.EndTime,
StartTime: pva.StartTime,
VestingPeriods: pva.VestingPeriods,
}
return json.Marshal(alias)
}
// DelayedVestingAccount implements the VestingAccount interface. It vests all // DelayedVestingAccount implements the VestingAccount interface. It vests all
// coins after a specific time, but non prior. In other words, it keeps them // coins after a specific time, but non prior. In other words, it keeps them
// locked until a specified time. // locked until a specified time.