mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-04 09:48:19 +01:00
Code Issues Projects Releases Wiki Activity

multi: update GenTaprootFundingScript to pass tapscript root

Browse source 
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
No known key found for this signature in database
GPG key ID: 8E4256593F177720
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contractcourt/chain_watcher.go
View file

@ -308,7 +308,7 @@ func (c *chainWatcher) Start() error {
) )
if chanState.ChanType.IsTaproot() { if chanState.ChanType.IsTaproot() {
c.fundingPkScript, _, err = input.GenTaprootFundingScript( c.fundingPkScript, _, err = input.GenTaprootFundingScript(
localKey, remoteKey, 0, fn.None[chainhash.Hash](), localKey, remoteKey, 0, chanState.TapscriptRoot,
) )
if err != nil { if err != nil {
return err return err

3
funding/manager.go
View file

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

2
graph/builder.go
View file

@ -1146,6 +1146,8 @@ func makeFundingScript(bitcoinKey1, bitcoinKey2 []byte,
return nil, err return nil, err
} }
// TODO(roasbeef): add tapscript root to gossip v1.5
return fundingScript, nil return fundingScript, nil
} }