diff --git a/lib/commands.py b/lib/commands.py index f07aa7c02..7f6eda55d 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -665,13 +665,15 @@ command_options = { # don't use floats because of rounding errors +json_loads = lambda x: json.loads(x, parse_float=lambda x: str(Decimal(x))) arg_types = { - 'num':int, - 'nbits':int, - 'entropy':long, - 'pubkeys': json.loads, - 'inputs': json.loads, - 'outputs': json.loads, + 'num': int, + 'nbits': int, + 'entropy': long, + 'tx': json_loads, + 'pubkeys': json_loads, + 'inputs': json_loads, + 'outputs': json_loads, 'tx_fee': lambda x: str(Decimal(x)) if x is not None else None, 'amount': lambda x: str(Decimal(x)) if x!='!' else '!', } diff --git a/lib/transaction.py b/lib/transaction.py index d8bd0aeab..b5d903bc4 100644 --- a/lib/transaction.py +++ b/lib/transaction.py @@ -761,7 +761,6 @@ class Transaction: return out def sign(self, keypairs): - print "sign" for i, txin in enumerate(self.inputs): num = txin['num_sig'] for x_pubkey in txin['x_pubkeys']: