LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

update for btcutil.DecodeAddress api change.

Browse source
This commit is contained in:
Owain G. Ainsworth 2014-03-19 01:47:12 +00:00
parent ec0d84882a
commit 6dea3789cb
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
createtx.go
View file

@ -155,7 +155,7 @@ func (a *Account) txToPairs(pairs map[string]int64, minconf int) (*CreatedTx, er
// Add outputs to new tx. // Add outputs to new tx.
for addrStr, amt := range pairs { for addrStr, amt := range pairs {
addr, err := btcutil.DecodeAddr(addrStr) addr, err := btcutil.DecodeAddress(addrStr, cfg.Net())
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot decode address: %s", err) return nil, fmt.Errorf("cannot decode address: %s", err)
} }

16
rpcserver.go
View file

@ -264,7 +264,7 @@ func DumpPrivKey(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
return nil, &btcjson.ErrInternal return nil, &btcjson.ErrInternal
} }
addr, err := btcutil.DecodeAddr(cmd.Address) addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -470,7 +470,7 @@ func GetAccount(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
} }
// Is address valid? // Is address valid?
addr, err := btcutil.DecodeAddr(cmd.Address) addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -548,7 +548,7 @@ func GetAddressBalance(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
} }
// Is address valid? // Is address valid?
addr, err := btcutil.DecodeAddr(cmd.Address) addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -1051,7 +1051,7 @@ func ListAddressTransactions(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
// Decode addresses. // Decode addresses.
pkHashMap := make(map[string]struct{}) pkHashMap := make(map[string]struct{})
for _, addrStr := range cmd.Addresses { for _, addrStr := range cmd.Addresses {
addr, err := btcutil.DecodeAddr(addrStr) addr, err := btcutil.DecodeAddress(addrStr, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -1131,7 +1131,7 @@ func ListUnspent(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
if len(cmd.Addresses) != 0 { if len(cmd.Addresses) != 0 {
// confirm that all of them are good: // confirm that all of them are good:
for _, as := range cmd.Addresses { for _, as := range cmd.Addresses {
a, err := btcutil.DecodeAddr(as) a, err := btcutil.DecodeAddress(as, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.ErrInvalidAddressOrKey return nil, &btcjson.ErrInvalidAddressOrKey
} }
@ -1468,7 +1468,7 @@ func SignMessage(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
} }
// This really should work when the above found something valid. // This really should work when the above found something valid.
addr, err := btcutil.DecodeAddr(cmd.Address) addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.Error{ return nil, &btcjson.Error{
Code: btcjson.ErrWallet.Code, Code: btcjson.ErrWallet.Code,
@ -1577,7 +1577,7 @@ func ValidateAddress(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
return nil, &btcjson.ErrInternal return nil, &btcjson.ErrInternal
} }
addr, err := btcutil.DecodeAddr(cmd.Address) addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
if err != nil { if err != nil {
return map[string]interface{}{ return map[string]interface{}{
"isvalid": false, "isvalid": false,
@ -1655,7 +1655,7 @@ func VerifyMessage(icmd btcjson.Cmd) (interface{}, *btcjson.Error) {
} }
// This really should work when the above found something valid. // This really should work when the above found something valid.
addr, err := btcutil.DecodeAddr(cmd.Address) addr, err := btcutil.DecodeAddress(cmd.Address, cfg.Net())
if err != nil { if err != nil {
return nil, &btcjson.Error{ return nil, &btcjson.Error{
Code: btcjson.ErrWallet.Code, Code: btcjson.ErrWallet.Code,