build: update btcd and btcwallet dependencies

This commit is contained in:
Wilmer Paulino
2021-03-09 14:12:26 -08:00
parent a329c80612
commit a620ce3682
25 changed files with 327 additions and 317 deletions

View File

@@ -21,7 +21,7 @@ import (
//
// This is a part of the WalletController interface.
func (b *BtcWallet) FetchInputInfo(prevOut *wire.OutPoint) (*lnwallet.Utxo, error) {
_, txOut, confirmations, err := b.wallet.FetchInputInfo(prevOut)
_, txOut, _, confirmations, err := b.wallet.FetchInputInfo(prevOut)
if err != nil {
return nil, err
}
@@ -51,9 +51,10 @@ func deriveFromKeyLoc(scopedMgr *waddrmgr.ScopedKeyManager,
keyLoc keychain.KeyLocator) (*btcec.PrivateKey, error) {
path := waddrmgr.DerivationPath{
Account: uint32(keyLoc.Family),
Branch: 0,
Index: uint32(keyLoc.Index),
InternalAccount: uint32(keyLoc.Family),
Account: uint32(keyLoc.Family),
Branch: 0,
Index: keyLoc.Index,
}
addr, err := scopedMgr.DeriveFromKeyPath(addrmgrNs, path)
if err != nil {