Making sure transaction information is properly serialized

Author: dominiek

CHANGELOG.md

@@ -1,4 +1,8 @@
 
+# 0.1.10 -- Bugfixes
+
+- Ensuring transaction information is properly serialized
+
 # 0.1.9 -- Bugfixes
 
 - Fix for BigNumber serialization

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eth-indexer",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "High performance Ethereum smart contract event indexing for fast local retrieval",
   "author": "Dominiek Ter Heide <[email protected]>",
   "license": "MIT",

src/utils.js

@@ -2,28 +2,52 @@
 import BigNumber from 'bignumber.js';
 
 const isBigNumber = value =>
-  (value && value.isBigNumber === true) ||
-  (value && value instanceof BigNumber) ||
-  (value && value.lte && value.toNumber);
+  (value.isBigNumber === true) ||
+  (value instanceof BigNumber) ||
+  (value.lte && value.toNumber);
+
+const serializeBigNumber = (value) => {
+  if (isBigNumber(value)) {
+    return {
+      type: 'BigNumber',
+      value: value.toString(),
+    };
+  }
+  return value;
+};
+
+const unserializeBigNumber = (value) => {
+  if (value && value.type === 'BigNumber') {
+    return new BigNumber(value.value);
+  }
+  return value;
+};
 
 export const serialize = (event) => {
   const doc = Object.assign({}, event);
+  for (const key in event) {
+    if (event[key]) {
+      doc[key] = serializeBigNumber(event[key]);
+    }
+  }
   for (const key in event.args) {
-    if (isBigNumber(event.args[key])) {
-      doc.args[key] = {
-        type: 'BigNumber',
-        value: event.args[key].toString(),
-      };
+    if (event.args[key]) {
+      doc.args[key] = serializeBigNumber(event.args[key]);
     }
   }
   return doc;
 };
 
 export const unserialize = (doc) => {
   const event = Object.assign({}, doc);
+  for (const key in doc) {
+    if (doc[key]) {
+      event[key] = unserializeBigNumber(doc[key]);
+    }
+  }
   for (const key in doc.args) {
-    if (doc.args[key] && doc.args[key].type === 'BigNumber') {
-      event.args[key] = new BigNumber(doc.args[key].value);
+    if (doc.args[key]) {
+      event.args[key] = unserializeBigNumber(doc.args[key]);
     }
   }
   return event;