Skip to content

[Custom Transactions] Commitment Transaction & Channel Refactors #3606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 25, 2025
Merged

[Custom Transactions] Commitment Transaction & Channel Refactors #3606

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e58184c
Remove redundant parameters from the `CommitmentTransaction` constructor
tankyleo Feb 26, 2025
0ac188f
Let `CommitmentTransaction` build the `TxCreationKeys` it will cache
tankyleo Feb 26, 2025
9b71c64
Remove some unneeded `Result`'s in `CommitmentTransaction`
tankyleo Mar 5, 2025
1023d0b
Remove explicit per-commitment key derivations from channel objects
tankyleo Feb 26, 2025
592f17d
Remove unnecessary allocation in `send_commitment_no_state_update`
tankyleo Mar 2, 2025
728e7c2
Remove `i64` casts in `ChannelContext::build_commitment_transaction`
tankyleo Feb 26, 2025
22be385
Clean up tautologies in `ChannelContext::build_commitment_transaction`
tankyleo Feb 26, 2025
09422dd
Remove redundant fields in `CommitmentStats`
tankyleo Feb 26, 2025
935a8fd
Reorg return values of `ChannelContext::build_commitment_transaction`
tankyleo Feb 27, 2025
ff259ba
Cover the saturating sub of the fee and anchors from funder's balance
tankyleo Mar 17, 2025
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
19 changes: 6 additions & 13 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3703,13 +3703,9 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
} else {
log_trace!(logger, " ...not including inbound HTLC {} (hash {}) with value {} due to state ({})", htlc.htlc_id, &htlc.payment_hash, htlc.amount_msat, state_name);
match &htlc.state {
&InboundHTLCState::LocalRemoved(ref reason) => {
if generated_by_local {
if let &InboundHTLCRemovalReason::Fulfill(preimage) = reason {
inbound_htlc_preimages.push(preimage);
value_to_self_msat_offset += htlc.amount_msat as i64;
}
}
&InboundHTLCState::LocalRemoved(InboundHTLCRemovalReason::Fulfill(preimage)) => {
inbound_htlc_preimages.push(preimage);
value_to_self_msat_offset += htlc.amount_msat as i64;
},
_ => {},
}
Expand Down Expand Up @@ -3745,13 +3741,10 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
} else {
log_trace!(logger, " ...not including outbound HTLC {} (hash {}) with value {} due to state ({})", htlc.htlc_id, &htlc.payment_hash, htlc.amount_msat, state_name);
match htlc.state {
OutboundHTLCState::AwaitingRemoteRevokeToRemove(OutboundHTLCOutcome::Success(_))|OutboundHTLCState::AwaitingRemovedRemoteRevoke(OutboundHTLCOutcome::Success(_)) => {
value_to_self_msat_offset -= htlc.amount_msat as i64;
},
OutboundHTLCState::AwaitingRemoteRevokeToRemove(OutboundHTLCOutcome::Success(_)) |
OutboundHTLCState::AwaitingRemovedRemoteRevoke(OutboundHTLCOutcome::Success(_)) |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AwaitingRemovedRemoteRevoke isn't a tautology because it is always !include even if generated_by_local.

Copy link
Contributor Author

@tankyleo tankyleo Mar 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think I make any changes to that variant ? As before, always subtract from the offset.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I'm off on the vocabulary, the tautology to me is the !generated_by_local expression below.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sheesh I was more tired than I thought :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem

OutboundHTLCState::RemoteRemoved(OutboundHTLCOutcome::Success(_)) => {
if !generated_by_local {
value_to_self_msat_offset -= htlc.amount_msat as i64;
}
value_to_self_msat_offset -= htlc.amount_msat as i64;
},
_ => {},
}
Expand Down