highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-08-03 18:22:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpc: recognize the new unused prefix address types

Browse Source
This commit is contained in:
Olaoluwa Osuntokun
2019-02-19 19:17:46 -08:00
parent 8c1181af3b
commit 65cdb1294e
2 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rpcserver.go
View File

@@ -932,17 +932,42 @@ func (r *rpcServer) NewAddress(ctx context.Context,
// Translate the gRPC proto address type to the wallet controller's
// available address types.
var addrType lnwallet.AddressType
var (
addr btcutil.Address
err error
)
switch in.Type {
case lnrpc.AddressType_WITNESS_PUBKEY_HASH:
addrType = lnwallet.WitnessPubKey
case lnrpc.AddressType_NESTED_PUBKEY_HASH:
addrType = lnwallet.NestedWitnessPubKey
}
addr, err = r.server.cc.wallet.NewAddress(
lnwallet.WitnessPubKey, false,
)
if err != nil {
return nil, err
}
addr, err := r.server.cc.wallet.NewAddress(addrType, false)
if err != nil {
return nil, err
case lnrpc.AddressType_NESTED_PUBKEY_HASH:
addr, err = r.server.cc.wallet.NewAddress(
lnwallet.NestedWitnessPubKey, false,
)
if err != nil {
return nil, err
}
case lnrpc.AddressType_UNUSED_WITNESS_PUBKEY_HASH:
addr, err = r.server.cc.wallet.LastUnusedAddress(
lnwallet.WitnessPubKey,
)
if err != nil {
return nil, err
}
case lnrpc.AddressType_UNUSED_NESTED_PUBKEY_HASH:
addr, err = r.server.cc.wallet.LastUnusedAddress(
lnwallet.NestedWitnessPubKey,
)
if err != nil {
return nil, err
}
}
rpcsLog.Infof("[newaddress] addr=%v", addr.String())