Merge pull request #3238 from ethereum/issue/3221

big-number (BN & BigNumber) mapping added to abi.encodeParameters

CHANGELOG.md

@@ -105,6 +105,7 @@ Released with 1.0.0-beta.37 code base.
 - ``eth_requestAccounts`` as ``requestAccounts`` added to web3-eth package (#3219)
 - ``sha3Raw`` and ``soliditySha3Raw`` added to web3-utils package (#3226)
 - ``eth_getProof`` as ``getProof`` added to web3-eth package (#3220)
+- ``BN`` and ``BigNumber`` objects are now supported by the ``abi.encodeParameter(s)`` method (#3238) 
 - ``getPendingTransactions`` added to web3-eth package (#3239)
 
 ### Fixed

packages/web3-eth-abi/src/index.js

@@ -76,8 +76,10 @@ ABICoder.prototype.encodeEventSignature = function (functionName) {
  * Should be used to encode plain param
  *
  * @method encodeParameter
- * @param {String} type
- * @param {Object} param
+ *
+ * @param {String|Object} type
+ * @param {any} param
+ *
  * @return {String} encoded plain param
  */
 ABICoder.prototype.encodeParameter = function (type, param) {
@@ -88,12 +90,23 @@ ABICoder.prototype.encodeParameter = function (type, param) {
  * Should be used to encode list of params
  *
  * @method encodeParameters
- * @param {Array} types
- * @param {Array} params
+ *
+ * @param {Array<String|Object>} types
+ * @param {Array<any>} params
+ *
  * @return {String} encoded list of params
  */
 ABICoder.prototype.encodeParameters = function (types, params) {
-    return ethersAbiCoder.encode(this.mapTypes(types), params);
+    return ethersAbiCoder.encode(
+        this.mapTypes(types),
+        params.map(function (param) {
+            if (utils.isBN(param) || utils.isBigNumber(param)) {
+                return param.toString(10);
+            }
+
+            return param;
+        })
+    );
 };
 
 /**

test/abi.encodeParameter.js

@@ -1,5 +1,7 @@
 var chai = require('chai');
 var assert = chai.assert;
+var BN = require('bn.js');
+var BigNumber = require('bignumber.js');
 var coder = require('../packages/web3-eth-abi');
 
 
@@ -305,7 +307,17 @@ describe('lib/solidity/coder', function () {
               '0000000000000000000000000000000000000000000000000000000000000000' +
               '0000000000000000000000000000000000000000000000000000000000000120' +
               '000000000000000000000000000000000000000000000000000000000000000f' +
-              '74657374696e672074657374696e670000000000000000000000000000000000' })
+              '74657374696e672074657374696e670000000000000000000000000000000000' });
+        test({
+            type: 'uint256',
+            value: new BN(42),
+            expected: '000000000000000000000000000000000000000000000000000000000000002a'
+        });
+        test({
+            type: 'uint256',
+            value: new BigNumber(42),
+            expected: '000000000000000000000000000000000000000000000000000000000000002a'
+        });
     });
 });
 
@@ -656,6 +668,16 @@ describe('lib/solidity/coder', function () {
                     'bc00000000000000000000000000000000000000000000000000000000000000' +
                     '0000000000000000000000000000000000000000000000000000000000000001' +
                     'de00000000000000000000000000000000000000000000000000000000000000' })
+        test({
+            types: ['uint256', 'uint256'],
+            values: [new BN(42), new BN(42)],
+            expected: '000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a'
+        });
+        test({
+            types: ['uint256', 'uint256'],
+            values: [new BigNumber(42), new BigNumber(42)],
+            expected: '000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a'
+        });
     });
 });