multi: update GenTaprootFundingScript to pass tapscript root

In most cases, we won't yet be passing a root. The option usage helps us keep the control flow mostly unchanged.
This commit is contained in:
Olaoluwa Osuntokun
2024-03-13 10:52:07 -04:00
committed by Oliver Gugger
parent eeee2979e5
commit 142b408be7
3 changed files with 4 additions and 3 deletions

View File

@@ -24,7 +24,6 @@ import (
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/channeldb/models"
"github.com/lightningnetwork/lnd/discovery"
"github.com/lightningnetwork/lnd/fn"
"github.com/lightningnetwork/lnd/graph"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/keychain"
@@ -2900,7 +2899,7 @@ func makeFundingScript(channel *channeldb.OpenChannel) ([]byte, error) {
if channel.ChanType.IsTaproot() {
pkScript, _, err := input.GenTaprootFundingScript(
localKey, remoteKey, int64(channel.Capacity),
fn.None[chainhash.Hash](),
channel.TapscriptRoot,
)
if err != nil {
return nil, err