Skip to content

merge bitcoin#14700...#16854: backports - #4606

Merged
PastaPastaPasta merged 6 commits into
dashpay:developfrom
kwvg:portsportsports
Dec 21, 2021
Merged

merge bitcoin#14700...#16854: backports#4606
PastaPastaPasta merged 6 commits into
dashpay:developfrom
kwvg:portsportsports

Conversation

@kwvg

@kwvgkwvg commented Dec 4, 2021

Copy link
Copy Markdown
Collaborator

No description provided.

@PastaPastaPastaPastaPastaPasta added this to the 18 milestone Dec 5, 2021
UdjinM6
UdjinM6 requested changes Dec 7, 2021
View reviewed changes
Comment threadtest/functional/rpc_psbt.py Outdated
Comment threadtest/functional/feature_block.py Outdated
@thephezthephez added the RPC Some notable changes to RPC params/behaviour/descriptions label Dec 7, 2021
PastaPastaPasta
PastaPastaPasta previously approved these changes Dec 11, 2021
View reviewed changes

@PastaPastaPastaPastaPastaPasta left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one comment

utACK for merge via merge commit

Comment threadsrc/rpc/rawtransaction.cpp Outdated
@UdjinM6UdjinM6 changed the title merge bitcoin#14719...#16854: backportsmerge bitcoin#14700...#16854: backportsDec 12, 2021
UdjinM6
UdjinM6 previously approved these changes Dec 12, 2021
View reviewed changes

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

PastaPastaPasta
PastaPastaPasta requested changes Dec 12, 2021
View reviewed changes
Comment threadsrc/rpc/rawtransaction.cpp Outdated
Comment threadtest/functional/rpc_psbt.py Outdated
@kwvg
kwvgforce-pushed the portsportsports branch 2 times, most recently from 11c5fc5 to d81793fCompareDecember 13, 2021 05:40
UdjinM6
UdjinM6 reviewed Dec 17, 2021
View reviewed changes
Comment threadsrc/rpc/rawtransaction.cpp Outdated
Comment on lines 1449 to 1445

@UdjinM6UdjinM6Dec 17, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

13932: hmmm... doesn't this mean that in our case utxoupdatepsbt simply does nothing all the time?

@kwvgkwvgDec 18, 2021

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it exists only to exist but I presume that its absence may be an unexpected API deviation so it was added in despite practically being a NOP.

@github-actions

github-actionsBot commented Dec 17, 2021

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@kwvg
kwvg requested a review from UdjinM6December 19, 2021 08:37
UdjinM6
UdjinM6 reviewed Dec 19, 2021
View reviewed changes
Comment threadtest/functional/rpc_psbt.py Outdated
@kwvg
kwvg requested a review from UdjinM6December 21, 2021 07:17
UdjinM6
UdjinM6 approved these changes Dec 21, 2021
View reviewed changes

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

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 Dec 21, 2021
View reviewed changes

@PastaPastaPastaPastaPastaPasta left a comment

Copy link
Copy Markdown
Member

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 e95c13c into dashpay:developDec 21, 2021
UdjinM6 added a commit to UdjinM6/dash that referenced this pull request Dec 30, 2021
@UdjinM6
Fix 16854
75148ab
merged via dashpay#4606
@UdjinM6UdjinM6 mentioned this pull request Dec 30, 2021
Merged
@kwvg
kwvg deleted the portsportsports branch July 18, 2023 11:40
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Nov 16, 2023
@UdjinM6@gades
Fix 16854
0b7a34a
merged via dashpay#4606
gades pushed a commit to piratecash/pirate that referenced this pull request Dec 9, 2023
@UdjinM6@gades
Fix 16854
d273a1d
merged via dashpay#4606
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes

Assignees

No one assigned

Labels

Bitcoin BackportRPCSome notable changes to RPC params/behaviour/descriptions

Projects

None yet

Milestone

18

Development

Successfully merging this pull request may close these issues.

4 participants

@kwvg@UdjinM6@PastaPastaPasta@thephez