funding: use p2tr by default for batch_open_channel

In LND v0.15.1, batch_open_channel used p2tr by default
for change output. However, in a later version, a breaking
change has been fixed in FundPSBT to make the change type
configurable (default to p2wkh). As batch_open_channel
uses FundPsbt, we need to put back p2tr as default for
change output
This commit is contained in:
Torakushi
2023-04-16 13:55:24 +02:00
parent 66a85bf9db
commit 0445fef7ad
3 changed files with 32 additions and 0 deletions

View File

@@ -7,6 +7,7 @@ import (
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/input"
@@ -777,6 +778,21 @@ func testBatchChanFunding(ht *lntest.HarnessTest) {
ht.AssertTopologyChannelOpen(alice, chanPoint2)
ht.AssertTopologyChannelOpen(alice, chanPoint3)
// Check if the change type from the batch_open_channel funding is P2TR.
rawTx := ht.Miner.GetRawTransaction(txHash)
require.Len(ht, rawTx.MsgTx().TxOut, 4)
// For calculating the change output index we use the formula for the
// sum of consecutive of integers (n(n+1)/2). All the channel point
// indexes are known, so we just calculate the difference to get the
// change output index.
changeIndex := uint32(6) - (chanPoint1.OutputIndex +
chanPoint2.OutputIndex + chanPoint3.OutputIndex)
ht.AssertOutputScriptClass(
rawTx, changeIndex, txscript.WitnessV1TaprootTy,
)
// With the channel open, ensure that it is counted towards Alice's
// total channel balance.
balRes := alice.RPC.ChannelBalance()