mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-09-20 21:30:06 +02:00
contractcourt: convert taprootBriefcase to use new tlv record type
This commit doesn't yet go all the way to modify all the other records quite yet.
This commit is contained in:
committed by
Oliver Gugger
parent
035126b280
commit
900a0a114a
@@ -1622,13 +1622,13 @@ func taprootBriefcaseFromRetInfo(retInfo *retributionInfo) *taprootBriefcase {
|
||||
// commitment, we'll need to stash the control block.
|
||||
case input.TaprootRemoteCommitSpend:
|
||||
//nolint:lll
|
||||
tapCase.CtrlBlocks.CommitSweepCtrlBlock = bo.signDesc.ControlBlock
|
||||
tapCase.CtrlBlocks.Val.CommitSweepCtrlBlock = bo.signDesc.ControlBlock
|
||||
|
||||
// To spend the revoked output again, we'll store the same
|
||||
// control block value as above, but in a different place.
|
||||
case input.TaprootCommitmentRevoke:
|
||||
//nolint:lll
|
||||
tapCase.CtrlBlocks.RevokeSweepCtrlBlock = bo.signDesc.ControlBlock
|
||||
tapCase.CtrlBlocks.Val.RevokeSweepCtrlBlock = bo.signDesc.ControlBlock
|
||||
|
||||
// For spending the HTLC outputs, we'll store the first and
|
||||
// second level tweak values.
|
||||
@@ -1642,10 +1642,10 @@ func taprootBriefcaseFromRetInfo(retInfo *retributionInfo) *taprootBriefcase {
|
||||
secondLevelTweak := bo.secondLevelTapTweak
|
||||
|
||||
//nolint:lll
|
||||
tapCase.TapTweaks.BreachedHtlcTweaks[resID] = firstLevelTweak
|
||||
tapCase.TapTweaks.Val.BreachedHtlcTweaks[resID] = firstLevelTweak
|
||||
|
||||
//nolint:lll
|
||||
tapCase.TapTweaks.BreachedSecondLevelHltcTweaks[resID] = secondLevelTweak
|
||||
tapCase.TapTweaks.Val.BreachedSecondLevelHltcTweaks[resID] = secondLevelTweak
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1665,13 +1665,13 @@ func applyTaprootRetInfo(tapCase *taprootBriefcase,
|
||||
// commitment, we'll apply the control block.
|
||||
case input.TaprootRemoteCommitSpend:
|
||||
//nolint:lll
|
||||
bo.signDesc.ControlBlock = tapCase.CtrlBlocks.CommitSweepCtrlBlock
|
||||
bo.signDesc.ControlBlock = tapCase.CtrlBlocks.Val.CommitSweepCtrlBlock
|
||||
|
||||
// To spend the revoked output again, we'll apply the same
|
||||
// control block value as above, but to a different place.
|
||||
case input.TaprootCommitmentRevoke:
|
||||
//nolint:lll
|
||||
bo.signDesc.ControlBlock = tapCase.CtrlBlocks.RevokeSweepCtrlBlock
|
||||
bo.signDesc.ControlBlock = tapCase.CtrlBlocks.Val.RevokeSweepCtrlBlock
|
||||
|
||||
// For spending the HTLC outputs, we'll apply the first and
|
||||
// second level tweak values.
|
||||
@@ -1680,7 +1680,8 @@ func applyTaprootRetInfo(tapCase *taprootBriefcase,
|
||||
case input.TaprootHtlcOfferedRevoke:
|
||||
resID := newResolverID(bo.OutPoint())
|
||||
|
||||
tap1, ok := tapCase.TapTweaks.BreachedHtlcTweaks[resID]
|
||||
//nolint:lll
|
||||
tap1, ok := tapCase.TapTweaks.Val.BreachedHtlcTweaks[resID]
|
||||
if !ok {
|
||||
return fmt.Errorf("unable to find taproot "+
|
||||
"tweak for: %v", bo.OutPoint())
|
||||
@@ -1688,7 +1689,7 @@ func applyTaprootRetInfo(tapCase *taprootBriefcase,
|
||||
bo.signDesc.TapTweak = tap1[:]
|
||||
|
||||
//nolint:lll
|
||||
tap2, ok := tapCase.TapTweaks.BreachedSecondLevelHltcTweaks[resID]
|
||||
tap2, ok := tapCase.TapTweaks.Val.BreachedSecondLevelHltcTweaks[resID]
|
||||
if !ok {
|
||||
return fmt.Errorf("unable to find taproot "+
|
||||
"tweak for: %v", bo.OutPoint())
|
||||
|
Reference in New Issue
Block a user