Skip to content

Commit 05ad64b

Browse files
committed
tap: remove lnd version check from FundVirtualPsbt
This commit removes the version check for lnd in the `FundVirtualPsbt` since we can assume the new coin selection mode in the FundPsbt call with the minimal lnd version now being `0.18.4`.
1 parent 07ead54 commit 05ad64b

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

rpcserver.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import (
5252
"github.com/lightningnetwork/lnd/build"
5353
"github.com/lightningnetwork/lnd/keychain"
5454
"github.com/lightningnetwork/lnd/lnrpc"
55-
"github.com/lightningnetwork/lnd/lnrpc/verrpc"
5655
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
5756
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
5857
"github.com/lightningnetwork/lnd/lnwire"
@@ -78,17 +77,6 @@ var (
7877
// P2TRChangeType is the type of change address that should be used for
7978
// funding PSBTs, as we'll always want to use P2TR change addresses.
8079
P2TRChangeType = walletrpc.ChangeAddressType_CHANGE_ADDRESS_TYPE_P2TR
81-
82-
// fundPsbtCoinSelectVersion is the version of lnd that enabled better
83-
// coin selection support in the FundPsbt RPC call.
84-
fundPsbtCoinSelectVersion = &verrpc.Version{
85-
AppMajor: 0,
86-
AppMinor: 17,
87-
AppPatch: 99,
88-
BuildTags: []string{
89-
"signrpc", "walletrpc", "chainrpc", "invoicesrpc",
90-
},
91-
}
9280
)
9381

9482
const (
@@ -2304,22 +2292,6 @@ func (r *rpcServer) CommitVirtualPsbts(ctx context.Context,
23042292
req *wrpc.CommitVirtualPsbtsRequest) (*wrpc.CommitVirtualPsbtsResponse,
23052293
error) {
23062294

2307-
// For this call we require `lnd` to be at least v0.17.99-beta (which
2308-
// will become v0.18.0-beta eventually) as we need the new coin
2309-
// selection mode in the FundPsbt call.
2310-
fundPsbtCoinSelectNotSupportedErr := fmt.Errorf("connected lnd "+
2311-
"version %v does not support advanced coin selection in the "+
2312-
"FundPsbt RPC, need at least v%d.%d.%d for this call",
2313-
r.cfg.Lnd.Version.Version, fundPsbtCoinSelectVersion.AppMajor,
2314-
fundPsbtCoinSelectVersion.AppMinor,
2315-
fundPsbtCoinSelectVersion.AppPatch)
2316-
verErr := lndclient.AssertVersionCompatible(
2317-
r.cfg.Lnd.Version, fundPsbtCoinSelectVersion,
2318-
)
2319-
if verErr != nil {
2320-
return nil, fundPsbtCoinSelectNotSupportedErr
2321-
}
2322-
23232295
if len(req.VirtualPsbts) == 0 {
23242296
return nil, fmt.Errorf("no virtual PSBTs specified")
23252297
}

0 commit comments

Comments
 (0)