tMerge pull request #3141 from SomberNight/locktime_local_height - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 84676634484651e47d33e2788957b672fb8858dc
DIR parent 3696d38f335b666c797483f839c3adbb0d64b5a2
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 28 Oct 2017 22:41:48 +0200
Merge pull request #3141 from SomberNight/locktime_local_height
ttxn: set locktime to local height for RBF, CPFP, sweep
Diffstat:
M lib/wallet.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -919,7 +919,9 @@ class Abstract_Wallet(PrintError):
raise BaseException(_('Not enough funds on address.') + '\nTotal: %d satoshis\nFee: %d\nDust Threshold: %d'%(total, fee, self.dust_threshold()))
outputs = [(TYPE_ADDRESS, recipient, total - fee)]
- tx = Transaction.from_io(inputs, outputs)
+ locktime = self.get_local_height()
+
+ tx = Transaction.from_io(inputs, outputs, locktime=locktime)
tx.set_rbf(True)
tx.sign(keypairs)
return tx
t@@ -1060,7 +1062,8 @@ class Abstract_Wallet(PrintError):
continue
if delta > 0:
raise BaseException(_('Cannot bump fee: could not find suitable outputs'))
- return Transaction.from_io(inputs, outputs)
+ locktime = self.get_local_height()
+ return Transaction.from_io(inputs, outputs, locktime=locktime)
def cpfp(self, tx, fee):
txid = tx.txid()
t@@ -1077,7 +1080,8 @@ class Abstract_Wallet(PrintError):
self.add_input_info(item)
inputs = [item]
outputs = [(TYPE_ADDRESS, address, value - fee)]
- return Transaction.from_io(inputs, outputs)
+ locktime = self.get_local_height()
+ return Transaction.from_io(inputs, outputs, locktime=locktime)
def add_input_info(self, txin):
address = txin['address']