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

rpc/legacyrpc: update method to use default fee rate

Browse source
This commit is contained in:
Olaoluwa Osuntokun 2017-11-18 15:23:11 -08:00
parent 7b9d880fee
commit aa42e17e2f
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rpc/legacyrpc/methods.go
View file

@ -506,7 +506,7 @@ func getInfo(icmd interface{}, w *wallet.Wallet, chainClient *chain.RPCClient) (
// to using the manager version. // to using the manager version.
info.WalletVersion = int32(waddrmgr.LatestMgrVersion) info.WalletVersion = int32(waddrmgr.LatestMgrVersion)
info.Balance = bal.ToBTC() info.Balance = bal.ToBTC()
info.PaytxFee = w.RelayFee().ToBTC() info.PaytxFee = float64(txrules.DefaultRelayFeePerKb)
// We don't set the following since they don't make much sense in the // We don't set the following since they don't make much sense in the
// wallet architecture: // wallet architecture:
// - unlocked_until // - unlocked_until
@ -1368,12 +1368,13 @@ func makeOutputs(pairs map[string]btcutil.Amount, chainParams *chaincfg.Params)
// It returns the transaction hash in string format upon success // It returns the transaction hash in string format upon success
// All errors are returned in btcjson.RPCError format // All errors are returned in btcjson.RPCError format
func sendPairs(w *wallet.Wallet, amounts map[string]btcutil.Amount, func sendPairs(w *wallet.Wallet, amounts map[string]btcutil.Amount,
account uint32, minconf int32) (string, error) { account uint32, minconf int32, feeSatPerKb btcutil.Amount) (string, error) {
outputs, err := makeOutputs(amounts, w.ChainParams()) outputs, err := makeOutputs(amounts, w.ChainParams())
if err != nil { if err != nil {
return "", err return "", err
} }
txHash, err := w.SendOutputs(outputs, account, minconf) txHash, err := w.SendOutputs(outputs, account, minconf, feeSatPerKb)
if err != nil { if err != nil {
if err == txrules.ErrAmountNegative { if err == txrules.ErrAmountNegative {
return "", ErrNeedPositiveAmount return "", ErrNeedPositiveAmount
@ -1440,7 +1441,8 @@ func sendFrom(icmd interface{}, w *wallet.Wallet, chainClient *chain.RPCClient)
cmd.ToAddress: amt, cmd.ToAddress: amt,
} }
return sendPairs(w, pairs, account, minConf) return sendPairs(w, pairs, account, minConf,
txrules.DefaultRelayFeePerKb)
} }
// sendMany handles a sendmany RPC request by creating a new transaction // sendMany handles a sendmany RPC request by creating a new transaction
@ -1481,7 +1483,7 @@ func sendMany(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
pairs[k] = amt pairs[k] = amt
} }
return sendPairs(w, pairs, account, minConf) return sendPairs(w, pairs, account, minConf, txrules.DefaultRelayFeePerKb)
} }
// sendToAddress handles a sendtoaddress RPC request by creating a new // sendToAddress handles a sendtoaddress RPC request by creating a new
@ -1517,7 +1519,8 @@ func sendToAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
} }
// sendtoaddress always spends from the default account, this matches bitcoind // sendtoaddress always spends from the default account, this matches bitcoind
return sendPairs(w, pairs, waddrmgr.DefaultAccountNum, 1) return sendPairs(w, pairs, waddrmgr.DefaultAccountNum, 1,
txrules.DefaultRelayFeePerKb)
} }
// setTxFee sets the transaction fee per kilobyte added to transactions. // setTxFee sets the transaction fee per kilobyte added to transactions.
@ -1529,12 +1532,6 @@ func setTxFee(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
return nil, ErrNeedPositiveAmount return nil, ErrNeedPositiveAmount
} }
relayFee, err := btcutil.NewAmount(cmd.Amount)
if err != nil {
return nil, err
}
w.SetRelayFee(relayFee)
// A boolean true result is returned upon success. // A boolean true result is returned upon success.
return true, nil return true, nil
} }