Merge #10115: Avoid reading the old hd master key during wallet encryption
ClosedPublic
Actions

Authored by markblundeberg on May 9 2019, 02:21.

Details

Reviewers

jasonbcox
Fabien
deadalnix

Group Reviewers

Restricted Project

Commits

rSTAGING5f231a9d0d2e: Merge #10115: Avoid reading the old hd master key during wallet encryption
rABC5f231a9d0d2e: Merge #10115: Avoid reading the old hd master key during wallet encryption

Summary

backport PR10115 https://github.com/bitcoin/bitcoin/pull/10115/files
185c7f0 Avoid reading the old hd master key during wallet encryption (Matt Corallo)

Tree-SHA512: b744e8490c0e948355bb77b2695902bb99f89a68af46aa2be9120bd2ccf3c340eb8a56340fec117f9a935192298028945c9b18120ee6b8b23e7da8ffdb635745

(parent was backported in D927)

Test Plan

make check

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markblundeberg created this revision.May 9 2019, 02:21

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 9 2019, 02:21

Herald added a reviewer: deadalnix. · View Herald Transcript

(Note this brings us up-to-date with Core on this code, aside from some renames later on)

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

markblundeberg planned changes to this revision.May 9 2019, 02:23

Harbormaster completed remote builds in B5777: Diff 8546.May 9 2019, 02:37

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

markblundeberg requested review of this revision.May 9 2019, 02:39

markblundeberg edited the summary of this revision. (Show Details)

jasonbcox accepted this revision.May 9 2019, 16:21

This revision is now accepted and ready to land.May 9 2019, 16:21

Closed by commit rABC5f231a9d0d2e: Merge #10115: Avoid reading the old hd master key during wallet encryption (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com>). · Explain WhyMay 10 2019, 02:27

This revision was automatically updated to reflect the committed changes.

Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com> added a commit: rSTAGING5f231a9d0d2e: Merge #10115: Avoid reading the old hd master key during wallet encryption.Sep 18 2019, 23:27

Revision Contents
Changeset List

Path

Size

src/

wallet/

wallet.h

8 lines

wallet.cpp

17 lines

Diff 8577

View Options

src/wallet/wallet.h