status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into sandbox 

Conflicts:
	dist/ethereum-light.js
	dist/ethereum-light.js.map
	dist/ethereum-light.min.js
	dist/ethereum.js
	dist/ethereum.js.map
	dist/ethereum.min.js
	lib/web3.js
This commit is contained in:
Marek Kotewicz 2015-03-26 11:19:12 +01:00
parent 0beb01f4da 1a84015bab
commit e928e14bc4
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/ethereum-light.js vendored
View File

@ -1997,7 +1997,7 @@ var indexedParamsToTopics = function (event, indexed) {
return abi.formatInput(inputs, [v]); return abi.formatInput(inputs, [v]);
}); });
} }
return abi.formatInput(inputs, [value]); return '0x' + abi.formatInput(inputs, [value]);
}); });
}; };

2
dist/ethereum-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.js vendored
View File

@ -1997,7 +1997,7 @@ var indexedParamsToTopics = function (event, indexed) {
return abi.formatInput(inputs, [v]); return abi.formatInput(inputs, [v]);
}); });
} }
return abi.formatInput(inputs, [value]); return '0x' + abi.formatInput(inputs, [value]);
}); });
}; };

2
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/web3/event.js
View File

@ -57,7 +57,7 @@ var indexedParamsToTopics = function (event, indexed) {
return abi.formatInput(inputs, [v]); return abi.formatInput(inputs, [v]);
}); });
} }
return abi.formatInput(inputs, [value]); return '0x' + abi.formatInput(inputs, [value]);
}); });
}; };

2
test/event.inputParser.js
View File

@ -80,7 +80,7 @@ describe('lib/web3/event', function () {
assert.equal(result.address, address); assert.equal(result.address, address);
assert.equal(result.topics.length, 2); assert.equal(result.topics.length, 2);
assert.equal(result.topics[0], signature); assert.equal(result.topics[0], signature);
assert.equal(result.topics[1], f.formatInputInt(4)); assert.equal(result.topics[1], '0x' + f.formatInputInt(4));
assert.equal(result.fromBlock, options.fromBlock); assert.equal(result.fromBlock, options.fromBlock);
assert.equal(result.toBlock, options.toBlock); assert.equal(result.toBlock, options.toBlock);
assert.equal(result.offset, options.offset); assert.equal(result.offset, options.offset);