Skip to content

Conversation

@tomt1664
Copy link
Member

@tomt1664 tomt1664 commented Jun 30, 2025

solving_data removed as explicit arguments for walletcreatefundedpsbt and fundrawtransaction where the argument was being ignored. solving_data remains part of the options explicit argument.

Fixes: #1470

@delta1 delta1 changed the base branch from elements-23.x to master July 7, 2025 13:43
@delta1 delta1 changed the base branch from master to elements-23.x July 7, 2025 13:44
Copy link
Member

@delta1 delta1 left a comment

Choose a reason for hiding this comment

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

ACK e7921a0

Running tests locally

@tomt1664 tomt1664 changed the base branch from elements-23.x to master July 7, 2025 14:24
@tomt1664 tomt1664 changed the base branch from master to elements-23.x July 7, 2025 14:27
@tomt1664 tomt1664 force-pushed the fix/duplicate_solve_data branch from e7921a0 to a9da179 Compare July 7, 2025 14:56
@tomt1664 tomt1664 changed the base branch from elements-23.x to master July 7, 2025 14:57
@tomt1664
Copy link
Member Author

tomt1664 commented Jul 7, 2025

re-based to master

Copy link
Member

@delta1 delta1 left a comment

Choose a reason for hiding this comment

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

ACK a9da179

Ran tests locally

@delta1 delta1 merged commit 73760ba into ElementsProject:master Jul 8, 2025
14 checks passed
uint32_t psbt_version = 2;
if (!request.params[6].isNull()) {
if (!request.params[5].isNull()) {
psbt_version = request.params[6].get_int();
Copy link
Member

@delta1 delta1 Jul 9, 2025

Choose a reason for hiding this comment

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

Hey @tomt1664 just spotted this, should be params[5] here? Presumably I've fixme'd out some test code that would have caught this

psbt_version = request.params[5].get_int();

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, you are right - should be params[5].
As afar as I can see there is no test (including fixmes) that check this.
I will update and add a test case to catch this.

delta1 added a commit to delta1/elements that referenced this pull request Jul 9, 2025
delta1 added a commit to delta1/elements that referenced this pull request Jul 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Redundant duplicated solving_data in FundTransaction

2 participants