GlcoinCore/pool
1
0
Fork 0
mirror of https://github.com/lightninglabs/pool.git synced 2026-08-19 13:17:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #202 from lightninglabs/update-lndclient

Browse source 
mod: update lndclient, block until lnd is unlocked, bump version to v0.4.2-alpha
This commit is contained in:
Oliver Gugger 2021-01-19 08:38:50 +01:00 • committed by GitHub
commit 131f2c12f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
funding/manager.go
View file

@ -659,7 +659,9 @@ func (m *Manager) connectToMatchedTrader(ctx context.Context,
nodeKey [33]byte, addrs []net.Addr) {
for _, addr := range addrs {
err := m.LightningClient.Connect(ctx, nodeKey, addr.String())
err := m.LightningClient.Connect(
ctx, nodeKey, addr.String(), false,
)
if err != nil {
// If we're already connected, then we can stop now.
if strings.Contains(err.Error(), "already connected") {

6
go.mod
View file

@ -13,10 +13,10 @@ require (
github.com/golang/protobuf v1.3.3
github.com/grpc-ecosystem/grpc-gateway v1.14.6
github.com/jessevdk/go-flags v1.4.0
github.com/lightninglabs/aperture v0.1.3-beta
github.com/lightninglabs/lndclient v0.11.0-3
github.com/lightninglabs/aperture v0.1.5-beta
github.com/lightninglabs/lndclient v0.11.0-5
github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d
github.com/lightningnetwork/lnd v0.12.0-beta.rc3
github.com/lightningnetwork/lnd v0.12.0-beta.rc5
github.com/lightningnetwork/lnd/cert v1.0.3
github.com/stretchr/testify v1.5.1
github.com/urfave/cli v1.20.0

18
go.sum
View file

@ -45,6 +45,7 @@ github.com/btcsuite/btcwallet v0.11.1-0.20200814001439-1d31f4ea6fc5 h1:1We7EuizB
github.com/btcsuite/btcwallet v0.11.1-0.20200814001439-1d31f4ea6fc5 h1:1We7EuizBnX/17Q6O2dkeToyehxzUHo62Wv1c0ncr7c=
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 h1:3gvLezYoUkr9MvxocB/vyPNzL+gSqsNT4Q6XTPK+R04=
github.com/btcsuite/btcwallet v0.11.1-0.20201207233335-415f37ff11a1/go.mod h1:P1U4LKSB/bhFQdOM7ab1XqNoBGFyFAe7eKObEBD9mIo=
github.com/btcsuite/btcwallet/wallet/txauthor v1.0.0 h1:KGHMW5sd7yDdDMkCZ/JpP0KltolFsQcB973brBnfj4c=
@ -199,15 +200,13 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/lightninglabs/aperture v0.1.3-beta h1:F5TcMGNZwvmBXNV8nESJ2Gx+xk3Kchu09SMOU/8x7Vk=
github.com/lightninglabs/aperture v0.1.3-beta/go.mod h1:skgCNj3K3bQXgPwrdjCkPSPVYQ3SRJZKoGl49JI+mCA=
github.com/lightninglabs/aperture v0.1.5-beta h1:pBy6aXWCY/oezr1NZ1A5VeU8Xtdjp9U7Ts6KSni9R30=
github.com/lightninglabs/aperture v0.1.5-beta/go.mod h1:9xl4mx778ZAzrB87nLHMqk+XQcSz8Dx/DypjWzGN1xo=
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-0 h1:tCvhlN/NNC/PeCjifONq/f8vU/6ZJS1ivXhpIfw6JfY=
github.com/lightninglabs/lndclient v0.11.0-0/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
github.com/lightninglabs/lndclient v0.11.0-0/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
github.com/lightninglabs/lndclient v0.11.0-3 h1:x8co3UOeaUwh0iBFNeaPaqJsg8gvlgV/+fQHp2MT9eI=
github.com/lightninglabs/lndclient v0.11.0-3/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
github.com/lightninglabs/lndclient v0.11.0-4/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=
github.com/lightninglabs/lndclient v0.11.0-5 h1:nHDit/3siG8wvzbQPiyGVpu9v5llqThJK1KmG/IZTIw=
github.com/lightninglabs/lndclient v0.11.0-5/go.mod h1:nIQ+lDm7JGRmP7OSeVfhOAyoqD4GA4NYU8GTsTXITbE=
github.com/lightninglabs/neutrino v0.11.0/go.mod h1:CuhF0iuzg9Sp2HO6ZgXgayviFTn1QHdSTJlMncK80wg=
github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200 h1:j4iZ1XlUAPQmW6oSzMcJGILYsRHNs+4O3Gk+2Ms5Dww=
github.com/lightninglabs/neutrino v0.11.1-0.20200316235139-bffc52e8f200/go.mod h1:MlZmoKa7CJP3eR1s5yB7Rm5aSyadpKkxqAwLQmog7N0=
@ -218,8 +217,9 @@ github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce7
github.com/lightningnetwork/lightning-onion v1.0.2-0.20200501022730-3c8c8d0b89ea h1:oCj48NQ8u7Vz+MmzHqt0db6mxcFZo3Ho7M5gCJauY/k=
github.com/lightningnetwork/lightning-onion v1.0.2-0.20200501022730-3c8c8d0b89ea/go.mod h1:rigfi6Af/KqsF7Za0hOgcyq2PNH4AN70AaMRxcJkff4=
github.com/lightningnetwork/lnd v0.11.0-beta/go.mod h1:CzArvT7NFDLhVyW06+NJWSuWFmE6Ea+AjjA3txUBqTM=
github.com/lightningnetwork/lnd v0.12.0-beta.rc3 h1:kii3l6UIuzRYPAcEheFcRIDFEDLni0K8fbvMRc1qMcY=
github.com/lightningnetwork/lnd v0.12.0-beta.rc3/go.mod h1:2GyP1IG1kXV5Af/LOCxnXfux1OP3fAGr8zptS5PB2YI=
github.com/lightningnetwork/lnd v0.11.1-beta/go.mod h1:PGIgxy8aH70Li33YVYkHSaCM8m8LjEevk5h1Dpldrr4=
github.com/lightningnetwork/lnd v0.12.0-beta.rc5 h1:fUBal/d82ApcWTkI8JgERZ+jxeu0h4XwLRrEwOFPMqY=
github.com/lightningnetwork/lnd v0.12.0-beta.rc5/go.mod h1:2GyP1IG1kXV5Af/LOCxnXfux1OP3fAGr8zptS5PB2YI=
github.com/lightningnetwork/lnd/cert v1.0.2 h1:g2rEu+sM2Uyz0bpfuvwri/ks6R/26H5iY1NcGbpDJ+c=
github.com/lightningnetwork/lnd/cert v1.0.2/go.mod h1:fmtemlSMf5t4hsQmcprSoOykypAPp+9c+0d0iqTScMo=
github.com/lightningnetwork/lnd/cert v1.0.3 h1:/K2gjzLgVI8we2IIPKc0ztWTEa85uds5sWXi1K6mOT0=

8
internal/test/lightning_mock.go
View file

@ -60,6 +60,8 @@ func NewMockLightning() *MockLightning {
}
type MockLightning struct {
lndclient.LightningClient
SendPaymentChannel chan PaymentChannelMessage
NodePubkey string
ChainParams *chaincfg.Params
@ -368,13 +370,15 @@ func (m *MockLightning) OpenChannel(_ context.Context, peer route.Vertex,
}
func (m *MockLightning) CloseChannel(context.Context, *wire.OutPoint,
bool) (chan lndclient.CloseChannelUpdate, chan error, error) {
bool, int32, btcutil.Address) (chan lndclient.CloseChannelUpdate,
chan error, error) {
return nil, nil, nil
}
func (m *MockLightning) Connect(_ context.Context, peer route.Vertex,
host string) error {
host string, _ bool) error {
m.lock.Lock()
defer m.lock.Unlock()

3
server.go
View file

@ -548,7 +548,8 @@ func getLnd(network string, cfg *LndConfig) (*lndclient.GrpcLndServices, error)
TLSPath: cfg.TLSPath,
CheckVersion: minimalCompatibleVersion,
BlockUntilChainSynced: true,
ChainSyncCtx: ctxc,
BlockUntilUnlocked: true,
CallerCtx: ctxc,
})
}

2
version.go
View file

@ -23,7 +23,7 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr
const (
appMajor uint = 0
appMinor uint = 4
appPatch uint = 1
appPatch uint = 2
// appPreRelease MUST only contain characters from semanticAlphabet per
// the semantic versioning spec.