← Watch feed
lnwallet: add field `CommitTxBlockHeight` to ResolutionReq
Public commit record
73/100 · Adequate
What the developer wrote
Authored by ffranr
lnwallet: add field `CommitTxBlockHeight` to ResolutionReq
Introduce `CommitTxBlockHeight` field to the `ResolutionReq` structure
and related methods. This field records the block height where a
commitment transaction has confirmed.
✓ Specific, descriptive subject✓ Names a concrete action or component✓ Provides detailed explanatory context
What changed, and why it matters
This commit adds a new piece of information—the block height at which a commitment transaction was confirmed—to the data structures used when resolving Lightning Network channel closes. It does not change any security-critical logic by itself; it is a data plumbing change that makes the confirmation height available to auxiliary contract resolvers. There is no direct vulnerability visible in the diff, but it could be a prerequisite for a future fix or feature that depends on knowing this height accurately.
Recommended action
Treat as a routine refactor/data-structure enhancement. Monitor follow-up commits that consume `CommitTxBlockHeight` inside `AuxContractResolver` implementations to determine whether this field enables a security-critical check. No immediate patching action is indicated by this commit alone.
Security signals we found
01
New data field added to contract-resolution request structure
02
Block-height value threaded from chain spend notification into auxiliary resolver
03
No validation, signature, or timelock logic modified
04
No explicit security context provided by commit message
05
Potential prerequisite for a later security or correctness fix
Evidence from the diff
The change introduces CommitTxBlockHeight uint32 to lnwallet.ResolutionReq and threads it through NewLocalForceCloseSummary, NewUnilateralCloseSummary, NewBreachRetribution, extractHtlcResolutions, newOutgoingHtlcResolution, and newIncomingHtlcResolution. The height is sourced from commitSpend.SpendingHeight in on-chain close paths and is set to 0 in the offline ForceClose path. The field is consumed by AuxContractResolver.ResolveContract calls. The patch is purely additive and does not alter existing validation, signature, or timelock logic. No security relevance is disclosed by the vendor in the commit message or title.
Changed components
lnwallet/aux_resolutions.golnwallet/channel.gocontractcourt/chain_watcher.goInspect captured patch +177 / −150
diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go
index 9c566fd..082b472 100644
--- a/contractcourt/chain_watcher.go
+++ b/contractcourt/chain_watcher.go
@@ -1061,7 +1061,8 @@ func (c *chainWatcher) dispatchLocalForceClose(
"detected", c.cfg.chanState.FundingOutpoint)
forceClose, err := lnwallet.NewLocalForceCloseSummary(
- c.cfg.chanState, c.cfg.signer, commitSpend.SpendingTx, stateNum,
+ c.cfg.chanState, c.cfg.signer, commitSpend.SpendingTx,
+ uint32(commitSpend.SpendingHeight), stateNum,
c.cfg.auxLeafStore, c.cfg.auxResolver,
)
if err != nil {
diff --git a/lnwallet/aux_resolutions.go b/lnwallet/aux_resolutions.go
index b36e2d6..14802c5 100644
--- a/lnwallet/aux_resolutions.go
+++ b/lnwallet/aux_resolutions.go
@@ -77,6 +77,10 @@ type ResolutionReq struct {
// CommitTx is the force close commitment transaction.
CommitTx *wire.MsgTx
+ // CommitTxBlockHeight is the block height where the commitment
+ // transaction confirmed. It is 0 if unknown or not confirmed yet.
+ CommitTxBlockHeight uint32
+
// CommitFee is the fee that was paid for the commitment transaction.
CommitFee btcutil.Amount
diff --git a/lnwallet/channel.go b/lnwallet/channel.go
index c96a35b..484a019 100644
--- a/lnwallet/channel.go
+++ b/lnwallet/channel.go
@@ -2215,20 +2215,23 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
// At this point, we'll check to see if we need any extra
// resolution data for this output.
+ //
+ //nolint:ll
resolveReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanState.ChanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- FundingBlob: chanState.CustomBlob,
- Type: input.TaprootRemoteCommitSpend,
- CloseType: Breach,
- CommitTx: spendTx,
- SignDesc: *br.LocalOutputSignDesc,
- KeyRing: keyRing,
- CsvDelay: ourDelay,
- BreachCsvDelay: fn.Some(theirDelay),
- CommitFee: chanState.RemoteCommitment.CommitFee,
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanState.ChanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ FundingBlob: chanState.CustomBlob,
+ Type: input.TaprootRemoteCommitSpend,
+ CloseType: Breach,
+ CommitTx: spendTx,
+ CommitTxBlockHeight: breachHeight,
+ SignDesc: *br.LocalOutputSignDesc,
+ KeyRing: keyRing,
+ CsvDelay: ourDelay,
+ BreachCsvDelay: fn.Some(theirDelay),
+ CommitFee: chanState.RemoteCommitment.CommitFee,
}
if revokedLog != nil {
resolveReq.CommitBlob = revokedLog.CustomBlob.ValOpt()
@@ -2295,20 +2298,23 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
// At this point, we'll check to see if we need any extra
// resolution data for this output.
+ //
+ //nolint:ll
resolveReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanState.ChanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- FundingBlob: chanState.CustomBlob,
- Type: input.TaprootCommitmentRevoke,
- CloseType: Breach,
- CommitTx: spendTx,
- SignDesc: *br.RemoteOutputSignDesc,
- KeyRing: keyRing,
- CsvDelay: theirDelay,
- BreachCsvDelay: fn.Some(theirDelay),
- CommitFee: chanState.RemoteCommitment.CommitFee,
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanState.ChanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ FundingBlob: chanState.CustomBlob,
+ Type: input.TaprootCommitmentRevoke,
+ CloseType: Breach,
+ CommitTx: spendTx,
+ CommitTxBlockHeight: breachHeight,
+ SignDesc: *br.RemoteOutputSignDesc,
+ KeyRing: keyRing,
+ CsvDelay: theirDelay,
+ BreachCsvDelay: fn.Some(theirDelay),
+ CommitFee: chanState.RemoteCommitment.CommitFee,
}
if revokedLog != nil {
resolveReq.CommitBlob = revokedLog.CustomBlob.ValOpt()
@@ -6886,6 +6892,7 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, //nolint:funlen
// First, we'll generate the commitment point and the revocation point
// so we can re-construct the HTLC state and also our payment key.
commitType := lntypes.Remote
+ commitTxHeight := uint32(commitSpend.SpendingHeight)
keyRing := DeriveCommitmentKeys(
commitPoint, commitType, chanState.ChanType,
&chanState.LocalChanCfg, &chanState.RemoteChanCfg,
@@ -6920,8 +6927,9 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, //nolint:funlen
chainfee.SatPerKWeight(remoteCommit.FeePerKw), commitType,
signer, remoteCommit.Htlcs, keyRing, &chanState.LocalChanCfg,
&chanState.RemoteChanCfg, commitSpend.SpendingTx,
- chanState.ChanType, isRemoteInitiator, leaseExpiry, chanState,
- auxResult.AuxLeaves, auxResolver,
+ commitTxHeight, chanState.ChanType,
+ isRemoteInitiator, leaseExpiry, chanState, auxResult.AuxLeaves,
+ auxResolver,
)
if err != nil {
return nil, fmt.Errorf("unable to create htlc resolutions: %w",
@@ -7009,21 +7017,24 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, //nolint:funlen
// At this point, we'll check to see if we need any extra
// resolution data for this output.
+ //
+ //nolint:ll
resolveReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanState.ChanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- CommitBlob: chanState.RemoteCommitment.CustomBlob,
- FundingBlob: chanState.CustomBlob,
- Type: input.TaprootRemoteCommitSpend,
- CloseType: RemoteForceClose,
- CommitTx: commitTxBroadcast,
- ContractPoint: *selfPoint,
- SignDesc: commitResolution.SelfOutputSignDesc,
- KeyRing: keyRing,
- CsvDelay: maturityDelay,
- CommitFee: chanState.RemoteCommitment.CommitFee,
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanState.ChanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ CommitBlob: chanState.RemoteCommitment.CustomBlob,
+ FundingBlob: chanState.CustomBlob,
+ Type: input.TaprootRemoteCommitSpend,
+ CloseType: RemoteForceClose,
+ CommitTx: commitTxBroadcast,
+ CommitTxBlockHeight: commitTxHeight,
+ ContractPoint: *selfPoint,
+ SignDesc: commitResolution.SelfOutputSignDesc,
+ KeyRing: keyRing,
+ CsvDelay: maturityDelay,
+ CommitFee: chanState.RemoteCommitment.CommitFee,
}
resolveBlob := fn.MapOptionZ(
auxResolver,
@@ -7209,7 +7220,7 @@ type HtlcResolutions struct {
// the remote party's commitment transaction.
func newOutgoingHtlcResolution(signer input.Signer,
localChanCfg *channeldb.ChannelConfig, commitTx *wire.MsgTx,
- htlc *channeldb.HTLC, keyRing *CommitmentKeyRing,
+ commitTxHeight uint32, htlc *channeldb.HTLC, keyRing *CommitmentKeyRing,
feePerKw chainfee.SatPerKWeight, csvDelay, leaseExpiry uint32,
whoseCommit lntypes.ChannelParty, isCommitFromInitiator bool,
chanType channeldb.ChannelType, chanState *channeldb.OpenChannel,
@@ -7285,24 +7296,26 @@ func newOutgoingHtlcResolution(signer input.Signer,
}
}
+ //nolint:ll
resReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- CommitBlob: chanState.RemoteCommitment.CustomBlob,
- FundingBlob: chanState.CustomBlob,
- Type: input.TaprootHtlcOfferedRemoteTimeout,
- CloseType: RemoteForceClose,
- CommitTx: commitTx,
- ContractPoint: op,
- SignDesc: signDesc,
- KeyRing: keyRing,
- CsvDelay: htlcCsvDelay,
- CltvDelay: fn.Some(htlc.RefundTimeout),
- CommitFee: chanState.RemoteCommitment.CommitFee,
- HtlcID: fn.Some(htlc.HtlcIndex),
- PayHash: fn.Some(htlc.RHash),
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ CommitBlob: chanState.RemoteCommitment.CustomBlob,
+ FundingBlob: chanState.CustomBlob,
+ Type: input.TaprootHtlcOfferedRemoteTimeout,
+ CloseType: RemoteForceClose,
+ CommitTx: commitTx,
+ CommitTxBlockHeight: commitTxHeight,
+ ContractPoint: op,
+ SignDesc: signDesc,
+ KeyRing: keyRing,
+ CsvDelay: htlcCsvDelay,
+ CltvDelay: fn.Some(htlc.RefundTimeout),
+ CommitFee: chanState.RemoteCommitment.CommitFee,
+ HtlcID: fn.Some(htlc.HtlcIndex),
+ PayHash: fn.Some(htlc.RHash),
}
resolveRes := fn.MapOptionZ(
auxResolver,
@@ -7513,31 +7526,33 @@ func newOutgoingHtlcResolution(signer input.Signer,
// the sweeping sub-system.
resolveRes := fn.MapOptionZ(
auxResolver, func(a AuxContractResolver) fn.Result[tlv.Blob] {
+ //nolint:ll
resReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- CommitBlob: chanState.LocalCommitment.CustomBlob, //nolint:ll
- FundingBlob: chanState.CustomBlob,
- Type: input.TaprootHtlcLocalOfferedTimeout, //nolint:ll
- CloseType: LocalForceClose,
- CommitTx: commitTx,
- ContractPoint: op,
- SignDesc: sweepSignDesc,
- KeyRing: keyRing,
- CsvDelay: htlcCsvDelay,
- HtlcAmt: btcutil.Amount(txOut.Value),
- CommitCsvDelay: csvDelay,
- CltvDelay: fn.Some(htlc.RefundTimeout),
- CommitFee: chanState.LocalCommitment.CommitFee, //nolint:ll
- HtlcID: fn.Some(htlc.HtlcIndex),
- PayHash: fn.Some(htlc.RHash),
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ CommitBlob: chanState.LocalCommitment.CustomBlob,
+ FundingBlob: chanState.CustomBlob,
+ Type: input.TaprootHtlcLocalOfferedTimeout,
+ CloseType: LocalForceClose,
+ CommitTx: commitTx,
+ CommitTxBlockHeight: commitTxHeight,
+ ContractPoint: op,
+ SignDesc: sweepSignDesc,
+ KeyRing: keyRing,
+ CsvDelay: htlcCsvDelay,
+ HtlcAmt: btcutil.Amount(txOut.Value),
+ CommitCsvDelay: csvDelay,
+ CltvDelay: fn.Some(htlc.RefundTimeout),
+ CommitFee: chanState.LocalCommitment.CommitFee,
+ HtlcID: fn.Some(htlc.HtlcIndex),
+ PayHash: fn.Some(htlc.RHash),
AuxSigDesc: fn.Some(AuxSigDesc{
SignDetails: *txSignDetails,
AuxSig: func() []byte {
- tlvType := htlcCustomSigType.TypeVal() //nolint:ll
- return htlc.CustomRecords[uint64(tlvType)] //nolint:ll
+ tlvType := htlcCustomSigType.TypeVal()
+ return htlc.CustomRecords[uint64(tlvType)]
}(),
}),
}
@@ -7573,7 +7588,7 @@ func newOutgoingHtlcResolution(signer input.Signer,
// TODO(roasbeef) consolidate code with above func
func newIncomingHtlcResolution(signer input.Signer,
localChanCfg *channeldb.ChannelConfig, commitTx *wire.MsgTx,
- htlc *channeldb.HTLC, keyRing *CommitmentKeyRing,
+ commitTxHeight uint32, htlc *channeldb.HTLC, keyRing *CommitmentKeyRing,
feePerKw chainfee.SatPerKWeight, csvDelay, leaseExpiry uint32,
whoseCommit lntypes.ChannelParty, isCommitFromInitiator bool,
chanType channeldb.ChannelType, chanState *channeldb.OpenChannel,
@@ -7648,26 +7663,28 @@ func newIncomingHtlcResolution(signer input.Signer,
}
}
+ //nolint:ll
resReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- CommitBlob: chanState.RemoteCommitment.CustomBlob,
- Type: input.TaprootHtlcAcceptedRemoteSuccess,
- FundingBlob: chanState.CustomBlob,
- CloseType: RemoteForceClose,
- CommitTx: commitTx,
- ContractPoint: op,
- SignDesc: signDesc,
- KeyRing: keyRing,
- HtlcID: fn.Some(htlc.HtlcIndex),
- CsvDelay: htlcCsvDelay,
- CltvDelay: fn.Some(htlc.RefundTimeout),
- CommitFee: chanState.RemoteCommitment.CommitFee,
- PayHash: fn.Some(htlc.RHash),
- CommitCsvDelay: csvDelay,
- HtlcAmt: htlc.Amt.ToSatoshis(),
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ CommitBlob: chanState.RemoteCommitment.CustomBlob,
+ Type: input.TaprootHtlcAcceptedRemoteSuccess,
+ FundingBlob: chanState.CustomBlob,
+ CloseType: RemoteForceClose,
+ CommitTx: commitTx,
+ CommitTxBlockHeight: commitTxHeight,
+ ContractPoint: op,
+ SignDesc: signDesc,
+ KeyRing: keyRing,
+ HtlcID: fn.Some(htlc.HtlcIndex),
+ CsvDelay: htlcCsvDelay,
+ CltvDelay: fn.Some(htlc.RefundTimeout),
+ CommitFee: chanState.RemoteCommitment.CommitFee,
+ PayHash: fn.Some(htlc.RHash),
+ CommitCsvDelay: csvDelay,
+ HtlcAmt: htlc.Amt.ToSatoshis(),
}
resolveRes := fn.MapOptionZ(
auxResolver,
@@ -7867,28 +7884,30 @@ func newIncomingHtlcResolution(signer input.Signer,
resolveRes := fn.MapOptionZ(
auxResolver, func(a AuxContractResolver) fn.Result[tlv.Blob] {
+ //nolint:ll
resReq := ResolutionReq{
- ChanPoint: chanState.FundingOutpoint,
- ChanType: chanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- CommitBlob: chanState.LocalCommitment.CustomBlob, //nolint:ll
- Type: input.TaprootHtlcAcceptedLocalSuccess, //nolint:ll
- FundingBlob: chanState.CustomBlob,
- CloseType: LocalForceClose,
- CommitTx: commitTx,
- ContractPoint: op,
- SignDesc: sweepSignDesc,
- KeyRing: keyRing,
- HtlcID: fn.Some(htlc.HtlcIndex),
- CsvDelay: htlcCsvDelay,
- CommitFee: chanState.LocalCommitment.CommitFee, //nolint:ll
- PayHash: fn.Some(htlc.RHash),
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ CommitBlob: chanState.LocalCommitment.CustomBlob,
+ Type: input.TaprootHtlcAcceptedLocalSuccess,
+ FundingBlob: chanState.CustomBlob,
+ CloseType: LocalForceClose,
+ CommitTx: commitTx,
+ CommitTxBlockHeight: commitTxHeight,
+ ContractPoint: op,
+ SignDesc: sweepSignDesc,
+ KeyRing: keyRing,
+ HtlcID: fn.Some(htlc.HtlcIndex),
+ CsvDelay: htlcCsvDelay,
+ CommitFee: chanState.LocalCommitment.CommitFee,
+ PayHash: fn.Some(htlc.RHash),
AuxSigDesc: fn.Some(AuxSigDesc{
SignDetails: *txSignDetails,
AuxSig: func() []byte {
- tlvType := htlcCustomSigType.TypeVal() //nolint:ll
- return htlc.CustomRecords[uint64(tlvType)] //nolint:ll
+ tlvType := htlcCustomSigType.TypeVal()
+ return htlc.CustomRecords[uint64(tlvType)]
}(),
}),
CommitCsvDelay: csvDelay,
@@ -7949,9 +7968,10 @@ func extractHtlcResolutions(feePerKw chainfee.SatPerKWeight,
whoseCommit lntypes.ChannelParty, signer input.Signer,
htlcs []channeldb.HTLC, keyRing *CommitmentKeyRing,
localChanCfg, remoteChanCfg *channeldb.ChannelConfig,
- commitTx *wire.MsgTx, chanType channeldb.ChannelType,
- isCommitFromInitiator bool, leaseExpiry uint32,
- chanState *channeldb.OpenChannel, auxLeaves fn.Option[CommitAuxLeaves],
+ commitTx *wire.MsgTx, commitTxHeight uint32,
+ chanType channeldb.ChannelType, isCommitFromInitiator bool,
+ leaseExpiry uint32, chanState *channeldb.OpenChannel,
+ auxLeaves fn.Option[CommitAuxLeaves],
auxResolver fn.Option[AuxContractResolver]) (*HtlcResolutions, error) {
// TODO(roasbeef): don't need to swap csv delay?
@@ -7984,8 +8004,8 @@ func extractHtlcResolutions(feePerKw chainfee.SatPerKWeight,
// Otherwise, we'll create an incoming HTLC resolution
// as we can satisfy the contract.
ihr, err := newIncomingHtlcResolution(
- signer, localChanCfg, commitTx, &htlc,
- keyRing, feePerKw, uint32(csvDelay),
+ signer, localChanCfg, commitTx, commitTxHeight,
+ &htlc, keyRing, feePerKw, uint32(csvDelay),
leaseExpiry, whoseCommit, isCommitFromInitiator,
chanType, chanState, auxLeaves, auxResolver,
)
@@ -7999,10 +8019,10 @@ func extractHtlcResolutions(feePerKw chainfee.SatPerKWeight,
}
ohr, err := newOutgoingHtlcResolution(
- signer, localChanCfg, commitTx, &htlc, keyRing,
- feePerKw, uint32(csvDelay), leaseExpiry, whoseCommit,
- isCommitFromInitiator, chanType, chanState, auxLeaves,
- auxResolver,
+ signer, localChanCfg, commitTx, commitTxHeight, &htlc,
+ keyRing, feePerKw, uint32(csvDelay), leaseExpiry,
+ whoseCommit, isCommitFromInitiator, chanType, chanState,
+ auxLeaves, auxResolver,
)
if err != nil {
return nil, fmt.Errorf("outgoing resolution "+
@@ -8148,7 +8168,8 @@ func (lc *LightningChannel) ForceClose(opts ...ForceCloseOpt) (
localCommitment := lc.channelState.LocalCommitment
summary, err := NewLocalForceCloseSummary(
lc.channelState, lc.Signer, commitTx,
- localCommitment.CommitHeight, lc.leafStore, lc.auxResolver,
+ 0, localCommitment.CommitHeight, lc.leafStore,
+ lc.auxResolver,
)
if err != nil {
return nil, fmt.Errorf("unable to gen force close "+
@@ -8162,11 +8183,11 @@ func (lc *LightningChannel) ForceClose(opts ...ForceCloseOpt) (
}
// NewLocalForceCloseSummary generates a LocalForceCloseSummary from the given
-// channel state. The passed commitTx must be a fully signed commitment
+// channel state. The passed commitTx must be a fully signed commitment
// transaction corresponding to localCommit.
func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
- signer input.Signer, commitTx *wire.MsgTx, stateNum uint64,
- leafStore fn.Option[AuxLeafStore],
+ signer input.Signer, commitTx *wire.MsgTx, commitTxHeight uint32,
+ stateNum uint64, leafStore fn.Option[AuxLeafStore],
auxResolver fn.Option[AuxContractResolver]) (*LocalForceCloseSummary,
error) {
@@ -8301,20 +8322,21 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
func(a AuxContractResolver) fn.Result[tlv.Blob] {
//nolint:ll
return a.ResolveContract(ResolutionReq{
- ChanPoint: chanState.FundingOutpoint, //nolint:ll
- ChanType: chanState.ChanType,
- ShortChanID: chanState.ShortChanID(),
- Initiator: chanState.IsInitiator,
- CommitBlob: chanState.LocalCommitment.CustomBlob,
- FundingBlob: chanState.CustomBlob,
- Type: input.TaprootLocalCommitSpend,
- CloseType: LocalForceClose,
- CommitTx: commitTx,
- ContractPoint: commitResolution.SelfOutPoint,
- SignDesc: commitResolution.SelfOutputSignDesc,
- KeyRing: keyRing,
- CsvDelay: csvTimeout,
- CommitFee: chanState.LocalCommitment.CommitFee,
+ ChanPoint: chanState.FundingOutpoint,
+ ChanType: chanState.ChanType,
+ ShortChanID: chanState.ShortChanID(),
+ Initiator: chanState.IsInitiator,
+ CommitBlob: chanState.LocalCommitment.CustomBlob,
+ FundingBlob: chanState.CustomBlob,
+ Type: input.TaprootLocalCommitSpend,
+ CloseType: LocalForceClose,
+ CommitTx: commitTx,
+ CommitTxBlockHeight: commitTxHeight,
+ ContractPoint: commitResolution.SelfOutPoint,
+ SignDesc: commitResolution.SelfOutputSignDesc,
+ KeyRing: keyRing,
+ CsvDelay: csvTimeout,
+ CommitFee: chanState.LocalCommitment.CommitFee,
})
},
)
@@ -8334,9 +8356,9 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel,
htlcResolutions, err := extractHtlcResolutions(
chainfee.SatPerKWeight(localCommit.FeePerKw), lntypes.Local,
signer, localCommit.Htlcs, keyRing, &chanState.LocalChanCfg,
- &chanState.RemoteChanCfg, commitTx, chanState.ChanType,
- chanState.IsInitiator, leaseExpiry, chanState,
- auxResult.AuxLeaves, auxResolver,
+ &chanState.RemoteChanCfg, commitTx, commitTxHeight,
+ chanState.ChanType, chanState.IsInitiator, leaseExpiry,
+ chanState, auxResult.AuxLeaves, auxResolver,
)
if err != nil {
return nil, fmt.Errorf("unable to gen htlc resolution: %w", err)
Risk score
Our methodology →Why this scored 25/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.