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

lnwallet: check if requested address type is compatible with account

Browse Source
This commit is contained in:
Wilmer Paulino 2021-05-25 16:08:23 -07:00
parent 798113a024
commit 8745cf03c1
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lnwallet/btcwallet/btcwallet.go
View File

@ -71,7 +71,8 @@ var (
errNoImportedAddrGen = errors.New("addresses cannot be generated for " + errNoImportedAddrGen = errors.New("addresses cannot be generated for " +
"the default imported account") "the default imported account")
// errIncompatibleAccountAddr // errIncompatibleAccountAddr is an error returned when the type of a
// new address being requested is incompatible with the account.
errIncompatibleAccountAddr = errors.New("incompatible address type " + errIncompatibleAccountAddr = errors.New("incompatible address type " +
"for account") "for account")
) )
@ -392,12 +393,17 @@ func (b *BtcWallet) keyScopeForAccountAddr(accountName string,
return addrKeyScope, defaultAccount, nil return addrKeyScope, defaultAccount, nil
} }
// Otherwise, look up the account's key scope. // Otherwise, look up the account's key scope and check that it supports
// the requested address type.
keyScope, account, err := b.wallet.LookupAccount(accountName) keyScope, account, err := b.wallet.LookupAccount(accountName)
if err != nil { if err != nil {
return waddrmgr.KeyScope{}, 0, err return waddrmgr.KeyScope{}, 0, err
} }
if keyScope != addrKeyScope {
return waddrmgr.KeyScope{}, 0, errIncompatibleAccountAddr
}
return keyScope, account, nil return keyScope, account, nil
} }