Skip to content

merge bitcoin#15948, #15976, #16194...: assumeutxo project backports (part 1) #4498

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
PastaPastaPasta merged 14 commits into from
Oct 23, 2021
Merged

merge bitcoin#15948, #15976, #16194...: assumeutxo project backports (part 1) #4498

PastaPastaPasta merged 14 commits into from
Oct 23, 2021

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Oct 9, 2021 •
edited
Loading

No description provided.

@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Oct 10, 2021

linter is mad

@kwvg kwvg changed the title merge bitcoin#15948, #15976, #16194...: assumeutxo project backports merge bitcoin#15948, #15976, #16194...: assumeutxo project backports (part 1) Oct 10, 2021
@github-actions
Copy link

github-actions bot commented Oct 10, 2021

This pull request has conflicts, please rebase.

@github-actions
Copy link

github-actions bot commented Oct 13, 2021

This pull request has conflicts, please rebase.

UdjinM6
UdjinM6 requested changes Oct 16, 2021
View reviewed changes
@kwvg kwvg requested a review from UdjinM6 October 16, 2021 17:44
@UdjinM6 UdjinM6 added this to the 18 milestone Oct 16, 2021
PastaPastaPasta
PastaPastaPasta requested changes Oct 18, 2021
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.

Looks good! Few comments

UdjinM6
UdjinM6 requested changes Oct 19, 2021
View reviewed changes
@github-actions
Copy link

github-actions bot commented Oct 21, 2021

This pull request has conflicts, please rebase.

1 similar comment
@github-actions
Copy link

github-actions bot commented Oct 21, 2021

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the assumeutxo branch 2 times, most recently from 281c31d to 9ec894a Compare October 21, 2021 17:28
@github-actions
Copy link

github-actions bot commented Oct 21, 2021

This pull request has conflicts, please rebase.

kwvg and others added 14 commits October 22, 2021 08:15
@kwvg @UdjinM6
merge bitcoin#15948: rename chainActive
1f436f8 
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
@kwvg @UdjinM6
merge bitcoin#15976: move methods under CChainState
1bb1cea 
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
@kwvg
merge bitcoin#16092: Don't use global (external) symbols for symbols …
900c010 
…that are used in only one translation unit
@kwvg @UdjinM6
merge bitcoin#16194: share blockmetadata with BlockManager
a620d94 
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
@kwvg
merge bitcoin#16355: move CCoinsViewErrorCatcher out of init.cpp
8dbf26e
@kwvg
merge bitcoin#15999: Remove dead code in LoadChainTip
51f73b5
@kwvg
merge bitcoin#16443: have CCoins* data managed under CChainState
84339a4
@kwvg
merge bitcoin#16757: CChainState return values
80d08bb
@kwvg
merge bitcoin#16743: move LoadChainTip/RelayBlocks under CChainState
510ee35
@kwvg
merge bitcoin#16945: introduce CChainState::GetCoinsCacheSizeState
f9c4b85
@kwvg
trivial: make linter happy
692928d
@kwvg
mutex: lock cs_main before calling ::ChainstateActive().CoinsTip()
16e238d
@kwvg
mutex: lock mempool.cs before calling LimitMempoolSize()
2da416a
@UdjinM6 @kwvg
mutex: refactor coinjoin mutex locking logic
4606c50
UdjinM6
UdjinM6 approved these changes Oct 23, 2021
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

PastaPastaPasta
PastaPastaPasta approved these changes Oct 23, 2021
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 29dbe98 into dashpay:develop Oct 23, 2021
@PastaPastaPasta PastaPastaPasta mentioned this pull request Oct 23, 2021
Merged
@kwvg kwvg deleted the assumeutxo branch July 18, 2023 11:40
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

Bitcoin Backport

Projects

None yet

Milestone

18

Development

Successfully merging this pull request may close these issues.

3 participants

@kwvg @PastaPastaPasta @UdjinM6