Page MenuHomePhabricator

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

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

Details

Reviewers
deadalnix
Fabien
jasonbcox
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Project
Commits
rABC174f07f3684a: Merge #12924: Fix hdmaster-key / seed-key confusion
Summary

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)
https://github.com/bitcoin/bitcoin/pull/12924/
https://github.com/bitcoin/bitcoin/pull/13297/

Depends on D4190

Test Plan
make check
test_runner.py

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

Diff Detail

Repository
rABC Bitcoin ABC
Branch
PR12924
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7717
Build 13473: Bitcoin ABC Buildbot (legacy)
Build 13472: arc lint + arc unit

Event Timeline

nakihito created this revision.Sep 27 2019, 22:14
Owners added a reviewer: Restricted Owners Package.Sep 27 2019, 22:14
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 27 2019, 22:14
nakihito planned changes to this revision.Sep 27 2019, 22:14
nakihito edited the summary of this revision. (Show Details)Sep 27 2019, 22:16
nakihito edited the test plan for this revision. (Show Details)
nakihito requested review of this revision.Sep 27 2019, 23:01
nakihito added inline comments.
src/wallet/wallet.h
1279 ↗(On Diff #13190)

This is the only change from PR13297.

nakihito updated this revision to Diff 13259.Sep 27 2019, 23:31

Fixed comment.

nakihito planned changes to this revision.Sep 27 2019, 23:31
nakihito requested review of this revision.Sep 27 2019, 23:31
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
nakihito updated this revision to Diff 13295.EditedOct 1 2019, 17:13

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

nakihito planned changes to this revision.Oct 1 2019, 17:13
nakihito edited the summary of this revision. (Show Details)Oct 1 2019, 17:15
nakihito updated this revision to Diff 13306.Oct 1 2019, 19:21

Rebase and more release notes.

nakihito planned changes to this revision.Oct 1 2019, 19:21
nakihito edited the summary of this revision. (Show Details)Oct 2 2019, 17:22
nakihito edited the summary of this revision. (Show Details)Oct 2 2019, 17:29
nakihito requested review of this revision.Oct 3 2019, 17:24
deadalnix added inline comments.Oct 6 2019, 18:06
doc/release-notes.md
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
nakihito updated this revision to Diff 13403.Oct 8 2019, 00:35

Rebased and changed release note to better reflect changes.

nakihito planned changes to this revision.Oct 8 2019, 00:35
nakihito requested review of this revision.Oct 8 2019, 00:43
nakihito planned changes to this revision.Oct 9 2019, 01:26
nakihito updated this revision to Diff 13419.Oct 9 2019, 18:11

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 planned changes to this revision.Oct 9 2019, 22:33
nakihito updated this revision to Diff 13479.Oct 9 2019, 22:56

Rebased.

nakihito planned changes to this revision.Oct 9 2019, 22:56
nakihito requested review of this revision.Oct 9 2019, 23:17
nakihito updated this revision to Diff 13541.Oct 14 2019, 20:23

Rebased.

nakihito updated this revision to Diff 13636.Oct 22 2019, 00:16

Rebased and missed a hdmasterkey -> hdseedid.

nakihito planned changes to this revision.Oct 22 2019, 00:16
nakihito requested review of this revision.Fri, Oct 25, 20:46
nakihito edited the summary of this revision. (Show Details)
deadalnix accepted this revision.Tue, Oct 29, 22:50
This revision is now accepted and ready to land.Tue, Oct 29, 22:50