Merge #12560: [wallet] Upgrade path for non-HD wallets to HD
AbandonedPublic
Actions

Authored by nakihito on Sep 27 2019, 17:09.

Details

Reviewers

deadalnix
Fabien
jasonbcox

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Summary

a8da482 Bump wallet version for pre split keypool (Andrew Chow)
dfcd9f3 Use a keypool of presplit keys after upgrading to hd chain split (Andrew Chow)
5c50e93 Allow -upgradewallet to upgradewallets to HD (Andrew Chow)
2bcf2b5 Test sethdseed (Andrew Chow)
b5ba01a Add 'sethdseed' RPC to initialize or replace HD seed (Chris Moore)
dd3c07a Separate HaveKey function that checks whether a key is in a keystore (Andrew Chow)

Pull request description:

Revival/rebase of #11085

Adds a new command `sethdseed` which allows you to either set or generate a new HD seed to be used. A new keypool can be generated or the original one kept and new keys added to the keypool will come from the new HD seed.

Wallets that are not HD will be upgraded to be version FEATURE_HD_SPLIT when the `sethdseed` RPC command is used.

I have also add some tests for this.

Additionally `-upgradewallet` can now be used to upgrade a wallet from non-HD to HD. When it is used for such an upgrade, the keypool will be regenerated.

Tree-SHA512: e56c792e150590429ac4a1061e8d6f7b20cca06366e184eb9bbade4cd6ae82699a28fe84f87031eadba97ad2c1606517a105f00fb7b45779c979243020071adb

Backport of Core PR12560
https://github.com/bitcoin/bitcoin/pull/12560/

Test Plan

make check
test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

PR12560

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 7613
Build 13266: Bitcoin ABC Buildbot (legacy)
Build 13265: arc lint + arc unit

Event Timeline

nakihito created this revision.Sep 27 2019, 17:09

Owners added a reviewer: Restricted Owners Package.Sep 27 2019, 17:09

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 27 2019, 17:09

nakihito planned changes to this revision.Sep 27 2019, 17:09

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7613: Diff 13180.Sep 27 2019, 17:24

nakihito added a child revision: D4166: Merge #13252: Wallet: Refactor ReserveKeyFromKeyPool for safety.Sep 27 2019, 17:38

Restored newline.

nakihito planned changes to this revision.Sep 27 2019, 19:48

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7618: Diff 13187.Sep 27 2019, 20:00

nakihito added a child revision: D4175: Merge #12924: Fix hdmaster-key / seed-key confusion.Sep 27 2019, 22:16

Fixed formatting issues.

nakihito planned changes to this revision.Sep 27 2019, 23:20

Build Bitcoin-ABC / Diffs / Diff Testing started.

Fixed block comment end tag.

nakihito planned changes to this revision.Sep 27 2019, 23:26

Build Bitcoin-ABC / Diffs / Diff Testing started.

nakihito requested review of this revision.Sep 27 2019, 23:28

nakihito added inline comments.

src/wallet/rpcwallet.cpp
4364 ↗	(On Diff #13257)	Wallet pointers were changed to `shared_ptr` in D4134

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7624: Diff 13257.Sep 27 2019, 23:33

This patch contains at least one serious blunder. In addition, the fact that the blunder passed through shows that the test plan is inadequate.

src/keystore.h
91 ↗	(On Diff #13258)	Relayout
src/wallet/rpcwallet.cpp
4362 ↗	(On Diff #13258)	Why not static?
4448 ↗	(On Diff #13258)	braces
src/wallet/wallet.h
89 ↗	(On Diff #13258)	...