Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lightning/src/ln/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6130,8 +6130,6 @@ where
holder_commitment_transaction_number,
self.counterparty_next_commitment_transaction_number,
);
// TODO(splicing) Forced error, as the use case is not complete
return Err(AbortReason::InternalError("Splicing not yet supported"));
} else {
self.assert_no_commitment_advancement(holder_commitment_transaction_number, "initial commitment_signed");
self.channel_state = ChannelState::FundingNegotiated(FundingNegotiatedFlags::new());
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/functional_test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ pub fn provide_anchor_reserves<'a, 'b, 'c>(nodes: &[Node<'a, 'b, 'c>]) -> Transa
}
let tx = Transaction {
version: TxVersion::TWO,
lock_time: LockTime::ZERO,
lock_time: LockTime::from_height(nodes[0].best_block_info().1).unwrap(),
input: vec![TxIn { ..Default::default() }],
output,
};
Expand Down
3 changes: 2 additions & 1 deletion lightning/src/ln/funding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use crate::prelude::Vec;
use crate::sign::{P2TR_KEY_PATH_WITNESS_WEIGHT, P2WPKH_WITNESS_WEIGHT};

/// The components of a splice's funding transaction that are contributed by one party.
#[derive(Debug, Clone)]
pub enum SpliceContribution {
/// When funds are added to a channel.
SpliceIn {
Expand Down Expand Up @@ -85,7 +86,7 @@ impl SpliceContribution {

/// An input to contribute to a channel's funding transaction either when using the v2 channel
/// establishment protocol or when splicing.
#[derive(Clone)]
#[derive(Debug, Clone)]
pub struct FundingTxInput {
/// The unspent [`TxOut`] that the input spends.
///
Expand Down
Loading
Loading