|
|
|
@ -280,6 +280,7 @@ class Wallet: |
|
|
|
self.fee = 100000 |
|
|
|
self.fee = 100000 |
|
|
|
self.num_zeros = 0 |
|
|
|
self.num_zeros = 0 |
|
|
|
self.master_public_key = '' |
|
|
|
self.master_public_key = '' |
|
|
|
|
|
|
|
self.conversion_currency = None |
|
|
|
|
|
|
|
|
|
|
|
# saved fields |
|
|
|
# saved fields |
|
|
|
self.use_encryption = False |
|
|
|
self.use_encryption = False |
|
|
|
@ -637,6 +638,9 @@ class Wallet: |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def save(self): |
|
|
|
def save(self): |
|
|
|
|
|
|
|
# TODO: Need special config storage class. Should not be mixed |
|
|
|
|
|
|
|
# up with the wallet. |
|
|
|
|
|
|
|
# Settings should maybe be stored in a flat ini file. |
|
|
|
s = { |
|
|
|
s = { |
|
|
|
'seed_version': self.seed_version, |
|
|
|
'seed_version': self.seed_version, |
|
|
|
'use_encryption': self.use_encryption, |
|
|
|
'use_encryption': self.use_encryption, |
|
|
|
@ -660,6 +664,7 @@ class Wallet: |
|
|
|
'expert_mode': self.expert_mode, |
|
|
|
'expert_mode': self.expert_mode, |
|
|
|
'gap_limit': self.gap_limit, |
|
|
|
'gap_limit': self.gap_limit, |
|
|
|
'debug_server': self.debug_server, |
|
|
|
'debug_server': self.debug_server, |
|
|
|
|
|
|
|
'conversion_currency': self.conversion_currency |
|
|
|
} |
|
|
|
} |
|
|
|
f = open(self.path,"w") |
|
|
|
f = open(self.path,"w") |
|
|
|
f.write( repr(s) ) |
|
|
|
f.write( repr(s) ) |
|
|
|
@ -688,7 +693,6 @@ class Wallet: |
|
|
|
self.fee = int(d.get('fee')) |
|
|
|
self.fee = int(d.get('fee')) |
|
|
|
self.seed = d.get('seed') |
|
|
|
self.seed = d.get('seed') |
|
|
|
self.server = d.get('server') |
|
|
|
self.server = d.get('server') |
|
|
|
#blocks = d.get('blocks') |
|
|
|
|
|
|
|
self.addresses = d.get('addresses') |
|
|
|
self.addresses = d.get('addresses') |
|
|
|
self.change_addresses = d.get('change_addresses') |
|
|
|
self.change_addresses = d.get('change_addresses') |
|
|
|
self.history = d.get('history') |
|
|
|
self.history = d.get('history') |
|
|
|
@ -704,6 +708,7 @@ class Wallet: |
|
|
|
self.expert_mode = d.get('expert_mode', False) |
|
|
|
self.expert_mode = d.get('expert_mode', False) |
|
|
|
self.gap_limit = d.get('gap_limit', 5) |
|
|
|
self.gap_limit = d.get('gap_limit', 5) |
|
|
|
self.debug_server = d.get('debug_server', False) |
|
|
|
self.debug_server = d.get('debug_server', False) |
|
|
|
|
|
|
|
self.conversion_currency = d.get('conversion_currency', 'USD') |
|
|
|
except: |
|
|
|
except: |
|
|
|
raise BaseException("cannot read wallet file") |
|
|
|
raise BaseException("cannot read wallet file") |
|
|
|
|
|
|
|
|
|
|
|
|