Merge pull request #456 from sfsf9797/fix-datatype

Fix datatype

Author: allenday

ethereumetl/mappers/receipt_mapper.py

@@ -23,7 +23,7 @@
 
 from ethereumetl.domain.receipt import EthReceipt
 from ethereumetl.mappers.receipt_log_mapper import EthReceiptLogMapper
-from ethereumetl.utils import hex_to_dec, to_normalized_address
+from ethereumetl.utils import hex_to_dec, to_normalized_address, to_float_or_none
 
 
 class EthReceiptMapper(object):
@@ -53,7 +53,7 @@ def json_dict_to_receipt(self, json_dict):
         receipt.l1_fee = hex_to_dec(json_dict.get('l1Fee'))
         receipt.l1_gas_used = hex_to_dec(json_dict.get('l1GasUsed'))
         receipt.l1_gas_price = hex_to_dec(json_dict.get('l1GasPrice'))
-        receipt.l1_fee_scalar = hex_to_dec(json_dict.get('l1FeeScalar'))
+        receipt.l1_fee_scalar = to_float_or_none(json_dict.get('l1FeeScalar'))
 
 
         if 'logs' in json_dict:

ethereumetl/utils.py

@@ -47,6 +47,16 @@ def to_int_or_none(val):
     except ValueError:
         return None
 
+def to_float_or_none(val):
+    if isinstance(val, float):
+        return val
+    if val is None or val == "":
+        return None
+    try:
+        return float(val)
+    except ValueError:
+        print("can't cast %s to float" % val)
+        return val
 
 def chunk_string(string, length):
     return (string[0 + i:length + i] for i in range(0, len(string), length))