allow empty address arguments when encoding abi params (#1047)

* allow empty address arguments * add test for address encoding
web3 · Sep 19, 2017 · bacd46e · bacd46e
1 parent 57b4c0b
commit bacd46e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/web3-eth-abi/src/types/address.js b/packages/web3-eth-abi/src/types/address.js
@@ -15,7 +15,7 @@ var SolidityType = require('../type');
 var SolidityTypeAddress = function () {
  this._inputFormatter = function(){
  var args = Array.prototype.slice.call(arguments);
- args[0] = formatters.inputAddressFormatter(args[0]);
+ args[0] = (!args[0] || args[0] === '0x0') ? '' : formatters.inputAddressFormatter(args[0]);
  return f.formatInputInt.apply(this, args);
  };
  this._outputFormatter = f.formatOutputAddress;

diff --git a/test/eth.abi.encodeParameters.js b/test/eth.abi.encodeParameters.js
@@ -9,6 +9,9 @@ var tests = [{
 },{
  params: [['uint8[]','bytes32'], [['34','434'], '0x324567fff']],
  result: '0x0000000000000000000000000000000000000000000000000000000000000040324567fff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000001b2'
+},{
+ params: [['address','address','address', 'address'], ['0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1','','0x0', null]],
+ result: '0x00000000000000000000000090f8bf6a479f320ead074411a4b0e7944ea8c9c1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
 }];
 
 describe('encodeParameters', function () {