Merge pull request #27 from nelisky/insight_tx-fixes

Insight tx fixes

trezorlib/tx_api.py

@@ -52,12 +52,15 @@ def opcode_serialize(opcode):
     except:
         raise Exception('Unknown script opcode: %s' % opcode)
 
-def insight_tx(url):
+def insight_tx(url, rawdata=False):
-    try:
+    if not rawdata:
-        f = urllib2.urlopen(url)
+        try:
-    except:
+            f = urllib2.urlopen(url)
-        raise Exception('URL error: %s' % url)
+            data = json.load(f)
-    data = json.load(f)
+        except:
+            raise Exception('URL error: %s' % url)
+    else:
+        data = url
 
     t = proto_types.TransactionType()
     t.version = data['version']
@@ -81,7 +84,7 @@ def insight_tx(url):
 
     for vout in data['vout']:
         o = t.bin_outputs.add()
-        o.amount = int(Decimal(vout['value']) * 100000000)
+        o.amount = int(Decimal(str(vout['value'])) * 100000000)
         asm = vout['scriptPubKey']['asm'].split(' ')
         asm = [ opcode_serialize(x) for x in asm ]
         o.script_pubkey = ''.join(asm)