BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3895 from SomberNight/fix_3890 

locking in wallet.create_new_address
This commit is contained in:
ThomasV 2018-02-13 09:52:16 +01:00 committed by GitHub
parent 1471489969 7e77baf4fb
commit e0130cafcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/wallet.py
View File

@ -208,7 +208,7 @@ class Abstract_Wallet(PrintError):
self.up_to_date = False self.up_to_date = False
# locks: if you need to take multiple ones, acquire them in the order they are defined here! # locks: if you need to take multiple ones, acquire them in the order they are defined here!
self.lock = threading.Lock() self.lock = threading.RLock()
self.transaction_lock = threading.RLock() self.transaction_lock = threading.RLock()
self.check_history() self.check_history()
@ -1947,15 +1947,16 @@ class Deterministic_Wallet(Abstract_Wallet):
def create_new_address(self, for_change=False): def create_new_address(self, for_change=False):
assert type(for_change) is bool assert type(for_change) is bool
addr_list = self.change_addresses if for_change else self.receiving_addresses with self.lock:
n = len(addr_list) addr_list = self.change_addresses if for_change else self.receiving_addresses
x = self.derive_pubkeys(for_change, n) n = len(addr_list)
address = self.pubkeys_to_address(x) x = self.derive_pubkeys(for_change, n)
addr_list.append(address) address = self.pubkeys_to_address(x)
self._addr_to_addr_index[address] = (for_change, n) addr_list.append(address)
self.save_addresses() self._addr_to_addr_index[address] = (for_change, n)
self.add_address(address) self.save_addresses()
return address self.add_address(address)
return address
def synchronize_sequence(self, for_change): def synchronize_sequence(self, for_change):
limit = self.gap_limit_for_change if for_change else self.gap_limit limit = self.gap_limit_for_change if for_change else self.gap_limit