Skip to content

backport: merge bitcoin#21523, #17954, #17905, #17993, #19132, #20494, #19425, #17513, bitcoin-gui#8, partial bitcoin#17938, #18587 (auxiliary backports: part 9) #5246

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.

Sign up for GitHub

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

Merged
PastaPastaPasta merged 14 commits into from
Apr 15, 2023
Merged

backport: merge bitcoin#21523, #17954, #17905, #17993, #19132, #20494, #19425, #17513, bitcoin-gui#8, partial bitcoin#17938, #18587 (auxiliary backports: part 9) #5246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8d5ae62
uint256: add definition for constant 'ZERO'
kwvg Mar 5, 2023
00802bb
partial bitcoin#17938: Disallow automatic conversion between disparat…
kwvg Apr 5, 2023
4595895
merge bitcoin#21523: run VerifyDB on all chainstates
kwvg Apr 6, 2023
a262bb8
merge bitcoin#17954: Remove calls to Chain::Lock methods
kwvg Mar 12, 2023
091eda4
merge bitcoin#17905: Avoid redundant tx status updates
kwvg Aug 1, 2018
aef3dd7
merge bitcoin#17993: Balance/TxStatus polling update based on last bl…
kwvg Apr 10, 2023
4df5b1c
merge bitcoin#19132: lock cs_main, m_cached_tip_mutex in that order
kwvg Jun 1, 2020
3b08a1c
partial bitcoin#18587: Avoid wallet tryGetBalances calls in WalletMod…
kwvg Apr 24, 2020
76d870b
merge bitcoin-gui#8: Fix regression in TransactionTableModel
kwvg Apr 10, 2023
ab1da2f
qt: source TransactionTable block height from wallet interface
kwvg Apr 10, 2023
3417be5
merge bitcoin#20494: Move node and wallet code out of src/interfaces
kwvg Apr 13, 2023
320b4b6
merge bitcoin#19425: Get rid of more redundant chain methods
kwvg Apr 5, 2023
0fe2c99
merge bitcoin#17513: Nuke some circular dependencies
kwvg Nov 19, 2019
be54c1a
test: fix test affected by "Allow LegacyScriptPubKeyMan to be null"
kwvg Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,6 @@ libbitcoin_server_a_SOURCES = \
index/base.cpp \
index/blockfilterindex.cpp \
index/txindex.cpp \
interfaces/chain.cpp \
interfaces/node.cpp \
init.cpp \
governance/governance.cpp \
governance/classes.cpp \
Expand Down Expand Up @@ -436,6 +434,7 @@ libbitcoin_server_a_SOURCES = \
node/coin.cpp \
node/coinstats.cpp \
node/context.cpp \
node/interfaces.cpp \
node/transaction.cpp \
noui.cpp \
policy/fees.cpp \
Expand Down Expand Up @@ -495,12 +494,12 @@ libbitcoin_wallet_a_SOURCES = \
coinjoin/client.cpp \
coinjoin/options.cpp \
coinjoin/util.cpp \
interfaces/wallet.cpp \
wallet/coincontrol.cpp \
wallet/context.cpp \
wallet/crypter.cpp \
wallet/db.cpp \
wallet/fees.cpp \
wallet/interfaces.cpp \
wallet/load.cpp \
wallet/rpcdump.cpp \
wallet/rpcwallet.cpp \
Expand Down
1 change: 1 addition & 0 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ BITCOIN_QT_H = \
qt/rpcconsole.h \
qt/sendcoinsdialog.h \
qt/sendcoinsentry.h \
qt/sendcoinsrecipient.h \
qt/signverifymessagedialog.h \
qt/splashscreen.h \
qt/trafficgraphdata.h \
Expand Down
1 change: 1 addition & 0 deletions src/Makefile.test.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ BITCOIN_TESTS =\
test/getarg_tests.cpp \
test/governance_validators_tests.cpp \
test/hash_tests.cpp \
test/interfaces_tests.cpp \
test/key_io_tests.cpp \
test/key_tests.cpp \
test/lcg.h \
Expand Down
6 changes: 2 additions & 4 deletions src/bench/wallet_balance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const b
RegTestingSetup test_setup;
const auto& ADDRESS_WATCHONLY = ADDRESS_B58T_UNSPENDABLE;

NodeContext node;
std::unique_ptr<interfaces::Chain> chain = interfaces::MakeChain(node);
CWallet wallet{chain.get(), "", CreateMockWalletDatabase()};
CWallet wallet{test_setup.m_node.chain.get(), "", CreateMockWalletDatabase()};
{
wallet.SetupLegacyScriptPubKeyMan();
bool first_run;
if (wallet.LoadWallet(first_run) != DBErrors::LOAD_OK) assert(false);
}
auto handler = chain->handleNotifications({ &wallet, [](CWallet*) {} });
auto handler = test_setup.m_node.chain->handleNotifications({ &wallet, [](CWallet*) {} });

const std::optional<std::string> address_mine{add_mine ? std::optional<std::string>{getnewaddress(wallet)} : std::nullopt};
if (add_watchonly) importaddress(wallet, ADDRESS_WATCHONLY);
Expand Down
4 changes: 2 additions & 2 deletions src/evo/deterministicmns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ template <typename ProTx>
static bool CheckHashSig(const ProTx& proTx, const PKHash& pkhash, CValidationState& state)
{
std::string strError;
if (!CHashSigner::VerifyHash(::SerializeHash(proTx), CKeyID(pkhash), proTx.vchSig, strError)) {
if (!CHashSigner::VerifyHash(::SerializeHash(proTx), ToKeyID(pkhash), proTx.vchSig, strError)) {
return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, "bad-protx-sig");
}
return true;
Expand All @@ -1426,7 +1426,7 @@ template <typename ProTx>
static bool CheckStringSig(const ProTx& proTx, const PKHash& pkhash, CValidationState& state)
{
std::string strError;
if (!CMessageSigner::VerifyMessage(CKeyID(pkhash), proTx.vchSig, proTx.MakeSignString(), strError)) {
if (!CMessageSigner::VerifyMessage(ToKeyID(pkhash), proTx.vchSig, proTx.MakeSignString(), strError)) {
return state.Invalid(ValidationInvalidReason::CONSENSUS, false, REJECT_INVALID, "bad-protx-sig");
}
return true;
Expand Down
7 changes: 2 additions & 5 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2190,11 +2190,8 @@ bool AppInitMain(const CoreContext& context, NodeContext& node, interfaces::Bloc
if (llmq::utils::IsV19Active(tip))
bls::bls_legacy_scheme.store(false);

// Only verify the DB of the active chainstate. This is fixed in later
// work when we allow VerifyDB to be parameterized by chainstate.
if (&::ChainstateActive() == chainstate &&
!CVerifyDB().VerifyDB(
chainparams, *chainstate, &chainstate->CoinsDB(),
if (!CVerifyDB().VerifyDB(
*chainstate, chainparams, chainstate->CoinsDB(),
*node.evodb,
args.GetArg("-checklevel", DEFAULT_CHECKLEVEL),
args.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS))) {
Expand Down
Loading