Skip to content

Commit b7f85d1

Browse files
ddustinddustin
committed
Test commit for CI
1 parent 61a86e5 commit b7f85d1

File tree

3 files changed

+167
-19
lines changed

3 files changed

+167
-19
lines changed

‎channeld/channeld.c

+69-17
Original file line numberDiff line numberDiff line change
@@ -3654,6 +3654,9 @@ static void resume_splice_negotiation(struct peer *peer,
36543654
new_output_index);
36553655
wire_sync_write(MASTER_FD, take(msg));
36563656
}
3657+
3658+
size_t dummy;
3659+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
36573660
}
36583661

36593662
static struct inflight *inflights_new(struct peer *peer)
@@ -3841,7 +3844,7 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
38413844
funding_feerate_perkw,
38423845
both_amount,
38433846
peer->splicing->accepter_relative,
3844-
ictx->current_psbt,
3847+
clone_psbt(tmpctx, ictx->current_psbt),
38453848
false,
38463849
peer->splicing->force_sign_first);
38473850

@@ -3862,15 +3865,34 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
38623865
new_inflight->force_sign_first = peer->splicing->force_sign_first;
38633866
new_inflight->is_locked = false;
38643867

3865-
current_push_val = relative_splice_balance_fundee(peer, our_role,ictx->current_psbt,
3868+
size_t dummy;
3869+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
3870+
3871+
current_push_val = relative_splice_balance_fundee(peer, our_role, ictx->current_psbt,
38663872
outpoint.n, splice_funding_index);
3873+
3874+
size_t dummy;
3875+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
3876+
38673877
update_hsmd_with_splice(peer, new_inflight, our_role, current_push_val);
38683878

3879+
size_t dummy;
3880+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
3881+
38693882
update_view_from_inflights(peer);
38703883

3884+
size_t dummy;
3885+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
3886+
38713887
peer->splice_state->count++;
38723888

3889+
size_t dummy;
3890+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
3891+
38733892
resume_splice_negotiation(peer, true, true, true, true);
3893+
3894+
size_t dummy;
3895+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
38743896
}
38753897

38763898
/* splice_initiator runs when splice_ack is received by the other side. It
@@ -3992,6 +4014,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
39924014
char *error;
39934015
u32 chan_output_index, splice_funding_index;
39944016
struct wally_psbt_output *new_chan_output;
4017+
struct wally_psbt *psbt;
39954018
struct inflight *new_inflight;
39964019
struct bitcoin_txid current_psbt_txid;
39974020
struct amount_sat both_amount;
@@ -4003,7 +4026,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
40034026
/* We must loading the funding tx as our previous utxo */
40044027
prev_tx = bitcoin_tx_from_txid(peer, peer->channel->funding.txid);
40054028

4006-
ictx = new_interactivetx_context(tmpctx, our_role,
4029+
ictx = new_interactivetx_context(NULL, our_role,
40074030
peer->pps, peer->channel_id);
40084031

40094032
ictx->next_update_fn = next_splice_step;
@@ -4015,60 +4038,82 @@ static void splice_initiator_user_finalized(struct peer *peer)
40154038
ictx->tx_add_input_count = peer->splicing->tx_add_input_count;
40164039
ictx->tx_add_output_count = peer->splicing->tx_add_output_count;
40174040

4041+
clone_psbt(NULL, ictx->current_psbt);
4042+
40184043
ictx->shared_outpoint = tal(ictx, struct bitcoin_outpoint);
40194044
*ictx->shared_outpoint = peer->channel->funding;
40204045
ictx->funding_tx = prev_tx;
40214046

4022-
error = process_interactivetx_updates(tmpctx, ictx,
4047+
clone_psbt(NULL, ictx->current_psbt);
4048+
4049+
error = process_interactivetx_updates(ictx, ictx,
40234050
&peer->splicing->received_tx_complete,
40244051
&abort_msg);
40254052
if (error)
40264053
peer_failed_warn(peer->pps, &peer->channel_id,
40274054
"Splice interactivetx error: %s", error);
40284055

4056+
clone_psbt(NULL, ictx->current_psbt); // dustin
4057+
40294058
check_tx_abort(peer, abort_msg);
40304059

4060+
psbt = ictx->current_psbt;
4061+
4062+
clone_psbt(NULL, psbt);
4063+
40314064
/* With pause_when_complete fase, this assert should never fail */
40324065
assert(peer->splicing->received_tx_complete);
40334066
peer->splicing->sent_tx_complete = true;
40344067

4035-
psbt_sort_by_serial_id(ictx->current_psbt);
4068+
clone_psbt(NULL, psbt);
40364069

4037-
new_chan_output = find_channel_output(peer, ictx->current_psbt,
4070+
new_chan_output = find_channel_output(peer, psbt,
40384071
&chan_output_index,
40394072
&peer->splicing->remote_funding_pubkey);
4073+
4074+
clone_psbt(NULL, psbt);
40404075

4041-
splice_funding_index = find_channel_funding_input(ictx->current_psbt,
4076+
splice_funding_index = find_channel_funding_input(psbt,
40424077
&peer->channel->funding);
4078+
4079+
clone_psbt(NULL, psbt); // lisa
40434080

4044-
both_amount = check_balances(peer, our_role, ictx->current_psbt,
4081+
both_amount = check_balances(peer, our_role, psbt,
40454082
chan_output_index, splice_funding_index);
40464083
new_chan_output->amount = both_amount.satoshis; /* Raw: type conv */
4084+
4085+
clone_psbt(NULL, psbt);
40474086

4048-
psbt_elements_normalize_fees(ictx->current_psbt);
4087+
psbt_elements_normalize_fees(psbt);
4088+
4089+
clone_psbt(NULL, psbt);
40494090

40504091
status_debug("Splice adding inflight: %s",
4051-
fmt_wally_psbt(tmpctx, ictx->current_psbt));
4092+
fmt_wally_psbt(tmpctx, psbt));
40524093

4053-
psbt_txid(tmpctx, ictx->current_psbt, &current_psbt_txid, NULL);
4094+
psbt_txid(ictx, psbt, &current_psbt_txid, NULL);
4095+
4096+
clone_psbt(NULL, psbt);
40544097

4055-
outmsg = towire_channeld_add_inflight(tmpctx,
4098+
outmsg = towire_channeld_add_inflight(NULL,
40564099
&peer->splicing->remote_funding_pubkey,
40574100
&current_psbt_txid,
40584101
chan_output_index,
40594102
peer->splicing->feerate_per_kw,
40604103
amount_sat(new_chan_output->amount),
40614104
peer->splicing->opener_relative,
4062-
ictx->current_psbt,
4105+
psbt,
40634106
true,
40644107
peer->splicing->force_sign_first);
4108+
4109+
clone_psbt(NULL, psbt);
40654110

40664111
master_wait_sync_reply(tmpctx, peer, take(outmsg),
40674112
WIRE_CHANNELD_GOT_INFLIGHT);
40684113

40694114
new_inflight = inflights_new(peer);
40704115

4071-
psbt_txid(tmpctx, ictx->current_psbt, &new_inflight->outpoint.txid,
4116+
psbt_txid(new_inflight, psbt, &new_inflight->outpoint.txid,
40724117
NULL);
40734118
new_inflight->remote_funding = peer->splicing->remote_funding_pubkey;
40744119
new_inflight->outpoint.n = chan_output_index;
@@ -4084,7 +4129,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
40844129
* normal in-memory copy of the psbt: peer->splicing/ictx->current_psbt.
40854130
* Since we have to support using the inflight psbt anyway, we default
40864131
* to it. */
4087-
new_inflight->psbt = clone_psbt(new_inflight, ictx->current_psbt);
4132+
new_inflight->psbt = clone_psbt(new_inflight, psbt); // wally_psbt_clone_alloc fails here
40884133

40894134
current_push_val = relative_splice_balance_fundee(peer, our_role,
40904135
new_inflight->psbt,
@@ -4121,6 +4166,8 @@ static void splice_initiator_user_finalized(struct peer *peer)
41214166
true,
41224167
!sign_first);
41234168
wire_sync_write(MASTER_FD, take(outmsg));
4169+
4170+
tal_free(ictx);
41244171
}
41254172

41264173
/* During a splice the user may call splice_update mulitple times adding
@@ -4141,7 +4188,7 @@ static void splice_initiator_user_update(struct peer *peer, const u8 *inmsg)
41414188
return;
41424189
}
41434190

4144-
ictx = new_interactivetx_context(tmpctx, TX_INITIATOR,
4191+
ictx = new_interactivetx_context(NULL, TX_INITIATOR,
41454192
peer->pps, peer->channel_id);
41464193

41474194
if (!fromwire_channeld_splice_update(ictx, inmsg, &ictx->desired_psbt))
@@ -4152,6 +4199,7 @@ static void splice_initiator_user_update(struct peer *peer, const u8 *inmsg)
41524199
" splice when not in"
41534200
" splice mode.");
41544201
wire_sync_write(MASTER_FD, take(msg));
4202+
tal_free(ictx);
41554203
return;
41564204

41574205
}
@@ -4175,10 +4223,11 @@ static void splice_initiator_user_update(struct peer *peer, const u8 *inmsg)
41754223
if (!interactivetx_has_changes(ictx, ictx->desired_psbt)) {
41764224
splice_initiator_user_finalized(peer);
41774225
tal_steal(last_inflight(peer), last_inflight(peer)->psbt);
4226+
tal_free(ictx);
41784227
return;
41794228
}
41804229

4181-
error = process_interactivetx_updates(tmpctx, ictx,
4230+
error = process_interactivetx_updates(ictx, ictx,
41824231
&peer->splicing->received_tx_complete,
41834232
&abort_msg);
41844233
if (error)
@@ -4199,6 +4248,7 @@ static void splice_initiator_user_update(struct peer *peer, const u8 *inmsg)
41994248
ictx->current_psbt,
42004249
false, false);
42014250
wire_sync_write(MASTER_FD, take(outmsg));
4251+
tal_free(ictx);
42024252
}
42034253

42044254
/* This occurs when the user has signed the final version of the PSBT. At this
@@ -5645,6 +5695,8 @@ static void handle_funding_depth(struct peer *peer, const u8 *msg)
56455695

56465696
for (size_t i = 0; i < tal_count(peer->splice_state->inflights); i++) {
56475697
struct inflight *inflight = peer->splice_state->inflights[i];
5698+
size_t dummy;
5699+
psbt_get_bytes(NULL, inflight->psbt, &dummy);
56485700
if (bitcoin_txid_eq(&inflight->outpoint.txid,
56495701
&txid)) {
56505702
inflight->is_locked = true;

‎common/interactivetx.c

+49-2
Original file line numberDiff line numberDiff line change
@@ -391,19 +391,36 @@ char *process_interactivetx_updates(const tal_t *ctx,
391391
if (received_tx_complete)
392392
they_complete = *received_tx_complete;
393393

394-
/* Build change_set and handle PSBT variables */
395-
ictx->change_set = tal_free(ictx->change_set);
394+
if (ictx->current_psbt)
395+
clone_psbt(NULL, ictx->current_psbt);
396+
if (ictx->desired_psbt)
397+
clone_psbt(NULL, ictx->desired_psbt);
396398

397399
/* Call next_update_fn or default to 'desired_psbt' */
398400
next_psbt = ictx->next_update_fn(ictx, ictx);
399401

402+
if (ictx->current_psbt)
403+
clone_psbt(NULL, ictx->current_psbt);
404+
if (ictx->desired_psbt)
405+
clone_psbt(NULL, ictx->desired_psbt);
406+
400407
/* Returning NULL from next_update_fn is the same as using `current_psbt`
401408
* with no changes -- both indicate no changes */
402409
if (!next_psbt)
403410
next_psbt = ictx->current_psbt;
404411

412+
if (ictx->current_psbt)
413+
clone_psbt(NULL, ictx->current_psbt);
414+
if (ictx->desired_psbt)
415+
clone_psbt(NULL, ictx->desired_psbt);
416+
405417
ictx->change_set = get_changes(ctx, ictx, next_psbt);
406418

419+
if (ictx->current_psbt)
420+
clone_psbt(NULL, ictx->current_psbt); // this fails
421+
if (ictx->desired_psbt)
422+
clone_psbt(NULL, ictx->desired_psbt);
423+
407424
/* If current_psbt and next_psbt are the same, dont double free it!
408425
* Otherwise we advance `current_psbt` to `next_psbt` and begin
409426
* processing the change set in `ictx->change_set` */
@@ -414,6 +431,11 @@ char *process_interactivetx_updates(const tal_t *ctx,
414431
ictx->current_psbt = next_psbt;
415432
}
416433

434+
if (ictx->current_psbt)
435+
clone_psbt(NULL, ictx->current_psbt);
436+
if (ictx->desired_psbt)
437+
clone_psbt(NULL, ictx->desired_psbt);
438+
417439
/* As initiator we always start with a single send to start it off */
418440
if (ictx->our_role == TX_INITIATOR) {
419441
error = send_next(ctx, ictx, &we_complete);
@@ -426,6 +448,11 @@ char *process_interactivetx_updates(const tal_t *ctx,
426448
}
427449
}
428450

451+
if (ictx->current_psbt)
452+
clone_psbt(NULL, ictx->current_psbt);
453+
if (ictx->desired_psbt)
454+
clone_psbt(NULL, ictx->desired_psbt);
455+
429456
/* Loop through tx update turns with peer */
430457
while (!(we_complete && they_complete)) {
431458
struct channel_id cid;
@@ -439,10 +466,20 @@ char *process_interactivetx_updates(const tal_t *ctx,
439466
if (received_tx_complete)
440467
*received_tx_complete = false;
441468

469+
if (ictx->current_psbt)
470+
clone_psbt(NULL, ictx->current_psbt);
471+
if (ictx->desired_psbt)
472+
clone_psbt(NULL, ictx->desired_psbt);
473+
442474
msg = read_next_msg(ctx, ictx, &error);
443475
if (error)
444476
return error;
445477

478+
if (ictx->current_psbt)
479+
clone_psbt(NULL, ictx->current_psbt);
480+
if (ictx->desired_psbt)
481+
clone_psbt(NULL, ictx->desired_psbt);
482+
446483
t = fromwire_peektype(msg);
447484
switch (t) {
448485
case WIRE_TX_ADD_INPUT: {
@@ -803,10 +840,20 @@ char *process_interactivetx_updates(const tal_t *ctx,
803840
send_next(ctx, ictx, &we_complete);
804841
}
805842

843+
if (ictx->current_psbt)
844+
clone_psbt(NULL, ictx->current_psbt);
845+
if (ictx->desired_psbt)
846+
clone_psbt(NULL, ictx->desired_psbt);
847+
806848
/* Sort psbt! */
807849
psbt_sort_by_serial_id(ictx->current_psbt);
808850

809851
tal_steal(ictx, ictx->current_psbt);
810852

853+
if (ictx->current_psbt)
854+
clone_psbt(NULL, ictx->current_psbt);
855+
if (ictx->desired_psbt)
856+
clone_psbt(NULL, ictx->desired_psbt);
857+
811858
return NULL;
812859
}

0 commit comments

Comments
 (0)