Bump wallet version for pre split keypool
ClosedPublic
Actions

Authored by nakihito on Oct 3 2019, 19:34.

Details

Reviewers

deadalnix
Fabien
jasonbcox

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

rSTAGING677f3d051472: Bump wallet version for pre split keypool
rABC677f3d051472: Bump wallet version for pre split keypool

Summary

Bump the wallet version to indicate support for the pre split keypool.
Also prevents any wallets from upgrading to versions between HD_SPLIT
and PRE_SPLIT_KEYPOOL.

Partial backport of Core PR12560 (4/4)
https://github.com/bitcoin/bitcoin/pull/12560/commits/a8da482a8bc87ff26194612727d4a7b86b2fb60d

Depends on D4206

Test Plan

Using a wallet from before v0.19.7:

make check
./bitcoind -printtoconsole -upgradewallet=190700
./bitcoin-cli getwalletinfo

Above should output something like:

{
   "walletname": "",
   "walletversion": 200300,
   "balance": 0.00000000,
   "unconfirmed_balance": 0.00000000,
   "immature_balance": 0.00000000,
   "txcount": 0,
   "keypoololdest": 1570130795,
   "keypoolsize": 2000,
   "keypoolsize_hd_internal": 0,
   "paytxfee": 0.00000000,
   "hdmasterkeyid": "0a6b7ba8344e7f65abca305956e696c2b2d4023a"
}

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

nakihito created this revision.Oct 3 2019, 19:34

Owners added a reviewer: Restricted Owners Package.Oct 3 2019, 19:34

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 3 2019, 19:34

nakihito planned changes to this revision.Oct 3 2019, 19:34

Build Bitcoin-ABC / Diffs / Diff Testing started.

nakihito requested review of this revision.Oct 3 2019, 19:35

nakihito mentioned this in D4171: Merge #12560: [wallet] Upgrade path for non-HD wallets to HD.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7682: Diff 13343.Oct 3 2019, 19:44

nakihito added a child revision: D4166: Merge #13252: Wallet: Refactor ReserveKeyFromKeyPool for safety.Oct 3 2019, 20:51

jasonbcox mentioned this in D4206: Allow -upgradewallet to upgradewallets to HD and use a keypool of presplit keys after upgrading to hd chain split.Oct 4 2019, 21:35

Considering the error message, I would prefer that this is merged with D4206. Landing immediately after is acceptable as long as the diffs don't cross release boundaries, but why risk it in the first place?

This revision is now accepted and ready to land.Oct 4 2019, 21:57

In D4207#101151, @jasonbcox wrote:

Considering the error message, I would prefer that this is merged with D4206. Landing immediately after is acceptable as long as the diffs don't cross release boundaries, but why risk it in the first place?

It was mainly for testing purposes and making the review process easier. I am not opposed to squashing the two together as this stack was originally one large diff that seemed like it would be difficult to review.

nakihito added a child revision: D4190: Rename master key to seed.Oct 6 2019, 18:30

Closed by commit rABC677f3d051472: Bump wallet version for pre split keypool (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by nakihito). · Explain WhyOct 7 2019, 18:03

This revision was automatically updated to reflect the committed changes.

Nico Guiton <nico@bitframe.org> added a commit: rABC677f3d051472: Bump wallet version for pre split keypool.

Nico Guiton <nico@bitframe.org> added a commit: rSTAGING677f3d051472: Bump wallet version for pre split keypool.Oct 9 2019, 20:11