Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue #52 #54

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix for issue #52 #54

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd45587
handle cases when the param is a multidimensional array
Feb 24, 2020
844e652
Fixed testing errors
ch4r10t33r Feb 24, 2020
0f00855
Fix to handle multi dimensional array in input parameters
ch4r10t33r Feb 24, 2020
78acb32
Fixed linting errors introduced by vs code
ch4r10t33r Feb 24, 2020
ad370cd
Handle scenario where decodedP is undefined
ch4r10t33r Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 35 additions & 26 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const { sha3, BN } = require("web3-utils");
const {
sha3,
BN
} = require("web3-utils");
const abiCoder = require("web3-eth-abi");

const state = {
Expand All @@ -21,15 +24,15 @@ function _addABI(abiArray) {

if (Array.isArray(abiArray)) {
// Iterate new abi to generate method id"s
abiArray.map(function(abi) {
abiArray.map(function (abi) {
if (abi.name) {
const signature = sha3(
abi.name +
"(" +
abi.inputs
.map(_typeToString)
.join(",") +
")"
"(" +
abi.inputs
.map(_typeToString)
.join(",") +
")"
);
if (abi.type === "event") {
state.methodIDs[signature.slice(2)] = abi;
Expand All @@ -48,17 +51,17 @@ function _addABI(abiArray) {
function _removeABI(abiArray) {
if (Array.isArray(abiArray)) {
// Iterate new abi to generate method id"s
abiArray.map(function(abi) {
abiArray.map(function (abi) {
if (abi.name) {
const signature = sha3(
abi.name +
"(" +
abi.inputs
.map(function(input) {
return input.type;
})
.join(",") +
")"
"(" +
abi.inputs
.map(function (input) {
return input.type;
})
.join(",") +
")"
);
if (abi.type === "event") {
if (state.methodIDs[signature.slice(2)]) {
Expand Down Expand Up @@ -113,7 +116,11 @@ function _decodeMethod(data) {
const isArray = Array.isArray(param);

if (isArray) {
parsedParam = param.map(_ => _.toLowerCase());
if (param[0].constructor === Array) {
parsedParam = eval(param.toString().toLowerCase());
} else {
parsedParam = param.map(_ => _.toLowerCase());
}
} else {
parsedParam = param.toLowerCase();
}
Expand Down Expand Up @@ -141,7 +148,7 @@ function _decodeLogs(logs) {
let topicsIndex = 1;

let dataTypes = [];
method.inputs.map(function(input) {
method.inputs.map(function (input) {
if (!input.indexed) {
dataTypes.push(input.type);
}
Expand All @@ -153,7 +160,7 @@ function _decodeLogs(logs) {
);

// Loop topic and data to get the params
method.inputs.map(function(param) {
method.inputs.map(function (param) {
let decodedP = {
name: param.name,
type: param.type,
Expand All @@ -168,13 +175,15 @@ function _decodeLogs(logs) {
}

if (param.type === "address") {
decodedP.value = decodedP.value.toLowerCase();
// 42 because len(0x) + 40
if (decodedP.value.length > 42) {
let toRemove = decodedP.value.length - 42;
let temp = decodedP.value.split("");
temp.splice(2, toRemove);
decodedP.value = temp.join("");
if (decodedP.value) {
decodedP.value = decodedP.value.toLowerCase();
// 42 because len(0x) + 40
if (decodedP.value.length > 42) {
let toRemove = decodedP.value.length - 42;
let temp = decodedP.value.split("");
temp.splice(2, toRemove);
decodedP.value = temp.join("");
}
}
}

Expand Down Expand Up @@ -211,4 +220,4 @@ module.exports = {
decodeMethod: _decodeMethod,
decodeLogs: _decodeLogs,
removeABI: _removeABI,
};
};