Skip to content

Commit 402bfbb

Browse files
committed
Create explicit types for script path spend and key path spend taproot inputs
1 parent ee18883 commit 402bfbb

File tree

2 files changed

+67
-85
lines changed

2 files changed

+67
-85
lines changed

eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import fr.acinq.eclair.payment.relay.Relayer.RelayFees
3232
import fr.acinq.eclair.router.Announcements
3333
import fr.acinq.eclair.transactions.DirectedHtlc._
3434
import fr.acinq.eclair.transactions.Scripts._
35+
import fr.acinq.eclair.transactions.Transactions.InputInfo.RedeemPath
3536
import fr.acinq.eclair.transactions.Transactions._
3637
import fr.acinq.eclair.transactions._
3738
import fr.acinq.eclair.wire.protocol._
@@ -380,7 +381,7 @@ object Helpers {
380381
case SimpleTaprootChannelCommitmentFormat =>
381382
val fundingScript = Taproot.musig2FundingScript(fundingPubkey1, fundingPubkey2)
382383
val fundingTxOut = TxOut(fundingSatoshis, fundingScript)
383-
InputInfo.TaprootInput(OutPoint(fundingTxId, fundingTxOutputIndex), fundingTxOut, Taproot.musig2Aggregate(fundingPubkey1, fundingPubkey2), None, ByteVector32.Zeroes)
384+
InputInfo.TaprootInput(OutPoint(fundingTxId, fundingTxOutputIndex), fundingTxOut, Taproot.musig2Aggregate(fundingPubkey1, fundingPubkey2), RedeemPath.KeyPath(None))
384385
case DefaultCommitmentFormat | _: AnchorOutputsCommitmentFormat =>
385386
val fundingScript = multiSig2of2(fundingPubkey1, fundingPubkey2)
386387
val fundingTxOut = TxOut(fundingSatoshis, pay2wsh(fundingScript))

0 commit comments

Comments
 (0)