Page MenuHomePhabricator

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

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

Details

Reviewers
deadalnix
Fabien
jasonbcox
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Project
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)

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 7828
Build 13678: Bitcoin ABC Teamcity Staging
Build 13677: arc lint + arc unit

Event Timeline

nakihito created this revision.Fri, Sep 27, 22:14
Owners added a reviewer: Restricted Owners Package.Fri, Sep 27, 22:14
Herald added a reviewer: Restricted Project. · View Herald TranscriptFri, Sep 27, 22:14
nakihito planned changes to this revision.Fri, Sep 27, 22:14
nakihito edited the summary of this revision. (Show Details)Fri, Sep 27, 22:16
nakihito edited the test plan for this revision. (Show Details)
nakihito requested review of this revision.Fri, Sep 27, 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.Fri, Sep 27, 23:31

Fixed comment.

nakihito planned changes to this revision.Fri, Sep 27, 23:31
nakihito requested review of this revision.Fri, Sep 27, 23:31
deadalnix requested changes to this revision.Sat, Sep 28, 14:45

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

This revision now requires changes to proceed.Sat, Sep 28, 14:45
nakihito updated this revision to Diff 13295.EditedTue, Oct 1, 17:13

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

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

Rebase and more release notes.

nakihito planned changes to this revision.Tue, Oct 1, 19:21
nakihito edited the summary of this revision. (Show Details)Wed, Oct 2, 17:22
nakihito edited the summary of this revision. (Show Details)Wed, Oct 2, 17:29
nakihito requested review of this revision.Thu, Oct 3, 17:24
deadalnix added inline comments.Sun, Oct 6, 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.Sun, Oct 6, 22:31
nakihito updated this revision to Diff 13403.Tue, Oct 8, 00:35

Rebased and changed release note to better reflect changes.

nakihito planned changes to this revision.Tue, Oct 8, 00:35
nakihito requested review of this revision.Tue, Oct 8, 00:43
nakihito planned changes to this revision.Wed, Oct 9, 01:26
nakihito updated this revision to Diff 13419.Wed, Oct 9, 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.Wed, Oct 9, 22:33
nakihito updated this revision to Diff 13479.Wed, Oct 9, 22:56

Rebased.

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

Rebased.

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

Rebased and missed a hdmasterkey -> hdseedid.

nakihito planned changes to this revision.Tue, Oct 22, 00:16