btcpayserver/lightning
btcpayserver/lightning
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

splice: Allow splice_update to return signatures

Browse Source 
This is needed to all multi-channel splices. When channeld can return the signatures to the user (based on signing order precedent), it now does from splice_update.

Additionally, we move sending of the initial psbt from splice_init down to splice_update. This is also necessary for correct psbt diff detection during multi-channel splices.

Changelog-Changed: splice_update can in some cases now return the remotely partiall signed psbt to the user, if so `signtures_secured` will be true.
This commit is contained in:
Dusty Daemon 2024-11-11 11:42:51 +10:30 committed by Rusty Russell
parent 0d241ee187
commit 73ad8eaa31
15 changed files with 504 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.msggen.json
View File

@ -3147,7 +3147,8 @@
},
"Splice_updateResponse": {
"Splice_Update.commitments_secured": 2,
"Splice_Update.psbt": 1
"Splice_Update.psbt": 1,
"Splice_Update.signatures_secured": 3
},
"StaticbackupResponse": {
"StaticBackup.scb[]": 1
@ -10929,6 +10930,10 @@
"added": "pre-v0.10.1",
"deprecated": null
},
"Splice_Update.signatures_secured": {
"added": "v24.11",
"deprecated": null
},
"StaticBackup": {
"added": "pre-v0.10.1",
"deprecated": null

181
channeld/channeld.c
View File

@ -1645,6 +1645,24 @@ static bool have_i_signed_inflight(const struct peer *peer,
return has_sig;
}
static bool have_they_signed_inflight(const struct peer *peer,
const struct inflight *inflight)
{
bool has_sig;
u32 index;
index = find_channel_funding_input(inflight->psbt,
&peer->channel->funding);
if (!psbt_input_have_signature(inflight->psbt, index,
&peer->channel->funding_pubkey[REMOTE],
&has_sig))
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"Unable parse inflight psbt");
return has_sig;
}
/* this checks if local has signed everything buy the funding input */
static bool missing_user_signatures(const struct peer *peer,
const struct inflight *inflight)
@ -3158,7 +3176,6 @@ static void resume_splice_negotiation(struct peer *peer,
enum peer_wire type;
struct wally_psbt *current_psbt = inflight->psbt;
struct commitsig *their_commit;
struct witness **inws;
const struct witness **outws;
u8 der[73];
size_t der_len;
@ -3167,13 +3184,23 @@ static void resume_splice_negotiation(struct peer *peer,
u32 splice_funding_index;
const u8 *msg, *sigmsg;
u32 chan_output_index;
struct bitcoin_signature their_sig;
struct pubkey *their_pubkey;
struct bitcoin_tx *final_tx COMPILER_WANTS_INIT("12.3.0 -O3");
struct bitcoin_tx *final_tx;
struct bitcoin_txid final_txid;
u8 **wit_stack;
struct tlv_txsigs_tlvs *txsig_tlvs, *their_txsigs_tlvs;
const u8 *msg_received;
struct witness **inws;
struct bitcoin_signature *their_sig;
if (peer->splicing) {
inws = peer->splicing->inws;
their_sig = peer->splicing->their_sig;
}
else {
inws = NULL;
their_sig = NULL;
}
status_info("Splice negotation, will %ssend commit, %srecv commit,"
" %ssend signature, %srecv signature as %s",
@ -3246,9 +3273,10 @@ static void resume_splice_negotiation(struct peer *peer,
tal_hex(tmpctx, msg));
/* Set the splice_sig on the splice funding tx psbt */
if (!psbt_input_set_signature(current_psbt, splice_funding_index,
&peer->channel->funding_pubkey[LOCAL],
&splice_sig))
if (send_signature
&& !psbt_input_set_signature(current_psbt, splice_funding_index,
&peer->channel->funding_pubkey[LOCAL],
&splice_sig))
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"Unable to set signature internally "
"funding_index: %d "
@ -3300,10 +3328,18 @@ static void resume_splice_negotiation(struct peer *peer,
status_debug("Splice is using cached tx_sig_msg");
}
if (fromwire_peektype(msg_received) == WIRE_TX_SIGNATURES)
assert(!peer->splicing || !peer->splicing->their_sig);
assert(!peer->splicing || !peer->splicing->inws);
if (fromwire_peektype(msg_received) == WIRE_TX_SIGNATURES) {
status_debug("Splice: Using existing sig msg");
msg = msg_received;
else
}
else {
status_debug("Splice: Awaiting signature message");
msg = peer_read(tmpctx, peer->pps);
status_debug("Splice: Got signature message!");
}
type = fromwire_peektype(msg);
@ -3329,32 +3365,43 @@ static void resume_splice_negotiation(struct peer *peer,
"Splicing bad tx_signatures %s",
tal_hex(msg, msg));
if (peer->splicing)
peer->splicing->inws = tal_steal(peer->splicing, inws);
/* BOLT-0d8b701614b09c6ee4172b04da2203e73deec7e2 #2:
* - Upon receipt of `tx_signatures` for the splice transaction:
* - MUST consider splice negotiation complete.
* - MUST consider the connection no longer quiescent.
*/
end_stfu_mode(peer);
if (send_signature)
end_stfu_mode(peer);
their_sig = tal(tmpctx, struct bitcoin_signature);
/* BOLT-a8b9f495cac28124c69cc5ee429f9ef2bacb9921 #2:
* Both nodes:
* - MUST sign the transaction using SIGHASH_ALL */
their_sig.sighash_type = SIGHASH_ALL;
their_sig->sighash_type = SIGHASH_ALL;
if (!signature_from_der(their_txsigs_tlvs->funding_outpoint_sig,
tal_count(their_txsigs_tlvs->funding_outpoint_sig),
&their_sig)) {
their_sig)) {
tal_free(their_txsigs_tlvs);
peer_failed_warn(peer->pps, &peer->channel_id,
"Splicing bad tx_signatures %s",
tal_hex(msg, msg));
}
if (peer->splicing)
peer->splicing->their_sig = tal_steal(peer->splicing,
their_sig);
tal_free(their_txsigs_tlvs);
/* Set the commit_sig on the commitment tx psbt */
if (!psbt_input_set_signature(current_psbt,
splice_funding_index,
their_pubkey,
&their_sig)) {
their_sig)) {
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"Unable to set signature internally "
@ -3364,10 +3411,19 @@ static void resume_splice_negotiation(struct peer *peer,
"psbt: %s",
splice_funding_index,
fmt_pubkey(tmpctx, their_pubkey),
fmt_bitcoin_signature(tmpctx, &their_sig),
fmt_bitcoin_signature(tmpctx, their_sig),
fmt_wally_psbt(tmpctx, current_psbt));
}
}
if (have_i_signed_inflight(peer, inflight)
&& have_they_signed_inflight(peer, inflight)) {
if (!their_sig) {
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"Should not arrive here w/o their_sig");
return;
}
psbt_input_set_witscript(current_psbt,
splice_funding_index,
wit_script);
@ -3402,25 +3458,25 @@ static void resume_splice_negotiation(struct peer *peer,
&peer->channel_id,
"Mismatch witness stack count."
" Most likely you are missing"
" signatures. Your"
" TX_SIGNATURES message: %s.",
tal_hex(msg, msg));
" signatures.");
psbt_finalize_input(current_psbt, in, inws[j++]);
psbt_finalize_input(current_psbt, in,
inws[j++]);
}
final_tx = bitcoin_tx_with_psbt(tmpctx, current_psbt);
wit_stack = bitcoin_witness_2of2(final_tx, &splice_sig,
&their_sig,
their_sig,
&peer->channel->funding_pubkey[LOCAL],
their_pubkey);
bitcoin_tx_input_set_witness(final_tx, splice_funding_index,
wit_stack);
}
if (recv_signature) {
/* We let core validate our peer's signatures are correct. */
msg = towire_channeld_update_inflight(NULL, current_psbt, NULL,
NULL);
wire_sync_write(MASTER_FD, take(msg));
@ -3436,9 +3492,13 @@ static void resume_splice_negotiation(struct peer *peer,
status_debug("Splice: we signed second");
}
peer->splicing = tal_free(peer->splicing);
if (send_signature) {
if (!recv_signature)
end_stfu_mode(peer);
if (recv_signature) {
peer->splicing = tal_free(peer->splicing);
final_tx = bitcoin_tx_with_psbt(tmpctx, current_psbt);
msg = towire_channeld_splice_confirmed_signed(tmpctx, final_tx,
chan_output_index);
wire_sync_write(MASTER_FD, take(msg));
@ -3678,8 +3738,6 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg)
struct bitcoin_tx *prev_tx;
u32 sequence = 0;
u8 *scriptPubkey;
char *error;
u8 *abort_msg;
ictx = new_interactivetx_context(tmpctx, TX_INITIATOR,
peer->pps, peer->channel_id);
@ -3768,31 +3826,18 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg)
psbt_add_serials(ictx->desired_psbt, ictx->our_role);
error = process_interactivetx_updates(tmpctx,
ictx,
&peer->splicing->received_tx_complete,
&abort_msg);
if (error)
peer_failed_warn(peer->pps, &peer->channel_id,
"Interactive splicing_ack error: %s", error);
check_tx_abort(peer, abort_msg);
peer->splicing->tx_add_input_count = ictx->tx_add_input_count;
peer->splicing->tx_add_output_count = ictx->tx_add_output_count;
if (peer->splicing->current_psbt != ictx->current_psbt)
tal_free(peer->splicing->current_psbt);
peer->splicing->current_psbt = tal_steal(peer->splicing,
ictx->current_psbt);
peer->splicing->tx_add_input_count = 0;
peer->splicing->tx_add_output_count = 0;
peer->splicing->mode = true;
/* Return the current PSBT to the channel_control to give to user. */
outmsg = towire_channeld_splice_confirmed_init(NULL,
ictx->current_psbt);
ictx->desired_psbt);
wire_sync_write(MASTER_FD, take(outmsg));
tal_free(peer->splicing->current_psbt);
peer->splicing->current_psbt = create_psbt(peer->splicing, 0, 0, 0);
}
/* This occurs when the user has marked they are done making changes to the
@ -3804,6 +3849,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
{
u8 *outmsg;
struct interactivetx_context *ictx;
bool sign_first;
char *error;
u32 chan_output_index, splice_funding_index;
struct wally_psbt_output *new_chan_output;
@ -3871,24 +3917,31 @@ static void splice_initiator_user_finalized(struct peer *peer)
new_inflight = inflights_new(peer);
psbt_txid(tmpctx, ictx->current_psbt, &new_inflight->outpoint.txid, NULL);
psbt_txid(tmpctx, ictx->current_psbt, &new_inflight->outpoint.txid,
NULL);
new_inflight->outpoint.n = chan_output_index;
new_inflight->psbt = tal_steal(new_inflight, ictx->current_psbt);
new_inflight->amnt = amount_sat(new_chan_output->amount);
new_inflight->splice_amnt = peer->splicing->opener_relative;
new_inflight->last_tx = NULL;
new_inflight->i_am_initiator = true;
new_inflight->force_sign_first = peer->splicing->force_sign_first;
new_inflight->psbt = tal_steal(new_inflight, ictx->current_psbt);
current_push_val = relative_splice_balance_fundee(peer, our_role, ictx->current_psbt,
chan_output_index, splice_funding_index);
/* Switch over to using inflight psbt */
ictx->current_psbt = NULL;
peer->splicing->current_psbt = NULL;
current_push_val = relative_splice_balance_fundee(peer, our_role,
new_inflight->psbt,
chan_output_index,
splice_funding_index);
update_hsmd_with_splice(peer, new_inflight, our_role, current_push_val);
update_view_from_inflights(peer);
peer->splice_state->count++;
their_commit = interactive_send_commitments(peer, ictx->current_psbt,
their_commit = interactive_send_commitments(peer, new_inflight->psbt,
our_role,
last_inflight_index(peer),
true, true, NULL);
@ -3896,16 +3949,19 @@ static void splice_initiator_user_finalized(struct peer *peer)
new_inflight->last_tx = tal_steal(new_inflight, their_commit->tx);
new_inflight->last_sig = their_commit->commit_signature;
outmsg = towire_channeld_update_inflight(NULL, ictx->current_psbt,
outmsg = towire_channeld_update_inflight(NULL, new_inflight->psbt,
their_commit->tx,
&their_commit->commit_signature);
wire_sync_write(MASTER_FD, take(outmsg));
if (peer->splicing->current_psbt != ictx->current_psbt)
tal_free(peer->splicing->current_psbt);
peer->splicing->current_psbt = tal_steal(peer->splicing, ictx->current_psbt);
sign_first = do_i_sign_first(peer, new_inflight->psbt, our_role,
peer->splicing->force_sign_first);
if (!sign_first)
resume_splice_negotiation(peer, false, false, false, true);
outmsg = towire_channeld_splice_confirmed_update(NULL,
ictx->current_psbt,
new_inflight->psbt,
true);
wire_sync_write(MASTER_FD, take(outmsg));
}
@ -3952,13 +4008,10 @@ static void splice_initiator_user_update(struct peer *peer, const u8 *inmsg)
ictx->tx_add_input_count = peer->splicing->tx_add_input_count;
ictx->tx_add_output_count = peer->splicing->tx_add_output_count;
/* User may not have setup serial numbers on their modifeid PSBT, so we
* ensure that for them here */
psbt_add_serials(ictx->desired_psbt, ictx->our_role);
/* If there no are no changes, we consider the splice 'user finalized' */
/* If there no are no changes, we consider the splice user finalized */
if (!interactivetx_has_changes(ictx, ictx->desired_psbt)) {
splice_initiator_user_finalized(peer);
tal_steal(last_inflight(peer), last_inflight(peer)->psbt);
return;
}
@ -3995,10 +4048,11 @@ static void splice_initiator_user_update(struct peer *peer, const u8 *inmsg)
* theirs back. */
static void splice_initiator_user_signed(struct peer *peer, const u8 *inmsg)
{
struct inflight *inflight = last_inflight(peer);
struct wally_psbt *signed_psbt;
struct bitcoin_txid current_psbt_txid, signed_psbt_txid;
struct inflight *inflight;
const u8 *msg, *outmsg;
bool sign_first;
if (!peer->splicing) {
msg = towire_channeld_splice_state_error(NULL, "Can't accept a"
@ -4038,7 +4092,7 @@ static void splice_initiator_user_signed(struct peer *peer, const u8 *inmsg)
return;
}
psbt_txid(tmpctx, peer->splicing->current_psbt, &current_psbt_txid, NULL);
psbt_txid(tmpctx, inflight->psbt, &current_psbt_txid, NULL);
psbt_txid(tmpctx, signed_psbt, &signed_psbt_txid, NULL);
if (!bitcoin_txid_eq(&signed_psbt_txid, &current_psbt_txid))
@ -4048,9 +4102,7 @@ static void splice_initiator_user_signed(struct peer *peer, const u8 *inmsg)
fmt_bitcoin_txid(tmpctx, &signed_psbt_txid),
fmt_bitcoin_txid(tmpctx, &current_psbt_txid));
peer->splicing->current_psbt = tal_free(peer->splicing->current_psbt);
inflight = last_inflight(peer);
tal_free(inflight->psbt);
inflight->psbt = tal_steal(inflight, signed_psbt);
/* Save the user provided signatures to DB incase we have to
@ -4061,7 +4113,10 @@ static void splice_initiator_user_signed(struct peer *peer, const u8 *inmsg)
wire_sync_write(MASTER_FD, take(outmsg));
resume_splice_negotiation(peer, false, false, true, true);
sign_first = do_i_sign_first(peer, signed_psbt, TX_INITIATOR,
inflight->force_sign_first);
resume_splice_negotiation(peer, false, false, true, sign_first);
}
/* This occurs once our 'stfu' transition was successful. */

2
channeld/splice.c
View File

@ -31,6 +31,8 @@ struct splicing *splicing_new(const tal_t *ctx)
splicing->received_tx_complete = false;
splicing->sent_tx_complete = false;
splicing->tx_sig_msg = NULL;
splicing->inws = NULL;
splicing->their_sig = NULL;
return splicing;
}

4
channeld/splice.h
View File

@ -53,6 +53,10 @@ struct splicing {
bool sent_tx_complete;
/* If our peer signs early, we allow that and cache it here */
const u8 *tx_sig_msg;
/* The witness stack data received by peer */
struct witness **inws;
/* Their channel funding signature */
struct bitcoin_signature *their_sig;
};
/* Sets `splice` items to default values */

BIN
cln-grpc/proto/node.proto generated
View File

Binary file not shown.

BIN
cln-grpc/src/convert.rs generated
View File

Binary file not shown.

BIN
cln-rpc/src/model.rs generated
View File

Binary file not shown.

16
contrib/msggen/msggen/schema.json
View File

@ -32758,7 +32758,8 @@
"response": {
"required": [
"psbt",
"commitments_secured"
"commitments_secured",
"signatures_secured"
],
"additionalProperties": false,
"properties": {
@ -32773,6 +32774,13 @@
"description": [
"Whether or not the commitments were secured."
]
},
"signatures_secured": {
"added": "v24.11",
"type": "boolean",
"description": [
"whether or not the peer sent us their signatures for this splice"
]
}
}
},
@ -32853,7 +32861,8 @@
},
"response": {
"psbt": "cHNidP8BAgQCAAAAAQMEkgAAAAEEAQIBBQECAQYBAwH7BAIAAAAAAQCJAgAAAAH5+Z9NssTFQhFzAFkPSrEKg0AcgN7uwR9geC5Lqd+SfgAAAAAA/f///wJAQg8AAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWgWzcCwAAAAAiUSBbtDt/2hcV0N0BQWgloYUiotfssWR1uIeA6Pr8HHPviY0AAAABASuBbNwLAAAAACJRIFu0O3/aFxXQ3QFBaCWhhSKi1+yxZHW4h4Do+vwcc++JAQ4g9iEmrLThqBE+s85A7YDjSknUmwNcudNkF7HBMzInESwBDwQBAAAAARAE/f///wz8CWxpZ2h0bmluZwEImfI55kWjFBwAAQCJAgAAAAH5+Z9NssTFQhFzAFkPSrEKg0AcgN7uwR9geC5Lqd+SfgAAAAAA/f///wJAQg8AAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWgWzcCwAAAAAiUSBbtDt/2hcV0N0BQWgloYUiotfssWR1uIeA6Pr8HHPviY0AAAABAStAQg8AAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWAQ4g9iEmrLThqBE+s85A7YDjSknUmwNcudNkF7HBMzInESwBDwQAAAAAARAEAAAAAAz8CWxpZ2h0bmluZwEIo0w+EfrhL4QAAQMIzrnaCwAAAAABBCJRII+O1EYnVX28zEKuAYqcVHSpkShXksTKiRwfWcVmXTRgDPwJbGlnaHRuaW5nAQiPzwRTPwtPWgABAwjgyBAAAAAAAAEEIgAgk97dDCZbyoaFdtPuLlnuu7IOvCluWPftypPV7q7AiZYM/AlsaWdodG5pbmcBCK3lpE4Vja7KAA==",
"commitments_secured": true
"commitments_secured": true,
"signatures_secured": true
}
},
{
@ -32867,7 +32876,8 @@
},
"response": {
"psbt": "cHNidP8BAgQCAAAAAQMElAAAAAEEAQEBBQECAQYBAwH7BAIAAAAAAQCyAgAAAAL2ISastOGoET6zzkDtgONKSdSbA1y502QXscEzMicRLAEAAAAA/f////YhJqy04agRPrPOQO2A40pJ1JsDXLnTZBexwTMyJxEsAAAAAAAAAAAAAs652gsAAAAAIlEgj47URidVfbzMQq4BipxUdKmRKFeSxMqJHB9ZxWZdNGDgyBAAAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWkgAAAAEBK+DIEAAAAAAAIgAgk97dDCZbyoaFdtPuLlnuu7IOvCluWPftypPV7q7AiZYBDiCVuxWBeu80WsQES0HKNSpjl7RUGPMhcKRnsXRp4BRF+AEPBAEAAAABEAQAAAAADPwJbGlnaHRuaW5nAQheLXaEp+y8AgABAwi4Lg8AAAAAAAEEIgAgk97dDCZbyoaFdtPuLlnuu7IOvCluWPftypPV7q7AiZYM/AlsaWdodG5pbmcBCBkNULro+QrwAAEDCKCGAQAAAAAAAQQiUSDE0oJBX5qB0Y4IthmhnRFrhlbLG/ST5fVAu/e3oFhM2gz8CWxpZ2h0bmluZwEIuBcidnXj4BAA",
"commitments_secured": true
"commitments_secured": true,
"signatures_secured": true
}
}
]

616
contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
View File

File diff suppressed because one or more lines are too long

1
contrib/pyln-testing/pyln/testing/grpc2py.py
View File

@ -1980,6 +1980,7 @@ def splice_update2py(m):
return remove_default({
"commitments_secured": m.commitments_secured, # PrimitiveField in generate_composite
"psbt": m.psbt, # PrimitiveField in generate_composite
"signatures_secured": m.signatures_secured, # PrimitiveField in generate_composite
})

16
doc/schemas/lightning-splice_update.json
View File

@ -40,7 +40,8 @@
"response": {
"required": [
"psbt",
"commitments_secured"
"commitments_secured",
"signatures_secured"
],
"additionalProperties": false,
"properties": {
@ -55,6 +56,13 @@
"description": [
"Whether or not the commitments were secured."
]
},
"signatures_secured": {
"added": "v24.11",
"type": "boolean",
"description": [
"whether or not the peer sent us their signatures for this splice"
]
}
}
},
@ -135,7 +143,8 @@
},
"response": {
"psbt": "cHNidP8BAgQCAAAAAQMEkgAAAAEEAQIBBQECAQYBAwH7BAIAAAAAAQCJAgAAAAH5+Z9NssTFQhFzAFkPSrEKg0AcgN7uwR9geC5Lqd+SfgAAAAAA/f///wJAQg8AAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWgWzcCwAAAAAiUSBbtDt/2hcV0N0BQWgloYUiotfssWR1uIeA6Pr8HHPviY0AAAABASuBbNwLAAAAACJRIFu0O3/aFxXQ3QFBaCWhhSKi1+yxZHW4h4Do+vwcc++JAQ4g9iEmrLThqBE+s85A7YDjSknUmwNcudNkF7HBMzInESwBDwQBAAAAARAE/f///wz8CWxpZ2h0bmluZwEImfI55kWjFBwAAQCJAgAAAAH5+Z9NssTFQhFzAFkPSrEKg0AcgN7uwR9geC5Lqd+SfgAAAAAA/f///wJAQg8AAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWgWzcCwAAAAAiUSBbtDt/2hcV0N0BQWgloYUiotfssWR1uIeA6Pr8HHPviY0AAAABAStAQg8AAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWAQ4g9iEmrLThqBE+s85A7YDjSknUmwNcudNkF7HBMzInESwBDwQAAAAAARAEAAAAAAz8CWxpZ2h0bmluZwEIo0w+EfrhL4QAAQMIzrnaCwAAAAABBCJRII+O1EYnVX28zEKuAYqcVHSpkShXksTKiRwfWcVmXTRgDPwJbGlnaHRuaW5nAQiPzwRTPwtPWgABAwjgyBAAAAAAAAEEIgAgk97dDCZbyoaFdtPuLlnuu7IOvCluWPftypPV7q7AiZYM/AlsaWdodG5pbmcBCK3lpE4Vja7KAA==",
"commitments_secured": true
"commitments_secured": true,
"signatures_secured": true
}
},
{
@ -149,7 +158,8 @@
},
"response": {
"psbt": "cHNidP8BAgQCAAAAAQMElAAAAAEEAQEBBQECAQYBAwH7BAIAAAAAAQCyAgAAAAL2ISastOGoET6zzkDtgONKSdSbA1y502QXscEzMicRLAEAAAAA/f////YhJqy04agRPrPOQO2A40pJ1JsDXLnTZBexwTMyJxEsAAAAAAAAAAAAAs652gsAAAAAIlEgj47URidVfbzMQq4BipxUdKmRKFeSxMqJHB9ZxWZdNGDgyBAAAAAAACIAIJPe3QwmW8qGhXbT7i5Z7ruyDrwpblj37cqT1e6uwImWkgAAAAEBK+DIEAAAAAAAIgAgk97dDCZbyoaFdtPuLlnuu7IOvCluWPftypPV7q7AiZYBDiCVuxWBeu80WsQES0HKNSpjl7RUGPMhcKRnsXRp4BRF+AEPBAEAAAABEAQAAAAADPwJbGlnaHRuaW5nAQheLXaEp+y8AgABAwi4Lg8AAAAAAAEEIgAgk97dDCZbyoaFdtPuLlnuu7IOvCluWPftypPV7q7AiZYM/AlsaWdodG5pbmcBCBkNULro+QrwAAEDCKCGAQAAAAAAAQQiUSDE0oJBX5qB0Y4IthmhnRFrhlbLG/ST5fVAu/e3oFhM2gz8CWxpZ2h0bmluZwEIuBcidnXj4BAA",
"commitments_secured": true
"commitments_secured": true,
"signatures_secured": true
}
}
]

5
lightningd/channel_control.c
View File

@ -411,7 +411,7 @@ static void handle_splice_confirmed_update(struct lightningd *ld,
{
struct splice_command *cc;
struct wally_psbt *psbt;
bool commitments_secured;
bool commitments_secured, signatures_secured;
if (!fromwire_channeld_splice_confirmed_update(tmpctx,
msg,
@ -422,6 +422,8 @@ static void handle_splice_confirmed_update(struct lightningd *ld,
tal_hex(channel, msg));
return;
}
/* FIXME! */
signatures_secured = commitments_secured;
cc = splice_command_for_chan(ld, channel);
if (!cc) {
@ -434,6 +436,7 @@ static void handle_splice_confirmed_update(struct lightningd *ld,
struct json_stream *response = json_stream_success(cc->cmd);
json_add_string(response, "psbt", fmt_wally_psbt(tmpctx, psbt));
json_add_bool(response, "commitments_secured", commitments_secured);
json_add_bool(response, "signatures_secured", signatures_secured);
was_pending(command_success(cc->cmd, response));
}

27
tests/test_splicing.py
View File

@ -23,6 +23,9 @@ def test_splice(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])
@ -60,6 +63,9 @@ def test_splice_gossip(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])
@ -118,6 +124,9 @@ def test_splice_listnodes(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])
@ -151,6 +160,9 @@ def test_splice_out(node_factory, bitcoind):
# Pay with fee by subjtracting 5000 from channel balance
result = l1.rpc.splice_init(chan_id, -105000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.splice_signed(chan_id, result['psbt'])
l2.daemon.wait_for_log(r'CHANNELD_NORMAL to CHANNELD_AWAITING_SPLICE')
@ -189,6 +201,9 @@ def test_invalid_splice(node_factory, bitcoind):
with pytest.raises(RpcError) as rpc_error:
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
assert rpc_error.value.error["code"] == 357
assert rpc_error.value.error["message"] == "You provided 1000000000msat but committed to 1100000000msat."
@ -205,6 +220,9 @@ def test_invalid_splice(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])
@ -242,6 +260,9 @@ def test_commit_crash_splice(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, -105000, l1.rpc.addpsbtoutput(100000)['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
l1.daemon.wait_for_log(r"Splice initiator: we commit")
@ -256,6 +277,9 @@ def test_commit_crash_splice(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, -105000, l1.rpc.addpsbtoutput(100000)['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.splice_signed(chan_id, result['psbt'])
l2.daemon.wait_for_log(r'CHANNELD_NORMAL to CHANNELD_AWAITING_SPLICE')
@ -303,6 +327,9 @@ def test_splice_stuck_htlc(node_factory, bitcoind, executor):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])

10
tests/test_splicing_disconnect.py
View File

@ -30,6 +30,9 @@ def test_splice_disconnect_sig(node_factory, bitcoind):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])
@ -79,13 +82,10 @@ def test_splice_disconnect_commit(node_factory, bitcoind, executor):
funds_result = l1.rpc.fundpsbt("109000sat", "slow", 166, excess_as_change=True)
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
print("l1 splice_update")
result = l1.rpc.splice_update(chan_id, result['psbt'])
print("l1 signpsbt")
result = l1.rpc.signpsbt(result['psbt'])
print("l1 splice_signed")
assert(result['commitments_secured'] is False)
executor.submit(l1.rpc.splice_signed, chan_id, result['signed_psbt'])
executor.submit(l1.rpc.splice_update, chan_id, result['psbt'])
print("l2 waiting for dev_disconnect msg")

3
tests/test_splicing_insane.py
View File

@ -13,6 +13,9 @@ def make_pending_splice(node_factory):
result = l1.rpc.splice_init(chan_id, 100000, funds_result['psbt'])
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is False)
result = l1.rpc.splice_update(chan_id, result['psbt'])
assert(result['commitments_secured'] is True)
result = l1.rpc.signpsbt(result['psbt'])
result = l1.rpc.splice_signed(chan_id, result['signed_psbt'])