cmd+lnd: fix tweak handling

guggero · guggero · commit 0a92a5d5c4c3 · 2025-02-11T23:18:28.000+01:00
diff --git a/cmd/chantools/sweepremoteclosed.go b/cmd/chantools/sweepremoteclosed.go
@@ -371,7 +371,8 @@ func sweepRemoteClosed(extendedKey *hdkeychain.ExtendedKey, apiURL,
 			// output...
 			desc.WitnessScript = desc.Output.PkScript
 			witness, err := input.CommitSpendNoDelay(
-				signer, desc, sweepTx, true,
+				signer, desc, sweepTx,
+				len(desc.SingleTweak) == 0,
 			)
 			if err != nil {
 				return err
diff --git a/lnd/signer.go b/lnd/signer.go
@@ -283,7 +283,7 @@ func (s *Signer) AddTaprootSignature(packet *psbt.Packet, inputIndex int,
 func maybeTweakPrivKey(signDesc *input.SignDescriptor,
 	privKey *btcec.PrivateKey) *btcec.PrivateKey {
 
-	if signDesc.SingleTweak != nil {
+	if len(signDesc.SingleTweak) > 0 {
 		return input.TweakPrivKey(privKey, signDesc.SingleTweak)
 	}
 	return privKey

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ func (s Signer) AddTaprootSignature(packet psbt.Packet, inputIndex int,`
`283`	`283`	`func maybeTweakPrivKey(signDesc *input.SignDescriptor,`
`284`	`284`	`privKey btcec.PrivateKey) btcec.PrivateKey {`
`285`	`285`
`286`		`- if signDesc.SingleTweak != nil {`
	`286`	`+ if len(signDesc.SingleTweak) > 0 {`
`287`	`287`	`return input.TweakPrivKey(privKey, signDesc.SingleTweak)`
`288`	`288`	`}`
`289`	`289`	`return privKey`