tMerge pull request #3581 from SomberNight/bip_li01_sort_rbf_sweep - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 13bf539d175d7d97b9d55453892d380107a4fa8b
DIR parent fc574ee514c6798ed0950003f1736407e52c2074
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 22 Dec 2017 19:12:16 +0100
Merge pull request #3581 from SomberNight/bip_li01_sort_rbf_sweep
RBF/sweep: use BIP_LI01_sort()
Diffstat:
M lib/wallet.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -146,6 +146,7 @@ def sweep(privkeys, network, config, recipient, fee=None, imax=100):
locktime = network.get_local_height()
tx = Transaction.from_io(inputs, outputs, locktime=locktime)
+ tx.BIP_LI01_sort()
tx.set_rbf(True)
tx.sign(keypairs)
return tx
t@@ -1080,7 +1081,9 @@ class Abstract_Wallet(PrintError):
if delta > 0:
raise BaseException(_('Cannot bump fee: could not find suitable outputs'))
locktime = self.get_local_height()
- return Transaction.from_io(inputs, outputs, locktime=locktime)
+ tx_new = Transaction.from_io(inputs, outputs, locktime=locktime)
+ tx_new.BIP_LI01_sort()
+ return tx_new
def cpfp(self, tx, fee):
txid = tx.txid()
t@@ -1098,6 +1101,7 @@ class Abstract_Wallet(PrintError):
inputs = [item]
outputs = [(TYPE_ADDRESS, address, value - fee)]
locktime = self.get_local_height()
+ # note: no need to call tx.BIP_LI01_sort() here - single input/output
return Transaction.from_io(inputs, outputs, locktime=locktime)
def add_input_info(self, txin):