Fix event params decoding when no names for parameters #5409 (#5567)

openethereum · May 9, 2017 · c5116e5 · c5116e5
1 parent 1288b4b
commit c5116e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/js/src/abi/spec/event/event.js b/js/src/abi/spec/event/event.js
@@ -99,15 +99,15 @@ export default class Event {
     const namedTokens = {};
 
     topicParams.forEach((param, idx) => {
-      namedTokens[param.name] = topicTokens[idx];
+      namedTokens[param.name || idx] = topicTokens[idx];
     });
     dataParams.forEach((param, idx) => {
-      namedTokens[param.name] = dataTokens[idx];
+      namedTokens[param.name || idx] = dataTokens[idx];
     });
 
     const inputParamTypes = this.inputParamTypes();
     const decodedParams = this.inputParamNames()
-      .map((name, idx) => new DecodedLogParam(name, inputParamTypes[idx], namedTokens[name]));
+      .map((name, idx) => new DecodedLogParam(name, inputParamTypes[idx], namedTokens[name || idx]));
 
     return new DecodedLog(decodedParams, address);
   }

diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
@@ -182,10 +182,11 @@ export default class Contract {
         log.params = {};
         log.event = event.name;
 
-        decoded.params.forEach((param) => {
+        decoded.params.forEach((param, index) => {
           const { type, value } = param.token;
+          const key = param.name || index;
 
-          log.params[param.name] = { type, value };
+          log.params[key] = { type, value };
         });
 
         return log;

diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
@@ -112,11 +112,16 @@ export default class Event extends Component {
   }
 
   renderParam (name, param) {
+    // Don't add a label id the name is an index key (ie. a Number)
+    const label = parseInt(name).toString() === name.toString()
+      ? undefined
+      : name;
+
     return (
       <TypedInput
         allowCopy
         className={ styles.input }
-        label={ name }
+        label={ label }
         param={ param.type }
         readOnly
         value={ param.value }