diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go index 155fca2a9..8b2f75816 100644 --- a/contractcourt/chain_watcher.go +++ b/contractcourt/chain_watcher.go @@ -308,7 +308,7 @@ func (c *chainWatcher) Start() error { ) if chanState.ChanType.IsTaproot() { c.fundingPkScript, _, err = input.GenTaprootFundingScript( - localKey, remoteKey, 0, fn.None[chainhash.Hash](), + localKey, remoteKey, 0, chanState.TapscriptRoot, ) if err != nil { return err diff --git a/funding/manager.go b/funding/manager.go index ad6286090..b22f2e691 100644 --- a/funding/manager.go +++ b/funding/manager.go @@ -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 diff --git a/graph/builder.go b/graph/builder.go index 7f7823ab4..717d3e5ad 100644 --- a/graph/builder.go +++ b/graph/builder.go @@ -1146,6 +1146,8 @@ func makeFundingScript(bitcoinKey1, bitcoinKey2 []byte, return nil, err } + // TODO(roasbeef): add tapscript root to gossip v1.5 + return fundingScript, nil }