forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accounts: omit if the KDFParam field has an empty value

Browse source
This commit is contained in:
htkao 2019-06-02 17:27:17 -07:00
parent 0bea9a6447
commit 7def2d5ce6
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
accounts/keystore/key.go
View file

@ -79,13 +79,13 @@ type encryptedKeyJSONV1 struct {
} }
type kdfparamsJSON struct { type kdfparamsJSON struct {
Salt string `json:"salt"` Salt string `json:"salt,omitempty"`
Prf string `json:"prf"` Prf string `json:"prf,omitempty"`
DKLen int `json:"dklen"` DKLen int `json:"dklen,omitempty"`
C int `json:"c"` C int `json:"c,omitempty"`
N int `json:"n"` N int `json:"n,omitempty"`
P int `json:"p"` P int `json:"p,omitempty"`
R int `json:"r"` R int `json:"r,omitempty"`
} }
type CryptoJSON struct { type CryptoJSON struct {
@ -93,7 +93,7 @@ type CryptoJSON struct {
CipherText string `json:"ciphertext"` CipherText string `json:"ciphertext"`
CipherParams cipherparamsJSON `json:"cipherparams"` CipherParams cipherparamsJSON `json:"cipherparams"`
KDF string `json:"kdf"` KDF string `json:"kdf"`
KDFParams kdfparamsJSON `json:"kdfparams"` KDFParams kdfparamsJSON `json:"kdfparams"`
MAC string `json:"mac"` MAC string `json:"mac"`
} }