LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-03 02:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet: split "change address logic" from make_unsigned_transaction

Browse source
This commit is contained in:
SomberNight 2019-06-20 17:54:37 +02:00
parent e864fa5088
commit 8bfe12e047
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
electrum/wallet.py
View file

@ -674,6 +674,33 @@ class Abstract_Wallet(AddressSynchronizer):
return tx return tx
return candidate return candidate
def get_change_addresses_for_new_transaction(self, preferred_change_addr=None) -> List[str]:
change_addrs = []
if preferred_change_addr:
if isinstance(preferred_change_addr, (list, tuple)):
change_addrs = list(preferred_change_addr)
else:
change_addrs = [preferred_change_addr]
elif self.use_change:
# Recalc and get unused change addresses
addrs = self.calc_unused_change_addresses()
# New change addresses are created only after a few
# confirmations.
if addrs:
# if there are any unused, select all
change_addrs = addrs
else:
# if there are none, take one randomly from the last few
addrs = self.get_change_addresses()[-self.gap_limit_for_change:]
change_addrs = [random.choice(addrs)] if addrs else []
for addr in change_addrs:
assert is_address(addr), f"not valid bitcoin address: {addr}"
# note that change addresses are not necessarily ismine
# in which case this is a no-op
self.check_address(addr)
max_change = self.max_change_outputs if self.multiple_change else 1
return change_addrs[:max_change]
def make_unsigned_transaction(self, coins, outputs, config, fixed_fee=None, def make_unsigned_transaction(self, coins, outputs, config, fixed_fee=None,
change_addr=None, is_sweep=False): change_addr=None, is_sweep=False):
# check outputs # check outputs
@ -694,26 +721,8 @@ class Abstract_Wallet(AddressSynchronizer):
self.add_input_info(item) self.add_input_info(item)
# change address # change address
# if we leave it empty, coin_chooser will set it # if empty, coin_chooser will set it
change_addrs = [] change_addrs = self.get_change_addresses_for_new_transaction(change_addr)
if change_addr:
change_addrs = [change_addr]
elif self.use_change:
# Recalc and get unused change addresses
addrs = self.calc_unused_change_addresses()
# New change addresses are created only after a few
# confirmations.
if addrs:
# if there are any unused, select all
change_addrs = addrs
else:
# if there are none, take one randomly from the last few
addrs = self.get_change_addresses()[-self.gap_limit_for_change:]
change_addrs = [random.choice(addrs)] if addrs else []
for addr in change_addrs:
# note that change addresses are not necessarily ismine
# in which case this is a no-op
self.check_address(addr)
# Fee estimator # Fee estimator
if fixed_fee is None: if fixed_fee is None:
@ -727,7 +736,6 @@ class Abstract_Wallet(AddressSynchronizer):
if i_max is None: if i_max is None:
# Let the coin chooser select the coins to spend # Let the coin chooser select the coins to spend
max_change = self.max_change_outputs if self.multiple_change else 1
coin_chooser = coinchooser.get_coin_chooser(config) coin_chooser = coinchooser.get_coin_chooser(config)
# If there is an unconfirmed RBF tx, merge with it # If there is an unconfirmed RBF tx, merge with it
base_tx = self.get_unconfirmed_base_tx_for_batching() base_tx = self.get_unconfirmed_base_tx_for_batching()
@ -751,7 +759,7 @@ class Abstract_Wallet(AddressSynchronizer):
else: else:
txi = [] txi = []
txo = [] txo = []
tx = coin_chooser.make_tx(coins, txi, outputs[:] + txo, change_addrs[:max_change], tx = coin_chooser.make_tx(coins, txi, outputs[:] + txo, change_addrs,
fee_estimator, self.dust_threshold()) fee_estimator, self.dust_threshold())
else: else:
# FIXME?? this might spend inputs with negative effective value... # FIXME?? this might spend inputs with negative effective value...