AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of github.com:spesmilo/electrum

Browse Source
This commit is contained in:
ThomasV
2018-02-13 09:47:30 +01:00
parent 2829de5d49 15f7e09131
commit b3a67f7a1f
18 changed files with 65 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/simple_config.py
View File

@@ -324,7 +324,7 @@ class SimpleConfig(PrintError):
def get_fee_status(self):
dyn = self.is_dynfee()
mempool = self.get('mempool_fees')
mempool = self.use_mempool_fees()
pos = self.get_depth_level() if mempool else self.get_fee_level()
fee_rate = self.fee_per_kb()
target, tooltip = self.get_fee_text(pos, dyn, mempool, fee_rate)
@@ -395,10 +395,10 @@ class SimpleConfig(PrintError):
return bool(self.mempool_fees)
def is_dynfee(self):
return self.get('dynamic_fees', True)
return bool(self.get('dynamic_fees', True))
def use_mempool_fees(self):
return self.get('mempool_fees', False)
return bool(self.get('mempool_fees', False))
def fee_per_kb(self):
"""Returns sat/kvB fee to pay for a txn.

18
lib/wallet.py
View File

@@ -322,6 +322,9 @@ class Abstract_Wallet(PrintError):
def synchronize(self):
pass
def is_deterministic(self):
return self.keystore.is_deterministic()
def set_up_to_date(self, up_to_date):
with self.lock:
self.up_to_date = up_to_date
@@ -1883,9 +1886,6 @@ class Deterministic_Wallet(Abstract_Wallet):
def has_seed(self):
return self.keystore.has_seed()
def is_deterministic(self):
return self.keystore.is_deterministic()
def get_receiving_addresses(self):
return self.receiving_addresses
@@ -1971,16 +1971,8 @@ class Deterministic_Wallet(Abstract_Wallet):
def synchronize(self):
with self.lock:
if self.is_deterministic():
self.synchronize_sequence(False)
self.synchronize_sequence(True)
else:
if len(self.receiving_addresses) != len(self.keystore.keypairs):
pubkeys = self.keystore.keypairs.keys()
self.receiving_addresses = [self.pubkeys_to_address(i) for i in pubkeys]
self.save_addresses()
for addr in self.receiving_addresses:
self.add_address(addr)
self.synchronize_sequence(False)
self.synchronize_sequence(True)
def is_beyond_limit(self, address):
is_change, i = self.get_address_index(address)