grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicolas Gotchac 2017-05-09 12:56:08 +02:00 committed by Jaco Greeff
parent 1288b4b28f
commit c5116e5049
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/abi/spec/event/event.js
View File

@ -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);
}

5
js/src/api/contract/contract.js
View File

@ -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;

7
js/src/views/Contract/Events/Event/event.js
View File

@ -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 }