zebra.lucky
/
joinmarket-clientserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Bugfix for d719ff2730 

The above commit introduces auto freezing for utxos below
a threshold, but erroneously auto freezes new utxos in
almost all cases because transactions are processed
multiple times (add_utxos handles this in the wallet).
The problem here is solved as with the same issue of
duplication in the logging of new transactions; we keep
track of new txids that arrive in the wallet and make
sure not to process the same txid twice.
Additionally, the setting of WalletService.used_addresses
is fixed. Test for this function is also fixed.
master
Adam Gibson 6 years ago
parent
353b4aab8b
commit
83c4d3d533
No known key found for this signature in database
GPG Key ID: 141001A1AF77F20B
2 changed files with 27 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      jmclient/jmclient/wallet_service.py
  2. 16
      jmclient/test/test_walletservice.py

33
jmclient/jmclient/wallet_service.py
Unescape View File

@ -58,8 +58,8 @@ class WalletService(Service):
# transactions we are actively monitoring, # transactions we are actively monitoring,
# i.e. they are not new but we want to track: # i.e. they are not new but we want to track:
self.active_txids = [] self.active_txids = []
# to ensure transactions are only logged once: # to ensure transactions are only processed once:
self.logged_txids = [] self.processed_txids = []
self.set_autofreeze_warning_cb() self.set_autofreeze_warning_cb()
@ -205,7 +205,7 @@ class WalletService(Service):
""" """
to_be_frozen = set() to_be_frozen = set()
for au in added_utxos: for au in added_utxos:
if added_utxos[au]["address"] in self.used_addresses: if self.has_address_been_used(added_utxos[au]["address"]):
to_be_frozen.add(au) to_be_frozen.add(au)
# any utxos actually added must have their destination address # any utxos actually added must have their destination address
# added to the used address list for this program run: # added to the used address list for this program run:
@ -268,16 +268,14 @@ class WalletService(Service):
if txd is None: if txd is None:
continue continue
removed_utxos, added_utxos = self.wallet.process_new_tx(txd, txid, height) removed_utxos, added_utxos = self.wallet.process_new_tx(txd, txid, height)
if txid not in self.processed_txids:
# apply checks to disable/freeze utxos to reused addrs if needed: # apply checks to disable/freeze utxos to reused addrs if needed:
self.check_for_reuse(added_utxos) self.check_for_reuse(added_utxos)
# TODO note that this log message will be missed if confirmation
# TODO note that this log message will be missed if confirmation # is absurdly fast, this is considered acceptable compared with
# is absurdly fast, this is considered acceptable compared with # additional complexity.
# additional complexity.
if txid not in self.logged_txids:
self.log_new_tx(removed_utxos, added_utxos, txid) self.log_new_tx(removed_utxos, added_utxos, txid)
self.logged_txids.append(txid) self.processed_txids.append(txid)
# first fire 'all' type callbacks, irrespective of if the # first fire 'all' type callbacks, irrespective of if the
# transaction pertains to anything known (but must # transaction pertains to anything known (but must
@ -446,10 +444,9 @@ class WalletService(Service):
Bitcoin Core instance, in which case "recoversync" should have Bitcoin Core instance, in which case "recoversync" should have
been specifically chosen by the user. been specifically chosen by the user.
""" """
wallet_name = self.get_wallet_name() self.get_address_usages()
used_addresses = self.get_address_usages()
# for a first run, import first chunk # for a first run, import first chunk
if not used_addresses: if not self.used_addresses:
jlog.info("Detected new wallet, performing initial import") jlog.info("Detected new wallet, performing initial import")
# delegate inital address import to sync_addresses # delegate inital address import to sync_addresses
# this should be fast because "getaddressesbyaccount" should return # this should be fast because "getaddressesbyaccount" should return
@ -460,7 +457,7 @@ class WalletService(Service):
# Wallet has been used; scan forwards. # Wallet has been used; scan forwards.
jlog.debug("Fast sync in progress. Got this many used addresses: " + str( jlog.debug("Fast sync in progress. Got this many used addresses: " + str(
len(used_addresses))) len(self.used_addresses)))
# Need to have wallet.index point to the last used address # Need to have wallet.index point to the last used address
# Algo: # Algo:
# 1. Scan batch 1 of each branch, record matched wallet addresses. # 1. Scan batch 1 of each branch, record matched wallet addresses.
@ -483,7 +480,7 @@ class WalletService(Service):
# deposit by user will be based on wallet_display() which is only # deposit by user will be based on wallet_display() which is only
# showing imported addresses. Hence the gap-limit import at the end # showing imported addresses. Hence the gap-limit import at the end
# to ensure this is always true. # to ensure this is always true.
remaining_used_addresses = used_addresses.copy() remaining_used_addresses = self.used_addresses.copy()
addresses, saved_indices = self.collect_addresses_init() addresses, saved_indices = self.collect_addresses_init()
for addr in addresses: for addr in addresses:
remaining_used_addresses.discard(addr) remaining_used_addresses.discard(addr)
@ -513,7 +510,7 @@ class WalletService(Service):
# creating used_indices on-the-fly would be more efficient, but the # creating used_indices on-the-fly would be more efficient, but the
# overall performance gain is probably negligible # overall performance gain is probably negligible
used_indices = self.get_used_indices(used_addresses) used_indices = self.get_used_indices(self.used_addresses)
self.rewind_wallet_indices(used_indices, saved_indices) self.rewind_wallet_indices(used_indices, saved_indices)
# at this point we have the correct up to date index at each branch; # at this point we have the correct up to date index at each branch;
# we ensure that all addresses that will be displayed (see wallet_utils.py, # we ensure that all addresses that will be displayed (see wallet_utils.py,

16
jmclient/test/test_walletservice.py
Unescape View File

@ -20,7 +20,7 @@ def try_address_reuse(wallet_service, idx, funding_amt, config_threshold,
expected_final_balance): expected_final_balance):
set_freeze_reuse_config(config_threshold) set_freeze_reuse_config(config_threshold)
# check that below the threshold on the same address is not allowed: # check that below the threshold on the same address is not allowed:
fund_wallet_addr(wallet_service.wallet, wallet_service.get_addr(0, 0, idx), fund_wallet_addr(wallet_service.wallet, wallet_service.get_addr(0, 1, idx),
value_btc=funding_amt) value_btc=funding_amt)
wallet_service.transaction_monitor() wallet_service.transaction_monitor()
balances = wallet_service.get_balance_by_mixdepth() balances = wallet_service.get_balance_by_mixdepth()
@ -40,23 +40,31 @@ def test_address_reuse_freezing(setup_walletservice):
called, and that the balance available in the mixdepth correctly called, and that the balance available in the mixdepth correctly
reflects the usage pattern and freeze policy. reflects the usage pattern and freeze policy.
""" """
amount = 10**8
num_tx = 3
cb_called = 0 cb_called = 0
def reuse_callback(utxostr): def reuse_callback(utxostr):
nonlocal cb_called nonlocal cb_called
print("Address reuse freezing callback on utxo: ", utxostr) print("Address reuse freezing callback on utxo: ", utxostr)
cb_called += 1 cb_called += 1
wallet = get_populated_wallet(amount, num_tx) # we must fund after initial sync (for imports), hence
# "populated" with no coins
wallet = get_populated_wallet(num=0)
wallet_service = WalletService(wallet) wallet_service = WalletService(wallet)
wallet_service.set_autofreeze_warning_cb(reuse_callback) wallet_service.set_autofreeze_warning_cb(reuse_callback)
sync_test_wallet(True, wallet_service) sync_test_wallet(True, wallet_service)
for i in range(3):
fund_wallet_addr(wallet_service.wallet,
wallet_service.get_addr(0, 1, i))
# manually force the wallet service to see the new utxos:
wallet_service.transaction_monitor() wallet_service.transaction_monitor()
# check that with default status any reuse is blocked:
try_address_reuse(wallet_service, 0, 1, -1, 3 * 10**8) try_address_reuse(wallet_service, 0, 1, -1, 3 * 10**8)
assert cb_called == 1, "Failed to trigger freeze callback" assert cb_called == 1, "Failed to trigger freeze callback"
# check that above the threshold is allowed (1 sat less than funding) # check that above the threshold is allowed (1 sat less than funding)
try_address_reuse(wallet_service, 1, 1, 99999999, 4 * 10**8) try_address_reuse(wallet_service, 1, 1, 99999999, 4 * 10**8)
assert cb_called == 1, "Incorrectly triggered freeze callback" assert cb_called == 1, "Incorrectly triggered freeze callback"
# check that below the threshold on the same address is not allowed: # check that below the threshold on the same address is not allowed:
try_address_reuse(wallet_service, 1, 0.99999998, 99999999, 4 * 10**8) try_address_reuse(wallet_service, 1, 0.99999998, 99999999, 4 * 10**8)
# note can be more than 1 extra call here, somewhat suboptimal: # note can be more than 1 extra call here, somewhat suboptimal:

Write Preview
Loading…
Cancel
Save