AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3141 from SomberNight/locktime_local_height

Browse Source 
txn: set locktime to local height for RBF, CPFP, sweep
This commit is contained in:
ThomasV
2017-10-28 22:41:48 +02:00
committed by GitHub
parent 3696d38f33 211fa9a062
commit 8467663448
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/wallet.py
View File

@@ -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
@@ -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()
@@ -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']