Skip to content

backport: merge bitcoin#19525, #20434, #22244, #20476, #19667, #22320, #18676, #19375, #21991, #20421, partial #23511 (auxiliary backports: part 8) #5120

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 11 commits into from
Jan 19, 2023
Merged

backport: merge bitcoin#19525, #20434, #22244, #20476, #19667, #22320, #18676, #19375, #21991, #20421, partial #23511 (auxiliary backports: part 8) #5120

merged 11 commits into from
Jan 19, 2023

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Dec 28, 2022 •
edited
Loading

What was done?

Backports, see commit titles for more information

How Has This Been Tested?

make check

Breaking Changes

None

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation

For repository code-owners and collaborators only

  • I have assigned this pull request to a milestone

@kwvg kwvg marked this pull request as draft December 28, 2022 10:59
@github-actions
Copy link

github-actions bot commented Jan 2, 2023

This pull request has conflicts, please rebase.

@kwvg kwvg marked this pull request as ready for review January 2, 2023 10:39
@kwvg kwvg mentioned this pull request Jan 2, 2023
Merged
5 tasks
UdjinM6
UdjinM6 requested changes Jan 2, 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.

NACK

bitcoin can do 22930 because they switched to guix and downgraded glibc in 22365
running dashd produced via gitian build using this branch results in

./dashcore-3abf7af8a21f/bin/dashd: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.29' not found (required by ./dashcore-3abf7af8a21f/bin/dashd)

on 18.04/bionic

PastaPastaPasta
PastaPastaPasta requested changes Jan 12, 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.

re-req when you need me to review :D

@kwvg kwvg changed the title backport: merge bitcoin#22930, #19525, #20434, #22244, #20476, partial #23511 (auxiliary backports: part 8) backport: merge bitcoin#19525, #20434, #22244, #20476, #19667, #22320, #18676, #19375, #21991, #20421, partial #23511 (auxiliary backports: part 8) Jan 15, 2023
UdjinM6
UdjinM6 requested changes Jan 17, 2023
View reviewed changes
@kwvg kwvg requested a review from UdjinM6 January 17, 2023 08:35
@UdjinM6 UdjinM6 added this to the 19 milestone Jan 17, 2023
UdjinM6
UdjinM6 approved these changes Jan 17, 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.

utACK

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

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta merged commit 4966fd1 into dashpay:develop Jan 19, 2023
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

@knst knst Awaiting requested review from knst

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

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