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

Fixes for api changes

Browse source
This commit is contained in:
Josh Rickmar 2013-10-08 13:36:39 -04:00
parent c85a3a29e3
commit 9cc6600db2
2 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
createtx.go
View file

@ -164,24 +164,12 @@ func (w *BtcWallet) txToPairs(pairs map[string]uint64, fee uint64, minconf int)
msgtx.AddTxOut(txout) msgtx.AddTxOut(txout)
} }
var netID byte
switch w.Wallet.Net() {
case btcwire.MainNet:
netID = btcutil.MainNetAddr
case btcwire.TestNet:
fallthrough
case btcwire.TestNet3:
netID = btcutil.TestNetAddr
default: // wrong!
return nil, ErrUnknownBitcoinNet
}
// Selected unspent outputs become new transaction's inputs. // Selected unspent outputs become new transaction's inputs.
for _, op := range outputs { for _, op := range outputs {
msgtx.AddTxIn(btcwire.NewTxIn((*btcwire.OutPoint)(&op.Out), nil)) msgtx.AddTxIn(btcwire.NewTxIn((*btcwire.OutPoint)(&op.Out), nil))
} }
for i, op := range outputs { for i, op := range outputs {
addrstr, err := btcutil.EncodeAddress(op.Addr[:], netID) addrstr, err := btcutil.EncodeAddress(op.Addr[:], w.Wallet.Net())
if err != nil { if err != nil {
return nil, err return nil, err
} }

13
wallet/wallet.go
View file

@ -1036,18 +1036,7 @@ func (a *btcAddress) changeEncryptionKey(oldkey, newkey []byte) error {
// paymentAddress returns a human readable payment address string for // paymentAddress returns a human readable payment address string for
// an address. // an address.
func (a *btcAddress) paymentAddress(net btcwire.BitcoinNet) (string, error) { func (a *btcAddress) paymentAddress(net btcwire.BitcoinNet) (string, error) {
var netID byte return btcutil.EncodeAddress(a.pubKeyHash[:], net)
switch net {
case btcwire.MainNet:
netID = btcutil.MainNetAddr
case btcwire.TestNet:
fallthrough
case btcwire.TestNet3:
netID = btcutil.TestNetAddr
default: // wrong!
return "", errors.New("unknown bitcoin network")
}
return btcutil.EncodeAddress(a.pubKeyHash[:], netID)
} }
func walletHash(b []byte) uint32 { func walletHash(b []byte) uint32 {