Skip to content

merge bitcoin#15931, #16839, #17192, #17407, #18037, #17997, partial #15639, #17989: deglobalisation and mining rpc backports #4756

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
Merged
merged 17 commits into from
Apr 20, 2022
Merged

merge bitcoin#15931, #16839, #17192, #17407, #18037, #17997, partial #15639, #17989: deglobalisation and mining rpc backports #4756

merged 17 commits into from
Apr 20, 2022

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Apr 6, 2022

For more information, see #4357

@kwvg kwvg requested review from UdjinM6 and PastaPastaPasta April 6, 2022 09:14
@kwvg kwvg mentioned this pull request Apr 6, 2022
Closed
UdjinM6
UdjinM6 requested changes Apr 6, 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.

CI isn't happy, pls see https://github.com/UdjinM6/dash/commits/pr4756

@kwvg kwvg force-pushed the split_ci branch 3 times, most recently from d3ff9ad to 025dc2b Compare April 6, 2022 15:33
@kwvg kwvg requested a review from UdjinM6 April 6, 2022 15:34
UdjinM6
UdjinM6 previously approved these changes Apr 6, 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, utACK

@PastaPastaPasta
Copy link
Member

IMO this should be merged after rotation (#4752)

@github-actions
Copy link

github-actions bot commented Apr 7, 2022

This pull request has conflicts, please rebase.

@PastaPastaPasta PastaPastaPasta marked this pull request as draft April 7, 2022 16:07
@github-actions
Copy link

This pull request has conflicts, please rebase.

@kwvg kwvg marked this pull request as ready for review April 17, 2022 10:54
@github-actions
Copy link

This pull request has conflicts, please rebase.

kwvg and others added 11 commits April 20, 2022 00:22
@kwvg @UdjinM6
merge bitcoin#16839: Replace Connman and BanMan globals with NodeCont…
b3b6364 
…ext local

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
@kwvg
merge bitcoin#17407: Add reference to mempool in NodeContext
073a173
@kwvg @UdjinM6
merge bitcoin#18037: Allow scheduler to be mocked
87bd5f5 
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
@kwvg @UdjinM6
partial bitcoin#17989: Add fuzzing harness for ProcessMessage(...). E…
f0263a3 
…nables high-level fuzzing of the P2P layer

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
@kwvg
merge bitcoin#17997: Remove mempool global from net
41252a1
@kwvg
merge bitcoin#16943: Add generatetodescriptor RPC
c18786d
@kwvg
merge bitcoin#17781: Remove mempool global from miner
978fb0b
@kwvg
merge bitcoin#18575: Remove requirement that all benches use RegTesti…
d4ffaf0 
…ngSetup
@kwvg
merge bitcoin#17693: Add generateblock to mine a custom set of transa…
eea2d83 
…ctions
@UdjinM6 @kwvg
fix linter
103f49a
@UdjinM6 @kwvg
fuzz: fix 17018
41c2d0f
@kwvg kwvg requested a review from UdjinM6 April 19, 2022 19:08
UdjinM6
UdjinM6 approved these changes Apr 20, 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.

utACK

@UdjinM6 UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label Apr 20, 2022
PastaPastaPasta
PastaPastaPasta approved these changes Apr 20, 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 f2704ea into dashpay:develop Apr 20, 2022
@UdjinM6 UdjinM6 added this to the 19 milestone Apr 20, 2022
@PastaPastaPasta PastaPastaPasta added the Needs Release Notes This PR includes breaking changes for which release notes have not yet been merged. label Apr 28, 2022
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
Needs Release Notes This PR includes breaking changes for which release notes have not yet been merged. RPC Some notable changes to RPC params/behaviour/descriptions
Projects
None yet
Milestone
18.1
Development

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