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

lnwallet/btcwallet: update SendOutputs implementation due to recent API changes

Browse Source
This commit is contained in:
Olaoluwa Osuntokun
2017-11-23 00:29:32 -06:00
parent 8b6842c760
commit 36256f3f39
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lnwallet/btcwallet/btcwallet.go
View File

@ -85,8 +85,9 @@ func New(cfg Config) (*BtcWallet, error) {
return nil, err return nil, err
} }
} else { } else {
// Wallet has been created and been initialized at this point, open it // Wallet has been created and been initialized at this point,
// along with all the required DB namepsaces, and the DB itself. // open it along with all the required DB namepsaces, and the
// DB itself.
wallet, err = loader.OpenExistingWallet(pubPass, false) wallet, err = loader.OpenExistingWallet(pubPass, false)
if err != nil { if err != nil {
return nil, err return nil, err
@ -108,14 +109,6 @@ func New(cfg Config) (*BtcWallet, error) {
return nil, err return nil, err
} }
// Using the passed fee estimator, we'll compute the relay fee for all
// transactions made which will be scaled up according to the size of a
// particular transaction.
//
// TODO(roasbeef): hook in dynamic relay fees
relayFee := cfg.FeeEstimator.EstimateFeePerByte(3) * 1000
wallet.SetRelayFee(btcutil.Amount(relayFee))
return &BtcWallet{ return &BtcWallet{
cfg: &cfg, cfg: &cfg,
wallet: wallet, wallet: wallet,
@ -310,8 +303,14 @@ func (b *BtcWallet) FetchRootKey() (*btcec.PrivateKey, error) {
// outputs are non-standard, a non-nil error will be be returned. // outputs are non-standard, a non-nil error will be be returned.
// //
// This is a part of the WalletController interface. // This is a part of the WalletController interface.
func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut) (*chainhash.Hash, error) { func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut,
return b.wallet.SendOutputs(outputs, defaultAccount, 1) feeSatPerByte btcutil.Amount) (*chainhash.Hash, error) {
// The fee rate is passed in using units of sat/byte, so we'll scale
// this up to sat/KB as the SendOutputs method requires this unit.
feeSatPerKB := feeSatPerByte * 1024
return b.wallet.SendOutputs(outputs, defaultAccount, 1, feeSatPerKB)
} }
// LockOutpoint marks an outpoint as locked meaning it will no longer be deemed // LockOutpoint marks an outpoint as locked meaning it will no longer be deemed