fixes for develop+permissions merge

This commit is contained in:
Jae Kwon
2015-07-07 14:17:20 -07:00
parent 625c72a110
commit 21295f4ae2
6 changed files with 19 additions and 7 deletions

View File

@ -24,19 +24,19 @@ var GenDocKey = []byte("GenDocKey")
type BasicAccount struct {
Address []byte `json:"address"`
Amount uint64 `json:"amount"`
Amount int64 `json:"amount"`
}
type GenesisAccount struct {
Address []byte `json:"address"`
Amount uint64 `json:"amount"`
Amount int64 `json:"amount"`
Name string `json:"name"`
Permissions *ptypes.AccountPermissions `json:"permissions"`
}
type GenesisValidator struct {
PubKey account.PubKeyEd25519 `json:"pub_key"`
Amount uint64 `json:"amount"`
Amount int64 `json:"amount"`
Name string `json:"name"`
UnbondTo []BasicAccount `json:"unbond_to"`
}