davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

splice: Remove batch_size from commitment_signed

Browse Source 
The new spec sends `batch_size` in `start_batch` and removes it from `commitment_signed` so we need to stop processing it in `commitment_signed`.

Since the tlv is now reduced to one element and that automagically turns it into a direct use TLV so we have to update the code everywhere it is referenced.
This commit is contained in:
Dusty Daemon
2025-06-16 14:00:22 -04:00
committed by Rusty Russell
parent 07f4bc39b1
commit e755be0c4c
4 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
channeld/channeld.c
View File

@@ -1160,12 +1160,7 @@ static u8 *send_commit_part(const tal_t *ctx,
(int)splice_amnt, (int)remote_splice_amnt,
remote_index);
if (batch_size > 1) {
cs_tlv->splice_info = tal(cs_tlv, struct tlv_commitment_signed_tlvs_splice_info);
cs_tlv->splice_info->batch_size = batch_size;
cs_tlv->splice_info->funding_txid = funding->txid;
}
cs_tlv->splice_info = tal_dup(cs_tlv, struct bitcoin_txid, &funding->txid);
}
txs = channel_txs(tmpctx, funding, funding_sats, &htlc_map,
@@ -1926,11 +1921,11 @@ static struct commitsig_info *handle_peer_commit_sig(struct peer *peer,
if (peer->splice_state->await_commitment_succcess
&& !tal_count(peer->splice_state->inflights) && cs_tlv && cs_tlv->splice_info) {
if (!bitcoin_txid_eq(&peer->channel->funding.txid,
&cs_tlv->splice_info->funding_txid)) {
cs_tlv->splice_info)) {
status_info("Ignoring stale commit_sig for channel_id"
" %s, as %s is locked in now.",
fmt_bitcoin_txid(tmpctx,
&cs_tlv->splice_info->funding_txid),
cs_tlv->splice_info),
fmt_bitcoin_txid(tmpctx,
&peer->channel->funding.txid));
return NULL;
@@ -1980,22 +1975,17 @@ static struct commitsig_info *handle_peer_commit_sig(struct peer *peer,
outpoint = peer->splice_state->inflights[commit_index - 1]->outpoint;
funding_sats = peer->splice_state->inflights[commit_index - 1]->amnt;
if (cs_tlv && cs_tlv->splice_info
&& cs_tlv->splice_info->batch_size == 1)
peer_failed_err(peer->pps, &peer->channel_id,
"batch_size can never be 1");
status_debug("handle_peer_commit_sig for inflight outpoint %s",
fmt_bitcoin_txid(tmpctx, &outpoint.txid));
if (cs_tlv->splice_info
&& !bitcoin_txid_eq(&outpoint.txid,
&cs_tlv->splice_info->funding_txid))
cs_tlv->splice_info))
peer_failed_err(peer->pps, &peer->channel_id,
"Expected commit sig message for %s but"
" got %s",
fmt_bitcoin_txid(tmpctx, &outpoint.txid),
fmt_bitcoin_txid(tmpctx, &cs_tlv->splice_info->funding_txid));
fmt_bitcoin_txid(tmpctx, cs_tlv->splice_info));
}
else {
outpoint = peer->channel->funding;
@@ -2052,7 +2042,7 @@ static struct commitsig_info *handle_peer_commit_sig(struct peer *peer,
fmt_amount_sat(tmpctx, funding_sats),
cs_tlv && cs_tlv->splice_info
? fmt_bitcoin_txid(tmpctx,
&cs_tlv->splice_info->funding_txid)
cs_tlv->splice_info)
: "N/A",
peer->splice_state->await_commitment_succcess ? "yes"
: "no",
@@ -2216,7 +2206,7 @@ static int commit_index_from_msg(const u8 *msg, struct peer *peer)
if (!cs_tlv || !cs_tlv->splice_info)
return -1;
funding_txid = cs_tlv->splice_info->funding_txid;
funding_txid = *cs_tlv->splice_info;
if (bitcoin_txid_eq(&funding_txid, &peer->channel->funding.txid))
return 0;
@@ -2269,12 +2259,12 @@ static struct commitsig_info *handle_peer_commit_sig_batch(struct peer *peer,
s64 remote_splice_amnt,
u64 local_index,
const struct pubkey *local_per_commit,
bool allow_empty_commit)
bool allow_empty_commit,
u16 batch_size)
{
struct channel_id channel_id;
struct bitcoin_signature commit_sig;
secp256k1_ecdsa_signature *raw_sigs;
u16 batch_size;
const u8 **msg_batch;
enum peer_wire type;
struct tlv_commitment_signed_tlvs *cs_tlv
@@ -2286,11 +2276,6 @@ static struct commitsig_info *handle_peer_commit_sig_batch(struct peer *peer,
peer_failed_warn(peer->pps, &peer->channel_id,
"Bad commit_sig %s", tal_hex(msg, msg));
/* Default batch_size is 1 */
batch_size = 1;
if (cs_tlv->splice_info && cs_tlv->splice_info->batch_size)
batch_size = cs_tlv->splice_info->batch_size;
msg_batch = tal_arr(tmpctx, const u8*, batch_size);
msg_batch[0] = msg;
status_debug("msg_batch[0]: %p", msg_batch[0]);
@@ -2326,14 +2311,6 @@ static struct commitsig_info *handle_peer_commit_sig_batch(struct peer *peer,
" splice_info",
tal_hex(sub_msg, sub_msg), i, batch_size);
if (!sub_cs_tlv->splice_info
|| sub_cs_tlv->splice_info->batch_size != batch_size)
peer_failed_err(peer->pps, &peer->channel_id,
"batch_size value mismatch in"
" commit_sig bundle, item [%"PRIu16
"/%"PRIu16"] %s", i, batch_size,
tal_hex(sub_msg, sub_msg));
msg_batch[i] = sub_msg;
status_debug("msg_batch[%d]: %p", (int)i, msg_batch[i]);
}
@@ -4914,7 +4891,8 @@ static void peer_in(struct peer *peer, const u8 *msg)
NULL, 0, 0,
peer->next_index[LOCAL],
&peer->next_local_per_commit,
false);
false,
1); /* Batch size default is 1 */
return;
case WIRE_UPDATE_FEE:
handle_peer_feechange(peer, msg);

8
wire/extracted_peer_12_splice_update.patch
View File

@@ -22,3 +22,11 @@ index 9abcb0e64..e2aae8efb 100644
msgtype,commitment_signed,132
msgdata,commitment_signed,channel_id,channel_id,
msgdata,commitment_signed,signature,signature,
@@ -309,6 +309,5 @@ msgdata,commitment_signed,num_htlcs,u16,
msgdata,commitment_signed,htlc_signature,signature,num_htlcs
msgdata,commitment_signed,splice_channel_id,commitment_signed_tlvs,
tlvtype,commitment_signed_tlvs,splice_info,0
-tlvdata,commitment_signed_tlvs,splice_info,batch_size,u16,
tlvdata,commitment_signed_tlvs,splice_info,funding_txid,sha256,
msgtype,revoke_and_ack,133
msgdata,revoke_and_ack,channel_id,channel_id,

1
wire/peer_wire.csv
View File

@@ -309,7 +309,6 @@ msgdata,commitment_signed,num_htlcs,u16,
msgdata,commitment_signed,htlc_signature,signature,num_htlcs
msgdata,commitment_signed,splice_channel_id,commitment_signed_tlvs,
tlvtype,commitment_signed_tlvs,splice_info,0
tlvdata,commitment_signed_tlvs,splice_info,batch_size,u16,
tlvdata,commitment_signed_tlvs,splice_info,funding_txid,sha256,
msgtype,revoke_and_ack,133
msgdata,revoke_and_ack,channel_id,channel_id,
1 msgtype,protocol_batch_element,0
309 msgdata,commitment_signed,htlc_signature,signature,num_htlcs
310 msgdata,commitment_signed,splice_channel_id,commitment_signed_tlvs,
311 tlvtype,commitment_signed_tlvs,splice_info,0
tlvdata,commitment_signed_tlvs,splice_info,batch_size,u16,
312 tlvdata,commitment_signed_tlvs,splice_info,funding_txid,sha256,
313 msgtype,revoke_and_ack,133
314 msgdata,revoke_and_ack,channel_id,channel_id,

16
wire/test/run-peer-wire.c
View File

@@ -792,19 +792,12 @@ static bool update_fail_htlc_eq(const struct msg_update_fail_htlc *a,
&& eq_var(a, b, reason);
}
static bool tlv_splice_info_eq(const struct tlv_commitment_signed_tlvs_splice_info *a,
const struct tlv_commitment_signed_tlvs_splice_info *b)
{
return eq_field(a, b, batch_size)
&& eq_field(a, b, funding_txid);
}
static bool commitment_signed_eq(const struct msg_commitment_signed *a,
const struct msg_commitment_signed *b)
const struct msg_commitment_signed *b)
{
return eq_upto(a, b, htlc_signature)
&& eq_var(a, b, htlc_signature)
&& eq_tlv(a, b, splice_info, tlv_splice_info_eq);
&& eq_tlv(a, b, splice_info, bitcoin_txid_eq);
}
static bool funding_signed_eq(const struct msg_funding_signed *a,
@@ -1026,9 +1019,8 @@ int main(int argc, char *argv[])
cs.htlc_signature = tal_arr(ctx, secp256k1_ecdsa_signature, 2);
memset(cs.htlc_signature, 2, sizeof(secp256k1_ecdsa_signature)*2);
cs.tlvs = tlv_commitment_signed_tlvs_new(tmpctx);
cs.tlvs->splice_info = tal(ctx, struct tlv_commitment_signed_tlvs_splice_info);
cs.tlvs->splice_info->batch_size = 1;
set_bitcoin_txid(&cs.tlvs->splice_info->funding_txid);
cs.tlvs->splice_info = tal(ctx, struct bitcoin_txid);
set_bitcoin_txid(cs.tlvs->splice_info);
msg = towire_struct_commitment_signed(ctx, &cs);
cs2 = fromwire_struct_commitment_signed(ctx, msg);