AaronFiore/electrum
1
0
Fork 0
Code Activity

fix more type errors caused by jsonrpc (parsing floats and transactions)

Browse Source
This commit is contained in:
ThomasV
2015-12-16 20:17:20 +01:00
parent f8f124ad84
commit 026f9312a7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/commands.py
View File

@@ -665,13 +665,15 @@ command_options = {
# don't use floats because of rounding errors # don't use floats because of rounding errors
json_loads = lambda x: json.loads(x, parse_float=lambda x: str(Decimal(x)))
arg_types = { arg_types = {
'num':int, 'num': int,
'nbits':int, 'nbits': int,
'entropy':long, 'entropy': long,
'pubkeys': json.loads, 'tx': json_loads,
'inputs': json.loads, 'pubkeys': json_loads,
'outputs': json.loads, 'inputs': json_loads,
'outputs': json_loads,
'tx_fee': lambda x: str(Decimal(x)) if x is not None else None, 'tx_fee': lambda x: str(Decimal(x)) if x is not None else None,
'amount': lambda x: str(Decimal(x)) if x!='!' else '!', 'amount': lambda x: str(Decimal(x)) if x!='!' else '!',
} }

1
lib/transaction.py
View File

@@ -761,7 +761,6 @@ class Transaction:
return out return out
def sign(self, keypairs): def sign(self, keypairs):
print "sign"
for i, txin in enumerate(self.inputs): for i, txin in enumerate(self.inputs):
num = txin['num_sig'] num = txin['num_sig']
for x_pubkey in txin['x_pubkeys']: for x_pubkey in txin['x_pubkeys']: