Consensys · Jan 28, 2020 · Feb 28, 2024 · Feb 28, 2024 · Feb 28, 2024
Showing with 57 additions and 62 deletions.

+57 −62 index.js
diff --git a/index.js b/index.js
@@ -15,16 +15,13 @@ function _addABI(abiArray) {
     // Iterate new abi to generate method id"s
     abiArray.map(function(abi) {
       if (abi.name) {
-        const signature = sha3(
-          abi.name +
-            "(" +
-            abi.inputs
-              .map(function(input) {
-                return input.type;
-              })
-              .join(",") +
-            ")"
-        );
+        let signature;
+        if (abi.type === "event") {
+          signature = abiCoder.encodeFunctionSignature(abi);
+        } else {
+          signature = abiCoder.encodeEventSignature(abi);
+        }
+
         if (abi.type === "event") {
           state.methodIDs[signature.slice(2)] = abi;
         } else {
@@ -44,16 +41,14 @@ function _removeABI(abiArray) {
     // Iterate new abi to generate method id"s
     abiArray.map(function(abi) {
       if (abi.name) {
-        const signature = sha3(
-          abi.name +
-            "(" +
-            abi.inputs
-              .map(function(input) {
-                return input.type;
-              })
-              .join(",") +
-            ")"
-        );
+        let signature;
+        if (abi.type === "event") {
+          signature = abiCoder.encodeFunctionSignature(abi);
+        } else {
+          signature = abiCoder.encodeEventSignature(abi);
+        }
+
+
         if (abi.type === "event") {
           if (state.methodIDs[signature.slice(2)]) {
             delete state.methodIDs[signature.slice(2)];
@@ -74,56 +69,56 @@ function _getMethodIDs() {
   return state.methodIDs;
 }
 
-function _decodeMethod(data) {
-  const methodID = data.slice(2, 10);
-  const abiItem = state.methodIDs[methodID];
-  if (abiItem) {
-    const params = abiItem.inputs.map(function(item) {
-      return item.type;
-    });
-    let decoded = abiCoder.decodeParameters(params, data.slice(10));
+function _isArrayKey(key) {
+  return /^\d+$/.test(key) || key === "__length__";
+}
 
-    let retData = {
-      name: abiItem.name,
-      params: [],
-    };
+function _isArray(obj) {
+  if (!Array.isArray(obj)) {
+    return false;
+  }
 
-    for (let i = 0; i < decoded.__length__; i++) {
-      let param = decoded[i];
-      let parsedParam = param;
-      const isUint = abiItem.inputs[i].type.indexOf("uint") === 0;
-      const isInt = abiItem.inputs[i].type.indexOf("int") === 0;
-      const isAddress = abiItem.inputs[i].type.indexOf("address") === 0;
+  return Object.keys(obj).every(value => {
+    return _isArrayKey(value);
+  });
+}
 
-      if (isUint || isInt) {
-        const isArray = Array.isArray(param);
+function _cleanObject(obj) {
+  if (_isArray(obj)) {
 
-        if (isArray) {
-          parsedParam = param.map(val => new BN(val).toString());
-        } else {
-          parsedParam = new BN(param).toString();
-        }
+    // Return an array with all of the elements recursively cleaned.
+    const cleanedArray = [];
+    for (const elt of obj) {
+      cleanedArray.push(_cleanObject(elt));
+    }
+    return cleanedArray;
+  } else if (typeof obj === "object" && obj !== null) {
+
+    // Remove all of the array-style keys, and clean the values for the non array-style keys.
+    const cleanedObject = {}; 
+    for (const [key, value] of Object.entries(obj)) {
+      // Only keep keys that are not array keys.
+      if (!_isArrayKey(key)) {
+        cleanedObject[key] = _cleanObject(value);
       }
+    }
 
-      // Addresses returned by web3 are randomly cased so we need to standardize and lowercase all
-      if (isAddress) {
-        const isArray = Array.isArray(param);
-
-        if (isArray) {
-          parsedParam = param.map(_ => _.toLowerCase());
-        } else {
-          parsedParam = param.toLowerCase();
-        }
-      }
+    return cleanedObject;
+  } else {
+    // If the object is not an array or an object, we assume it's a primative and return it.
+    return obj;
+  }
+}
 
-      retData.params.push({
-        name: abiItem.inputs[i].name,
-        value: parsedParam,
-        type: abiItem.inputs[i].type,
-      });
-    }
+function _decodeMethod(data) {
+  const methodID = data.slice(2, 10);
+  const abiItem = state.methodIDs[methodID];
 
-    return retData;
+  if (abiItem) {
+    return {
+      name: abiItem.name,
+      params: _cleanObject(abiCoder.decodeParameters(abiItem.inputs, data.slice(10)))
+    };
   }
 }