tMerge pull request #4214 from SomberNight/payto_read_rbf_from_config - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit eb4463063f1bd72665f059d69ca0cd879f1726ff
DIR parent ed0cbf11cda8243f17d9206fb43a12c46c26c5c4
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 4 Apr 2018 15:26:49 +0200
Merge pull request #4214 from SomberNight/payto_read_rbf_from_config
payto: get RBF setting from config
Diffstat:
M lib/commands.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -412,6 +412,8 @@ class Commands:
tx = self.wallet.make_unsigned_transaction(coins, final_outputs, self.config, fee, change_addr)
if locktime != None:
tx.locktime = locktime
+ if rbf is None:
+ rbf = self.config.get('use_rbf', True)
if rbf:
tx.set_rbf(True)
if not unsigned:
t@@ -420,7 +422,7 @@ class Commands:
return tx
@command('wp')
- def payto(self, destination, amount, fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, rbf=False, password=None, locktime=None):
+ def payto(self, destination, amount, fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, rbf=None, password=None, locktime=None):
"""Create a transaction. """
tx_fee = satoshis(fee)
domain = from_addr.split(',') if from_addr else None
t@@ -428,7 +430,7 @@ class Commands:
return tx.as_dict()
@command('wp')
- def paytomany(self, outputs, fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, rbf=False, password=None, locktime=None):
+ def paytomany(self, outputs, fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, rbf=None, password=None, locktime=None):
"""Create a multi-output transaction. """
tx_fee = satoshis(fee)
domain = from_addr.split(',') if from_addr else None