Skip to content

backport: bitcoin#18038, #14193, #17564, #17999, #18740, #19096, #16426, #17737, #18698: deglobalization backports (part 2)#4801

Merged
PastaPastaPasta merged 9 commits intodashpay:developfrom
kwvg:deglobalization2
May 19, 2022
Merged

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Apr 23, 2022 •
edited
Loading

Made possible with significant contributions by @UdjinM6

@kwvg kwvg marked this pull request as draft April 23, 2022 08:04
@kwvg kwvg force-pushed the deglobalization2 branch from 164ac72 to e055b70 Compare April 24, 2022 10:53
UdjinM6
UdjinM6 requested changes May 1, 2022
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.

pls see below + https://github.com/UdjinM6/dash/commits/pr4801 + rebasing after #4826 should help a bit

@github-actions
Copy link

github-actions bot commented May 2, 2022

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the deglobalization2 branch from e055b70 to 320d868 Compare May 3, 2022 03:51
@kwvg kwvg force-pushed the deglobalization2 branch from 320d868 to 2957eed Compare May 5, 2022 15:00
@kwvg kwvg requested a review from UdjinM6 May 5, 2022 15:01
@kwvg kwvg force-pushed the deglobalization2 branch 4 times, most recently from b36dfad to 0f3ad04 Compare May 6, 2022 18:35
@UdjinM6
Copy link

UdjinM6 commented May 7, 2022

pls see https://github.com/UdjinM6/dash/commits/pr4801

@kwvg kwvg force-pushed the deglobalization2 branch from 0f3ad04 to a9aa5d0 Compare May 7, 2022 16:02
@kwvg kwvg marked this pull request as ready for review May 7, 2022 19:51
@kwvg kwvg requested a review from PastaPastaPasta May 8, 2022 07:51
PastaPastaPasta
PastaPastaPasta previously approved these changes May 10, 2022
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.

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta changed the title merge bitcoin#18038, #14193, #17564, #17999, #18740, #19096: deglobalization backports (part 2) backport: bitcoin#18038, #14193, #17564, #17999, #18740, #19096: deglobalization backports (part 2) May 10, 2022
@UdjinM6 UdjinM6 added this to the 18.1 milestone May 10, 2022
@UdjinM6 UdjinM6 changed the title backport: bitcoin#18038, #14193, #17564, #17999, #18740, #19096: deglobalization backports (part 2) backport: bitcoin#18038, #14193, #17564, #17999, #18740, #19096, #16426, #17737, #18698: deglobalization backports (part 2) May 10, 2022
UdjinM6
UdjinM6 requested changes May 11, 2022
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

It looks like I messed up in 784ba27a2e9da233f9dc32a1984bdd718d28875b - it's incomplete (wallet crashes on testnet due to potential deadlocks) and fixing it makes things look ugly and fragile... Sorry! 🙈 let's revert changes added via 784ba27a2e9da233f9dc32a1984bdd718d28875b (880320fc6e83d3923d9fbab0d546a2d625857caa) and apply 8e5c343ae134741c9bf23f1fa79de768e04589d4 and 2f5339d5b822a48e7841c4bc5f2dc1cb3597115b instead. I think it should work but pls test it too!

@kwvg kwvg force-pushed the deglobalization2 branch from a9aa5d0 to 2c2e6b3 Compare May 11, 2022 19:46
@kwvg kwvg requested review from PastaPastaPasta and UdjinM6 May 11, 2022 19:46
UdjinM6
UdjinM6 previously approved these changes May 12, 2022
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.

ok, it looks stable now :)

ACK

@github-actions
Copy link

github-actions bot commented May 12, 2022

This pull request has conflicts, please rebase.

UdjinM6
UdjinM6 previously approved these changes May 16, 2022
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, ACK

@github-actions
Copy link

github-actions bot commented May 17, 2022

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the deglobalization2 branch from d0b1984 to c13023b Compare May 17, 2022 17:15
PastaPastaPasta
PastaPastaPasta previously approved these changes May 17, 2022
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.

utACK for merging via merge commit

@kwvg kwvg requested a review from UdjinM6 May 17, 2022 17:26
@UdjinM6
Copy link

UdjinM6 commented May 17, 2022

LGTM but 16426 was built on top of 16034 originally and we backport 16034 in #4679 which should be merged first imo. This PR should be rebased after that.

@github-actions
Copy link

github-actions bot commented May 18, 2022

This pull request has conflicts, please rebase.

kwvg added 9 commits May 18, 2022 20:49
@kwvg
merge bitcoin#18038: Mempool tracks locally submitted transactions to…
6390cae 
… improve wallet privacy
@kwvg
merge bitcoin#14193: Add missing mempool locks
a250f2c 
Co-authored-by: "UdjinM6 <[email protected]>"
@kwvg
merge bitcoin#17564: Use mempool from node context instead of global
465ea12
@kwvg
merge bitcoin#18740: Remove g_rpc_node global
1a65972
@kwvg
merge bitcoin#19096: Remove g_rpc_chain global
f8924ce
@kwvg
merge bitcoin#16426: Reverse cs_main, cs_wallet lock order and reduce…
f2300bc 
… cs_main locking

Co-authored-by: "UdjinM6 <[email protected]>"
@kwvg
merge bitcoin#17737: Add ChainstateManager, remove BlockManager global
8b9e784 
Co-authored-by: "UdjinM6 <[email protected]>"
@kwvg
merge bitcoin#18698: Make g_chainman internal to validation
761305d
@kwvg
rpc: remove remnant BlockIndex global invocations
7f2cfae
@kwvg kwvg force-pushed the deglobalization2 branch from c13023b to 7f2cfae Compare May 18, 2022 16:24
@kwvg kwvg requested a review from PastaPastaPasta May 18, 2022 16:24
UdjinM6
UdjinM6 approved these changes May 18, 2022
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, re-ACK

PastaPastaPasta
PastaPastaPasta approved these changes May 19, 2022
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.

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta merged commit 22a24ab into dashpay:develop May 19, 2022
@knst knst mentioned this pull request Jan 10, 2023
Merged
3 tasks
@knst knst mentioned this pull request Jan 22, 2023
Merged
2 tasks
@kwvg kwvg deleted the deglobalization2 branch July 18, 2023 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.1

Development

Successfully merging this pull request may close these issues.

3 participants

@kwvg @UdjinM6 @PastaPastaPasta