Fundchannel complete psbt not txid #4428
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustyrussell
force-pushed
the
guilt/fundchannel-complete-psbt-not-txid
branch
2 times, most recently
from
1787092
to
00121a6
Compare
|
Trivial rebase to fix un-rebuilt man page. |
…_e_s Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
We'll need it in next patch to identify the funding output. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
rustyrussell
force-pushed
the
guilt/fundchannel-complete-psbt-not-txid
branch
from
00121a6
to
f51a6fd
Compare
…h PSBT Requiring the user to calculate the txid of the PSBT is a horrible, bad, no-good idea. Doesn't deprecate yet, so I can test that this path works while multifundchannel still uses it. Fixes: ElementsProject#4416 (at least for future users!) Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Changelog-Added: JSON-RPC: `fundchannel_complete` takes a psbt parameter.
I didn't change the callers yet, so I can test the backwards compat code works. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
In particular, txprepare gives us a nice way to get a valid PSBT for testing. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Changelog-Added: JSON-RPC: `txprepare` and `withdraw` now return a `psbt` field.
And update all the in-tree callers. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Changelog-Deprecated: JSON-RPC: `fundchannel_complete` `txid` and `txout` parameters (use `psbt`)
rustyrussell
force-pushed
the
guilt/fundchannel-complete-psbt-not-txid
branch
from
f51a6fd
to
e9ecb9c
Compare
|
OK, had to add more PSBT JSON outputs to make our tests work (probably a good thing anyway!) |
|
... and check fails on elements. Fixed. |
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
rustyrussell
force-pushed
the
guilt/fundchannel-complete-psbt-not-txid
branch
from
9c13d6f
to
d5a8b4d
Compare
niftynei
approved these changes
Mar 16, 2021
| @@ -1192,7 +1252,7 @@ static const struct json_command fundchannel_complete_command = { | |||
| "channels", | |||
| json_fundchannel_complete, | |||
| "Complete channel establishment with peer {id} for funding transaction" | |||
| "with {txid}. Returns true on success, false otherwise." | |||
| "with {psbt}. Returns true on success, false otherwise." | |||
There was a problem hiding this comment.
I wonder if this will actually make us incompatible with LN Pool? surely not... as the pool probably produces PSBTs for peers to sign for the collectively built opening tx?
There was a problem hiding this comment.
We can always re-add a txid arg, but I really think that it's a great sanity-check!
|
|
||
| # Can't complete with incorrect address. | ||
| wrongaddr = l1.rpc.txprepare([{l1.rpc.newaddr()['bech32']: amount}]) | ||
| with pytest.raises(RpcError, match=r'No output to open channel'): |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This prevents the footgun from #4416