ethjs-abi 2.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.0 -- accept length zero
+
+1. accept length zero, '0x' for address/fixed and dymaic bytes
+
 # 0.1.9 -- event and log decoding
 
 1. Event and log decoding methods

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethjs-abi",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "description": "Just the Ethereum encoding and decoding methods from the ethers-io-wallet.",
   "main": "lib/index.js",
   "files": [
@@ -137,7 +137,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/ethjs/ethers-abi"
+    "url": "git://github.com/ethjs/ethjs-abi"
   },
   "license": "MIT",
   "lint-staged": {

src/index.js

@@ -73,6 +73,7 @@ function decodeParams(names, types, data, useNumberedParams = true) {
   var offset = 0;
   types.forEach(function(type, index) {
     var coder = getParamCoder(type);
+
     if (coder.dynamic) {
       var dynamicOffset = uint256Coder.decode(data, offset);
       var result = coder.decode(data, dynamicOffset.value.toNumber());
@@ -81,8 +82,14 @@ function decodeParams(names, types, data, useNumberedParams = true) {
       var result = coder.decode(data, offset);
       offset += result.consumed;
     }
-    if (useNumberedParams) values[index] = result.value;
-    if (names[index]) { values[names[index]] = result.value; }
+
+    if (useNumberedParams) {
+      values[index] = result.value;
+    }
+
+    if (names[index]) {
+      values[names[index]] = result.value;
+    }
   });
   return values;
 }
@@ -111,6 +118,7 @@ function encodeEvent(eventObject, values) {
 
 function eventSignature(eventObject) {
   const signature = `${eventObject.name}(${utils.getKeys(eventObject.inputs, 'type').join(',')})`;
+
   return `0x${utils.keccak256(signature)}`;
 }
 
@@ -121,12 +129,15 @@ function decodeEvent(eventObject, data, topics, useNumberedParams = true) {
   const nonIndexedTypes = utils.getKeys(nonIndexed, 'type');
   const event = decodeParams(nonIndexedNames, nonIndexedTypes, utils.hexOrBuffer(data), useNumberedParams);
   const topicOffset = eventObject.anonymous ? 0 : 1;
+
   eventObject.inputs.filter((input) => input.indexed).map((input, i) => {
-    const topic = new Buffer(topics[i + topicOffset].slice(2),'hex');
+    const topic = new Buffer(topics[i + topicOffset].slice(2), 'hex');
     const coder = getParamCoder(input.type);
     event[input.name] = coder.decode(topic, 0).value;
-  })
-  event._eventName = eventObject.name
+  });
+
+  event._eventName = eventObject.name;
+
   return event;
 }
 

src/utils/index.js

@@ -141,7 +141,7 @@ function coderFixedBytes(length) {
       return result;
     },
     decode: function decodeFixedBytes(data, offset) {
-      if (data.length < offset + 32) { throw new Error(`[ethjs-abi] while decoding fixed bytes, invalid bytes data length: ${length}`); }
+      if (data.length !== 0 && data.length < offset + 32) { throw new Error(`[ethjs-abi] while decoding fixed bytes, invalid bytes data length: ${length}`); }
 
       return {
         consumed: 32,
@@ -168,7 +168,7 @@ const coderAddress = {
         value: '0x',
       };
     }
-    if (data.length < offset + 32) { throw new Error(`[ethjs-abi] while decoding address data, invalid address data, invalid byte length ${data.length}`); }
+    if (data.length !== 0 && data.length < offset + 32) { throw new Error(`[ethjs-abi] while decoding address data, invalid address data, invalid byte length ${data.length}`); }
     return {
       consumed: 32,
       value: `0x${data.slice(offset + 12, offset + 32).toString('hex')}`,
@@ -189,11 +189,11 @@ function encodeDynamicBytesHelper(value) {
 }
 
 function decodeDynamicBytesHelper(data, offset) {
-  if (data.length < offset + 32) { throw new Error(`[ethjs-abi] while decoding dynamic bytes data, invalid bytes length: ${data.length} should be less than ${offset + 32}`); }
+  if (data.length !== 0 && data.length < offset + 32) { throw new Error(`[ethjs-abi] while decoding dynamic bytes data, invalid bytes length: ${data.length} should be less than ${offset + 32}`); }
 
   var length = uint256Coder.decode(data, offset).value; // eslint-disable-line
   length = length.toNumber();
-  if (data.length < offset + 32 + length) { throw new Error(`[ethjs-abi] while decoding dynamic bytes data, invalid bytes length: ${data.length} should be less than ${offset + 32 + length}`); }
+  if (data.length !== 0 && data.length < offset + 32 + length) { throw new Error(`[ethjs-abi] while decoding dynamic bytes data, invalid bytes length: ${data.length} should be less than ${offset + 32 + length}`); }
 
   return {
     consumed: parseInt(32 + 32 * Math.ceil(length / 32), 10),