diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-05-21 09:41:44 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-05-21 09:41:59 +0200 |
| commit | 6738813bcbb730b5a19e67482b6612d568c22699 (patch) | |
| tree | c4943972497615f64d232bf83d4169214ea4489c /test/functional/test_framework/test_framework.py | |
| parent | d792e47421fcb9ce3b381c1e6d8902777ae3f9f3 (diff) | |
| parent | 6249021d152dec348eb4325c0dfccb3ba59f46d1 (diff) | |
Merge #12924: Fix hdmaster-key / seed-key confusion (scripted diff)
6249021d1 [docs] Add release notes for HD master key -> HD seed rename (John Newbery)
79053a5f2 [rpc] [wallet] Add 'hdmasterkeyid' alias return values. (John Newbery)
c75c35141 [refactor] manually change remaining instances of master key to seed. (John Newbery)
131d4450b scripted-diff: Rename master key to seed (John Newbery)
Pull request description:
Addresses #12084 and #8684
This renames a couple of functions and members (no functional changes, expect log prints):
- Rename CKey::SetMaster to CKey::SetSeed
- Rename CHDChain::masterKeyId to CHDChain::seedID
- Rename CHDChain::hdMasterKeyID to CHDChain::hdSeedID
- Rename CWallet::GenerateNewHDMasterKey to CWallet::GenerateNewHDSeed
- Rename CWallet::SetHDMasterKey to CWallet::SetHDSeed
As well it introduces a tiny API change:
- RPC API change: Rename "hdmasterkeyid" to "hdseedid", rename "hdmaster" in wallet-dump output to "hdseed"
Fixes also a bug:
- Bugfix: use "s" instead of the incorrect "m" for the seed-key hd-keypath key metadata
Tree-SHA512: c913252636f213135a3b64df5de5d21844fb9c2d646567c1aad0ec65745188587de26119de99492c67e559bd49fdd9606b54276f00dddb84301785beba58f281
Diffstat (limited to 'test/functional/test_framework/test_framework.py')
0 files changed, 0 insertions, 0 deletions