Skip to content

merge bitcoin #13013, #14908, #14906: Make explicit CMutableTransaction -> CTransaction conversion #4504

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
UdjinM6 merged 3 commits into from
Oct 13, 2021
Merged

merge bitcoin #13013, #14908, #14906: Make explicit CMutableTransaction -> CTransaction conversion #4504

UdjinM6 merged 3 commits into from
Oct 13, 2021

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Oct 11, 2021

No description provided.

@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Oct 11, 2021

Please make these separate commits

@kwvg
Copy link
Collaborator Author

kwvg commented Oct 11, 2021

I discovered bitcoin#14908 after pushing this branch, I did all the changes manually. Just mentioned it for completeness but otherwise did those changes by hand

@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Oct 11, 2021

They really should be in separate commits, both for git cleanliness sake, and for the sake of my script. There should only be one backport per commit

@kwvg
Copy link
Collaborator Author

kwvg commented Oct 11, 2021 •
edited
Loading

Done

@UdjinM6 UdjinM6 added this to the 18 milestone Oct 11, 2021
UdjinM6
UdjinM6 previously approved these changes Oct 11, 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.

LGTM, utACK

PastaPastaPasta
PastaPastaPasta requested changes Oct 11, 2021
View reviewed changes
PastaPastaPasta
PastaPastaPasta requested changes Oct 13, 2021
View reviewed changes
PastaPastaPasta
PastaPastaPasta approved these changes Oct 13, 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

UdjinM6
UdjinM6 approved these changes Oct 13, 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

@UdjinM6 UdjinM6 changed the title merge bitcoin #14908, #14906: Make explicit CMutableTransaction -> CTransaction conversion merge bitcoin #13013, #14908, #14906: Make explicit CMutableTransaction -> CTransaction conversion Oct 13, 2021
@UdjinM6 UdjinM6 merged commit 2a5b5bb into dashpay:develop Oct 13, 2021
@kwvg kwvg deleted the explicit_ref 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

None yet

Projects

Core Dev Backlog
Status: Done

Milestone

18

Development

Successfully merging this pull request may close these issues.

3 participants

@kwvg @PastaPastaPasta @UdjinM6