Page MenuHomePhabricator

Merge #12924: Fix hdmaster-key / seed-key confusion

Authored by nakihito on Sep 27 2019, 22:14.



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)
Also included the behavioral changes from the scripted commit 131d4450b scripted-diff: Rename master key to seed (John Newbery)
(hdmasterkeyid -> hdseedid)

Pull request description:

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

Backport of remainder of Core PR12924 and PR13297 (single typo fix)

Depends on D4190

Test Plan
make check

./bitcoin-cli help getwalletinfo
./bitcoin-cli help getaddressinfo
./bitcoin-cli help sethdseed

Diff Detail

rABC Bitcoin ABC
Lint Not Applicable
Tests Not Applicable

Event Timeline

Owners added a reviewer: Restricted Owners Package.Sep 27 2019, 22:14
nakihito added inline comments.
1279 ↗(On Diff #13190)

This is the only change from PR13297.

deadalnix requested changes to this revision.Sep 28 2019, 14:45

Splitting the script diff part would make this way easier to review.

This revision now requires changes to proceed.Sep 28 2019, 14:45

Rebased off D4190 separating the scripted diff portion of the PR.

Rebase and more release notes.

nakihito requested review of this revision.Oct 3 2019, 17:24
9 ↗(On Diff #13306)

What is the extent of the breakage here? Who's using this?

nakihito retitled this revision from Merge #12924: Fix hdmaster-key / seed-key confusion (scripted diff) to Merge #12924: Fix hdmaster-key / seed-key confusion.Oct 6 2019, 22:31

Rebased and changed release note to better reflect changes.

nakihito requested review of this revision.Oct 8 2019, 00:43

Added behavioral changes and relevant release notes removed from D4190. Also reworded release notes to more clearly state that the changed properties were deprecated.

nakihito requested review of this revision.Oct 9 2019, 23:17

Rebased and missed a hdmasterkey -> hdseedid.

nakihito edited the summary of this revision. (Show Details)
This revision is now accepted and ready to land.Oct 29 2019, 22:50