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.

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

Jump to bottom

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

Merged
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

merged 14 commits into from
Apr 15, 2023

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Mar 10, 2023 •
edited
Loading

@kwvg kwvg force-pushed the auxports9 branch 5 times, most recently from fc0a846 to 79e7ae6 Compare March 13, 2023 06:18
@kwvg kwvg marked this pull request as ready for review March 13, 2023 11:52
@kwvg kwvg requested review from UdjinM6, knst and PastaPastaPasta and removed request for UdjinM6 and knst March 13, 2023 11:52
@kwvg kwvg mentioned this pull request Mar 13, 2023
Merged
knst
knst requested changes Mar 14, 2023
View reviewed changes
Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

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

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 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 kwvg force-pushed the auxports9 branch 2 times, most recently from e74ef38 to 8c48c41 Compare March 16, 2023 08:55
@knst
Copy link
Collaborator

knst commented Mar 16, 2023 •
edited
Loading

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
Copy link

This pull request has conflicts, please rebase.

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

github-actions bot commented Apr 4, 2023

This pull request has conflicts, please rebase.

@kwvg 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 kwvg requested a review from knst April 13, 2023 06:41
knst
knst previously approved these changes Apr 13, 2023
View reviewed changes
Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6
Copy link

UdjinM6 commented Apr 13, 2023

why 284a20a is here? it looks unrelated.

@kwvg
Copy link
Collaborator Author

kwvg commented Apr 14, 2023

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
Copy link

UdjinM6 commented Apr 14, 2023

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

@kwvg
Copy link
Collaborator Author

kwvg commented Apr 15, 2023

284a20a has been split off into #5324

@kwvg kwvg requested a review from knst April 15, 2023 09:30
UdjinM6
UdjinM6 approved these changes Apr 15, 2023
View reviewed changes
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.

LGTM, utACK

PastaPastaPasta
PastaPastaPasta approved these changes Apr 15, 2023
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

light-ACK for merging via merge commit

kwvg added 14 commits April 15, 2023 12:12
@kwvg @PastaPastaPasta
uint256: add definition for constant 'ZERO'
8d5ae62
@kwvg @PastaPastaPasta
partial bitcoin#17938: Disallow automatic conversion between disparat…
00802bb 
…e hash types

includes:
- 0a5ea32
- 3fcc468
- 2c54217
- 966a22d
- 4d73691
@kwvg @PastaPastaPasta
merge bitcoin#21523: run VerifyDB on all chainstates
4595895
@kwvg @PastaPastaPasta
merge bitcoin#17954: Remove calls to Chain::Lock methods
a262bb8
@kwvg @PastaPastaPasta
merge bitcoin#17905: Avoid redundant tx status updates
091eda4
@kwvg @PastaPastaPasta
merge bitcoin#17993: Balance/TxStatus polling update based on last bl…
aef3dd7 
…ock hash
@kwvg @PastaPastaPasta
merge bitcoin#19132: lock cs_main, m_cached_tip_mutex in that order
4df5b1c
@kwvg @PastaPastaPasta
partial bitcoin#18587: Avoid wallet tryGetBalances calls in WalletMod…
3b08a1c 
…el::pollBalanceChanged

contains:
- 2bc9b92
- bf0a510
@kwvg @PastaPastaPasta
merge bitcoin-gui#8: Fix regression in TransactionTableModel
76d870b
@kwvg @PastaPastaPasta
qt: source TransactionTable block height from wallet interface
ab1da2f
@kwvg @PastaPastaPasta
merge bitcoin#20494: Move node and wallet code out of src/interfaces
3417be5
@kwvg @PastaPastaPasta
merge bitcoin#19425: Get rid of more redundant chain methods
320b4b6
@kwvg @PastaPastaPasta
merge bitcoin#17513: Nuke some circular dependencies
0fe2c99
@kwvg @PastaPastaPasta
test: fix test affected by "Allow LegacyScriptPubKeyMan to be null"
be54c1a
@PastaPastaPasta PastaPastaPasta merged commit 5b027e6 into dashpay:develop Apr 15, 2023
@UdjinM6 UdjinM6 added this to the 20 milestone Apr 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@knst knst Awaiting requested review from knst

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
20
Development

Successfully merging this pull request may close these issues.
4 participants
@kwvg @knst @PastaPastaPasta @UdjinM6