backport: merge bitcoin#21523, #17954, #17905, #17993, #19132, #20494, #19425, #17513, bitcoin-gui#8, partial bitcoin#17938, #18587 (auxiliary backports: part 9) by kwvg · Pull Request #5246 · dashpay/dash

kwvg · 2023-03-10T21:42:35Z

Additional Notes

Depends on backport: merge bitcoin#19905, #19927, #21025, #20749, #21055, partial #19775, #20750, #21270 (prune g_chainman usage) #5235
Depends on backport: CWallet refactoring: bitcoin#14588 #16026 #16786 #17261 #18026 #18067 #18115 #18241, #19982 fixes for #17260, #16301, #16426, redo #20033, #19845 #5173

knst

I think these 2 backports should be included in this PR:

Merge bitcoin#19132: qt: lock cs_main, m_cached_tip_mutex in that order
Merge bitcoin-core/gui#8: Fix regression in TransactionTableModel

Because they contains fixes for:
Merge bitcoin#17993: gui: Balance/TxStatus polling update based on last block hash.

bitcoin#19425 partial due to missing changes in these lines?

m_node.chain->broadcastTransaction

(after comment "Load wallet again, this time creating new block and mempool")

Better to wait #5173 to be merged and after that complete 19425.

I think better to avoid adding extra functions to interface of BaseHash in standard.h

src/qt/transactiontablemodel.cpp

src/qt/walletmodel.cpp

test/lint/lint-circular-dependencies.sh

src/wallet/test/wallet_tests.cpp

knst · 2023-03-16T19:11:07Z

I think better to avoid adding extra functions to interface of BaseHash in standard.h

sorry, forgot to attach a link to a comment.

Here is it: Nuke IsNull

github-actions · 2023-03-19T16:11:37Z

This pull request has conflicts, please rebase.

github-actions · 2023-04-04T17:45:07Z

This pull request has conflicts, please rebase.

knst

utACK

UdjinM6 · 2023-04-13T21:17:34Z

why 284a20a is here? it looks unrelated.

kwvg · 2023-04-14T04:36:34Z

Was running the extended test suite locally and found this test to be consistently failing, CI excludes feature_pruning and feature_dbcrash so at some point it broke but warnings weren't raised. Figured I'd add the fix into an "auxiliary" PR so it's here. It can be moved to a distinct PR if necessary but the fix was minor enough that I didn't really feel it should be.

UdjinM6 · 2023-04-14T21:03:59Z

I'd say drop it cause it's not a backport and it's not a fix for any backport listed here

kwvg · 2023-04-15T09:29:50Z

284a20a has been split off into #5324

UdjinM6

LGTM, utACK

PastaPastaPasta

light-ACK for merging via merge commit

…e hash types includes: - 0a5ea32 - 3fcc468 - 2c54217 - 966a22d - 4d73691

…ock hash

…el::pollBalanceChanged contains: - 2bc9b92 - bf0a510

kwvg force-pushed the auxports9 branch 5 times, most recently from fc0a846 to 79e7ae6 Compare March 13, 2023 06:18

kwvg marked this pull request as ready for review March 13, 2023 11:52

kwvg requested review from PastaPastaPasta, UdjinM6 and knst and removed request for UdjinM6 and knst March 13, 2023 11:52

kwvg mentioned this pull request Mar 13, 2023

backport: merge bitcoin#19806, #21582, #21584, #21270, #21789, #22415, #21525, #21592 (assumeutxo project backports, part 3) #5236

Merged

kwvg force-pushed the auxports9 branch from 79e7ae6 to 89b886c Compare March 13, 2023 16:16

knst requested changes Mar 14, 2023

View reviewed changes

src/qt/transactiontablemodel.cpp Outdated Show resolved Hide resolved

src/qt/walletmodel.cpp Show resolved Hide resolved

test/lint/lint-circular-dependencies.sh Outdated Show resolved Hide resolved

src/wallet/test/wallet_tests.cpp Outdated Show resolved Hide resolved

kwvg force-pushed the auxports9 branch 2 times, most recently from e74ef38 to 8c48c41 Compare March 16, 2023 08:55

github-actions bot added the needs rebase label Mar 19, 2023

kwvg force-pushed the auxports9 branch from 8c48c41 to 797cd6a Compare March 20, 2023 11:41

github-actions bot removed the needs rebase label Mar 20, 2023

kwvg force-pushed the auxports9 branch 3 times, most recently from da1cf22 to 383f109 Compare March 27, 2023 14:52

github-actions bot added the needs rebase label Apr 4, 2023

kwvg force-pushed the auxports9 branch from 383f109 to 29bde86 Compare April 5, 2023 09:07

github-actions bot removed the needs rebase label Apr 5, 2023

kwvg changed the title ~~backport: merge bitcoin#21523, #17954, partial #17938 (auxiliary backports: part 9)~~ backport: merge bitcoin#21523, #17954, #17905, #17993, #19132, #20494, #19425, #17513, bitcoin-gui#8, partial bitcoin#17938, #18587 (auxiliary backports: part 9) Apr 13, 2023

kwvg force-pushed the auxports9 branch from 940271d to 284a20a Compare April 13, 2023 06:39

kwvg requested a review from knst April 13, 2023 06:41

knst previously approved these changes Apr 13, 2023

View reviewed changes

kwvg dismissed knst’s stale review via 16d0af0 April 15, 2023 09:24

kwvg force-pushed the auxports9 branch from 284a20a to 16d0af0 Compare April 15, 2023 09:24

kwvg requested a review from knst April 15, 2023 09:30

UdjinM6 approved these changes Apr 15, 2023

View reviewed changes

PastaPastaPasta approved these changes Apr 15, 2023

View reviewed changes

kwvg added 14 commits April 15, 2023 12:12

uint256: add definition for constant 'ZERO'

8d5ae62

partial bitcoin#17938: Disallow automatic conversion between disparat…

00802bb

…e hash types includes: - 0a5ea32 - 3fcc468 - 2c54217 - 966a22d - 4d73691

merge bitcoin#21523: run VerifyDB on all chainstates

4595895

merge bitcoin#17954: Remove calls to Chain::Lock methods

a262bb8

merge bitcoin#17905: Avoid redundant tx status updates

091eda4

merge bitcoin#17993: Balance/TxStatus polling update based on last bl…

aef3dd7

…ock hash

merge bitcoin#19132: lock cs_main, m_cached_tip_mutex in that order

4df5b1c

partial bitcoin#18587: Avoid wallet tryGetBalances calls in WalletMod…

3b08a1c

…el::pollBalanceChanged contains: - 2bc9b92 - bf0a510

merge bitcoin-gui#8: Fix regression in TransactionTableModel

76d870b

qt: source TransactionTable block height from wallet interface

ab1da2f

merge bitcoin#20494: Move node and wallet code out of src/interfaces

3417be5

merge bitcoin#19425: Get rid of more redundant chain methods

320b4b6

merge bitcoin#17513: Nuke some circular dependencies

0fe2c99

test: fix test affected by "Allow LegacyScriptPubKeyMan to be null"

be54c1a

PastaPastaPasta force-pushed the auxports9 branch from 16d0af0 to be54c1a Compare April 15, 2023 17:12

PastaPastaPasta merged commit 5b027e6 into dashpay:develop Apr 15, 2023

UdjinM6 added this to the 20 milestone Apr 15, 2023

Conversation

kwvg commented Mar 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional Notes

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

knst commented Mar 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 19, 2023

Uh oh!

github-actions bot commented Apr 4, 2023

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 commented Apr 13, 2023

Uh oh!

kwvg commented Apr 14, 2023

Uh oh!

UdjinM6 commented Apr 14, 2023

Uh oh!

kwvg commented Apr 15, 2023

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kwvg commented Mar 10, 2023 •

edited

Loading

knst commented Mar 16, 2023 •

edited

Loading