@@ -3598,11 +3598,14 @@ static void resume_splice_negotiation(struct peer *peer,
3598
3598
& peer -> channel -> funding_pubkey [REMOTE ],
3599
3599
splice_funding_index );
3600
3600
3601
+ status_info ("Splicing signing.1" );
3601
3602
msg = hsm_req (tmpctx , take (msg ));
3603
+ status_info ("Splicing signing.2" );
3602
3604
if (!fromwire_hsmd_sign_tx_reply (msg , & splice_sig ))
3603
3605
status_failed (STATUS_FAIL_HSM_IO ,
3604
3606
"Reading sign_splice_tx reply: %s" ,
3605
3607
tal_hex (tmpctx , msg ));
3608
+ status_info ("Splicing signing.3" );
3606
3609
3607
3610
/* Set the splice_sig on the splice funding tx psbt */
3608
3611
if (send_signature
@@ -3620,36 +3623,52 @@ static void resume_splice_negotiation(struct peer *peer,
3620
3623
& peer -> channel -> funding_pubkey [LOCAL ]),
3621
3624
fmt_bitcoin_signature (tmpctx , & splice_sig ),
3622
3625
fmt_wally_psbt (tmpctx , current_psbt ));
3626
+ status_info ("Splicing signing.4" );
3623
3627
3624
3628
txsig_tlvs = tlv_txsigs_tlvs_new (tmpctx );
3625
3629
txsig_tlvs -> shared_input_signature = & splice_sig .s ;
3626
3630
3631
+ status_info ("Splicing signing.5" );
3632
+
3627
3633
/* DTODO: is this finalize call required? */
3628
3634
psbt_finalize (current_psbt );
3629
3635
3636
+ status_info ("Splicing signing.6" );
3637
+
3630
3638
outws = psbt_to_witnesses (tmpctx , current_psbt ,
3631
3639
our_role , splice_funding_index );
3640
+ status_info ("Splicing signing.7" );
3632
3641
sigmsg = towire_tx_signatures (tmpctx , & peer -> channel_id ,
3633
3642
& inflight -> outpoint .txid , outws ,
3634
3643
txsig_tlvs );
3644
+ status_info ("Splicing signing.8" );
3635
3645
3636
3646
psbt_txid (tmpctx , current_psbt , & final_txid , NULL );
3647
+ status_info ("Splicing signing.9" );
3637
3648
3638
3649
if (do_i_sign_first (peer , current_psbt , our_role ,
3639
3650
inflight -> force_sign_first )
3640
3651
&& send_signature ) {
3652
+ status_info ("Splicing signing.9A" );
3641
3653
inflight -> i_sent_sigs = true;
3654
+ status_info ("Splicing signing.9B" );
3642
3655
msg = towire_channeld_update_inflight (NULL , current_psbt ,
3643
3656
NULL , NULL ,
3644
3657
inflight -> locked_scid ,
3645
3658
inflight -> i_sent_sigs );
3659
+ status_info ("Splicing signing.9C" );
3646
3660
wire_sync_write (MASTER_FD , take (msg ));
3647
3661
3662
+ status_info ("Splicing signing.9D" );
3648
3663
msg = towire_channeld_splice_sending_sigs (tmpctx , & final_txid );
3664
+ status_info ("Splicing signing.9E" );
3649
3665
wire_sync_write (MASTER_FD , take (msg ));
3650
3666
3667
+ status_info ("Splicing signing.9F" );
3651
3668
peer_write (peer -> pps , sigmsg );
3669
+ status_info ("Splicing signing.9G" );
3652
3670
}
3671
+ status_info ("Splicing signing.10" );
3653
3672
3654
3673
their_pubkey = & peer -> channel -> funding_pubkey [REMOTE ];
3655
3674
@@ -3741,6 +3760,7 @@ static void resume_splice_negotiation(struct peer *peer,
3741
3760
fmt_wally_psbt (tmpctx , current_psbt ));
3742
3761
}
3743
3762
}
3763
+ status_info ("Splicing signing.11" );
3744
3764
3745
3765
if (have_i_signed_inflight (peer , inflight )
3746
3766
&& have_they_signed_inflight (peer , inflight )) {
@@ -3835,6 +3855,7 @@ static void resume_splice_negotiation(struct peer *peer,
3835
3855
bitcoin_tx_input_set_witness (final_tx , splice_funding_index ,
3836
3856
wit_stack );
3837
3857
}
3858
+ status_info ("Splicing signing.12" );
3838
3859
3839
3860
if (recv_signature ) {
3840
3861
/* We let core validate our peer's signatures are correct. */
@@ -3844,6 +3865,7 @@ static void resume_splice_negotiation(struct peer *peer,
3844
3865
send_signature || inflight -> i_sent_sigs );
3845
3866
wire_sync_write (MASTER_FD , take (msg ));
3846
3867
}
3868
+ status_info ("Splicing signing.13" );
3847
3869
3848
3870
if (!do_i_sign_first (peer , current_psbt , our_role ,
3849
3871
inflight -> force_sign_first )
@@ -3855,6 +3877,7 @@ static void resume_splice_negotiation(struct peer *peer,
3855
3877
peer_write (peer -> pps , sigmsg );
3856
3878
status_debug ("Splice: we signed second" );
3857
3879
}
3880
+ status_info ("Splicing signing.14" );
3858
3881
3859
3882
if (send_signature ) {
3860
3883
if (!recv_signature )
@@ -3867,6 +3890,7 @@ static void resume_splice_negotiation(struct peer *peer,
3867
3890
new_output_index );
3868
3891
wire_sync_write (MASTER_FD , take (msg ));
3869
3892
}
3893
+ status_info ("Splicing signing.15" );
3870
3894
3871
3895
audit_psbt (current_psbt , current_psbt );
3872
3896
}
0 commit comments