Page MenuHomePhabricator
Differential D4175

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

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
rSTAGING174f07f3684a: Merge #12924: Fix hdmaster-key / seed-key confusion
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 Passed
Unit
No Test Coverage
Build Status
Buildable 7765
Build 13569: Bitcoin ABC Buildbot (legacy)
Build 13568: 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
teamcity added a comment.Sep 27 2019, 22:14

Build Bitcoin-ABC / Diffs / Diff Testing started.

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 added a parent revision: D4171: Merge #12560: [wallet] Upgrade path for non-HD wallets to HD.
teamcity added a comment.Sep 27 2019, 22:28

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7620: Diff 13190.Sep 27 2019, 22:28
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
teamcity added a comment.Sep 27 2019, 23:31

Build Bitcoin-ABC / Diffs / Diff Testing started.

nakihito requested review of this revision.Sep 27 2019, 23:31
Harbormaster completed remote builds in B7626: Diff 13259.Sep 27 2019, 23:48
teamcity added a comment.Sep 27 2019, 23:48

Build Bitcoin-ABC / Diffs / Diff Testing passed.

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 edited the summary of this revision. (Show Details)Oct 1 2019, 16:40
nakihito added a parent revision: D4190: Rename master key to seed.
nakihito removed a parent revision: D4171: Merge #12560: [wallet] Upgrade path for non-HD wallets to HD.
nakihito mentioned this in D4190: Rename master key to seed.Oct 1 2019, 17:10
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
teamcity added a comment.Oct 1 2019, 17:13

Build Bitcoin-ABC / Diffs / Diff Testing started.

nakihito edited the summary of this revision. (Show Details)Oct 1 2019, 17:15
teamcity added a comment.Oct 1 2019, 17:23

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7650: Diff 13295.Oct 1 2019, 17:23
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
teamcity added a comment.Oct 1 2019, 19:22

Build Bitcoin-ABC / Diffs / Diff Testing started.

Harbormaster completed remote builds in B7655: Diff 13306.Oct 1 2019, 19:42
teamcity added a comment.Oct 1 2019, 19:42

Build Bitcoin-ABC / Diffs / Diff Testing passed.

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
teamcity added a comment.Oct 8 2019, 00:35

Build Bitcoin-ABC / Diffs / Diff Testing started.

nakihito requested review of this revision.Oct 8 2019, 00:43
teamcity added a comment.Oct 8 2019, 00:51

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7717: Diff 13403.Oct 8 2019, 00:51
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.

teamcity added a comment.Oct 9 2019, 18:12

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Oct 9 2019, 18:22

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7726: Diff 13419.Oct 9 2019, 18:23
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
teamcity added a comment.Oct 9 2019, 22:56

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Oct 9 2019, 23:10

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7730: Diff 13479.Oct 9 2019, 23:11
nakihito requested review of this revision.Oct 9 2019, 23:17
nakihito updated this revision to Diff 13541.Oct 14 2019, 20:23

Rebased.

teamcity added a comment.Oct 14 2019, 20:24

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Oct 14 2019, 20:38

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7765: Diff 13541.Oct 14 2019, 20:38
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
teamcity added a comment.Oct 22 2019, 00:16

Build Bitcoin-ABC / Diffs / Diff Testing started.

teamcity added a comment.Oct 22 2019, 00:29

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7828: Diff 13636.Oct 22 2019, 00:29
nakihito requested review of this revision.Oct 25 2019, 20:46
nakihito edited the summary of this revision. (Show Details)
nakihito added a child revision: D4304: Merge #9662: Add createwallet "disableprivatekeys" option: a sane mode for watchonly-wallets.Oct 29 2019, 19:25
deadalnix accepted this revision.Oct 29 2019, 22:50
This revision is now accepted and ready to land.Oct 29 2019, 22:50
Closed by commit rABC174f07f3684a: Merge #12924: Fix hdmaster-key / seed-key confusion (authored by Jonas Schnelli <dev@jonasschnelli.ch>, committed by nakihito). · Explain WhyOct 29 2019, 23:47
This revision was automatically updated to reflect the committed changes.
Nico Guiton <nico@bitframe.org> added a commit: rABC174f07f3684a: Merge #12924: Fix hdmaster-key / seed-key confusion.
nakihito added a commit: rSTAGING174f07f3684a: Merge #12924: Fix hdmaster-key / seed-key confusion.Apr 7 2020, 21:31
Fabien mentioned this in D9211: Skip hdKeypath of 'm'.Feb 11 2021, 11:21
Fabien mentioned this in rABC5848be501e8b: Skip hdKeypath of 'm'.Feb 11 2021, 13:14

Revision Contents
Changeset List

PathSize
doc/
7 lines
src/
wallet/
10 lines
17 lines
10 lines
41 lines
4 lines
test/
functional/
2 lines
6 lines
5 lines

Diff 13541

View Options

doc/release-notes.md

Loading...
View Options

src/wallet/rpcdump.cpp

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/wallet.h

Loading...
View Options

src/wallet/wallet.cpp

Loading...
View Options

src/wallet/walletdb.h

Loading...
View Options

test/functional/wallet_dump.py

Loading...
View Options

test/functional/wallet_hd.py

Loading...
View Options

test/functional/wallet_keypool.py

Loading...