akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #808 from cfromknecht/upd-btcwallet-for-deadlock-fix

Browse Source 
update btcwallet+keychain to include waddrmgr deadlock fix
This commit is contained in:
Olaoluwa Osuntokun 2018-03-08 21:04:30 -05:00 committed by GitHub
commit 30c92ea7f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
glide.lock generated
View File

@ -1,5 +1,5 @@
hash: 75e7ae24914974ad34be24e5176b64e6d8cdc80aa65084714f1eb4d469b7830b hash: e0cbbf733425814948ced513c5921d8a4920f179d059f39eeafbf337c32b4ead
updated: 2018-03-06T13:12:10.827387022-05:00 updated: 2018-03-08T20:06:04.267833-05:00
imports: imports:
- name: git.schwanenlied.me/yawning/bsaes.git - name: git.schwanenlied.me/yawning/bsaes.git
version: e06297f34865a50b8e473105e52cb64ad1b55da8 version: e06297f34865a50b8e473105e52cb64ad1b55da8
@ -45,13 +45,13 @@ imports:
- name: github.com/btcsuite/websocket - name: github.com/btcsuite/websocket
version: 31079b6807923eb23992c421b114992b95131b55 version: 31079b6807923eb23992c421b114992b95131b55
- name: github.com/davecgh/go-spew - name: github.com/davecgh/go-spew
version: 8991bc29aa16c548c550c7ff78260e27b9ab7c73 version: ecdeabc65495df2dec95d7c4a4c3e021903035e5
subpackages: subpackages:
- spew - spew
- name: github.com/go-errors/errors - name: github.com/go-errors/errors
version: 3afebba5a48dbc89b574d890b6b34d9ee10b4785 version: 8fa88b06e5974e97fbf9899a7f86a344bfd1f105
- name: github.com/golang/protobuf - name: github.com/golang/protobuf
version: bbd03ef6da3a115852eaf24c8a1c46aeb39aa175 version: ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e
subpackages: subpackages:
- jsonpb - jsonpb
- proto - proto
@ -93,7 +93,9 @@ imports:
- chaincfg/chainhash - chaincfg/chainhash
- wire - wire
- name: github.com/miekg/dns - name: github.com/miekg/dns
version: 5364553f1ee9cddc7ac8b62dce148309c386695b version: 946bd9fbed05568b0f3cd188353d8aa28f38b688
subpackages:
- internal/socket
- name: github.com/roasbeef/btcd - name: github.com/roasbeef/btcd
version: e6807bc4dd5ddbb95b4ab163f6dd61e4ad79463a version: e6807bc4dd5ddbb95b4ab163f6dd61e4ad79463a
subpackages: subpackages:
@ -124,7 +126,7 @@ imports:
- hdkeychain - hdkeychain
- txsort - txsort
- name: github.com/roasbeef/btcwallet - name: github.com/roasbeef/btcwallet
version: 97f2ef9c15d9a82a0e8b160df01157893f3853b5 version: f7f0a70678cb406625ecd63984b739a72ac9fd4a
subpackages: subpackages:
- chain - chain
- internal/helpers - internal/helpers
@ -155,8 +157,6 @@ imports:
- blake2b - blake2b
- chacha20poly1305 - chacha20poly1305
- curve25519 - curve25519
- ed25519
- ed25519/internal/edwards25519
- hkdf - hkdf
- internal/chacha20 - internal/chacha20
- nacl/box - nacl/box
@ -169,35 +169,30 @@ imports:
- scrypt - scrypt
- ssh/terminal - ssh/terminal
- name: golang.org/x/net - name: golang.org/x/net
version: cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb version: 66aacef3dd8a676686c7ae3716979581e8b03c47
subpackages: subpackages:
- bpf
- context - context
- http2 - http2
- http2/hpack - http2/hpack
- idna - idna
- internal/iana
- internal/socket
- internal/timeseries - internal/timeseries
- ipv4
- ipv6
- lex/httplex - lex/httplex
- proxy - proxy
- trace - trace
- name: golang.org/x/sys - name: golang.org/x/sys
version: 88d2dcc510266da9f7f8c7f34e1940716cab5f5c version: ab9e364efd8b52800ff7ee48a9ffba4e0ed78dfb
subpackages: subpackages:
- unix - unix
- windows - windows
- name: golang.org/x/text - name: golang.org/x/text
version: 27420a1a391f5504f73155051cd274311bf70883 version: 18c65dde6afd36dbc39197ca72008895b8dfbfb6
subpackages: subpackages:
- secure/bidirule - secure/bidirule
- transform - transform
- unicode/bidi - unicode/bidi
- unicode/norm - unicode/norm
- name: google.golang.org/genproto - name: google.golang.org/genproto
version: 2b5a72b8730b0b16380010cfe5286c42108d88e7 version: ee236bd376b077c7a89f260c026c4735b195e459
subpackages: subpackages:
- googleapis/api/annotations - googleapis/api/annotations
- googleapis/rpc/status - googleapis/rpc/status
@ -221,7 +216,7 @@ imports:
- name: gopkg.in/errgo.v1 - name: gopkg.in/errgo.v1
version: 442357a80af5c6bf9b6d51ae791a39c3421004f3 version: 442357a80af5c6bf9b6d51ae791a39c3421004f3
- name: gopkg.in/macaroon-bakery.v2 - name: gopkg.in/macaroon-bakery.v2
version: 22c04a94d902625448265ef041bb53e715452a40 version: 04cf5ef151a211d929975161aea7c65f94c90446
subpackages: subpackages:
- bakery - bakery
- bakery/checkers - bakery/checkers

2
glide.yaml
View File

@ -36,7 +36,7 @@ import:
- hdkeychain - hdkeychain
- txsort - txsort
- package: github.com/roasbeef/btcwallet - package: github.com/roasbeef/btcwallet
version: 97f2ef9c15d9a82a0e8b160df01157893f3853b5 version: f7f0a70678cb406625ecd63984b739a72ac9fd4a
subpackages: subpackages:
- chain - chain
- waddrmgr - waddrmgr

2
keychain/btcwallet.go
View File

@ -73,7 +73,7 @@ func (b *BtcWalletKeyRing) keyScope() (*waddrmgr.ScopedKeyManager, error) {
// Otherwise, we'll first do a check to ensure that the root manager // Otherwise, we'll first do a check to ensure that the root manager
// isn't locked, as otherwise we won't be able to *use* the scope. // isn't locked, as otherwise we won't be able to *use* the scope.
if b.wallet.Manager.Locked() { if b.wallet.Manager.IsLocked() {
return nil, fmt.Errorf("cannot create BtcWalletKeyRing with " + return nil, fmt.Errorf("cannot create BtcWalletKeyRing with " +
"locked waddrmgr.Manager") "locked waddrmgr.Manager")
} }