LBRYFoundation/lbcwallet
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcwallet.git synced 2025-08-23 17:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update for btcutil.Address API change.

Browse source
This commit is contained in:
Josh Rickmar 2014-02-26 15:22:48 -05:00
parent acb4819ee1
commit 76c6379a54
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rpcserver.go
View file

@ -450,18 +450,7 @@ func GetAccount(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
if err != nil { if err != nil {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
var net btcwire.BitcoinNet if !addr.IsForNet(cfg.Net()) {
switch a := addr.(type) {
case *btcutil.AddressPubKeyHash:
net = a.Net()
case *btcutil.AddressScriptHash:
net = a.Net()
default:
return nil, &btcjson.ErrInvalidAddressOrKey
}
if net != cfg.Net() {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -540,7 +529,7 @@ func GetAddressBalance(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
apkh, ok := addr.(*btcutil.AddressPubKeyHash) apkh, ok := addr.(*btcutil.AddressPubKeyHash)
if !ok || apkh.Net() != cfg.Net() { if !ok || !apkh.IsForNet(cfg.Net()) {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -1043,7 +1032,7 @@ func ListAddressTransactions(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
apkh, ok := addr.(*btcutil.AddressPubKeyHash) apkh, ok := addr.(*btcutil.AddressPubKeyHash)
if !ok || apkh.Net() != cfg.Net() { if !ok || !apkh.IsForNet(cfg.Net()) {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
pkHashMap[string(addr.ScriptAddress())] = struct{}{} pkHashMap[string(addr.ScriptAddress())] = struct{}{}