Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport wallet-dump.py and key timestamp PRs #1887

Merged
merged 12 commits into from
Feb 1, 2018

Conversation

codablock
Copy link

Includes the previously missed PRs for wallet-dump.py and key timestamp related PRs.

@codablock codablock changed the title Backport HD wallet related/dependent PRs from Bitcoin 0.14 Backport wallet-dump.py and key timestamp PRs Jan 31, 2018
@UdjinM6 UdjinM6 added this to the 12.3 milestone Jan 31, 2018
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small nit otherwise looks good, ACK

assert_equal(found_addr, test_addr_count)
# TODO clarify if we want the behavior that is tested below in Dash (only when HD seed was generated and not user-provided)
# assert_equal(found_addr_chg, 180 + 50) # old reserve keys are marked as change now
assert_equal(found_addr_rsv, 180) # keypool size (TODO: fix off-by-one)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no off-by-one as far as I see

laanwj and others added 12 commits February 1, 2018 11:13
…ryption-tests)

54af51d [QA] Add walletdump RPC test (including HD- & encryption-tests) (Jonas Schnelli)
fa4439d [qa] Rework hd wallet dump test (MarcoFalke)
e89614b [qa] Add more helpful RPC timeout message (Russell Yanofsky)
8463aaa [qa] Increase wallet-dump RPC timeout (Russell Yanofsky)
bitcoin#8840: test: Explicitly set encoding to utf8 when opening text files
We currently have usehd defaulted to 0, so we need to explicitly start it
with usehd=1 in wallet-dump.py.

This requires setting up a new data dirs cache for hd as the wallets won't
be compatible otherwise. At the same time we need the initial state of
the wallet to test the dump functionality.

Also use redirect_stderr=True to fix failure when run from pull-tester
266a811 Use MTP for importmulti "now" timestamps (Russell Yanofsky)
3cf9917 Add test to check new importmulti "now" value (Russell Yanofsky)
442887f Require timestamps for importmulti keys (Russell Yanofsky)
…ly keys (on top of bitcoin#9682)

a80f98b Use importmulti timestamp when importing watch only keys (Russell Yanofsky)
a58370e Dedup nTimeFirstKey update logic (Russell Yanofsky)
…is not marked 'override'" warnings

6c5427d wallet: Prevent "overrides a member function but is not marked 'override'" warnings (Wladimir J. van der Laan)
…ortmulti rescans

e662af3 Use 2 hour grace period for key timestamps in importmulti rescans (Russell Yanofsky)
38d3e9e [qa] Extend import-rescan.py to test imports on pruned nodes. (Russell Yanofsky)
c28583d [qa] Extend import-rescan.py to test specific key timestamps (Russell Yanofsky)
8be0866 [qa] Simplify import-rescan.py (Russell Yanofsky)
Added a workaround to the masternode+pruning mode check to allow pruning
in regtest. The actual bug behind the masternode+pruning check is not
touched this way. Please read the linked GitHub issues for details.
@codablock codablock force-pushed the pr_backport_hd_wallet branch from 523ac51 to 00a0bc7 Compare February 1, 2018 10:13
@codablock
Copy link
Author

Pushed a fix for the small review nit.

There seem to be unrelated CI failures atm which only sometimes happen. Going through the logs I feel it has something to do with messages being sent before VERSION. This should be fixed by #1882 and thus I rebased on develop and force pushed. Watching for this failure in the future...

Then there is still the nasty wine tests timeout...

@UdjinM6 UdjinM6 merged commit 5c00bfe into dashpay:develop Feb 1, 2018
@codablock codablock deleted the pr_backport_hd_wallet branch February 1, 2018 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants