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

rpc: update RPC server to disallow p2pkh adds, assume segwit for ConfirmedBalance

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2018-02-17 15:38:06 -08:00
parent 525cca02e2
commit b41222b316
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcserver.go
View File

@ -463,8 +463,6 @@ func (r *rpcServer) NewAddress(ctx context.Context,
addrType = lnwallet.WitnessPubKey addrType = lnwallet.WitnessPubKey
case lnrpc.NewAddressRequest_NESTED_PUBKEY_HASH: case lnrpc.NewAddressRequest_NESTED_PUBKEY_HASH:
addrType = lnwallet.NestedWitnessPubKey addrType = lnwallet.NestedWitnessPubKey
case lnrpc.NewAddressRequest_PUBKEY_HASH:
addrType = lnwallet.PubKeyHash
} }
addr, err := r.server.cc.wallet.NewAddress(addrType, false) addr, err := r.server.cc.wallet.NewAddress(addrType, false)
@ -1264,13 +1262,13 @@ func (r *rpcServer) WalletBalance(ctx context.Context,
in *lnrpc.WalletBalanceRequest) (*lnrpc.WalletBalanceResponse, error) { in *lnrpc.WalletBalanceRequest) (*lnrpc.WalletBalanceResponse, error) {
// Get total balance, from txs that have >= 0 confirmations. // Get total balance, from txs that have >= 0 confirmations.
totalBal, err := r.server.cc.wallet.ConfirmedBalance(0, in.WitnessOnly) totalBal, err := r.server.cc.wallet.ConfirmedBalance(0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Get confirmed balance, from txs that have >= 1 confirmations. // Get confirmed balance, from txs that have >= 1 confirmations.
confirmedBal, err := r.server.cc.wallet.ConfirmedBalance(1, in.WitnessOnly) confirmedBal, err := r.server.cc.wallet.ConfirmedBalance(1)
if err != nil { if err != nil {
return nil, err return nil, err
} }