Skip to content

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

Closed
kwvg wants to merge 16 commits intodashpay:developfrom
kwvg:split
Closed

merge bitcoin#15931, #16839, #17192, #17407, #18037, #17997, partial #15639, #17989: deglobalisation and mining rpc backports#4357
kwvg wants to merge 16 commits intodashpay:developfrom
kwvg:split

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Aug 22, 2021 •
edited
Loading

No description provided.

@kwvg kwvg marked this pull request as draft August 22, 2021 20:24
@github-actions
Copy link

github-actions bot commented Sep 9, 2021

This pull request has conflicts, please rebase.

@kwvg kwvg changed the title merge bitcoin#14437: separate wallet from node merge bitcoin#16839, #17997, #18038, #18740, #19096, #19413, #19779: deglobalisation Oct 7, 2021
@github-actions
Copy link

github-actions bot commented Dec 30, 2021

This Pull Request may conflict if the Pull Requests below are merged first.

#4649
conflictable files: src/interfaces/node.cpp

@github-actions github-actions bot mentioned this pull request Dec 30, 2021
Merged
@github-actions
Copy link

github-actions bot commented Dec 30, 2021

This Pull Request may conflict if the Pull Requests below are merged first.

#4643
conflictable files: src/rpc/rawtransaction.cpp,src/test/rpc_tests.cpp,src/wallet/rpcwallet.cpp

@github-actions github-actions bot mentioned this pull request Dec 30, 2021
Merged
@kwvg kwvg self-assigned this Jan 9, 2022
@github-actions
Copy link

github-actions bot commented Jan 10, 2022

This pull request has conflicts, please rebase.

@kwvg kwvg changed the title merge bitcoin#16839, #17997, #18038, #18740, #19096, #19413, #19779: deglobalisation merge bitcoin#15931, #16839, #17192, #17407, #18037, #17997, partial #15639, #17989: deglobalisation (part 1) Jan 11, 2022
@github-actions
Copy link

github-actions bot commented Feb 10, 2022

This pull request has conflicts, please rebase.

@github-actions
Copy link

github-actions bot commented Feb 23, 2022

This pull request has conflicts, please rebase.

@kwvg kwvg changed the title merge bitcoin#15931, #16839, #17192, #17407, #18037, #17997, partial #15639, #17989: deglobalisation (part 1) merge bitcoin#15931, #16839, #17192, #17407, #18037, #17997, partial #15639, #17989: deglobalisation and mining rpc backports Mar 25, 2022
@kwvg kwvg marked this pull request as ready for review March 25, 2022 00:31
@kwvg kwvg requested a review from PastaPastaPasta March 25, 2022 00:34
@kwvg kwvg marked this pull request as draft April 3, 2022 13:08
@github-actions
Copy link

github-actions bot commented Apr 3, 2022

This pull request has conflicts, please rebase.

UdjinM6
UdjinM6 requested changes Apr 5, 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.

needs rebase + pls see https://github.com/UdjinM6/dash/commits/pr4357

kwvg and others added 16 commits April 5, 2022 14:40
@kwvg
partial bitcoin#15639: Drop libbitcoin_server.a dependency
18e506c
@kwvg
merge bitcoin#15842: replace isPotentialtip/waitForNotifications by h…
11ee62f 
…igher method
@kwvg @UdjinM6
merge bitcoin#16624: encapsulate transactions state
9828801 
Co-authored-by: UdjinM6 <[email protected]>
@kwvg @UdjinM6
merge bitcoin#15931: Remove GetDepthInMainChain dependency on locked …
0930a02 
…chain interface

Co-authored-by: UdjinM6 <[email protected]>
@kwvg @UdjinM6
Pass CConnman to function in place for global pointer access
71b206a 
Co-authored-by: UdjinM6 <[email protected]>
@kwvg
Replace CConnman global pointer with local member
207f50e
@kwvg @UdjinM6
merge bitcoin#16839: Replace Connman and BanMan globals with NodeCont…
93e716c 
…ext local

Co-authored-by: UdjinM6 <[email protected]>
@kwvg
merge bitcoin#17407: Add reference to mempool in NodeContext
490b02b
@kwvg @UdjinM6
merge bitcoin#18037: Allow scheduler to be mocked
3126403 
Co-authored-by: UdjinM6 <[email protected]>
@kwvg @UdjinM6
partial bitcoin#17989: Add fuzzing harness for ProcessMessage(...). E…
bc42908 
…nables high-level fuzzing of the P2P layer

Co-authored-by: UdjinM6 <[email protected]>
@kwvg
merge bitcoin#17997: Remove mempool global from net
a79df64
@kwvg
merge bitcoin#16943: Add generatetodescriptor RPC
3d17eec
@kwvg
merge bitcoin#17781: Remove mempool global from miner
fc9ac7b
@kwvg
merge bitcoin#18575: Remove requirement that all benches use RegTesti…
82e1ebc 
…ngSetup
@kwvg
merge bitcoin#17693: Add generateblock to mine a custom set of transa…
a2aa72d 
…ctions
@UdjinM6 @kwvg
fix linter
5c34034
@kwvg kwvg requested review from PastaPastaPasta and UdjinM6 April 5, 2022 09:28
UdjinM6
UdjinM6 requested changes Apr 5, 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 but gitlab action no longer works for this PR for some reason :/ should replace this PR with a new one

@kwvg kwvg mentioned this pull request Apr 6, 2022
Merged
@kwvg
Copy link
Collaborator Author

kwvg commented Apr 6, 2022

Superseded by #4756

@kwvg kwvg closed this Apr 6, 2022
@kwvg kwvg deleted the split 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 requested changes

@PastaPastaPasta PastaPastaPasta Awaiting requested review from PastaPastaPasta

Assignees

@kwvg kwvg

Labels

Bitcoin Backport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kwvg @UdjinM6 @PastaPastaPasta