Skip to content

Fixing serde impl for PSBT inputs#512

Merged
stevenroose merged 1 commit intorust-bitcoin:masterfrom
BP-WG:psbt/fix-serde-input
Nov 7, 2020
Merged

Fixing serde impl for PSBT inputs#512
stevenroose merged 1 commit intorust-bitcoin:masterfrom
BP-WG:psbt/fix-serde-input

Conversation

@dr-orlovsky
Copy link
Copy Markdown
Collaborator

@dr-orlovsky dr-orlovsky commented Nov 6, 2020

No description provided.

apoelstra
apoelstra approved these changes Nov 6, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

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

thanks! utack, pending CI

@apoelstra
Copy link
Copy Markdown
Member

apoelstra commented Nov 6, 2020

Looks like this was caused because #508 and #478 were merged at the same time

This was referenced Nov 6, 2020
Merged
Merged
@stevenroose stevenroose merged commit 3f465d5 into rust-bitcoin:master Nov 7, 2020
@stevenroose
Copy link
Copy Markdown
Collaborator

stevenroose commented Dec 21, 2020

#508 wasn't merged, though. I don't think this obsoletes #508 either, right? But I should probably rebase that?

@apoelstra
Copy link
Copy Markdown
Member

apoelstra commented Dec 21, 2020

Yeah, I think I meant #507 and #478, which were merged at the same time, though it's not obvious to me looking back where the conflict was.

Agreed, rebasing #508 would be great :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stevenroose stevenroose stevenroose approved these changes

@apoelstra apoelstra apoelstra approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dr-orlovsky @apoelstra @stevenroose