From 234f4d80fb7b92da95ddd1ba292766b59ea169d2 Mon Sep 17 00:00:00 2001 From: carla Date: Fri, 20 Aug 2021 16:48:17 +0200 Subject: [PATCH] gomod: bump to lndclient 13-7 This commit bumps pool to lndclient 13-7 so that code that depends on lnd 0.13 can import pool. As is, pool is running with lndclient 0.12, but pins minimum version to 0.11, so we are already in a state where some of the apis available at compile time are not enforced by minimum run version. This commit bumps this minimum version up to 0.12 to minimize the difference between the compile and runtime lnd version. --- account/manager.go | 3 ++- account/mock_test.go | 2 +- go.mod | 6 +++--- go.sum | 12 ++++-------- internal/test/walletkit_mock.go | 2 +- server.go | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/account/manager.go b/account/manager.go index 9c6ca8d..911bc73 100644 --- a/account/manager.go +++ b/account/manager.go @@ -7,6 +7,7 @@ import ( "math" "strings" "sync" + "time" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/btcec" @@ -1765,7 +1766,7 @@ coinSelection: // fail at any point. for i, input := range inputs { _, err := m.cfg.Wallet.LeaseOutput( - ctx, lockID, input.OutPoint, + ctx, lockID, input.OutPoint, time.Minute*10, ) if err != nil { log.Debugf("Unable to lease output %v: %v", diff --git a/account/mock_test.go b/account/mock_test.go index 17a39c0..17e16fe 100644 --- a/account/mock_test.go +++ b/account/mock_test.go @@ -305,7 +305,7 @@ func (w *mockWallet) ListUnspent(_ context.Context, _, _ int32) ( } func (w *mockWallet) LeaseOutput(_ context.Context, lockID wtxmgr.LockID, - op wire.OutPoint) (time.Time, error) { + op wire.OutPoint, _ time.Duration) (time.Time, error) { return time.Now().Add(10 * time.Minute), nil } diff --git a/go.mod b/go.mod index 1cac638..8a73c8e 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 github.com/jessevdk/go-flags v1.4.0 github.com/lightninglabs/aperture v0.1.6-beta - github.com/lightninglabs/lndclient v0.12.0-8 - github.com/lightninglabs/pool/auctioneerrpc v1.0.2 + github.com/lightninglabs/lndclient v0.13.0-7 + github.com/lightninglabs/pool/auctioneerrpc v1.0.3 github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display - github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210728112744-ebabda671786 + github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210802115842-44971f0c46c9 github.com/lightningnetwork/lnd/cert v1.0.3 github.com/stretchr/testify v1.7.0 github.com/urfave/cli v1.20.0 diff --git a/go.sum b/go.sum index 58c91d0..113f95c 100644 --- a/go.sum +++ b/go.sum @@ -90,9 +90,7 @@ github.com/btcsuite/btcutil/psbt v1.0.3-0.20201208143702-a53e38424cce/go.mod h1: github.com/btcsuite/btcutil/psbt v1.0.3-0.20210527170813-e2ba6805a890 h1:0xUNvvwJ7RjzBs4nCF+YrK28S5P/b4uHkpPxY1ovGY4= github.com/btcsuite/btcutil/psbt v1.0.3-0.20210527170813-e2ba6805a890/go.mod h1:LVveMu4VaNSkIRTZu2+ut0HDBRuYjqGocxDMNS1KuGQ= github.com/btcsuite/btcwallet v0.11.1-0.20200814001439-1d31f4ea6fc5/go.mod h1:YkEbJaCyN6yncq5gEp2xG0OKDwus2QxGCEXTNF27w5I= -github.com/btcsuite/btcwallet v0.11.1-0.20200814001439-1d31f4ea6fc5/go.mod h1:YkEbJaCyN6yncq5gEp2xG0OKDwus2QxGCEXTNF27w5I= github.com/btcsuite/btcwallet v0.11.1-0.20200904022754-2c5947a45222/go.mod h1:owv9oZqM0HnUW+ByF7VqOgfs2eb0ooiePW/+Tl/i/Nk= -github.com/btcsuite/btcwallet v0.11.1-0.20201207233335-415f37ff11a1/go.mod h1:P1U4LKSB/bhFQdOM7ab1XqNoBGFyFAe7eKObEBD9mIo= github.com/btcsuite/btcwallet v0.12.1-0.20210519225359-6ab9b615576f h1:Me6OOQP2ZYttZuViKXHVegXPKz2n42zNbHI3ljPeqwU= github.com/btcsuite/btcwallet v0.12.1-0.20210519225359-6ab9b615576f/go.mod h1:f1HuBGov5+OTp40Gh1vA+tvF6d7bbuLFTceJMRB7fXw= github.com/btcsuite/btcwallet/wallet/txauthor v1.0.0/go.mod h1:VufDts7bd/zs3GV13f/lXc/0lXrPnvxD/NvmpG/FEKU= @@ -377,11 +375,10 @@ github.com/lightninglabs/aperture v0.1.6-beta/go.mod h1:9xl4mx778ZAzrB87nLHMqk+X github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk= github.com/lightninglabs/lndclient v0.11.0-4/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI= -github.com/lightninglabs/lndclient v0.12.0-8 h1:ZnX8wp0atNsBNGNIs+MYvLDRRnoia63RPflD9OfeonQ= -github.com/lightninglabs/lndclient v0.12.0-8/go.mod h1:L0R2VOaLxMylGbxgnfiZGc0hMDIIgj91cfgwGuFz9kU= +github.com/lightninglabs/lndclient v0.13.0-7 h1:diIMNzbe8pMF1jf6tysOLLkeo1Q6KzyQNsNvLs+g3xg= +github.com/lightninglabs/lndclient v0.13.0-7/go.mod h1:Ia/UARBUq9Y8CCegm/Nrdi/z+NZsH85JzxetAdnC37Q= github.com/lightninglabs/neutrino v0.11.0/go.mod h1:CuhF0iuzg9Sp2HO6ZgXgayviFTn1QHdSTJlMncK80wg= github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200/go.mod h1:MlZmoKa7CJP3eR1s5yB7Rm5aSyadpKkxqAwLQmog7N0= -github.com/lightninglabs/neutrino v0.11.1-0.20201210023533-e1978372d15e/go.mod h1:KDWfQDKp+CFBxO1t2NRmWuagTY2sYIjpHB1k5vrojTI= github.com/lightninglabs/neutrino v0.12.1 h1:9umzk5kKNc/l3bAyak8ClSRP1qSulnjc6kppLYDnuqk= github.com/lightninglabs/neutrino v0.12.1/go.mod h1:GlKninWpRBbL7b8G0oQ36/8downfnFwKsr0hbRA6E/E= github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d/go.mod h1:KDb67YMzoh4eudnzClmvs2FbiLG9vxISmLApUkCa4uI= @@ -392,9 +389,8 @@ github.com/lightningnetwork/lightning-onion v1.0.2-0.20210520211913-522b799e65b1 github.com/lightningnetwork/lightning-onion v1.0.2-0.20210520211913-522b799e65b1/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4= github.com/lightningnetwork/lnd v0.11.0-beta/go.mod h1:CzArvT7NFDLhVyW06+NJWSuWFmE6Ea+AjjA3txUBqTM= github.com/lightningnetwork/lnd v0.11.1-beta/go.mod h1:PGIgxy8aH70Li33YVYkHSaCM8m8LjEevk5h1Dpldrr4= -github.com/lightningnetwork/lnd v0.12.0-beta/go.mod h1:2GyP1IG1kXV5Af/LOCxnXfux1OP3fAGr8zptS5PB2YI= -github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210728112744-ebabda671786 h1:DOZ16XjuSJgmgV0jXYcagxg19fRgad3DbzpNNkWuOsk= -github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210728112744-ebabda671786/go.mod h1:3cmukt9wR4PX1va9Q78gmqSPYd6yhV1wcFemM5F+kT8= +github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210802115842-44971f0c46c9 h1:kFyyJRNFAUnQl5G7b3stUF2KIfdUJu/KCKXvPlBJqNA= +github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210802115842-44971f0c46c9/go.mod h1:3cmukt9wR4PX1va9Q78gmqSPYd6yhV1wcFemM5F+kT8= github.com/lightningnetwork/lnd/cert v1.0.2/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo= github.com/lightningnetwork/lnd/cert v1.0.3 h1:/K2gjzLgVI8we2IIPKc0ztWTEa85uds5sWXi1K6mOT0= github.com/lightningnetwork/lnd/cert v1.0.3/go.mod h1:3MWXVLLPI0Mg0XETm9fT4N9Vyy/8qQLmaM5589bEggM= diff --git a/internal/test/walletkit_mock.go b/internal/test/walletkit_mock.go index ba3f800..ae0013b 100644 --- a/internal/test/walletkit_mock.go +++ b/internal/test/walletkit_mock.go @@ -45,7 +45,7 @@ func (m *MockWalletKit) ListUnspent(context.Context, int32, } func (m *MockWalletKit) LeaseOutput(context.Context, wtxmgr.LockID, - wire.OutPoint) (time.Time, error) { + wire.OutPoint, time.Duration) (time.Time, error) { return time.Now(), nil } diff --git a/server.go b/server.go index bc9419e..8287584 100644 --- a/server.go +++ b/server.go @@ -39,8 +39,8 @@ var ( // required in lnd to run pool. minimalCompatibleVersion = &verrpc.Version{ AppMajor: 0, - AppMinor: 11, - AppPatch: 1, + AppMinor: 12, + AppPatch: 0, // We don't actually require the invoicesrpc calls. But if we // try to use lndclient on an lnd that doesn't have it enabled,