AaronFiore/electrum
1
0
Fork 0
Code Activity

make use_change a stored preference

Browse Source
This commit is contained in:
ThomasV
2012-06-16 18:45:17 +02:00
parent 5cf7570a1a
commit 4343967ee0
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/wallet.py
View File

@@ -256,6 +256,7 @@ class Wallet:
self.gui_callback = gui_callback
self.gap_limit = 5 # configuration
self.use_change = True
self.fee = 100000
self.num_zeros = 0
self.master_public_key = ''
@@ -611,6 +612,7 @@ class Wallet:
s = {
'seed_version':self.seed_version,
'use_encryption':self.use_encryption,
'use_change':self.use_change,
'master_public_key': self.master_public_key.encode('hex'),
'fee':self.fee,
'server':self.server,
@@ -653,6 +655,7 @@ class Wallet:
self.seed_version = d.get('seed_version')
self.master_public_key = d.get('master_public_key').decode('hex')
self.use_encryption = d.get('use_encryption')
self.use_change = bool(d.get('use_change',True))
self.fee = int( d.get('fee') )
self.seed = d.get('seed')
self.server = d.get('server')
@@ -878,12 +881,19 @@ class Wallet:
tx['default_label'] = default_label
def mktx(self, to_address, amount, label, password, fee=None, change_addr=None, from_addr= None):
def mktx(self, to_address, amount, label, password, fee=None, from_addr= None):
if not self.is_valid(to_address):
raise BaseException("Invalid address")
inputs, total, fee = self.choose_tx_inputs( amount, fee, from_addr )
if not inputs:
raise BaseException("Not enough funds")
if self.use_change:
change_addr = inputs[0][0]
print "sending change to", change_addr
else:
change_addr = None
outputs = self.choose_tx_outputs( to_address, amount, fee, total, change_addr )
s_inputs = self.sign_inputs( inputs, outputs, password )