Paths

Table of Contentst

Differential D7848

[backport#17261 3/13] Refactor: Allow LegacyScriptPubKeyMan to be null
ClosedPublic
Actions

Authored by majcosta on Oct 9 2020, 14:55.

Tags

None

Subscribers

Details

Reviewers

Group Reviewers

Restricted Project

Commits

rABCe238f8c4badb: [backport#17261 3/13] Refactor: Allow LegacyScriptPubKeyMan to be null

Summary

In CWallet::LoadWallet, use this to detect and empty wallet with no keys

This commit does not change behavior.

https://github.com/bitcoin/bitcoin/pull/17261/commits/eb81fc3ee58d3e88af36d8091b9e4017a8603b3c

Depends on D7838

Partial backport of Core PR17261

Test Plan

export CC=clang CXX=clang++; cmake -GNinja -DCMAKE_BUILD_TYPE=Debug
ninja all check check-functional

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

majcosta created this revision.Oct 9 2020, 14:55

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 9 2020, 14:55

majcosta requested review of this revision.Oct 9 2020, 14:55

teamcity edited the summary of this revision. (Show Details)Oct 9 2020, 14:56

majcosta added a child revision: D7849: [backport#17261 4/13] List output types in an array in order to be iterated over.Oct 9 2020, 14:56

Harbormaster completed remote builds in B13300: Diff 24457.Oct 9 2020, 15:07

Fabien requested changes to this revision.Oct 9 2020, 16:04

Fabien added a subscriber: Fabien.

Fabien added inline comments.

src/bench/coin_selection.cpp
113 ↗	(On Diff #24457)	This one is missing the `SetupLegacyPubKeyMan()`
src/wallet/test/coinselector_tests.cpp
144 ↗	(On Diff #24457)	`m_wallet.SetupLegacyScriptPubKeyMan()` ?
293 ↗	(On Diff #24457)	This part differ from the PR, can you look if there is a backport missing ?
716 ↗	(On Diff #24457)	Dito, `m_wallet.SetupLegacyScriptPubKeyMan()` ?

This revision now requires changes to proceed.Oct 9 2020, 16:04

corrected missing calls to SetupLegacyScriptPubKeyMan().

one last one must remain missing since this backport is being done before PR17290 which was reverted recently

Harbormaster completed remote builds in B13323: Diff 24487.Oct 10 2020, 03:45

rebase

Harbormaster completed remote builds in B13327: Diff 24492.Oct 10 2020, 17:53

Fabien accepted this revision.Oct 10 2020, 18:34

This revision is now accepted and ready to land.Oct 10 2020, 18:34

Closed by commit rABCe238f8c4badb: [backport#17261 3/13] Refactor: Allow LegacyScriptPubKeyMan to be null (authored by Andrew Chow <achow101-github@achow101.com>, committed by majcosta). · Explain WhyOct 10 2020, 18:49

This revision was automatically updated to reflect the committed changes.

majcosta added a commit: rABCe238f8c4badb: [backport#17261 3/13] Refactor: Allow LegacyScriptPubKeyMan to be null.

jasonbcox mentioned this in D8015: Revert "Revert recent coin selection changes".Oct 21 2020, 00:12

jasonbcox mentioned this in rABC54fef78d5b20: Revert "Revert recent coin selection changes".Oct 21 2020, 18:44

Revision Contents
Changeset List

Path

Size

src/

bench/

coin_selection.cpp

10 lines

wallet_balance.cpp

1 line

qt/

test/

addressbooktests.cpp

1 line

wallettests.cpp

2 lines

wallet/

10 lines

3 lines

11 lines

test/

coinselector_tests.cpp

4 lines

ismine_tests.cpp

10 lines

psbt_wallet_tests.cpp

2 lines

wallet_tests.cpp

12 lines

19 lines

23 lines

23 lines

2 lines

Diff 24500

src/bench/coin_selection.cpp

Loading...

src/bench/wallet_balance.cpp

Loading...

src/qt/test/addressbooktests.cpp

Loading...

src/qt/test/wallettests.cpp

Loading...

src/wallet/rpcdump.cpp

Loading...

src/wallet/rpcwallet.h

Loading...

src/wallet/rpcwallet.cpp

Loading...

src/wallet/test/coinselector_tests.cpp

Loading...

src/wallet/test/ismine_tests.cpp

Loading...

src/wallet/test/psbt_wallet_tests.cpp

Loading...

src/wallet/test/wallet_tests.cpp

Loading...

src/wallet/wallet.h

Loading...

src/wallet/wallet.cpp

Loading...

src/wallet/walletdb.cpp

Loading...

src/wallet/wallettool.cpp

Loading...