Merge branch 'development' into fix/dev-tools-pages/finalTouches

* development: (87 commits)
  Update packages/sol-tracing-utils/src/trace_collection_subprovider.ts
  Make mapping namings direct
  Remove unused tslint disable
  Revert "Remove logAsyncErrors hack"
  Remove logAsyncErrors hack
  Refactor logAsyncErrors to follow our conventions
  Export Sources and SourceCodes out of tracing utils
  Replace console.log with logUtils.log (#1515)
  strict decoding of return values using generics
  makerAssetFillAmount -> takerAssetFillAmount
  Ran prettier
  Linter
  Fix build after rebase
  Style cleanup for Compressed Calldata in Contract Wrappers PR
  Use simpler `_.find` to locate fillOrderBai
  Updated dutch auction wrapper
  Added back abi-gen-wrappers
  Renamed signatureParser.ts to signature_parser.ts
  Renamed decode rule `structsAsObjects` to `shouldConvertStructsToObjects`
  circle build failed. New commit to resubmit job.
  ...

contracts/examples/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/examples/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/examples/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-examples",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -33,12 +33,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -58,20 +58,20 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-interfaces": "^1.0.3",
+        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.3",
+        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-multisig": "^1.0.3",
+        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-tokens": "^1.0.3",
+        "@0x/contracts-tokens": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.3",
+        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },

contracts/extensions/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "1.2.0",
         "changes": [

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.2.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.2.0 - _January 9, 2019_
 
     * Added Dutch Auction Wrapper (#1465)

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,13 +44,13 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/contract-wrappers": "^4.2.0",
+        "@0x/contract-wrappers": "^4.2.1",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -70,20 +70,20 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-interfaces": "^1.0.3",
+        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.3",
+        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-protocol": "^2.2.0",
+        "@0x/contracts-protocol": "^2.2.1",
-        "@0x/contracts-tokens": "^1.0.3",
+        "@0x/contracts-tokens": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.3",
+        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },

contracts/extensions/test/extensions/balance_threshold_filter.ts

@@ -1457,7 +1457,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                 validSignedOrder,
             );
-            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             // Cancel
             const txReceipt = await erc721MakerBalanceThresholdWrapper.cancelOrderAsync(
                 validSignedOrder,
@@ -1470,7 +1470,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                 validSignedOrder,
             );
-            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
         });
         it('Should successfully cancel order if maker does not meet balance threshold', async () => {
             // Create order where maker does not meet balance threshold
@@ -1479,7 +1479,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                 signedOrderWithBadMakerAddress,
             );
-            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             // Cancel
             const txReceipt = await erc721NonValidBalanceThresholdWrapper.cancelOrderAsync(
                 signedOrderWithBadMakerAddress,
@@ -1492,7 +1492,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                 signedOrderWithBadMakerAddress,
             );
-            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
         });
     });
 
@@ -1512,7 +1512,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const txReceipt = await erc721MakerBalanceThresholdWrapper.batchCancelOrdersAsync(
@@ -1527,7 +1527,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
             });
         });
         it('Should successfully batch cancel order if maker does not meet balance threshold', async () => {
@@ -1542,7 +1542,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const txReceipt = await erc721NonValidBalanceThresholdWrapper.batchCancelOrdersAsync(
@@ -1557,7 +1557,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoAfterCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
             });
         });
     });
@@ -1578,7 +1578,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const cancelOrdersUpToThisSalt = new BigNumber(1);
@@ -1596,9 +1596,9 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 );
                 const saltAsBigNumber = new BigNumber(salt);
                 if (saltAsBigNumber.lessThanOrEqualTo(cancelOrdersUpToThisSalt)) {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
                 } else {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
                 }
             });
         });
@@ -1614,7 +1614,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const cancelOrdersUpToThisSalt = new BigNumber(1);
@@ -1632,9 +1632,9 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 );
                 const saltAsBigNumber = new BigNumber(salt);
                 if (saltAsBigNumber.lessThanOrEqualTo(cancelOrdersUpToThisSalt)) {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
                 } else {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
                 }
             });
         });

contracts/extensions/test/extensions/order_validator.ts

@@ -432,7 +432,7 @@ describe('OrderValidator', () => {
                 takerAddress,
             );
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
-            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
@@ -485,7 +485,7 @@ describe('OrderValidator', () => {
                 takerAddress,
             );
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
-            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo.makerBalance).to.be.bignumber.equal(makerBalance);
@@ -514,10 +514,10 @@ describe('OrderValidator', () => {
             ] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
             const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
-            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
             expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
             expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo1.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
@@ -581,10 +581,10 @@ describe('OrderValidator', () => {
             ] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
             const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
-            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
             expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
             expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo1.makerBalance).to.be.bignumber.equal(makerBalance);

contracts/interfaces/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/interfaces/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/interfaces/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-interfaces",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,9 +30,9 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/interfaces/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -41,14 +41,14 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-libs": "^1.0.3",
+        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.3",
+        "@0x/contracts-utils": "^1.0.4",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "lodash": "^4.17.5"
     },
     "publishConfig": {

contracts/libs/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/libs/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-libs",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -69,17 +69,17 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-multisig": "^1.0.3",
+        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.3",
+        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },

contracts/multisig/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-abi": "^0.6.0",
         "@types/lodash": "4.14.104",
@@ -69,13 +69,13 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "lodash": "^4.17.5"
     },
     "publishConfig": {

contracts/protocol/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "2.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.2.0",
         "changes": [

contracts/protocol/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.2.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v2.2.0 - _January 9, 2019_
 
     * Added LibAddressArray (#1383)

contracts/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-protocol",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,11 +44,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -68,22 +68,22 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-examples": "^1.0.3",
+        "@0x/contracts-examples": "^1.0.4",
-        "@0x/contracts-interfaces": "^1.0.3",
+        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.3",
+        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-multisig": "^1.0.3",
+        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/contracts-tokens": "^1.0.3",
+        "@0x/contracts-tokens": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.3",
+        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },

contracts/protocol/test/exchange/core.ts

@@ -1043,7 +1043,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.FILLABLE;
+            const expectedOrderStatus = OrderStatus.Fillable;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1053,7 +1053,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
-            const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+            const expectedOrderStatus = OrderStatus.FullyFilled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1064,7 +1064,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = takerAssetFillAmount;
-            const expectedOrderStatus = OrderStatus.FILLABLE;
+            const expectedOrderStatus = OrderStatus.Fillable;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1074,7 +1074,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.CANCELLED;
+            const expectedOrderStatus = OrderStatus.Cancelled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1086,7 +1086,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = takerAssetFillAmount;
-            const expectedOrderStatus = OrderStatus.CANCELLED;
+            const expectedOrderStatus = OrderStatus.Cancelled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1098,7 +1098,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.EXPIRED;
+            const expectedOrderStatus = OrderStatus.Expired;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1112,7 +1112,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = takerAssetFillAmount;
-            const expectedOrderStatus = OrderStatus.EXPIRED;
+            const expectedOrderStatus = OrderStatus.Expired;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1126,7 +1126,7 @@ describe('Exchange core', () => {
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
             // FULLY_FILLED takes precedence over EXPIRED
-            const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+            const expectedOrderStatus = OrderStatus.FullyFilled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1136,7 +1136,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.INVALID_MAKER_ASSET_AMOUNT;
+            const expectedOrderStatus = OrderStatus.InvalidMakerAssetAmount;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1146,7 +1146,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.INVALID_TAKER_ASSET_AMOUNT;
+            const expectedOrderStatus = OrderStatus.InvalidTakerAssetAmount;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);

contracts/protocol/test/exchange/wrapper.ts

@@ -1288,7 +1288,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = new BigNumber(0);
-                    const expectedOrderStatus = OrderStatus.FILLABLE;
+                    const expectedOrderStatus = OrderStatus.Fillable;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1303,7 +1303,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
-                    const expectedOrderStatus = OrderStatus.FILLABLE;
+                    const expectedOrderStatus = OrderStatus.Fillable;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1317,7 +1317,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
-                    const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+                    const expectedOrderStatus = OrderStatus.FullyFilled;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1331,7 +1331,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = new BigNumber(0);
-                    const expectedOrderStatus = OrderStatus.CANCELLED;
+                    const expectedOrderStatus = OrderStatus.Cancelled;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1347,7 +1347,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
-                    const expectedOrderStatus = OrderStatus.CANCELLED;
+                    const expectedOrderStatus = OrderStatus.Cancelled;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1363,7 +1363,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = new BigNumber(0);
-                    const expectedOrderStatus = OrderStatus.EXPIRED;
+                    const expectedOrderStatus = OrderStatus.Expired;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1381,7 +1381,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
-                    const expectedOrderStatus = OrderStatus.EXPIRED;
+                    const expectedOrderStatus = OrderStatus.Expired;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1408,7 +1408,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedUnfilledOrderHash = orderHashUtils.getOrderHashHex(unfilledOrder);
                 const expectedUnfilledTakerAssetFilledAmount = new BigNumber(0);
-                const expectedUnfilledOrderStatus = OrderStatus.FILLABLE;
+                const expectedUnfilledOrderStatus = OrderStatus.Fillable;
                 const unfilledOrderInfo = ordersInfo[0];
                 expect(unfilledOrderInfo.orderHash).to.be.equal(expectedUnfilledOrderHash);
                 expect(unfilledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1418,7 +1418,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedPartialOrderHash = orderHashUtils.getOrderHashHex(partiallyFilledOrder);
                 const expectedPartialTakerAssetFilledAmount = partiallyFilledOrder.takerAssetAmount.div(2);
-                const expectedPartialOrderStatus = OrderStatus.FILLABLE;
+                const expectedPartialOrderStatus = OrderStatus.Fillable;
                 const partialOrderInfo = ordersInfo[1];
                 expect(partialOrderInfo.orderHash).to.be.equal(expectedPartialOrderHash);
                 expect(partialOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1428,7 +1428,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedFilledOrderHash = orderHashUtils.getOrderHashHex(fullyFilledOrder);
                 const expectedFilledTakerAssetFilledAmount = fullyFilledOrder.takerAssetAmount;
-                const expectedFilledOrderStatus = OrderStatus.FULLY_FILLED;
+                const expectedFilledOrderStatus = OrderStatus.FullyFilled;
                 const filledOrderInfo = ordersInfo[2];
                 expect(filledOrderInfo.orderHash).to.be.equal(expectedFilledOrderHash);
                 expect(filledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1438,7 +1438,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedCancelledOrderHash = orderHashUtils.getOrderHashHex(cancelledOrder);
                 const expectedCancelledTakerAssetFilledAmount = new BigNumber(0);
-                const expectedCancelledOrderStatus = OrderStatus.CANCELLED;
+                const expectedCancelledOrderStatus = OrderStatus.Cancelled;
                 const cancelledOrderInfo = ordersInfo[3];
                 expect(cancelledOrderInfo.orderHash).to.be.equal(expectedCancelledOrderHash);
                 expect(cancelledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1448,7 +1448,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedExpiredOrderHash = orderHashUtils.getOrderHashHex(expiredOrder);
                 const expectedExpiredTakerAssetFilledAmount = new BigNumber(0);
-                const expectedExpiredOrderStatus = OrderStatus.EXPIRED;
+                const expectedExpiredOrderStatus = OrderStatus.Expired;
                 const expiredOrderInfo = ordersInfo[4];
                 expect(expiredOrderInfo.orderHash).to.be.equal(expectedExpiredOrderHash);
                 expect(expiredOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(

contracts/protocol/test/utils/exchange_wrapper.ts

@@ -8,13 +8,16 @@ import {
 } from '@0x/contracts-test-utils';
 import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { SignedOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
+import { AbiEncoder, BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
-import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
+import { MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
 
 import { ExchangeContract } from '../../generated-wrappers/exchange';
 import { artifacts } from '../../src/artifacts';
 
+import { AbiDecodedFillOrderData } from './types';
+
 export class ExchangeWrapper {
     private readonly _exchange: ExchangeContract;
     private readonly _web3Wrapper: Web3Wrapper;
@@ -275,6 +278,14 @@ export class ExchangeWrapper {
         );
         return data;
     }
+    public abiDecodeFillOrder(data: string): AbiDecodedFillOrderData {
+        // Lookup fillOrder ABI in exchange abi
+        const fillOrderAbi = _.find(this._exchange.abi, { name: 'fillOrder' }) as MethodAbi;
+        // Decode input data
+        const abiEncoder = new AbiEncoder.Method(fillOrderAbi);
+        const decodedData = abiEncoder.decode(data) as AbiDecodedFillOrderData;
+        return decodedData;
+    }
     public getExchangeAddress(): string {
         return this._exchange.address;
     }

contracts/protocol/test/utils/fill_order_combinatorial_utils.ts

@@ -613,13 +613,13 @@ export class FillOrderCombinatorialUtils {
         takerAssetFillAmount: BigNumber,
     ): Promise<void> {
         const params = orderUtils.createFill(signedOrder, takerAssetFillAmount);
-        const expectedAbiEncodedData = this.exchangeWrapper.abiEncodeFillOrder(signedOrder, { takerAssetFillAmount });
+        const abiDataEncodedByContract = await this.testLibsContract.publicAbiEncodeFillOrder.callAsync(
-        const libsAbiEncodedData = await this.testLibsContract.publicAbiEncodeFillOrder.callAsync(
             params.order,
             params.takerAssetFillAmount,
             params.signature,
         );
-        expect(libsAbiEncodedData).to.be.equal(expectedAbiEncodedData, 'ABIEncodedFillOrderData');
+        const paramsDecodedByClient = this.exchangeWrapper.abiDecodeFillOrder(abiDataEncodedByContract);
+        expect(paramsDecodedByClient).to.be.deep.equal(params, 'ABIEncodedFillOrderData');
     }
     private async _getTakerAssetFillAmountAsync(
         signedOrder: SignedOrder,

contracts/protocol/test/utils/match_order_tester.ts

@@ -268,15 +268,15 @@ export class MatchOrderTester {
         const maxAmountBoughtByLeftMaker = signedOrderLeft.takerAssetAmount.minus(initialLeftOrderFilledAmount);
         const leftOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderLeft);
         const leftExpectedStatus = expectedTransferAmounts.amountBoughtByLeftMaker.equals(maxAmountBoughtByLeftMaker)
-            ? OrderStatus.FULLY_FILLED
+            ? OrderStatus.FullyFilled
-            : OrderStatus.FILLABLE;
+            : OrderStatus.Fillable;
         expect(leftOrderInfo.orderStatus, 'Checking exchange status for left order').to.be.equal(leftExpectedStatus);
         // Assert right order status
         const maxAmountBoughtByRightMaker = signedOrderRight.takerAssetAmount.minus(initialRightOrderFilledAmount);
         const rightOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderRight);
         const rightExpectedStatus = expectedTransferAmounts.amountBoughtByRightMaker.equals(maxAmountBoughtByRightMaker)
-            ? OrderStatus.FULLY_FILLED
+            ? OrderStatus.FullyFilled
-            : OrderStatus.FILLABLE;
+            : OrderStatus.Fillable;
         expect(rightOrderInfo.orderStatus, 'Checking exchange status for right order').to.be.equal(rightExpectedStatus);
     }
     /// @dev Asserts account balances after matching orders.

contracts/protocol/test/utils/types.ts

@@ -0,0 +1,8 @@
+import { SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+
+export interface AbiDecodedFillOrderData {
+    order: SignedOrder;
+    takerAssetFillAmount: BigNumber;
+    signature: string;
+}

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule",
+                "pr": 1474
+            }
+        ]
+    },
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -40,19 +40,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/sol-coverage": "^1.0.0",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/sol-profiler": "^1.0.0",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-trace": "^1.0.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/sol-coverage": "^1.0.1",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/sol-profiler": "^1.0.1",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-trace": "^1.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-abi": "^0.6.0",
         "@types/js-combinatorics": "^0.5.29",
@@ -63,7 +63,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-abi": "0.6.5",
         "ethereumjs-util": "^5.1.1",
         "ethers": "~4.0.4",

contracts/test-utils/src/types.ts

@@ -70,13 +70,13 @@ export interface Token {
 }
 
 export enum OrderStatus {
-    INVALID,
+    Invalid,
-    INVALID_MAKER_ASSET_AMOUNT,
+    InvalidMakerAssetAmount,
-    INVALID_TAKER_ASSET_AMOUNT,
+    InvalidTakerAssetAmount,
-    FILLABLE,
+    Fillable,
-    EXPIRED,
+    Expired,
-    FULLY_FILLED,
+    FullyFilled,
-    CANCELLED,
+    Cancelled,
 }
 
 export enum ContractName {

contracts/tokens/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/tokens/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/tokens/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-tokens",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -69,19 +69,19 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-interfaces": "^1.0.3",
+        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.3",
+        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-multisig": "^1.0.3",
+        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.3",
+        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },

contracts/utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.3",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.0",
+        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -70,14 +70,14 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-multisig": "^1.0.3",
+        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },

packages/0x.js/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "3.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "3.0.0",
         "changes": [

packages/0x.js/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v3.0.0 - _January 9, 2019_
 
     * Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`. (#1363)

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,11 +42,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0x/abi-gen-wrappers": "^2.1.0",
+        "@0x/abi-gen-wrappers": "^2.1.1",
         "@0x/contract-addresses": "^2.1.0",
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/migrations": "^2.3.0",
+        "@0x/migrations": "^2.3.1",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",
@@ -72,18 +72,18 @@
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0x/assert": "^1.0.21",
+        "@0x/assert": "^1.0.22",
-        "@0x/base-contract": "^3.0.11",
+        "@0x/base-contract": "^3.0.12",
-        "@0x/contract-wrappers": "^4.2.0",
+        "@0x/contract-wrappers": "^4.2.1",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/order-watcher": "^2.4.0",
+        "@0x/order-watcher": "^2.4.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/web3-provider-engine": "^14.0.0",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"

packages/abi-gen-templates/contract.handlebars

@@ -85,7 +85,7 @@ export class {{contractName}}Contract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('{{contractName}}', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-templates/partials/callAsync.handlebars

@@ -4,12 +4,7 @@ async callAsync(
     defaultBlock?: BlockParam,
 ): Promise<{{> return_type outputs=outputs}}> {
     const self = this as any as {{contractName}}Contract;
-    const functionSignature = '{{this.functionSignature}}';
+    const encodedData = self._strictEncodeArguments('{{this.functionSignature}}', [{{> params inputs=inputs}}]);
-    const inputAbi = self._lookupAbi(functionSignature).inputs;
-    [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
-    BaseContract.strictArgumentEncodingCheck(inputAbi, [{{> params inputs=inputs}}]);
-    const ethersFunction = self._lookupEthersInterface(functionSignature).functions.{{this.name}};
-    const encodedData = ethersFunction.encode([{{> params inputs=inputs}}]);
     const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
         {
             to: self.address,
@@ -20,9 +15,9 @@ async callAsync(
     );
     const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
     BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-    let resultArray = ethersFunction.decode(rawCallResult);
+    const abiEncoder = self._lookupAbiEncoder('{{this.functionSignature}}');
-    const outputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).outputs;
+    // tslint:disable boolean-naming
-    resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+    const result = abiEncoder.strictDecodeReturnValue<{{> return_type outputs=outputs}}>(rawCallResult);
-    resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+    // tslint:enable boolean-naming
-    return resultArray{{#singleReturnValue}}[0]{{/singleReturnValue}};
+    return result;
 },

packages/abi-gen-templates/partials/tx.handlebars

@@ -9,10 +9,7 @@ public {{this.tsName}} = {
     {{/this.payable}}
     ): Promise<string> {
         const self = this as any as {{contractName}}Contract;
-        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+        const encodedData = self._strictEncodeArguments('{{this.functionSignature}}', [{{> params inputs=inputs}}]);
-        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
-        BaseContract.strictArgumentEncodingCheck(inputAbi, [{{> params inputs=inputs}}]);
-        const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}.encode([{{> params inputs=inputs}}]);
         const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
             {
                 to: self.address,
@@ -33,9 +30,7 @@ public {{this.tsName}} = {
         txData: Partial<TxData> = {},
     ): Promise<number> {
         const self = this as any as {{contractName}}Contract;
-        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+        const encodedData = self._strictEncodeArguments('{{this.functionSignature}}', [{{> params inputs=inputs}}]);
-        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString);
-        const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}.encode([{{> params inputs=inputs}}]);
         const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
             {
                 to: self.address,
@@ -51,9 +46,7 @@ public {{this.tsName}} = {
     {{> typed_params inputs=inputs}}
     ): string {
         const self = this as any as {{contractName}}Contract;
-        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+        const abiEncodedTransactionData = self._strictEncodeArguments('{{this.functionSignature}}', [{{> params inputs=inputs}}]);
-        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString);
-        const abiEncodedTransactionData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}.encode([{{> params inputs=inputs}}]);
         return abiEncodedTransactionData;
     },
     {{> callAsync}}

packages/abi-gen-wrappers/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "version": "2.2.0",
+        "changes": [
+            {
+                "note": "Added `MultiAssetProxy`",
+                "pr": 1503
+            }
+        ]
+    },
+    {
+        "timestamp": 1547225310,
+        "version": "2.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.1.0",
         "changes": [

packages/abi-gen-wrappers/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v2.1.0 - _January 9, 2019_
 
     * Added Dutch Auction Wrapper (#1465)

packages/abi-gen-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/abi-gen-wrappers",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -18,7 +18,7 @@
         "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers"
     },
     "config": {
-        "abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DutchAuction|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IValidator|IWallet|OrderValidator|WETH9|ZRXToken).json"
+        "abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DutchAuction|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IValidator|IWallet|MultiAssetProxy|OrderValidator|WETH9|ZRXToken).json"
     },
     "repository": {
         "type": "git",
@@ -30,19 +30,19 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
+        "@0x/abi-gen": "^1.0.21",
         "@0x/abi-gen-templates": "^1.0.1",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5",
         "shx": "^0.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11"
+        "@0x/base-contract": "^3.0.12"
     },
     "publishConfig": {
         "access": "public"

packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts

@@ -43,12 +43,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'name()';
+            const encodedData = self._strictEncodeArguments('name()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.name;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -59,11 +54,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('name()');
-            const outputAbi = (_.find(self.abi, {name: 'name'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public approve = {
@@ -73,16 +69,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_spender,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -107,13 +94,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -132,13 +113,7 @@ export class DummyERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -151,18 +126,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'approve(address,uint256)';
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_spender,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_spender,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.approve;
-            const encodedData = ethersFunction.encode([_spender,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -175,11 +139,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('approve(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'approve'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public totalSupply = {
@@ -189,12 +154,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'totalSupply()';
+            const encodedData = self._strictEncodeArguments('totalSupply()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.totalSupply;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -205,11 +165,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('totalSupply()');
-            const outputAbi = (_.find(self.abi, {name: 'totalSupply'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferFrom = {
@@ -220,19 +181,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -260,15 +209,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -289,15 +230,7 @@ export class DummyERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -312,21 +245,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'transferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _value
         ]);
@@ -340,11 +259,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public decimals = {
@@ -354,12 +274,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'decimals()';
+            const encodedData = self._strictEncodeArguments('decimals()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.decimals;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -370,11 +285,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('decimals()');
-            const outputAbi = (_.find(self.abi, {name: 'decimals'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public balanceOf = {
@@ -385,15 +301,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'balanceOf(address)';
+            const encodedData = self._strictEncodeArguments('balanceOf(address)', [_owner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.balanceOf;
-            const encodedData = ethersFunction.encode([_owner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -405,11 +313,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('balanceOf(address)');
-            const outputAbi = (_.find(self.abi, {name: 'balanceOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public owner = {
@@ -419,12 +328,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'owner()';
+            const encodedData = self._strictEncodeArguments('owner()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.owner;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -435,11 +339,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('owner()');
-            const outputAbi = (_.find(self.abi, {name: 'owner'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public symbol = {
@@ -449,12 +354,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'symbol()';
+            const encodedData = self._strictEncodeArguments('symbol()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.symbol;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -465,11 +365,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('symbol()');
-            const outputAbi = (_.find(self.abi, {name: 'symbol'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public mint = {
@@ -478,13 +379,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('mint(uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('mint(uint256)', [_value
-            [_value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_value
-    ]);
-            const encodedData = self._lookupEthersInterface('mint(uint256)').functions.mint.encode([_value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -506,11 +401,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('mint(uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('mint(uint256)', [_value
-            [_value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('mint(uint256)').functions.mint.encode([_value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -527,11 +418,7 @@ export class DummyERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('mint(uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('mint(uint256)', [_value
-            [_value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('mint(uint256)').functions.mint.encode([_value
     ]);
             return abiEncodedTransactionData;
         },
@@ -542,15 +429,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'mint(uint256)';
+            const encodedData = self._strictEncodeArguments('mint(uint256)', [_value
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.mint;
-            const encodedData = ethersFunction.encode([_value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -562,11 +441,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('mint(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'mint'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transfer = {
@@ -576,16 +456,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -610,13 +481,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -635,13 +500,7 @@ export class DummyERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -654,18 +513,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'transfer(address,uint256)';
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_to,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transfer;
-            const encodedData = ethersFunction.encode([_to,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -678,11 +526,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transfer(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transfer'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public allowance = {
@@ -694,18 +543,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'allowance(address,address)';
+            const encodedData = self._strictEncodeArguments('allowance(address,address)', [_owner,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner,
-        _spender
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-        _spender
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-        _spender
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.allowance;
-            const encodedData = ethersFunction.encode([_owner,
         _spender
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -718,11 +556,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('allowance(address,address)');
-            const outputAbi = (_.find(self.abi, {name: 'allowance'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public setBalance = {
@@ -732,16 +571,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('setBalance(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target,
-            [_target,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_target,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_target,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('setBalance(address,uint256)').functions.setBalance.encode([_target,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -766,13 +596,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('setBalance(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target,
-            [_target,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_target,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('setBalance(address,uint256)').functions.setBalance.encode([_target,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -791,13 +615,7 @@ export class DummyERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('setBalance(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('setBalance(address,uint256)', [_target,
-            [_target,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_target,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('setBalance(address,uint256)').functions.setBalance.encode([_target,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -810,18 +628,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'setBalance(address,uint256)';
+            const encodedData = self._strictEncodeArguments('setBalance(address,uint256)', [_target,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_target,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_target,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_target,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.setBalance;
-            const encodedData = ethersFunction.encode([_target,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -834,11 +641,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('setBalance(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'setBalance'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferOwnership = {
@@ -847,13 +655,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-    ]);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -875,11 +677,7 @@ export class DummyERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -896,11 +694,7 @@ export class DummyERC20TokenContract extends BaseContract {
             newOwner: string,
         ): string {
             const self = this as any as DummyERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             return abiEncodedTransactionData;
         },
@@ -911,15 +705,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'transferOwnership(address)';
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [newOwner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferOwnership;
-            const encodedData = ethersFunction.encode([newOwner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -931,11 +717,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferOwnership(address)');
-            const outputAbi = (_.find(self.abi, {name: 'transferOwnership'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public MAX_MINT_AMOUNT = {
@@ -945,12 +732,7 @@ export class DummyERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as DummyERC20TokenContract;
-            const functionSignature = 'MAX_MINT_AMOUNT()';
+            const encodedData = self._strictEncodeArguments('MAX_MINT_AMOUNT()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.MAX_MINT_AMOUNT;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -961,11 +743,12 @@ export class DummyERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('MAX_MINT_AMOUNT()');
-            const outputAbi = (_.find(self.abi, {name: 'MAX_MINT_AMOUNT'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -1039,7 +822,7 @@ _totalSupply
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('DummyERC20Token', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts

@@ -51,12 +51,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'name()';
+            const encodedData = self._strictEncodeArguments('name()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.name;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -67,11 +62,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('name()');
-            const outputAbi = (_.find(self.abi, {name: 'name'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getApproved = {
@@ -82,15 +78,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'getApproved(uint256)';
+            const encodedData = self._strictEncodeArguments('getApproved(uint256)', [_tokenId
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getApproved;
-            const encodedData = ethersFunction.encode([_tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -102,11 +90,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getApproved(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'getApproved'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public approve = {
@@ -116,16 +105,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            [_approved,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_approved,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_approved,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -150,13 +130,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            [_approved,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_approved,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -175,13 +149,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            [_approved,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_approved,
     _tokenId
     ]);
             return abiEncodedTransactionData;
@@ -194,18 +162,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'approve(address,uint256)';
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_approved,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_approved,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.approve;
-            const encodedData = ethersFunction.encode([_approved,
         _tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -218,11 +175,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('approve(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'approve'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferFrom = {
@@ -233,19 +191,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -273,15 +219,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -302,15 +240,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -325,21 +255,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'transferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _tokenId
         ]);
@@ -353,11 +269,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public mint = {
@@ -367,16 +284,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('mint(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to,
-            [_to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('mint(address,uint256)').functions.mint.encode([_to,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -401,13 +309,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('mint(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to,
-            [_to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('mint(address,uint256)').functions.mint.encode([_to,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -426,13 +328,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('mint(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('mint(address,uint256)', [_to,
-            [_to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('mint(address,uint256)').functions.mint.encode([_to,
     _tokenId
     ]);
             return abiEncodedTransactionData;
@@ -445,18 +341,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'mint(address,uint256)';
+            const encodedData = self._strictEncodeArguments('mint(address,uint256)', [_to,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_to,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.mint;
-            const encodedData = ethersFunction.encode([_to,
         _tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -469,11 +354,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('mint(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'mint'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public safeTransferFrom1 = {
@@ -484,19 +370,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -524,15 +398,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -553,15 +419,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -576,21 +434,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'safeTransferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.safeTransferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _tokenId
         ]);
@@ -604,11 +448,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('safeTransferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'safeTransferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public ownerOf = {
@@ -619,15 +464,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'ownerOf(uint256)';
+            const encodedData = self._strictEncodeArguments('ownerOf(uint256)', [_tokenId
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.ownerOf;
-            const encodedData = ethersFunction.encode([_tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -639,11 +476,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('ownerOf(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'ownerOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public balanceOf = {
@@ -654,15 +492,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'balanceOf(address)';
+            const encodedData = self._strictEncodeArguments('balanceOf(address)', [_owner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.balanceOf;
-            const encodedData = ethersFunction.encode([_owner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -674,11 +504,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('balanceOf(address)');
-            const outputAbi = (_.find(self.abi, {name: 'balanceOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public owner = {
@@ -688,12 +519,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'owner()';
+            const encodedData = self._strictEncodeArguments('owner()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.owner;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -704,11 +530,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('owner()');
-            const outputAbi = (_.find(self.abi, {name: 'owner'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public symbol = {
@@ -718,12 +545,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'symbol()';
+            const encodedData = self._strictEncodeArguments('symbol()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.symbol;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -734,11 +556,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('symbol()');
-            const outputAbi = (_.find(self.abi, {name: 'symbol'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public burn = {
@@ -748,16 +571,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('burn(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner,
-            [_owner,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('burn(address,uint256)').functions.burn.encode([_owner,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -782,13 +596,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('burn(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner,
-            [_owner,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('burn(address,uint256)').functions.burn.encode([_owner,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -807,13 +615,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('burn(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('burn(address,uint256)', [_owner,
-            [_owner,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('burn(address,uint256)').functions.burn.encode([_owner,
     _tokenId
     ]);
             return abiEncodedTransactionData;
@@ -826,18 +628,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'burn(address,uint256)';
+            const encodedData = self._strictEncodeArguments('burn(address,uint256)', [_owner,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.burn;
-            const encodedData = ethersFunction.encode([_owner,
         _tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -850,11 +641,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('burn(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'burn'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public setApprovalForAll = {
@@ -864,16 +656,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('setApprovalForAll(address,bool)').inputs;
+            const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            [_operator,
-    _approved
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-    _approved
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_operator,
-    _approved
-    ]);
-            const encodedData = self._lookupEthersInterface('setApprovalForAll(address,bool)').functions.setApprovalForAll.encode([_operator,
     _approved
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -898,13 +681,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('setApprovalForAll(address,bool)').inputs;
+            const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            [_operator,
-    _approved
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-    _approved
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('setApprovalForAll(address,bool)').functions.setApprovalForAll.encode([_operator,
     _approved
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -923,13 +700,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _approved: boolean,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('setApprovalForAll(address,bool)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            [_operator,
-    _approved
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-    _approved
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('setApprovalForAll(address,bool)').functions.setApprovalForAll.encode([_operator,
     _approved
     ]);
             return abiEncodedTransactionData;
@@ -942,18 +713,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'setApprovalForAll(address,bool)';
+            const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_operator,
-        _approved
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-        _approved
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_operator,
-        _approved
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.setApprovalForAll;
-            const encodedData = ethersFunction.encode([_operator,
         _approved
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -966,11 +726,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('setApprovalForAll(address,bool)');
-            const outputAbi = (_.find(self.abi, {name: 'setApprovalForAll'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public safeTransferFrom2 = {
@@ -982,22 +743,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256,bytes)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            [_from,
-    _to,
-    _tokenId,
-    _data
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ]);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256,bytes)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId,
     _data
@@ -1028,17 +774,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256,bytes)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            [_from,
-    _to,
-    _tokenId,
-    _data
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256,bytes)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId,
     _data
@@ -1061,17 +797,7 @@ export class DummyERC721TokenContract extends BaseContract {
             _data: string,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256,bytes)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            [_from,
-    _to,
-    _tokenId,
-    _data
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256,bytes)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId,
     _data
@@ -1088,24 +814,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'safeTransferFrom(address,address,uint256,bytes)';
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _tokenId,
-        _data
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _tokenId,
-        _data
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _tokenId,
-        _data
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.safeTransferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _tokenId,
         _data
@@ -1120,11 +829,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('safeTransferFrom(address,address,uint256,bytes)');
-            const outputAbi = (_.find(self.abi, {name: 'safeTransferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public isApprovedForAll = {
@@ -1136,18 +846,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'isApprovedForAll(address,address)';
+            const encodedData = self._strictEncodeArguments('isApprovedForAll(address,address)', [_owner,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner,
-        _operator
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-        _operator
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-        _operator
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.isApprovedForAll;
-            const encodedData = ethersFunction.encode([_owner,
         _operator
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -1160,11 +859,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('isApprovedForAll(address,address)');
-            const outputAbi = (_.find(self.abi, {name: 'isApprovedForAll'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferOwnership = {
@@ -1173,13 +873,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-    ]);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -1201,11 +895,7 @@ export class DummyERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -1222,11 +912,7 @@ export class DummyERC721TokenContract extends BaseContract {
             newOwner: string,
         ): string {
             const self = this as any as DummyERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             return abiEncodedTransactionData;
         },
@@ -1237,15 +923,7 @@ export class DummyERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as DummyERC721TokenContract;
-            const functionSignature = 'transferOwnership(address)';
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [newOwner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferOwnership;
-            const encodedData = ethersFunction.encode([newOwner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -1257,11 +935,12 @@ export class DummyERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferOwnership(address)');
-            const outputAbi = (_.find(self.abi, {name: 'transferOwnership'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -1321,7 +1000,7 @@ _symbol
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('DummyERC721Token', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts

@@ -21,13 +21,7 @@ export class DutchAuctionContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DutchAuctionContract;
-            const inputAbi = self._lookupAbi('getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})').inputs;
+            const encodedData = self._strictEncodeArguments('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order
-            [order
-    ] = BaseContract._formatABIDataItemList(inputAbi, [order
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [order
-    ]);
-            const encodedData = self._lookupEthersInterface('getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})').functions.getAuctionDetails.encode([order
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -49,11 +43,7 @@ export class DutchAuctionContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DutchAuctionContract;
-            const inputAbi = self._lookupAbi('getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})').inputs;
+            const encodedData = self._strictEncodeArguments('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order
-            [order
-    ] = BaseContract._formatABIDataItemList(inputAbi, [order
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})').functions.getAuctionDetails.encode([order
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -70,11 +60,7 @@ export class DutchAuctionContract extends BaseContract {
             order: {makerAddress: string;takerAddress: string;feeRecipientAddress: string;senderAddress: string;makerAssetAmount: BigNumber;takerAssetAmount: BigNumber;makerFee: BigNumber;takerFee: BigNumber;expirationTimeSeconds: BigNumber;salt: BigNumber;makerAssetData: string;takerAssetData: string},
         ): string {
             const self = this as any as DutchAuctionContract;
-            const inputAbi = self._lookupAbi('getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order
-            [order
-    ] = BaseContract._formatABIDataItemList(inputAbi, [order
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})').functions.getAuctionDetails.encode([order
     ]);
             return abiEncodedTransactionData;
         },
@@ -85,15 +71,7 @@ export class DutchAuctionContract extends BaseContract {
         ): Promise<{beginTimeSeconds: BigNumber;endTimeSeconds: BigNumber;beginAmount: BigNumber;endAmount: BigNumber;currentAmount: BigNumber;currentTimeSeconds: BigNumber}
         > {
             const self = this as any as DutchAuctionContract;
-            const functionSignature = 'getAuctionDetails({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes})';
+            const encodedData = self._strictEncodeArguments('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))', [order
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [order
-        ] = BaseContract._formatABIDataItemList(inputAbi, [order
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [order
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getAuctionDetails;
-            const encodedData = ethersFunction.encode([order
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -105,11 +83,12 @@ export class DutchAuctionContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getAuctionDetails((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes))');
-            const outputAbi = (_.find(self.abi, {name: 'getAuctionDetails'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<{beginTimeSeconds: BigNumber;endTimeSeconds: BigNumber;beginAmount: BigNumber;endAmount: BigNumber;currentAmount: BigNumber;currentTimeSeconds: BigNumber}
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public matchOrders = {
@@ -121,22 +100,7 @@ export class DutchAuctionContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as DutchAuctionContract;
-            const inputAbi = self._lookupAbi('matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)').inputs;
+            const encodedData = self._strictEncodeArguments('matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', [buyOrder,
-            [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ] = BaseContract._formatABIDataItemList(inputAbi, [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ]);
-            const encodedData = self._lookupEthersInterface('matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)').functions.matchOrders.encode([buyOrder,
     sellOrder,
     buySignature,
     sellSignature
@@ -167,17 +131,7 @@ export class DutchAuctionContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as DutchAuctionContract;
-            const inputAbi = self._lookupAbi('matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)').inputs;
+            const encodedData = self._strictEncodeArguments('matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', [buyOrder,
-            [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ] = BaseContract._formatABIDataItemList(inputAbi, [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)').functions.matchOrders.encode([buyOrder,
     sellOrder,
     buySignature,
     sellSignature
@@ -200,17 +154,7 @@ export class DutchAuctionContract extends BaseContract {
             sellSignature: string,
         ): string {
             const self = this as any as DutchAuctionContract;
-            const inputAbi = self._lookupAbi('matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', [buyOrder,
-            [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ] = BaseContract._formatABIDataItemList(inputAbi, [buyOrder,
-    sellOrder,
-    buySignature,
-    sellSignature
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)').functions.matchOrders.encode([buyOrder,
     sellOrder,
     buySignature,
     sellSignature
@@ -227,24 +171,7 @@ export class DutchAuctionContract extends BaseContract {
         ): Promise<{left: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};right: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};leftMakerAssetSpreadAmount: BigNumber}
         > {
             const self = this as any as DutchAuctionContract;
-            const functionSignature = 'matchOrders({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},{address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},bytes,bytes)';
+            const encodedData = self._strictEncodeArguments('matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)', [buyOrder,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [buyOrder,
-        sellOrder,
-        buySignature,
-        sellSignature
-        ] = BaseContract._formatABIDataItemList(inputAbi, [buyOrder,
-        sellOrder,
-        buySignature,
-        sellSignature
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [buyOrder,
-        sellOrder,
-        buySignature,
-        sellSignature
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.matchOrders;
-            const encodedData = ethersFunction.encode([buyOrder,
         sellOrder,
         buySignature,
         sellSignature
@@ -259,11 +186,12 @@ export class DutchAuctionContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('matchOrders((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),bytes,bytes)');
-            const outputAbi = (_.find(self.abi, {name: 'matchOrders'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<{left: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};right: {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber};leftMakerAssetSpreadAmount: BigNumber}
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -316,7 +244,7 @@ export class DutchAuctionContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('DutchAuction', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts

@@ -40,13 +40,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-    ]);
-            const encodedData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -68,11 +62,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -89,11 +79,7 @@ export class ERC20ProxyContract extends BaseContract {
             target: string,
         ): string {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
     ]);
             return abiEncodedTransactionData;
         },
@@ -104,15 +90,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'addAuthorizedAddress(address)';
+            const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.addAuthorizedAddress;
-            const encodedData = ethersFunction.encode([target
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -124,11 +102,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('addAuthorizedAddress(address)');
-            const outputAbi = (_.find(self.abi, {name: 'addAuthorizedAddress'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public authorities = {
@@ -139,15 +118,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'authorities(uint256)';
+            const encodedData = self._strictEncodeArguments('authorities(uint256)', [index_0
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [index_0
-        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.authorities;
-            const encodedData = ethersFunction.encode([index_0
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -159,11 +130,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('authorities(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'authorities'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public removeAuthorizedAddress = {
@@ -172,13 +144,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-    ]);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -200,11 +166,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -221,11 +183,7 @@ export class ERC20ProxyContract extends BaseContract {
             target: string,
         ): string {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
     ]);
             return abiEncodedTransactionData;
         },
@@ -236,15 +194,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'removeAuthorizedAddress(address)';
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.removeAuthorizedAddress;
-            const encodedData = ethersFunction.encode([target
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -256,11 +206,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('removeAuthorizedAddress(address)');
-            const outputAbi = (_.find(self.abi, {name: 'removeAuthorizedAddress'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public owner = {
@@ -270,12 +221,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'owner()';
+            const encodedData = self._strictEncodeArguments('owner()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.owner;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -286,11 +232,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('owner()');
-            const outputAbi = (_.find(self.abi, {name: 'owner'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public removeAuthorizedAddressAtIndex = {
@@ -300,16 +247,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            [target,
-    index
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-    index
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
-    index
-    ]);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
     index
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -334,13 +272,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            [target,
-    index
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-    index
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
     index
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -359,13 +291,7 @@ export class ERC20ProxyContract extends BaseContract {
             index: BigNumber,
         ): string {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            [target,
-    index
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-    index
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
     index
     ]);
             return abiEncodedTransactionData;
@@ -378,18 +304,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'removeAuthorizedAddressAtIndex(address,uint256)';
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target,
-        index
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-        index
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
-        index
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.removeAuthorizedAddressAtIndex;
-            const encodedData = ethersFunction.encode([target,
         index
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -402,11 +317,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('removeAuthorizedAddressAtIndex(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'removeAuthorizedAddressAtIndex'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getProxyId = {
@@ -416,12 +332,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'getProxyId()';
+            const encodedData = self._strictEncodeArguments('getProxyId()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getProxyId;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -432,11 +343,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getProxyId()');
-            const outputAbi = (_.find(self.abi, {name: 'getProxyId'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public authorized = {
@@ -447,15 +359,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'authorized(address)';
+            const encodedData = self._strictEncodeArguments('authorized(address)', [index_0
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [index_0
-        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.authorized;
-            const encodedData = ethersFunction.encode([index_0
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -467,11 +371,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('authorized(address)');
-            const outputAbi = (_.find(self.abi, {name: 'authorized'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getAuthorizedAddresses = {
@@ -481,12 +386,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<string[]
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'getAuthorizedAddresses()';
+            const encodedData = self._strictEncodeArguments('getAuthorizedAddresses()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getAuthorizedAddresses;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -497,11 +397,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getAuthorizedAddresses()');
-            const outputAbi = (_.find(self.abi, {name: 'getAuthorizedAddresses'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string[]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferOwnership = {
@@ -510,13 +411,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-    ]);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -538,11 +433,7 @@ export class ERC20ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -559,11 +450,7 @@ export class ERC20ProxyContract extends BaseContract {
             newOwner: string,
         ): string {
             const self = this as any as ERC20ProxyContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             return abiEncodedTransactionData;
         },
@@ -574,15 +461,7 @@ export class ERC20ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC20ProxyContract;
-            const functionSignature = 'transferOwnership(address)';
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [newOwner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferOwnership;
-            const encodedData = ethersFunction.encode([newOwner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -594,11 +473,12 @@ export class ERC20ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferOwnership(address)');
-            const outputAbi = (_.find(self.abi, {name: 'transferOwnership'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -644,7 +524,7 @@ export class ERC20ProxyContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('ERC20Proxy', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts

@@ -43,16 +43,7 @@ export class ERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_spender,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -77,13 +68,7 @@ export class ERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -102,13 +87,7 @@ export class ERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -121,18 +100,7 @@ export class ERC20TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ERC20TokenContract;
-            const functionSignature = 'approve(address,uint256)';
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_spender,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_spender,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.approve;
-            const encodedData = ethersFunction.encode([_spender,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -145,11 +113,12 @@ export class ERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('approve(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'approve'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public totalSupply = {
@@ -159,12 +128,7 @@ export class ERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ERC20TokenContract;
-            const functionSignature = 'totalSupply()';
+            const encodedData = self._strictEncodeArguments('totalSupply()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.totalSupply;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -175,11 +139,12 @@ export class ERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('totalSupply()');
-            const outputAbi = (_.find(self.abi, {name: 'totalSupply'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferFrom = {
@@ -190,19 +155,7 @@ export class ERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -230,15 +183,7 @@ export class ERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -259,15 +204,7 @@ export class ERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -282,21 +219,7 @@ export class ERC20TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ERC20TokenContract;
-            const functionSignature = 'transferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _value
         ]);
@@ -310,11 +233,12 @@ export class ERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public balanceOf = {
@@ -325,15 +249,7 @@ export class ERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ERC20TokenContract;
-            const functionSignature = 'balanceOf(address)';
+            const encodedData = self._strictEncodeArguments('balanceOf(address)', [_owner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.balanceOf;
-            const encodedData = ethersFunction.encode([_owner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -345,11 +261,12 @@ export class ERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('balanceOf(address)');
-            const outputAbi = (_.find(self.abi, {name: 'balanceOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transfer = {
@@ -359,16 +276,7 @@ export class ERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -393,13 +301,7 @@ export class ERC20TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -418,13 +320,7 @@ export class ERC20TokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as ERC20TokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -437,18 +333,7 @@ export class ERC20TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ERC20TokenContract;
-            const functionSignature = 'transfer(address,uint256)';
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_to,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transfer;
-            const encodedData = ethersFunction.encode([_to,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -461,11 +346,12 @@ export class ERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transfer(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transfer'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public allowance = {
@@ -477,18 +363,7 @@ export class ERC20TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ERC20TokenContract;
-            const functionSignature = 'allowance(address,address)';
+            const encodedData = self._strictEncodeArguments('allowance(address,address)', [_owner,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner,
-        _spender
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-        _spender
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-        _spender
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.allowance;
-            const encodedData = ethersFunction.encode([_owner,
         _spender
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -501,11 +376,12 @@ export class ERC20TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('allowance(address,address)');
-            const outputAbi = (_.find(self.abi, {name: 'allowance'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -551,7 +427,7 @@ export class ERC20TokenContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('ERC20Token', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts

@@ -40,13 +40,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-    ]);
-            const encodedData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -68,11 +62,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -89,11 +79,7 @@ export class ERC721ProxyContract extends BaseContract {
             target: string,
         ): string {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
     ]);
             return abiEncodedTransactionData;
         },
@@ -104,15 +90,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'addAuthorizedAddress(address)';
+            const encodedData = self._strictEncodeArguments('addAuthorizedAddress(address)', [target
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.addAuthorizedAddress;
-            const encodedData = ethersFunction.encode([target
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -124,11 +102,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('addAuthorizedAddress(address)');
-            const outputAbi = (_.find(self.abi, {name: 'addAuthorizedAddress'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public authorities = {
@@ -139,15 +118,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'authorities(uint256)';
+            const encodedData = self._strictEncodeArguments('authorities(uint256)', [index_0
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [index_0
-        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.authorities;
-            const encodedData = ethersFunction.encode([index_0
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -159,11 +130,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('authorities(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'authorities'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public removeAuthorizedAddress = {
@@ -172,13 +144,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-    ]);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -200,11 +166,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -221,11 +183,7 @@ export class ERC721ProxyContract extends BaseContract {
             target: string,
         ): string {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            [target
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
     ]);
             return abiEncodedTransactionData;
         },
@@ -236,15 +194,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'removeAuthorizedAddress(address)';
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddress(address)', [target
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.removeAuthorizedAddress;
-            const encodedData = ethersFunction.encode([target
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -256,11 +206,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('removeAuthorizedAddress(address)');
-            const outputAbi = (_.find(self.abi, {name: 'removeAuthorizedAddress'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public owner = {
@@ -270,12 +221,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'owner()';
+            const encodedData = self._strictEncodeArguments('owner()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.owner;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -286,11 +232,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('owner()');
-            const outputAbi = (_.find(self.abi, {name: 'owner'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public removeAuthorizedAddressAtIndex = {
@@ -300,16 +247,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            [target,
-    index
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-    index
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
-    index
-    ]);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
     index
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -334,13 +272,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            [target,
-    index
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-    index
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
     index
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -359,13 +291,7 @@ export class ERC721ProxyContract extends BaseContract {
             index: BigNumber,
         ): string {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            [target,
-    index
-    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-    index
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
     index
     ]);
             return abiEncodedTransactionData;
@@ -378,18 +304,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'removeAuthorizedAddressAtIndex(address,uint256)';
+            const encodedData = self._strictEncodeArguments('removeAuthorizedAddressAtIndex(address,uint256)', [target,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target,
-        index
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-        index
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
-        index
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.removeAuthorizedAddressAtIndex;
-            const encodedData = ethersFunction.encode([target,
         index
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -402,11 +317,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('removeAuthorizedAddressAtIndex(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'removeAuthorizedAddressAtIndex'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getProxyId = {
@@ -416,12 +332,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'getProxyId()';
+            const encodedData = self._strictEncodeArguments('getProxyId()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getProxyId;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -432,11 +343,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getProxyId()');
-            const outputAbi = (_.find(self.abi, {name: 'getProxyId'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public authorized = {
@@ -447,15 +359,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'authorized(address)';
+            const encodedData = self._strictEncodeArguments('authorized(address)', [index_0
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [index_0
-        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.authorized;
-            const encodedData = ethersFunction.encode([index_0
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -467,11 +371,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('authorized(address)');
-            const outputAbi = (_.find(self.abi, {name: 'authorized'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getAuthorizedAddresses = {
@@ -481,12 +386,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<string[]
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'getAuthorizedAddresses()';
+            const encodedData = self._strictEncodeArguments('getAuthorizedAddresses()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getAuthorizedAddresses;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -497,11 +397,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getAuthorizedAddresses()');
-            const outputAbi = (_.find(self.abi, {name: 'getAuthorizedAddresses'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string[]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferOwnership = {
@@ -510,13 +411,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-    ]);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -538,11 +433,7 @@ export class ERC721ProxyContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -559,11 +450,7 @@ export class ERC721ProxyContract extends BaseContract {
             newOwner: string,
         ): string {
             const self = this as any as ERC721ProxyContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             return abiEncodedTransactionData;
         },
@@ -574,15 +461,7 @@ export class ERC721ProxyContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721ProxyContract;
-            const functionSignature = 'transferOwnership(address)';
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [newOwner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferOwnership;
-            const encodedData = ethersFunction.encode([newOwner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -594,11 +473,12 @@ export class ERC721ProxyContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferOwnership(address)');
-            const outputAbi = (_.find(self.abi, {name: 'transferOwnership'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -644,7 +524,7 @@ export class ERC721ProxyContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('ERC721Proxy', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts

@@ -52,15 +52,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'getApproved(uint256)';
+            const encodedData = self._strictEncodeArguments('getApproved(uint256)', [_tokenId
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getApproved;
-            const encodedData = ethersFunction.encode([_tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -72,11 +64,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getApproved(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'getApproved'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public approve = {
@@ -86,16 +79,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            [_approved,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_approved,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_approved,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -120,13 +104,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            [_approved,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_approved,
     _tokenId
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -145,13 +123,7 @@ export class ERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            [_approved,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_approved,
     _tokenId
     ]);
             return abiEncodedTransactionData;
@@ -164,18 +136,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'approve(address,uint256)';
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_approved,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_approved,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_approved,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_approved,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.approve;
-            const encodedData = ethersFunction.encode([_approved,
         _tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -188,11 +149,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('approve(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'approve'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferFrom = {
@@ -203,19 +165,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -243,15 +193,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -272,15 +214,7 @@ export class ERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -295,21 +229,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'transferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _tokenId
         ]);
@@ -323,11 +243,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public safeTransferFrom1 = {
@@ -338,19 +259,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _tokenId
-    ]);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -378,15 +287,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -407,15 +308,7 @@ export class ERC721TokenContract extends BaseContract {
             _tokenId: BigNumber,
         ): string {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _tokenId
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId
     ]);
@@ -430,21 +323,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'safeTransferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.safeTransferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _tokenId
         ]);
@@ -458,11 +337,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('safeTransferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'safeTransferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public ownerOf = {
@@ -473,15 +353,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'ownerOf(uint256)';
+            const encodedData = self._strictEncodeArguments('ownerOf(uint256)', [_tokenId
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.ownerOf;
-            const encodedData = ethersFunction.encode([_tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -493,11 +365,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('ownerOf(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'ownerOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public balanceOf = {
@@ -508,15 +381,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'balanceOf(address)';
+            const encodedData = self._strictEncodeArguments('balanceOf(address)', [_owner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.balanceOf;
-            const encodedData = ethersFunction.encode([_owner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -528,11 +393,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('balanceOf(address)');
-            const outputAbi = (_.find(self.abi, {name: 'balanceOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public setApprovalForAll = {
@@ -542,16 +408,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('setApprovalForAll(address,bool)').inputs;
+            const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            [_operator,
-    _approved
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-    _approved
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_operator,
-    _approved
-    ]);
-            const encodedData = self._lookupEthersInterface('setApprovalForAll(address,bool)').functions.setApprovalForAll.encode([_operator,
     _approved
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -576,13 +433,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('setApprovalForAll(address,bool)').inputs;
+            const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            [_operator,
-    _approved
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-    _approved
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('setApprovalForAll(address,bool)').functions.setApprovalForAll.encode([_operator,
     _approved
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -601,13 +452,7 @@ export class ERC721TokenContract extends BaseContract {
             _approved: boolean,
         ): string {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('setApprovalForAll(address,bool)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            [_operator,
-    _approved
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-    _approved
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('setApprovalForAll(address,bool)').functions.setApprovalForAll.encode([_operator,
     _approved
     ]);
             return abiEncodedTransactionData;
@@ -620,18 +465,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'setApprovalForAll(address,bool)';
+            const encodedData = self._strictEncodeArguments('setApprovalForAll(address,bool)', [_operator,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_operator,
-        _approved
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_operator,
-        _approved
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_operator,
-        _approved
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.setApprovalForAll;
-            const encodedData = ethersFunction.encode([_operator,
         _approved
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -644,11 +478,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('setApprovalForAll(address,bool)');
-            const outputAbi = (_.find(self.abi, {name: 'setApprovalForAll'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public safeTransferFrom2 = {
@@ -660,22 +495,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256,bytes)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            [_from,
-    _to,
-    _tokenId,
-    _data
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ]);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256,bytes)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId,
     _data
@@ -706,17 +526,7 @@ export class ERC721TokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256,bytes)').inputs;
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            [_from,
-    _to,
-    _tokenId,
-    _data
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256,bytes)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId,
     _data
@@ -739,17 +549,7 @@ export class ERC721TokenContract extends BaseContract {
             _data: string,
         ): string {
             const self = this as any as ERC721TokenContract;
-            const inputAbi = self._lookupAbi('safeTransferFrom(address,address,uint256,bytes)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            [_from,
-    _to,
-    _tokenId,
-    _data
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _tokenId,
-    _data
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('safeTransferFrom(address,address,uint256,bytes)').functions.safeTransferFrom.encode([_from,
     _to,
     _tokenId,
     _data
@@ -766,24 +566,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'safeTransferFrom(address,address,uint256,bytes)';
+            const encodedData = self._strictEncodeArguments('safeTransferFrom(address,address,uint256,bytes)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _tokenId,
-        _data
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _tokenId,
-        _data
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _tokenId,
-        _data
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.safeTransferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _tokenId,
         _data
@@ -798,11 +581,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('safeTransferFrom(address,address,uint256,bytes)');
-            const outputAbi = (_.find(self.abi, {name: 'safeTransferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public isApprovedForAll = {
@@ -814,18 +598,7 @@ export class ERC721TokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ERC721TokenContract;
-            const functionSignature = 'isApprovedForAll(address,address)';
+            const encodedData = self._strictEncodeArguments('isApprovedForAll(address,address)', [_owner,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner,
-        _operator
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-        _operator
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-        _operator
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.isApprovedForAll;
-            const encodedData = ethersFunction.encode([_owner,
         _operator
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -838,11 +611,12 @@ export class ERC721TokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('isApprovedForAll(address,address)');
-            const outputAbi = (_.find(self.abi, {name: 'isApprovedForAll'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -888,7 +662,7 @@ export class ERC721TokenContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('ERC721Token', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts

@@ -27,31 +27,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxDataPayable> = {},
         ): Promise<string> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)').inputs;
+            const encodedData = self._strictEncodeArguments('marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ]);
-            const encodedData = self._lookupEthersInterface('marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)').functions.marketBuyOrdersWithEth.encode([orders,
     makerAssetFillAmount,
     signatures,
     feeOrders,
@@ -91,23 +67,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)').inputs;
+            const encodedData = self._strictEncodeArguments('marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)').functions.marketBuyOrdersWithEth.encode([orders,
     makerAssetFillAmount,
     signatures,
     feeOrders,
@@ -136,23 +96,7 @@ export class ForwarderContract extends BaseContract {
             feeRecipient: string,
         ): string {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-    makerAssetFillAmount,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)').functions.marketBuyOrdersWithEth.encode([orders,
     makerAssetFillAmount,
     signatures,
     feeOrders,
@@ -175,33 +119,7 @@ export class ForwarderContract extends BaseContract {
         ): Promise<[{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}, {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}]
         > {
             const self = this as any as ForwarderContract;
-            const functionSignature = 'marketBuyOrdersWithEth(tuple[],uint256,bytes[],tuple[],bytes[],uint256,address)';
+            const encodedData = self._strictEncodeArguments('marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [orders,
-        makerAssetFillAmount,
-        signatures,
-        feeOrders,
-        feeSignatures,
-        feePercentage,
-        feeRecipient
-        ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-        makerAssetFillAmount,
-        signatures,
-        feeOrders,
-        feeSignatures,
-        feePercentage,
-        feeRecipient
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [orders,
-        makerAssetFillAmount,
-        signatures,
-        feeOrders,
-        feeSignatures,
-        feePercentage,
-        feeRecipient
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.marketBuyOrdersWithEth;
-            const encodedData = ethersFunction.encode([orders,
         makerAssetFillAmount,
         signatures,
         feeOrders,
@@ -219,11 +137,12 @@ export class ForwarderContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('marketBuyOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],uint256,bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)');
-            const outputAbi = (_.find(self.abi, {name: 'marketBuyOrdersWithEth'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<[{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}, {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public withdrawAsset = {
@@ -233,16 +152,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('withdrawAsset(bytes,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData,
-            [assetData,
-    amount
-    ] = BaseContract._formatABIDataItemList(inputAbi, [assetData,
-    amount
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [assetData,
-    amount
-    ]);
-            const encodedData = self._lookupEthersInterface('withdrawAsset(bytes,uint256)').functions.withdrawAsset.encode([assetData,
     amount
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -267,13 +177,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('withdrawAsset(bytes,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData,
-            [assetData,
-    amount
-    ] = BaseContract._formatABIDataItemList(inputAbi, [assetData,
-    amount
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('withdrawAsset(bytes,uint256)').functions.withdrawAsset.encode([assetData,
     amount
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -292,13 +196,7 @@ export class ForwarderContract extends BaseContract {
             amount: BigNumber,
         ): string {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('withdrawAsset(bytes,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData,
-            [assetData,
-    amount
-    ] = BaseContract._formatABIDataItemList(inputAbi, [assetData,
-    amount
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('withdrawAsset(bytes,uint256)').functions.withdrawAsset.encode([assetData,
     amount
     ]);
             return abiEncodedTransactionData;
@@ -311,18 +209,7 @@ export class ForwarderContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ForwarderContract;
-            const functionSignature = 'withdrawAsset(bytes,uint256)';
+            const encodedData = self._strictEncodeArguments('withdrawAsset(bytes,uint256)', [assetData,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [assetData,
-        amount
-        ] = BaseContract._formatABIDataItemList(inputAbi, [assetData,
-        amount
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [assetData,
-        amount
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.withdrawAsset;
-            const encodedData = ethersFunction.encode([assetData,
         amount
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -335,11 +222,12 @@ export class ForwarderContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('withdrawAsset(bytes,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'withdrawAsset'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public owner = {
@@ -349,12 +237,7 @@ export class ForwarderContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ForwarderContract;
-            const functionSignature = 'owner()';
+            const encodedData = self._strictEncodeArguments('owner()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.owner;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -365,11 +248,12 @@ export class ForwarderContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('owner()');
-            const outputAbi = (_.find(self.abi, {name: 'owner'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public marketSellOrdersWithEth = {
@@ -383,28 +267,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxDataPayable> = {},
         ): Promise<string> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)').inputs;
+            const encodedData = self._strictEncodeArguments('marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ]);
-            const encodedData = self._lookupEthersInterface('marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)').functions.marketSellOrdersWithEth.encode([orders,
     signatures,
     feeOrders,
     feeSignatures,
@@ -441,21 +304,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)').inputs;
+            const encodedData = self._strictEncodeArguments('marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)').functions.marketSellOrdersWithEth.encode([orders,
     signatures,
     feeOrders,
     feeSignatures,
@@ -482,21 +331,7 @@ export class ForwarderContract extends BaseContract {
             feeRecipient: string,
         ): string {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-    signatures,
-    feeOrders,
-    feeSignatures,
-    feePercentage,
-    feeRecipient
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)').functions.marketSellOrdersWithEth.encode([orders,
     signatures,
     feeOrders,
     feeSignatures,
@@ -517,30 +352,7 @@ export class ForwarderContract extends BaseContract {
         ): Promise<[{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}, {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}]
         > {
             const self = this as any as ForwarderContract;
-            const functionSignature = 'marketSellOrdersWithEth(tuple[],bytes[],tuple[],bytes[],uint256,address)';
+            const encodedData = self._strictEncodeArguments('marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)', [orders,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [orders,
-        signatures,
-        feeOrders,
-        feeSignatures,
-        feePercentage,
-        feeRecipient
-        ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-        signatures,
-        feeOrders,
-        feeSignatures,
-        feePercentage,
-        feeRecipient
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [orders,
-        signatures,
-        feeOrders,
-        feeSignatures,
-        feePercentage,
-        feeRecipient
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.marketSellOrdersWithEth;
-            const encodedData = ethersFunction.encode([orders,
         signatures,
         feeOrders,
         feeSignatures,
@@ -557,11 +369,12 @@ export class ForwarderContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('marketSellOrdersWithEth((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],(address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],bytes[],uint256,address)');
-            const outputAbi = (_.find(self.abi, {name: 'marketSellOrdersWithEth'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<[{makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}, {makerAssetFilledAmount: BigNumber;takerAssetFilledAmount: BigNumber;makerFeePaid: BigNumber;takerFeePaid: BigNumber}]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferOwnership = {
@@ -570,13 +383,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-    ]);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -598,11 +405,7 @@ export class ForwarderContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -619,11 +422,7 @@ export class ForwarderContract extends BaseContract {
             newOwner: string,
         ): string {
             const self = this as any as ForwarderContract;
-            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            [newOwner
-    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
     ]);
             return abiEncodedTransactionData;
         },
@@ -634,15 +433,7 @@ export class ForwarderContract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as ForwarderContract;
-            const functionSignature = 'transferOwnership(address)';
+            const encodedData = self._strictEncodeArguments('transferOwnership(address)', [newOwner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [newOwner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferOwnership;
-            const encodedData = ethersFunction.encode([newOwner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -654,11 +445,12 @@ export class ForwarderContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferOwnership(address)');
-            const outputAbi = (_.find(self.abi, {name: 'transferOwnership'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -725,7 +517,7 @@ _wethAssetData
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('Forwarder', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts

@@ -25,21 +25,7 @@ export class IValidatorContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as IValidatorContract;
-            const functionSignature = 'isValidSignature(bytes32,address,bytes)';
+            const encodedData = self._strictEncodeArguments('isValidSignature(bytes32,address,bytes)', [hash,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [hash,
-        signerAddress,
-        signature
-        ] = BaseContract._formatABIDataItemList(inputAbi, [hash,
-        signerAddress,
-        signature
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [hash,
-        signerAddress,
-        signature
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.isValidSignature;
-            const encodedData = ethersFunction.encode([hash,
         signerAddress,
         signature
         ]);
@@ -53,11 +39,12 @@ export class IValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,address,bytes)');
-            const outputAbi = (_.find(self.abi, {name: 'isValidSignature'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -103,7 +90,7 @@ export class IValidatorContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('IValidator', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts

@@ -24,18 +24,7 @@ export class IWalletContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as IWalletContract;
-            const functionSignature = 'isValidSignature(bytes32,bytes)';
+            const encodedData = self._strictEncodeArguments('isValidSignature(bytes32,bytes)', [hash,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [hash,
-        signature
-        ] = BaseContract._formatABIDataItemList(inputAbi, [hash,
-        signature
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [hash,
-        signature
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.isValidSignature;
-            const encodedData = ethersFunction.encode([hash,
         signature
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -48,11 +37,12 @@ export class IWalletContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,bytes)');
-            const outputAbi = (_.find(self.abi, {name: 'isValidSignature'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -98,7 +88,7 @@ export class IWalletContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('IWallet', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts

@@ -0,0 +1,824 @@
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name
+// tslint:disable:no-unused-variable
+// tslint:disable:no-unbound-method
+import { BaseContract } from '@0x/base-contract';
+import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types';
+import { BigNumber, classUtils, logUtils } from '@0x/utils';
+import { SimpleContractArtifact } from '@0x/types';
+import { Web3Wrapper } from '@0x/web3-wrapper';
+import * as ethers from 'ethers';
+import * as _ from 'lodash';
+// tslint:enable:no-unused-variable
+
+export type MultiAssetProxyEventArgs =
+    | MultiAssetProxyAuthorizedAddressAddedEventArgs
+    | MultiAssetProxyAuthorizedAddressRemovedEventArgs
+    | MultiAssetProxyAssetProxyRegisteredEventArgs;
+
+export enum MultiAssetProxyEvents {
+    AuthorizedAddressAdded = 'AuthorizedAddressAdded',
+    AuthorizedAddressRemoved = 'AuthorizedAddressRemoved',
+    AssetProxyRegistered = 'AssetProxyRegistered',
+}
+
+export interface MultiAssetProxyAuthorizedAddressAddedEventArgs extends DecodedLogArgs {
+    target: string;
+    caller: string;
+}
+
+export interface MultiAssetProxyAuthorizedAddressRemovedEventArgs extends DecodedLogArgs {
+    target: string;
+    caller: string;
+}
+
+export interface MultiAssetProxyAssetProxyRegisteredEventArgs extends DecodedLogArgs {
+    id: string;
+    assetProxy: string;
+}
+
+
+/* istanbul ignore next */
+// tslint:disable:no-parameter-reassignment
+// tslint:disable-next-line:class-name
+export class MultiAssetProxyContract extends BaseContract {
+    public assetProxies = {
+        async callAsync(
+            index_0: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<string
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'assetProxies(bytes4)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [index_0
+        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.assetProxies;
+            const encodedData = ethersFunction.encode([index_0
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'assetProxies'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public addAuthorizedAddress = {
+        async sendTransactionAsync(
+            target: string,
+            txData: Partial<TxData> = {},
+        ): Promise<string> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            [target
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target
+    ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
+    ]);
+            const encodedData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+                self.addAuthorizedAddress.estimateGasAsync.bind(
+                    self,
+                    target
+                ),
+            );
+            const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            return txHash;
+        },
+        async estimateGasAsync(
+            target: string,
+            txData: Partial<TxData> = {},
+        ): Promise<number> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            [target
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target
+    ], BaseContract._bigNumberToString);
+            const encodedData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            return gas;
+        },
+        getABIEncodedTransactionData(
+            target: string,
+        ): string {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('addAuthorizedAddress(address)').inputs;
+            [target
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target
+    ], BaseContract._bigNumberToString);
+            const abiEncodedTransactionData = self._lookupEthersInterface('addAuthorizedAddress(address)').functions.addAuthorizedAddress.encode([target
+    ]);
+            return abiEncodedTransactionData;
+        },
+        async callAsync(
+            target: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<void
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'addAuthorizedAddress(address)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [target
+        ] = BaseContract._formatABIDataItemList(inputAbi, [target
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.addAuthorizedAddress;
+            const encodedData = ethersFunction.encode([target
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'addAuthorizedAddress'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray;
+        },
+    };
+    public authorities = {
+        async callAsync(
+            index_0: BigNumber,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<string
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'authorities(uint256)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [index_0
+        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.authorities;
+            const encodedData = ethersFunction.encode([index_0
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'authorities'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public getAssetProxy = {
+        async callAsync(
+            assetProxyId: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<string
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'getAssetProxy(bytes4)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [assetProxyId
+        ] = BaseContract._formatABIDataItemList(inputAbi, [assetProxyId
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [assetProxyId
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getAssetProxy;
+            const encodedData = ethersFunction.encode([assetProxyId
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'getAssetProxy'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public removeAuthorizedAddress = {
+        async sendTransactionAsync(
+            target: string,
+            txData: Partial<TxData> = {},
+        ): Promise<string> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            [target
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target
+    ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
+    ]);
+            const encodedData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+                self.removeAuthorizedAddress.estimateGasAsync.bind(
+                    self,
+                    target
+                ),
+            );
+            const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            return txHash;
+        },
+        async estimateGasAsync(
+            target: string,
+            txData: Partial<TxData> = {},
+        ): Promise<number> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            [target
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target
+    ], BaseContract._bigNumberToString);
+            const encodedData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            return gas;
+        },
+        getABIEncodedTransactionData(
+            target: string,
+        ): string {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('removeAuthorizedAddress(address)').inputs;
+            [target
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target
+    ], BaseContract._bigNumberToString);
+            const abiEncodedTransactionData = self._lookupEthersInterface('removeAuthorizedAddress(address)').functions.removeAuthorizedAddress.encode([target
+    ]);
+            return abiEncodedTransactionData;
+        },
+        async callAsync(
+            target: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<void
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'removeAuthorizedAddress(address)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [target
+        ] = BaseContract._formatABIDataItemList(inputAbi, [target
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [target
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.removeAuthorizedAddress;
+            const encodedData = ethersFunction.encode([target
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'removeAuthorizedAddress'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray;
+        },
+    };
+    public owner = {
+        async callAsync(
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<string
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'owner()';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.owner;
+            const encodedData = ethersFunction.encode([]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'owner'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public removeAuthorizedAddressAtIndex = {
+        async sendTransactionAsync(
+            target: string,
+            index: BigNumber,
+            txData: Partial<TxData> = {},
+        ): Promise<string> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            [target,
+    index
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
+    index
+    ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
+    index
+    ]);
+            const encodedData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
+    index
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+                self.removeAuthorizedAddressAtIndex.estimateGasAsync.bind(
+                    self,
+                    target,
+                    index
+                ),
+            );
+            const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            return txHash;
+        },
+        async estimateGasAsync(
+            target: string,
+            index: BigNumber,
+            txData: Partial<TxData> = {},
+        ): Promise<number> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            [target,
+    index
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
+    index
+    ], BaseContract._bigNumberToString);
+            const encodedData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
+    index
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            return gas;
+        },
+        getABIEncodedTransactionData(
+            target: string,
+            index: BigNumber,
+        ): string {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('removeAuthorizedAddressAtIndex(address,uint256)').inputs;
+            [target,
+    index
+    ] = BaseContract._formatABIDataItemList(inputAbi, [target,
+    index
+    ], BaseContract._bigNumberToString);
+            const abiEncodedTransactionData = self._lookupEthersInterface('removeAuthorizedAddressAtIndex(address,uint256)').functions.removeAuthorizedAddressAtIndex.encode([target,
+    index
+    ]);
+            return abiEncodedTransactionData;
+        },
+        async callAsync(
+            target: string,
+            index: BigNumber,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<void
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'removeAuthorizedAddressAtIndex(address,uint256)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [target,
+        index
+        ] = BaseContract._formatABIDataItemList(inputAbi, [target,
+        index
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
+        index
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.removeAuthorizedAddressAtIndex;
+            const encodedData = ethersFunction.encode([target,
+        index
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'removeAuthorizedAddressAtIndex'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray;
+        },
+    };
+    public getProxyId = {
+        async callAsync(
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<string
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'getProxyId()';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getProxyId;
+            const encodedData = ethersFunction.encode([]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'getProxyId'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public authorized = {
+        async callAsync(
+            index_0: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<boolean
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'authorized(address)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [index_0
+        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.authorized;
+            const encodedData = ethersFunction.encode([index_0
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'authorized'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public registerAssetProxy = {
+        async sendTransactionAsync(
+            assetProxy: string,
+            txData: Partial<TxData> = {},
+        ): Promise<string> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('registerAssetProxy(address)').inputs;
+            [assetProxy
+    ] = BaseContract._formatABIDataItemList(inputAbi, [assetProxy
+    ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [assetProxy
+    ]);
+            const encodedData = self._lookupEthersInterface('registerAssetProxy(address)').functions.registerAssetProxy.encode([assetProxy
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+                self.registerAssetProxy.estimateGasAsync.bind(
+                    self,
+                    assetProxy
+                ),
+            );
+            const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            return txHash;
+        },
+        async estimateGasAsync(
+            assetProxy: string,
+            txData: Partial<TxData> = {},
+        ): Promise<number> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('registerAssetProxy(address)').inputs;
+            [assetProxy
+    ] = BaseContract._formatABIDataItemList(inputAbi, [assetProxy
+    ], BaseContract._bigNumberToString);
+            const encodedData = self._lookupEthersInterface('registerAssetProxy(address)').functions.registerAssetProxy.encode([assetProxy
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            return gas;
+        },
+        getABIEncodedTransactionData(
+            assetProxy: string,
+        ): string {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('registerAssetProxy(address)').inputs;
+            [assetProxy
+    ] = BaseContract._formatABIDataItemList(inputAbi, [assetProxy
+    ], BaseContract._bigNumberToString);
+            const abiEncodedTransactionData = self._lookupEthersInterface('registerAssetProxy(address)').functions.registerAssetProxy.encode([assetProxy
+    ]);
+            return abiEncodedTransactionData;
+        },
+        async callAsync(
+            assetProxy: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<void
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'registerAssetProxy(address)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [assetProxy
+        ] = BaseContract._formatABIDataItemList(inputAbi, [assetProxy
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [assetProxy
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.registerAssetProxy;
+            const encodedData = ethersFunction.encode([assetProxy
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'registerAssetProxy'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray;
+        },
+    };
+    public getAuthorizedAddresses = {
+        async callAsync(
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<string[]
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'getAuthorizedAddresses()';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getAuthorizedAddresses;
+            const encodedData = ethersFunction.encode([]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'getAuthorizedAddresses'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray[0];
+        },
+    };
+    public transferOwnership = {
+        async sendTransactionAsync(
+            newOwner: string,
+            txData: Partial<TxData> = {},
+        ): Promise<string> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            [newOwner
+    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
+    ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
+    ]);
+            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+                self.transferOwnership.estimateGasAsync.bind(
+                    self,
+                    newOwner
+                ),
+            );
+            const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            return txHash;
+        },
+        async estimateGasAsync(
+            newOwner: string,
+            txData: Partial<TxData> = {},
+        ): Promise<number> {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            [newOwner
+    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
+    ], BaseContract._bigNumberToString);
+            const encodedData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
+    ]);
+            const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...txData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            return gas;
+        },
+        getABIEncodedTransactionData(
+            newOwner: string,
+        ): string {
+            const self = this as any as MultiAssetProxyContract;
+            const inputAbi = self._lookupAbi('transferOwnership(address)').inputs;
+            [newOwner
+    ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
+    ], BaseContract._bigNumberToString);
+            const abiEncodedTransactionData = self._lookupEthersInterface('transferOwnership(address)').functions.transferOwnership.encode([newOwner
+    ]);
+            return abiEncodedTransactionData;
+        },
+        async callAsync(
+            newOwner: string,
+            callData: Partial<CallData> = {},
+            defaultBlock?: BlockParam,
+        ): Promise<void
+        > {
+            const self = this as any as MultiAssetProxyContract;
+            const functionSignature = 'transferOwnership(address)';
+            const inputAbi = self._lookupAbi(functionSignature).inputs;
+            [newOwner
+        ] = BaseContract._formatABIDataItemList(inputAbi, [newOwner
+        ], BaseContract._bigNumberToString.bind(self));
+            BaseContract.strictArgumentEncodingCheck(inputAbi, [newOwner
+        ]);
+            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferOwnership;
+            const encodedData = ethersFunction.encode([newOwner
+        ]);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            let resultArray = ethersFunction.decode(rawCallResult);
+            const outputAbi = (_.find(self.abi, {name: 'transferOwnership'}) as MethodAbi).outputs;
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+            return resultArray;
+        },
+    };
+    public static async deployFrom0xArtifactAsync(
+        artifact: ContractArtifact | SimpleContractArtifact,
+        provider: Provider,
+        txDefaults: Partial<TxData>,
+    ): Promise<MultiAssetProxyContract> {
+        if (_.isUndefined(artifact.compilerOutput)) {
+            throw new Error('Compiler output not found in the artifact file');
+        }
+        const bytecode = artifact.compilerOutput.evm.bytecode.object;
+        const abi = artifact.compilerOutput.abi;
+        return MultiAssetProxyContract.deployAsync(bytecode, abi, provider, txDefaults, );
+    }
+    public static async deployAsync(
+        bytecode: string,
+        abi: ContractAbi,
+        provider: Provider,
+        txDefaults: Partial<TxData>,
+    ): Promise<MultiAssetProxyContract> {
+        const constructorAbi = BaseContract._lookupConstructorAbi(abi);
+        [] = BaseContract._formatABIDataItemList(
+            constructorAbi.inputs,
+            [],
+            BaseContract._bigNumberToString,
+        );
+        const iface = new ethers.utils.Interface(abi);
+        const deployInfo = iface.deployFunction;
+        const txData = deployInfo.encode(bytecode, []);
+        const web3Wrapper = new Web3Wrapper(provider);
+        const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+            {data: txData},
+            txDefaults,
+            web3Wrapper.estimateGasAsync.bind(web3Wrapper),
+        );
+        const txHash = await web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+        logUtils.log(`transactionHash: ${txHash}`);
+        const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+        logUtils.log(`MultiAssetProxy successfully deployed at ${txReceipt.contractAddress}`);
+        const contractInstance = new MultiAssetProxyContract(abi, txReceipt.contractAddress as string, provider, txDefaults);
+        contractInstance.constructorArgs = [];
+        return contractInstance;
+    }
+    constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
+        super('MultiAssetProxy', abi, address, provider, txDefaults);
+        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+    }
+} // tslint:disable:max-file-line-count
+// tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts

@@ -24,18 +24,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<[{orderStatus: number;orderHash: string;orderTakerAssetFilledAmount: BigNumber}, {makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}]
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getOrderAndTraderInfo({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},address)';
+            const encodedData = self._strictEncodeArguments('getOrderAndTraderInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),address)', [order,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [order,
-        takerAddress
-        ] = BaseContract._formatABIDataItemList(inputAbi, [order,
-        takerAddress
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [order,
-        takerAddress
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getOrderAndTraderInfo;
-            const encodedData = ethersFunction.encode([order,
         takerAddress
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -48,11 +37,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getOrderAndTraderInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),address)');
-            const outputAbi = (_.find(self.abi, {name: 'getOrderAndTraderInfo'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<[{orderStatus: number;orderHash: string;orderTakerAssetFilledAmount: BigNumber}, {makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getBalanceAndAllowance = {
@@ -64,18 +54,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<[BigNumber, BigNumber]
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getBalanceAndAllowance(address,bytes)';
+            const encodedData = self._strictEncodeArguments('getBalanceAndAllowance(address,bytes)', [target,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target,
-        assetData
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-        assetData
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
-        assetData
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getBalanceAndAllowance;
-            const encodedData = ethersFunction.encode([target,
         assetData
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -88,11 +67,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getBalanceAndAllowance(address,bytes)');
-            const outputAbi = (_.find(self.abi, {name: 'getBalanceAndAllowance'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<[BigNumber, BigNumber]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getOrdersAndTradersInfo = {
@@ -104,18 +84,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<[Array<{orderStatus: number;orderHash: string;orderTakerAssetFilledAmount: BigNumber}>, Array<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}>]
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getOrdersAndTradersInfo(tuple[],address[])';
+            const encodedData = self._strictEncodeArguments('getOrdersAndTradersInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address[])', [orders,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [orders,
-        takerAddresses
-        ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-        takerAddresses
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [orders,
-        takerAddresses
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getOrdersAndTradersInfo;
-            const encodedData = ethersFunction.encode([orders,
         takerAddresses
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -128,11 +97,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getOrdersAndTradersInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address[])');
-            const outputAbi = (_.find(self.abi, {name: 'getOrdersAndTradersInfo'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<[Array<{orderStatus: number;orderHash: string;orderTakerAssetFilledAmount: BigNumber}>, Array<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}>]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getTradersInfo = {
@@ -144,18 +114,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<Array<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}>
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getTradersInfo(tuple[],address[])';
+            const encodedData = self._strictEncodeArguments('getTradersInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address[])', [orders,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [orders,
-        takerAddresses
-        ] = BaseContract._formatABIDataItemList(inputAbi, [orders,
-        takerAddresses
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [orders,
-        takerAddresses
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getTradersInfo;
-            const encodedData = ethersFunction.encode([orders,
         takerAddresses
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -168,11 +127,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getTradersInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes)[],address[])');
-            const outputAbi = (_.find(self.abi, {name: 'getTradersInfo'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<Array<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}>
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getERC721TokenOwner = {
@@ -184,18 +144,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getERC721TokenOwner(address,uint256)';
+            const encodedData = self._strictEncodeArguments('getERC721TokenOwner(address,uint256)', [token,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [token,
-        tokenId
-        ] = BaseContract._formatABIDataItemList(inputAbi, [token,
-        tokenId
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [token,
-        tokenId
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getERC721TokenOwner;
-            const encodedData = ethersFunction.encode([token,
         tokenId
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -208,11 +157,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getERC721TokenOwner(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'getERC721TokenOwner'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getBalancesAndAllowances = {
@@ -224,18 +174,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<[BigNumber[], BigNumber[]]
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getBalancesAndAllowances(address,bytes[])';
+            const encodedData = self._strictEncodeArguments('getBalancesAndAllowances(address,bytes[])', [target,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [target,
-        assetData
-        ] = BaseContract._formatABIDataItemList(inputAbi, [target,
-        assetData
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [target,
-        assetData
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getBalancesAndAllowances;
-            const encodedData = ethersFunction.encode([target,
         assetData
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -248,11 +187,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getBalancesAndAllowances(address,bytes[])');
-            const outputAbi = (_.find(self.abi, {name: 'getBalancesAndAllowances'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<[BigNumber[], BigNumber[]]
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public getTraderInfo = {
@@ -264,18 +204,7 @@ export class OrderValidatorContract extends BaseContract {
         ): Promise<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}
         > {
             const self = this as any as OrderValidatorContract;
-            const functionSignature = 'getTraderInfo({address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes},address)';
+            const encodedData = self._strictEncodeArguments('getTraderInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),address)', [order,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [order,
-        takerAddress
-        ] = BaseContract._formatABIDataItemList(inputAbi, [order,
-        takerAddress
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [order,
-        takerAddress
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.getTraderInfo;
-            const encodedData = ethersFunction.encode([order,
         takerAddress
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -288,11 +217,12 @@ export class OrderValidatorContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getTraderInfo((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),address)');
-            const outputAbi = (_.find(self.abi, {name: 'getTraderInfo'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<{makerBalance: BigNumber;makerAllowance: BigNumber;takerBalance: BigNumber;takerAllowance: BigNumber;makerZrxBalance: BigNumber;makerZrxAllowance: BigNumber;takerZrxBalance: BigNumber;takerZrxAllowance: BigNumber}
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -352,7 +282,7 @@ _zrxAssetData
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('OrderValidator', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts

@@ -57,12 +57,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'name()';
+            const encodedData = self._strictEncodeArguments('name()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.name;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -73,11 +68,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('name()');
-            const outputAbi = (_.find(self.abi, {name: 'name'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public approve = {
@@ -87,16 +83,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy,
-            [guy,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [guy,
-    wad
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [guy,
-    wad
-    ]);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([guy,
     wad
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -121,13 +108,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy,
-            [guy,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [guy,
-    wad
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([guy,
     wad
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -146,13 +127,7 @@ export class WETH9Contract extends BaseContract {
             wad: BigNumber,
         ): string {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [guy,
-            [guy,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [guy,
-    wad
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([guy,
     wad
     ]);
             return abiEncodedTransactionData;
@@ -165,18 +140,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'approve(address,uint256)';
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [guy,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [guy,
-        wad
-        ] = BaseContract._formatABIDataItemList(inputAbi, [guy,
-        wad
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [guy,
-        wad
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.approve;
-            const encodedData = ethersFunction.encode([guy,
         wad
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -189,11 +153,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('approve(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'approve'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public totalSupply = {
@@ -203,12 +168,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'totalSupply()';
+            const encodedData = self._strictEncodeArguments('totalSupply()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.totalSupply;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -219,11 +179,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('totalSupply()');
-            const outputAbi = (_.find(self.abi, {name: 'totalSupply'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferFrom = {
@@ -234,19 +195,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src,
-            [src,
-    dst,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [src,
-    dst,
-    wad
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [src,
-    dst,
-    wad
-    ]);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([src,
     dst,
     wad
     ]);
@@ -274,15 +223,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src,
-            [src,
-    dst,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [src,
-    dst,
-    wad
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([src,
     dst,
     wad
     ]);
@@ -303,15 +244,7 @@ export class WETH9Contract extends BaseContract {
             wad: BigNumber,
         ): string {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src,
-            [src,
-    dst,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [src,
-    dst,
-    wad
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([src,
     dst,
     wad
     ]);
@@ -326,21 +259,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'transferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [src,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [src,
-        dst,
-        wad
-        ] = BaseContract._formatABIDataItemList(inputAbi, [src,
-        dst,
-        wad
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [src,
-        dst,
-        wad
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferFrom;
-            const encodedData = ethersFunction.encode([src,
         dst,
         wad
         ]);
@@ -354,11 +273,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public withdraw = {
@@ -367,13 +287,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('withdraw(uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad
-            [wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [wad
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [wad
-    ]);
-            const encodedData = self._lookupEthersInterface('withdraw(uint256)').functions.withdraw.encode([wad
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -395,11 +309,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('withdraw(uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad
-            [wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [wad
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('withdraw(uint256)').functions.withdraw.encode([wad
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -416,11 +326,7 @@ export class WETH9Contract extends BaseContract {
             wad: BigNumber,
         ): string {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('withdraw(uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('withdraw(uint256)', [wad
-            [wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [wad
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('withdraw(uint256)').functions.withdraw.encode([wad
     ]);
             return abiEncodedTransactionData;
         },
@@ -431,15 +337,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'withdraw(uint256)';
+            const encodedData = self._strictEncodeArguments('withdraw(uint256)', [wad
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [wad
-        ] = BaseContract._formatABIDataItemList(inputAbi, [wad
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [wad
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.withdraw;
-            const encodedData = ethersFunction.encode([wad
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -451,11 +349,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('withdraw(uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'withdraw'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public decimals = {
@@ -465,12 +364,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<number
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'decimals()';
+            const encodedData = self._strictEncodeArguments('decimals()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.decimals;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -481,11 +375,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('decimals()');
-            const outputAbi = (_.find(self.abi, {name: 'decimals'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<number
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public balanceOf = {
@@ -496,15 +391,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'balanceOf(address)';
+            const encodedData = self._strictEncodeArguments('balanceOf(address)', [index_0
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [index_0
-        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.balanceOf;
-            const encodedData = ethersFunction.encode([index_0
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -516,11 +403,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('balanceOf(address)');
-            const outputAbi = (_.find(self.abi, {name: 'balanceOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public symbol = {
@@ -530,12 +418,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'symbol()';
+            const encodedData = self._strictEncodeArguments('symbol()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.symbol;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -546,11 +429,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('symbol()');
-            const outputAbi = (_.find(self.abi, {name: 'symbol'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transfer = {
@@ -560,16 +444,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst,
-            [dst,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [dst,
-    wad
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [dst,
-    wad
-    ]);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([dst,
     wad
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -594,13 +469,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst,
-            [dst,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [dst,
-    wad
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([dst,
     wad
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -619,13 +488,7 @@ export class WETH9Contract extends BaseContract {
             wad: BigNumber,
         ): string {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [dst,
-            [dst,
-    wad
-    ] = BaseContract._formatABIDataItemList(inputAbi, [dst,
-    wad
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([dst,
     wad
     ]);
             return abiEncodedTransactionData;
@@ -638,18 +501,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'transfer(address,uint256)';
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [dst,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [dst,
-        wad
-        ] = BaseContract._formatABIDataItemList(inputAbi, [dst,
-        wad
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [dst,
-        wad
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transfer;
-            const encodedData = ethersFunction.encode([dst,
         wad
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -662,11 +514,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transfer(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transfer'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public deposit = {
@@ -674,10 +527,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxDataPayable> = {},
         ): Promise<string> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('deposit()').inputs;
+            const encodedData = self._strictEncodeArguments('deposit()', []);
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const encodedData = self._lookupEthersInterface('deposit()').functions.deposit.encode([]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -696,9 +546,7 @@ export class WETH9Contract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('deposit()').inputs;
+            const encodedData = self._strictEncodeArguments('deposit()', []);
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('deposit()').functions.deposit.encode([]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -713,9 +561,7 @@ export class WETH9Contract extends BaseContract {
         getABIEncodedTransactionData(
         ): string {
             const self = this as any as WETH9Contract;
-            const inputAbi = self._lookupAbi('deposit()').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('deposit()', []);
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('deposit()').functions.deposit.encode([]);
             return abiEncodedTransactionData;
         },
         async callAsync(
@@ -724,12 +570,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<void
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'deposit()';
+            const encodedData = self._strictEncodeArguments('deposit()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.deposit;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -740,11 +581,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('deposit()');
-            const outputAbi = (_.find(self.abi, {name: 'deposit'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<void
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray;
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public allowance = {
@@ -756,18 +598,7 @@ export class WETH9Contract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as WETH9Contract;
-            const functionSignature = 'allowance(address,address)';
+            const encodedData = self._strictEncodeArguments('allowance(address,address)', [index_0,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [index_0,
-        index_1
-        ] = BaseContract._formatABIDataItemList(inputAbi, [index_0,
-        index_1
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [index_0,
-        index_1
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.allowance;
-            const encodedData = ethersFunction.encode([index_0,
         index_1
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -780,11 +611,12 @@ export class WETH9Contract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('allowance(address,address)');
-            const outputAbi = (_.find(self.abi, {name: 'allowance'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -830,7 +662,7 @@ export class WETH9Contract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('WETH9', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts

@@ -43,12 +43,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'name()';
+            const encodedData = self._strictEncodeArguments('name()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.name;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -59,11 +54,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('name()');
-            const outputAbi = (_.find(self.abi, {name: 'name'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public approve = {
@@ -73,16 +69,7 @@ export class ZRXTokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_spender,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -107,13 +94,7 @@ export class ZRXTokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -132,13 +113,7 @@ export class ZRXTokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('approve(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            [_spender,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('approve(address,uint256)').functions.approve.encode([_spender,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -151,18 +126,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'approve(address,uint256)';
+            const encodedData = self._strictEncodeArguments('approve(address,uint256)', [_spender,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_spender,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_spender,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_spender,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.approve;
-            const encodedData = ethersFunction.encode([_spender,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -175,11 +139,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('approve(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'approve'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public totalSupply = {
@@ -189,12 +154,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'totalSupply()';
+            const encodedData = self._strictEncodeArguments('totalSupply()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.totalSupply;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -205,11 +165,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('totalSupply()');
-            const outputAbi = (_.find(self.abi, {name: 'totalSupply'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transferFrom = {
@@ -220,19 +181,7 @@ export class ZRXTokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-    _to,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -260,15 +209,7 @@ export class ZRXTokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -289,15 +230,7 @@ export class ZRXTokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('transferFrom(address,address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            [_from,
-    _to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-    _to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transferFrom(address,address,uint256)').functions.transferFrom.encode([_from,
     _to,
     _value
     ]);
@@ -312,21 +245,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'transferFrom(address,address,uint256)';
+            const encodedData = self._strictEncodeArguments('transferFrom(address,address,uint256)', [_from,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_from,
-        _to,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_from,
-        _to,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_from,
-        _to,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transferFrom;
-            const encodedData = ethersFunction.encode([_from,
         _to,
         _value
         ]);
@@ -340,11 +259,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(address,address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transferFrom'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public decimals = {
@@ -354,12 +274,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<number
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'decimals()';
+            const encodedData = self._strictEncodeArguments('decimals()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.decimals;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -370,11 +285,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('decimals()');
-            const outputAbi = (_.find(self.abi, {name: 'decimals'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<number
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public balanceOf = {
@@ -385,15 +301,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'balanceOf(address)';
+            const encodedData = self._strictEncodeArguments('balanceOf(address)', [_owner
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.balanceOf;
-            const encodedData = ethersFunction.encode([_owner
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
@@ -405,11 +313,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('balanceOf(address)');
-            const outputAbi = (_.find(self.abi, {name: 'balanceOf'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public symbol = {
@@ -419,12 +328,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<string
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'symbol()';
+            const encodedData = self._strictEncodeArguments('symbol()', []);
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [] = BaseContract._formatABIDataItemList(inputAbi, [], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, []);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.symbol;
-            const encodedData = ethersFunction.encode([]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -435,11 +339,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('symbol()');
-            const outputAbi = (_.find(self.abi, {name: 'symbol'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<string
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public transfer = {
@@ -449,16 +354,7 @@ export class ZRXTokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<string> {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-    _value
-    ]);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -483,13 +379,7 @@ export class ZRXTokenContract extends BaseContract {
             txData: Partial<TxData> = {},
         ): Promise<number> {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const encodedData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             const txDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -508,13 +398,7 @@ export class ZRXTokenContract extends BaseContract {
             _value: BigNumber,
         ): string {
             const self = this as any as ZRXTokenContract;
-            const inputAbi = self._lookupAbi('transfer(address,uint256)').inputs;
+            const abiEncodedTransactionData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            [_to,
-    _value
-    ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-    _value
-    ], BaseContract._bigNumberToString);
-            const abiEncodedTransactionData = self._lookupEthersInterface('transfer(address,uint256)').functions.transfer.encode([_to,
     _value
     ]);
             return abiEncodedTransactionData;
@@ -527,18 +411,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<boolean
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'transfer(address,uint256)';
+            const encodedData = self._strictEncodeArguments('transfer(address,uint256)', [_to,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_to,
-        _value
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_to,
-        _value
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_to,
-        _value
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.transfer;
-            const encodedData = ethersFunction.encode([_to,
         _value
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -551,11 +424,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('transfer(address,uint256)');
-            const outputAbi = (_.find(self.abi, {name: 'transfer'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<boolean
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public allowance = {
@@ -567,18 +441,7 @@ export class ZRXTokenContract extends BaseContract {
         ): Promise<BigNumber
         > {
             const self = this as any as ZRXTokenContract;
-            const functionSignature = 'allowance(address,address)';
+            const encodedData = self._strictEncodeArguments('allowance(address,address)', [_owner,
-            const inputAbi = self._lookupAbi(functionSignature).inputs;
-            [_owner,
-        _spender
-        ] = BaseContract._formatABIDataItemList(inputAbi, [_owner,
-        _spender
-        ], BaseContract._bigNumberToString.bind(self));
-            BaseContract.strictArgumentEncodingCheck(inputAbi, [_owner,
-        _spender
-        ]);
-            const ethersFunction = self._lookupEthersInterface(functionSignature).functions.allowance;
-            const encodedData = ethersFunction.encode([_owner,
         _spender
         ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
@@ -591,11 +454,12 @@ export class ZRXTokenContract extends BaseContract {
             );
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            let resultArray = ethersFunction.decode(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('allowance(address,address)');
-            const outputAbi = (_.find(self.abi, {name: 'allowance'}) as MethodAbi).outputs;
+            // tslint:disable boolean-naming
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+            const result = abiEncoder.strictDecodeReturnValue<BigNumber
-            resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
+        >(rawCallResult);
-            return resultArray[0];
+            // tslint:enable boolean-naming
+            return result;
         },
     };
     public static async deployFrom0xArtifactAsync(
@@ -641,7 +505,7 @@ export class ZRXTokenContract extends BaseContract {
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
         super('ZRXToken', abi, address, provider, txDefaults);
-        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
+        classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
 // tslint:enable:no-unbound-method

packages/abi-gen-wrappers/src/index.ts

@@ -10,6 +10,7 @@ export * from './generated-wrappers/exchange';
 export * from './generated-wrappers/forwarder';
 export * from './generated-wrappers/i_validator';
 export * from './generated-wrappers/i_wallet';
+export * from './generated-wrappers/multi_asset_proxy';
 export * from './generated-wrappers/order_validator';
 export * from './generated-wrappers/weth9';
 export * from './generated-wrappers/zrx_token';

packages/abi-gen/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.20",

packages/abi-gen/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.21 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.20 - _January 9, 2019_
 
     * Dependencies updated

packages/abi-gen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/abi-gen",
-    "version": "1.0.20",
+    "version": "1.0.21",
     "engines": {
         "node": ">=6.12"
     },
@@ -31,10 +31,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.5",
@@ -45,7 +45,7 @@
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/glob": "5.0.35",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",

packages/abi-gen/src/index.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { abiUtils, logUtils } from '@0x/utils';
+import { AbiEncoder, abiUtils, logUtils } from '@0x/utils';
 import chalk from 'chalk';
 import { AbiDefinition, ConstructorAbi, EventAbi, MethodAbi } from 'ethereum-types';
 import { sync as globSync } from 'glob';
@@ -133,7 +133,7 @@ for (const abiFileName of abiFileNames) {
             singleReturnValue: methodAbi.outputs.length === 1,
             hasReturnValue: methodAbi.outputs.length !== 0,
             tsName: sanitizedMethodAbis[methodAbiIndex].name,
-            functionSignature: abiUtils.getFunctionSignature(methodAbi),
+            functionSignature: new AbiEncoder.Method(methodAbi).getSignature(),
         };
         return methodData;
     });

packages/assert/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.21",

packages/assert/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.22 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.21 - _January 9, 2019_
 
     * Dependencies updated

packages/assert/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/assert",
-    "version": "1.0.21",
+    "version": "1.0.22",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,7 +29,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/valid-url": "^1.0.2",
@@ -44,9 +44,9 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/json-schemas": "^2.1.5",
+        "@0x/json-schemas": "^2.1.6",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
         "lodash": "^4.17.5",
         "valid-url": "^1.0.9"
     },

packages/asset-buyer/CHANGELOG.json

@@ -6,7 +6,8 @@
                 "note": "Raise custom InsufficientAssetLiquidityError error with amountAvailableToFill attribute",
                 "pr": 1437
             }
-        ]
+        ],
+        "timestamp": 1547225310
     },
     {
         "timestamp": 1547040760,

packages/asset-buyer/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.0.0 - _January 11, 2019_
+
+    * Raise custom InsufficientAssetLiquidityError error with amountAvailableToFill attribute (#1437)
+
 ## v3.0.5 - _January 9, 2019_
 
     * Dependencies updated

packages/asset-buyer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/asset-buyer",
-    "version": "3.0.5",
+    "version": "4.0.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -36,21 +36,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
     "dependencies": {
-        "@0x/assert": "^1.0.21",
+        "@0x/assert": "^1.0.22",
-        "@0x/connect": "^3.0.11",
+        "@0x/connect": "^3.0.12",
-        "@0x/contract-wrappers": "^4.2.0",
+        "@0x/contract-wrappers": "^4.2.1",
-        "@0x/json-schemas": "^2.1.5",
+        "@0x/json-schemas": "^2.1.6",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "lodash": "^4.17.5"
     },
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/lodash": "^4.14.116",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",

packages/asset-buyer/src/utils/order_provider_response_processor.ts

@@ -105,7 +105,7 @@ function getValidOrdersWithRemainingFillableMakerAssetAmountsFromOnChain(
             // get corresponding on-chain state for the order
             const { orderInfo, traderInfo } = ordersAndTradersInfo[index];
             // if the order IS NOT fillable, do not add anything to the accumulations and continue iterating
-            if (orderInfo.orderStatus !== OrderStatus.FILLABLE) {
+            if (orderInfo.orderStatus !== OrderStatus.Fillable) {
                 return accOrders;
             }
             // if the order IS fillable, add the order and calculate the remaining fillable amount

packages/base-contract/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "3.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "3.0.11",

packages/base-contract/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.12 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v3.0.11 - _January 9, 2019_
 
     * Dependencies updated

packages/base-contract/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/base-contract",
-    "version": "3.0.11",
+    "version": "3.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,7 +29,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "make-promises-safe": "^1.1.0",
@@ -40,10 +40,10 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5"
     },

packages/base-contract/src/index.ts

@@ -1,4 +1,4 @@
-import { abiUtils, BigNumber } from '@0x/utils';
+import { AbiEncoder, abiUtils } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import {
     AbiDefinition,
@@ -16,8 +16,8 @@ import * as _ from 'lodash';
 
 import { formatABIDataItem } from './utils';
 
-export interface EthersInterfaceByFunctionSignature {
+export interface AbiEncoderByFunctionSignature {
-    [key: string]: ethers.utils.Interface;
+    [key: string]: AbiEncoder.Method;
 }
 
 const REVERT_ERROR_SELECTOR = '08c379a0';
@@ -26,7 +26,7 @@ const REVERT_ERROR_SELECTOR_BYTES_LENGTH = 4;
 const REVERT_ERROR_SELECTOR_END = REVERT_ERROR_SELECTOR_OFFSET + REVERT_ERROR_SELECTOR_BYTES_LENGTH * 2;
 
 export class BaseContract {
-    protected _ethersInterfacesByFunctionSignature: EthersInterfaceByFunctionSignature;
+    protected _abiEncoderByFunctionSignature: AbiEncoderByFunctionSignature;
     protected _web3Wrapper: Web3Wrapper;
     public abi: ContractAbi;
     public address: string;
@@ -65,9 +65,6 @@ export class BaseContract {
             return defaultConstructorAbi;
         }
     }
-    protected static _bnToBigNumber(_type: string, value: any): any {
-        return _.isObject(value) && value._hex ? new BigNumber(value.toString()) : value;
-    }
     protected static async _applyDefaultsToTxDataAsync<T extends Partial<TxData | TxDataPayable>>(
         txData: T,
         txDefaults: Partial<TxData>,
@@ -89,10 +86,15 @@ export class BaseContract {
     }
     protected static _throwIfRevertWithReasonCallResult(rawCallResult: string): void {
         if (rawCallResult.slice(REVERT_ERROR_SELECTOR_OFFSET, REVERT_ERROR_SELECTOR_END) === REVERT_ERROR_SELECTOR) {
-            const revertReason = ethers.utils.defaultAbiCoder.decode(
+            const revertReasonArray = AbiEncoder.create('(string)').decodeAsArray(
-                ['string'],
                 ethers.utils.hexDataSlice(rawCallResult, REVERT_ERROR_SELECTOR_BYTES_LENGTH),
             );
+            if (revertReasonArray.length !== 1) {
+                throw new Error(
+                    `Cannot safely decode revert reason: Expected an array with one element, got ${revertReasonArray}`,
+                );
+            }
+            const revertReason = revertReasonArray[0];
             throw new Error(revertReason);
         }
     }
@@ -100,11 +102,11 @@ export class BaseContract {
     // the given inputAbi. An argument may not be considered safely encodeable
     // if it overflows the corresponding Solidity type, there is a bug in the
     // encoder, or the encoder performs unsafe type coercion.
-    public static strictArgumentEncodingCheck(inputAbi: DataItem[], args: any[]): void {
+    public static strictArgumentEncodingCheck(inputAbi: DataItem[], args: any[]): string {
-        const coder = new ethers.utils.AbiCoder();
+        const abiEncoder = AbiEncoder.create(inputAbi);
         const params = abiUtils.parseEthersParams(inputAbi);
-        const rawEncoded = coder.encode(inputAbi, args);
+        const rawEncoded = abiEncoder.encode(args);
-        const rawDecoded = coder.decode(inputAbi, rawEncoded);
+        const rawDecoded = abiEncoder.decodeAsArray(rawEncoded);
         for (let i = 0; i < rawDecoded.length; i++) {
             const original = args[i];
             const decoded = rawDecoded[i];
@@ -116,13 +118,14 @@ export class BaseContract {
                 );
             }
         }
+        return rawEncoded;
     }
-    protected _lookupEthersInterface(functionSignature: string): ethers.utils.Interface {
+    protected _lookupAbiEncoder(functionSignature: string): AbiEncoder.Method {
-        const ethersInterface = this._ethersInterfacesByFunctionSignature[functionSignature];
+        const abiEncoder = this._abiEncoderByFunctionSignature[functionSignature];
-        if (_.isUndefined(ethersInterface)) {
+        if (_.isUndefined(abiEncoder)) {
             throw new Error(`Failed to lookup method with function signature '${functionSignature}'`);
         }
-        return ethersInterface;
+        return abiEncoder;
     }
     protected _lookupAbi(functionSignature: string): MethodAbi {
         const methodAbi = _.find(this.abi, (abiDefinition: AbiDefinition) => {
@@ -130,7 +133,7 @@ export class BaseContract {
                 return false;
             }
             // tslint:disable-next-line:no-unnecessary-type-assertion
-            const abiFunctionSignature = abiUtils.getFunctionSignature(abiDefinition as MethodAbi);
+            const abiFunctionSignature = new AbiEncoder.Method(abiDefinition as MethodAbi).getSignature();
             if (abiFunctionSignature === functionSignature) {
                 return true;
             }
@@ -138,6 +141,15 @@ export class BaseContract {
         }) as MethodAbi;
         return methodAbi;
     }
+    protected _strictEncodeArguments(functionSignature: string, functionArguments: any): string {
+        const abiEncoder = this._lookupAbiEncoder(functionSignature);
+        const inputAbi = abiEncoder.getDataItem().components;
+        if (inputAbi === undefined) {
+            throw new Error(`Undefined Method Input ABI`);
+        }
+        const abiEncodedArguments = abiEncoder.encode(functionArguments);
+        return abiEncodedArguments;
+    }
     constructor(
         contractName: string,
         abi: ContractAbi,
@@ -152,10 +164,11 @@ export class BaseContract {
         const methodAbis = this.abi.filter(
             (abiDefinition: AbiDefinition) => abiDefinition.type === AbiType.Function,
         ) as MethodAbi[];
-        this._ethersInterfacesByFunctionSignature = {};
+        this._abiEncoderByFunctionSignature = {};
         _.each(methodAbis, methodAbi => {
-            const functionSignature = abiUtils.getFunctionSignature(methodAbi);
+            const abiEncoder = new AbiEncoder.Method(methodAbi);
-            this._ethersInterfacesByFunctionSignature[functionSignature] = new ethers.utils.Interface([methodAbi]);
+            const functionSignature = abiEncoder.getSignature();
+            this._abiEncoderByFunctionSignature[functionSignature] = abiEncoder;
         });
     }
 }

packages/connect/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "3.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "3.0.11",

packages/connect/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.12 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v3.0.11 - _January 9, 2019_
 
     * Dependencies updated

packages/connect/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/connect",
-    "version": "3.0.11",
+    "version": "3.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0x/assert": "^1.0.21",
+        "@0x/assert": "^1.0.22",
-        "@0x/json-schemas": "^2.1.5",
+        "@0x/json-schemas": "^2.1.6",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
         "lodash": "^4.17.5",
         "query-string": "^5.0.1",
         "sinon": "^4.0.0",
@@ -57,7 +57,7 @@
         "websocket": "^1.0.25"
     },
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/fetch-mock": "^6.0.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",

packages/contract-addresses/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "2.2.0",
+        "changes": [
+            {
+                "note": "Added migration for `MultiAssetProxy` contract",
+                "pr": 1503
+            }
+        ]
+    },
     {
         "version": "2.1.0",
         "changes": [

packages/contract-addresses/src/index.ts

@@ -70,15 +70,15 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
     },
     // NetworkId 50 represents our Ganache snapshot generated from migrations.
     50: {
-        exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788',
         erc20Proxy: '0x1dc4c1cefef38a777b15aa20260a54e584b16c48',
         erc721Proxy: '0x1d7022f5b17d2f8b695918fb48fa1089c9f85401',
         zrxToken: '0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c',
         etherToken: '0x0b1ba0af832d7c05fd64161e0db78e85978e8082',
-        assetProxyOwner: '0x34d402f14d58e001d8efbe6585051bf9706aa064',
+        exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788',
-        forwarder: '0xb69e673309512a9d726f87304c6984054f87a93b',
+        assetProxyOwner: '0x04b5dadd2c0d6a261bfafbc964e0cac48585def3',
-        orderValidator: '0xe86bb98fcf9bff3512c74589b78fb168200cc546',
+        forwarder: '0x6000eca38b8b5bba64986182fe2a69c57f6b5414',
-        dutchAuction: '0xdc688d29394a3f1e6f1e5100862776691afaf3d2',
+        orderValidator: '0x32eecaf51dfea9618e9bc94e9fbfddb1bbdcba15',
+        dutchAuction: '0x7e3f4e1deb8d3a05d9d2da87d9521268d0ec3239',
     },
 };
 

packages/contract-artifacts/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "1.3.0",
+        "changes": [
+            {
+                "note": "Added artifact for `MultiAssetProxy` contract",
+                "pr": 1503
+            }
+        ]
+    },
     {
         "version": "1.2.0",
         "changes": [

packages/contract-artifacts/src/index.ts

@@ -1,7 +1,7 @@
 import * as AssetProxyOwner from '../artifacts/AssetProxyOwner.json';
-import * as DutchAuction from '../artifacts/DutchAuction.json';
 import * as DummyERC20Token from '../artifacts/DummyERC20Token.json';
 import * as DummyERC721Token from '../artifacts/DummyERC721Token.json';
+import * as DutchAuction from '../artifacts/DutchAuction.json';
 import * as ERC20Proxy from '../artifacts/ERC20Proxy.json';
 import * as ERC20Token from '../artifacts/ERC20Token.json';
 import * as ERC721Proxy from '../artifacts/ERC721Proxy.json';
@@ -10,6 +10,7 @@ import * as Exchange from '../artifacts/Exchange.json';
 import * as Forwarder from '../artifacts/Forwarder.json';
 import * as IValidator from '../artifacts/IValidator.json';
 import * as IWallet from '../artifacts/IWallet.json';
+import * as MultiAssetProxy from '../artifacts/MultiAssetProxy.json';
 import * as OrderValidator from '../artifacts/OrderValidator.json';
 import * as WETH9 from '../artifacts/WETH9.json';
 import * as ZRXToken from '../artifacts/ZRXToken.json';
@@ -27,6 +28,7 @@ export {
     Forwarder,
     IValidator,
     IWallet,
+    MultiAssetProxy,
     OrderValidator,
     WETH9,
     ZRXToken,

packages/contract-artifacts/tsconfig.json

@@ -19,6 +19,7 @@
         "./artifacts/Forwarder.json",
         "./artifacts/IValidator.json",
         "./artifacts/IWallet.json",
+        "./artifacts/MultiAssetProxy.json",
         "./artifacts/OrderValidator.json",
         "./artifacts/WETH9.json",
         "./artifacts/ZRXToken.json"

packages/contract-wrappers/CHANGELOG.json

@@ -1,4 +1,26 @@
 [
+    {
+        "version": "5.0.0",
+        "changes": [
+            {
+                "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule",
+                "pr": 1474
+            },
+            {
+                "note": "Remove Exchange `matchOrdersAsync` optimization",
+                "pr": 1514
+            }
+        ]
+    },
+    {
+        "timestamp": 1547225310,
+        "version": "4.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "4.2.0",
         "changes": [

packages/contract-wrappers/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.2.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v4.2.0 - _January 9, 2019_
 
     * Added Dutch Auction wrapper (#1465)

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-wrappers",
-    "version": "4.2.0",
+    "version": "4.2.1",
     "description": "Smart TS wrappers for 0x smart contracts",
     "keywords": [
         "0xproject",
@@ -37,10 +37,10 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0x/dev-utils": "^1.0.22",
+        "@0x/dev-utils": "^1.0.23",
-        "@0x/migrations": "^2.3.0",
+        "@0x/migrations": "^2.3.1",
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",
@@ -65,19 +65,19 @@
         "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0x/abi-gen-wrappers": "^2.1.0",
+        "@0x/abi-gen-wrappers": "^2.1.1",
-        "@0x/assert": "^1.0.21",
+        "@0x/assert": "^1.0.22",
         "@0x/contract-addresses": "^2.1.0",
         "@0x/contract-artifacts": "^1.2.0",
-        "@0x/contracts-test-utils": "^1.0.3",
+        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/fill-scenarios": "^1.1.0",
+        "@0x/fill-scenarios": "^1.1.1",
-        "@0x/json-schemas": "^2.1.5",
+        "@0x/json-schemas": "^2.1.6",
-        "@0x/order-utils": "^3.1.0",
+        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-abi": "0.6.5",
         "ethereumjs-blockstream": "6.0.0",
         "ethereumjs-util": "^5.1.1",

packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts

@@ -743,10 +743,6 @@ export class ExchangeWrapper extends ContractWrapper {
             rightSignedOrder.takerAssetData !== leftSignedOrder.makerAssetData
         ) {
             throw new Error(ExchangeWrapperError.AssetDataMismatch);
-        } else {
-            // Smart contracts assigns the asset data from the left order to the right one so we can save gas on reducing the size of call data
-            rightSignedOrder.makerAssetData = '0x';
-            rightSignedOrder.takerAssetData = '0x';
         }
         const exchangeInstance = await this._getExchangeContractAsync();
         if (orderTransactionOpts.shouldValidate) {

packages/contract-wrappers/src/types.ts

@@ -177,13 +177,13 @@ export interface OrderInfo {
 }
 
 export enum OrderStatus {
-    INVALID = 0,
+    Invalid = 0,
-    INVALID_MAKER_ASSET_AMOUNT,
+    InvalidMakerAssetAmount,
-    INVALID_TAKER_ASSET_AMOUNT,
+    InvalidTakerAssetAmount,
-    FILLABLE,
+    Fillable,
-    EXPIRED,
+    Expired,
-    FULLY_FILLED,
+    FullyFilled,
-    CANCELLED,
+    Cancelled,
 }
 
 export interface TraderInfo {

packages/contract-wrappers/test/exchange_wrapper_test.ts

@@ -109,7 +109,7 @@ describe('ExchangeWrapper', () => {
                 );
                 await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
                 const orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
-                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
             });
         });
         describe('#fillOrKillOrderAsync', () => {
@@ -157,7 +157,7 @@ describe('ExchangeWrapper', () => {
                 );
                 await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
                 const orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
-                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
             });
         });
         describe('#marketSellOrdersAsync', () => {
@@ -183,7 +183,7 @@ describe('ExchangeWrapper', () => {
                 );
                 await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
                 const orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
-                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
             });
         });
         describe('#batchFillOrdersNoThrowAsync', () => {
@@ -197,9 +197,9 @@ describe('ExchangeWrapper', () => {
                 );
                 await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
                 let orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
-                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
                 orderInfo = await contractWrappers.exchange.getOrderInfoAsync(anotherSignedOrder);
-                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+                expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
             });
         });
         describe('#batchFillOrKillOrdersAsync', () => {

packages/contract-wrappers/test/forwarder_wrapper_test.ts

@@ -97,8 +97,8 @@ describe('ForwarderWrapper', () => {
             );
             await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
             const ordersInfo = await contractWrappers.exchange.getOrdersInfoAsync([signedOrder, anotherSignedOrder]);
-            expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+            expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FullyFilled);
-            expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+            expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.FullyFilled);
         });
         it('should throw when invalid transaction and shouldValidate is true', async () => {
             const signedOrders = [signedOrder];
@@ -131,8 +131,8 @@ describe('ForwarderWrapper', () => {
             );
             await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
             const ordersInfo = await contractWrappers.exchange.getOrdersInfoAsync([signedOrder, anotherSignedOrder]);
-            expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+            expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FullyFilled);
-            expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(ordersInfo[1].orderTakerAssetFilledAmount).to.be.bignumber.equal(new BigNumber(4)); // only 95% of ETH is sold
         });
         it('should throw when invalid transaction and shouldValidate is true', async () => {

packages/contract-wrappers/test/order_validator_wrapper_test.ts

@@ -117,9 +117,9 @@ describe('OrderValidator', () => {
         it('should return correct on-chain order info for input orders', async () => {
             const firstOrderInfo = ordersInfo[0];
             const secondOrderInfo = ordersInfo[1];
-            expect(firstOrderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(firstOrderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(firstOrderInfo.orderTakerAssetFilledAmount).to.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(secondOrderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(secondOrderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(secondOrderInfo.orderTakerAssetFilledAmount).to.bignumber.equal(constants.ZERO_AMOUNT);
         });
         it('should return correct on-chain trader info for input takers', async () => {

packages/contract-wrappers/test/utils/token_utils.ts

@@ -9,14 +9,14 @@ import { provider, txDefaults, web3Wrapper } from './web3_wrapper';
 // Before we were fetching them from the TokenRegistry but now we can't as it's deprecated and removed.
 // TODO(albrow): Import these from the migrations package instead of hard-coding them.
 const DUMMY_ERC_20_ADRESSES = [
-    '0x6dfff22588be9b3ef8cf0ad6dc9b84796f9fb45f',
+    '0x34d402f14d58e001d8efbe6585051bf9706aa064',
-    '0xcfc18cec799fbd1793b5c43e773c98d4d61cc2db',
+    '0x25b8fe1de9daf8ba351890744ff28cf7dfa8f5e3',
-    '0xf22469f31527adc53284441bae1665a7b9214dba',
+    '0xcdb594a32b1cc3479d8746279712c39d18a07fc0',
-    '0x10add991de718a69dec2117cb6aa28098836511b',
+    '0x1e2f9e10d02a6b8f8f69fcbf515e75039d2ea30d',
-    '0x8d61158a366019ac78db4149d75fff9dda51160d',
+    '0xbe0037eaf2d64fe5529bca93c18c9702d3930376',
 ];
 
-const DUMMY_ERC_721_ADRESSES = ['0x131855dda0aaff096f6854854c55a4debf61077a'];
+const DUMMY_ERC_721_ADRESSES = ['0x07f96aa816c1f244cbc6ef114bb2b023ba54a2eb'];
 
 export const tokenUtils = {
     getDummyERC20TokenAddresses(): string[] {

packages/dev-tools-pages/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/dev-tools-pages",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -26,7 +26,7 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "@0x/react-shared": "^1.1.0",
+        "@0x/react-shared": "^1.1.1",
         "basscss": "^8.0.3",
         "bowser": "^1.9.3",
         "highlight.js": "^9.13.1",
@@ -81,6 +81,6 @@
         "puppeteerArgs": [
             "--no-sandbox",
             "--disable-setuid-sandbox"
-          ]
+        ]
     }
 }

packages/dev-utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1547040760,
         "version": "1.0.22",

packages/dev-utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.23 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.22 - _January 9, 2019_
 
     * Dependencies updated

packages/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/dev-utils",
-    "version": "1.0.22",
+    "version": "1.0.23",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,7 +29,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/tslint-config": "^2.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "make-promises-safe": "^1.1.0",
@@ -41,14 +41,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/subproviders": "^2.1.9",
+        "@0x/subproviders": "^2.1.10",
-        "@0x/types": "^1.5.0",
+        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.6",
+        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^2.1.1",
+        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/web3-provider-engine": "^14.0.0",
         "chai": "^4.0.1",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "lodash": "^4.17.5"
     },
     "publishConfig": {

packages/devnet/genesis.json

@@ -8,7 +8,7 @@
         "eip158Block": 3,
         "byzantiumBlock": 4,
         "clique": {
-            "period": 0,
+            "period": 1,
             "epoch": 30000
         }
     },