Merge pull request #2626 from 0xProject/feat/zero-ex/TransformERC20-call-data-validation

ZeroEx: transformERC20 call data validation

contracts/zero-ex/CHANGELOG.json

@@ -13,6 +13,10 @@
             {
                 "note": "Add `MetaTransactions` and `SignatureValidator` features",
                 "pr": 2610
+            },
+            {
+                "note": "Update `TransformERC20` and `MetaTransactions` to handle signed calldata.",
+                "pr": 2626
             }
         ],
         "timestamp": 1594788383

contracts/zero-ex/contracts/src/IZeroEx.sol

@@ -0,0 +1,53 @@
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "./features/IOwnable.sol";
+import "./features/ISimpleFunctionRegistry.sol";
+import "./features/ITokenSpender.sol";
+import "./features/ISignatureValidator.sol";
+import "./features/ITransformERC20.sol";
+import "./features/IMetaTransactions.sol";
+
+
+/// @dev Interface for a fully featured Exchange Proxy.
+interface IZeroEx is
+    IOwnable,
+    ISimpleFunctionRegistry,
+    ITokenSpender,
+    ISignatureValidator,
+    ITransformERC20,
+    IMetaTransactions
+{
+    // solhint-disable state-visibility
+
+    /// @dev Fallback for just receiving ether.
+    receive() external payable;
+
+    // solhint-enable state-visibility
+
+    /// @dev Get the implementation contract of a registered function.
+    /// @param selector The function selector.
+    /// @return impl The implementation contract address.
+    function getFunctionImplementation(bytes4 selector)
+        external
+        view
+        returns (address impl);
+}

contracts/zero-ex/contracts/src/features/IMetaTransactions.sol

@@ -28,7 +28,7 @@ interface IMetaTransactions {
     /// @dev Describes an exchange proxy meta transaction.
     struct MetaTransactionData {
         // Signer of meta-transaction. On whose behalf to execute the MTX.
-        address signer;
+        address payable signer;
         // Required sender, or NULL for anyone.
         address sender;
         // Minimum gas price.

contracts/zero-ex/contracts/src/features/ITransformERC20.sol

@@ -37,6 +37,33 @@ interface ITransformERC20 {
         bytes data;
     }
 
+    /// @dev Arguments for `_transformERC20()`.
+    struct TransformERC20Args {
+        // The taker address.
+        address payable taker;
+        // The token being provided by the taker.
+        // If `0xeee...`, ETH is implied and should be provided with the call.`
+        IERC20TokenV06 inputToken;
+        // The token to be acquired by the taker.
+        // `0xeee...` implies ETH.
+        IERC20TokenV06 outputToken;
+        // The amount of `inputToken` to take from the taker.
+        // If set to `uint256(-1)`, the entire spendable balance of the taker
+        // will be solt.
+        uint256 inputTokenAmount;
+        // The minimum amount of `outputToken` the taker
+        // must receive for the entire transformation to succeed. If set to zero,
+        // the minimum output token transfer will not be asserted.
+        uint256 minOutputTokenAmount;
+        // The transformations to execute on the token balance(s)
+        // in sequence.
+        Transformation[] transformations;
+        // The hash of the calldata for the `transformERC20()` call.
+        bytes32 callDataHash;
+        // The signature for `callDataHash` signed by `getQuoteSigner()`.
+        bytes callDataSignature;
+    }
+
     /// @dev Raised upon a successful `transformERC20`.
     /// @param taker The taker (caller) address.
     /// @param inputToken The token being provided by the taker.
@@ -57,12 +84,23 @@ interface ITransformERC20 {
     /// @param transformerDeployer The new deployer address.
     event TransformerDeployerUpdated(address transformerDeployer);
 
+    /// @dev Raised when `setQuoteSigner()` is called.
+    /// @param quoteSigner The new quote signer.
+    event QuoteSignerUpdated(address quoteSigner);
+
     /// @dev Replace the allowed deployer for transformers.
     ///      Only callable by the owner.
-    /// @param transformerDeployer The address of the trusted deployer for transformers.
+    /// @param transformerDeployer The address of the new trusted deployer
+    ///        for transformers.
     function setTransformerDeployer(address transformerDeployer)
         external;
 
+    /// @dev Replace the optional signer for `transformERC20()` calldata.
+    ///      Only callable by the owner.
+    /// @param quoteSigner The address of the new calldata signer.
+    function setQuoteSigner(address quoteSigner)
+        external;
+
     /// @dev Deploy a new flash wallet instance and replace the current one with it.
     ///      Useful if we somehow break the current wallet instance.
     ///       Only callable by the owner.
@@ -95,27 +133,9 @@ interface ITransformERC20 {
         returns (uint256 outputTokenAmount);
 
     /// @dev Internal version of `transformERC20()`. Only callable from within.
-    /// @param callDataHash Hash of the ingress calldata.
-    /// @param taker The taker address.
-    /// @param inputToken The token being provided by the taker.
-    ///        If `0xeee...`, ETH is implied and should be provided with the call.`
-    /// @param outputToken The token to be acquired by the taker.
-    ///        `0xeee...` implies ETH.
-    /// @param inputTokenAmount The amount of `inputToken` to take from the taker.
-    /// @param minOutputTokenAmount The minimum amount of `outputToken` the taker
-    ///        must receive for the entire transformation to succeed.
-    /// @param transformations The transformations to execute on the token balance(s)
-    ///        in sequence.
+    /// @param args A `TransformERC20Args` struct.
     /// @return outputTokenAmount The amount of `outputToken` received by the taker.
-    function _transformERC20(
-        bytes32 callDataHash,
-        address payable taker,
-        IERC20TokenV06 inputToken,
-        IERC20TokenV06 outputToken,
-        uint256 inputTokenAmount,
-        uint256 minOutputTokenAmount,
-        Transformation[] calldata transformations
-    )
+    function _transformERC20(TransformERC20Args calldata args)
         external
         payable
         returns (uint256 outputTokenAmount);
@@ -134,4 +154,11 @@ interface ITransformERC20 {
         external
         view
         returns (address deployer);
+
+    /// @dev Return the optional signer for `transformERC20()` calldata.
+    /// @return signer The transform deployer address.
+    function getQuoteSigner()
+        external
+        view
+        returns (address signer);
 }

contracts/zero-ex/contracts/src/features/MetaTransactions.sol

@@ -26,6 +26,7 @@ import "../fixins/FixinCommon.sol";
 import "../fixins/FixinEIP712.sol";
 import "../migrations/LibMigrate.sol";
 import "../storage/LibMetaTransactionsStorage.sol";
+import "./libs/LibSignedCallData.sol";
 import "./IMetaTransactions.sol";
 import "./ITransformERC20.sol";
 import "./ISignatureValidator.sol";
@@ -43,18 +44,27 @@ contract MetaTransactions is
     using LibBytesV06 for bytes;
     using LibRichErrorsV06 for bytes;
 
-    /// @dev Intermediate state vars to avoid stack overflows.
+    /// @dev Intermediate state vars used by `_executeMetaTransactionPrivate()`
+    ///      to avoid stack overflows.
     struct ExecuteState {
+        // Sender of the meta-transaction.
         address sender;
+        // Hash of the meta-transaction data.
         bytes32 hash;
+        // The meta-transaction data.
         MetaTransactionData mtx;
+        // The meta-transaction signature (by `mtx.signer`).
         bytes signature;
+        // The selector of the function being called.
         bytes4 selector;
+        // The ETH balance of this contract before performing the call.
         uint256 selfBalance;
+        // The block number at which the meta-transaction was executed.
         uint256 executedBlockNumber;
     }
 
-    struct TransformERC20Args {
+    /// @dev Arguments for a `TransformERC20.transformERC20()` call.
+    struct ExternalTransformERC20Args {
         IERC20TokenV06 inputToken;
         IERC20TokenV06 outputToken;
         uint256 inputTokenAmount;
@@ -379,7 +389,7 @@ contract MetaTransactions is
         // | transformations (offset) |     160 | = 32
         // | transformations (data)   |     192 |
 
-        TransformERC20Args memory args;
+        ExternalTransformERC20Args memory args;
         {
             bytes memory encodedStructArgs = new bytes(state.mtx.callData.length - 4 + 32);
             // Copy the args data from the original, after the new struct offset prefix.
@@ -388,8 +398,8 @@ contract MetaTransactions is
             uint256 fromMem;
             uint256 toMem;
             assembly {
-                // Prefix the original calldata with a struct offset,
-                // which is just one word over.
+                // Prefix the calldata with a struct offset,
+                // which points to just one word over.
                 mstore(add(encodedStructArgs, 32), 32)
                 // Copy everything after the selector.
                 fromMem := add(fromCallData, 36)
@@ -398,20 +408,27 @@ contract MetaTransactions is
             }
             LibBytesV06.memCopy(toMem, fromMem, fromCallData.length - 4);
             // Decode call args for `ITransformERC20.transformERC20()` as a struct.
-            args = abi.decode(encodedStructArgs, (TransformERC20Args));
+            args = abi.decode(encodedStructArgs, (ExternalTransformERC20Args));
         }
+        // Parse the signature and hash out of the calldata so `_transformERC20()`
+        // can authenticate it.
+        (bytes32 callDataHash, bytes memory callDataSignature) =
+            LibSignedCallData.parseCallData(state.mtx.callData);
         // Call `ITransformERC20._transformERC20()` (internal variant).
         return _callSelf(
             state.hash,
             abi.encodeWithSelector(
                 ITransformERC20._transformERC20.selector,
-                keccak256(state.mtx.callData),
-                state.mtx.signer, // taker is mtx signer
-                args.inputToken,
-                args.outputToken,
-                args.inputTokenAmount,
-                args.minOutputTokenAmount,
-                args.transformations
+                ITransformERC20.TransformERC20Args({
+                    taker: state.mtx.signer, // taker is mtx signer
+                    inputToken: args.inputToken,
+                    outputToken: args.outputToken,
+                    inputTokenAmount: args.inputTokenAmount,
+                    minOutputTokenAmount: args.minOutputTokenAmount,
+                    transformations: args.transformations,
+                    callDataHash: callDataHash,
+                    callDataSignature: callDataSignature
+              })
             ),
             state.mtx.value
         );

contracts/zero-ex/contracts/src/features/SignatureValidator.sol

@@ -106,11 +106,18 @@ contract SignatureValidator is
         override
         returns (bool isValid)
     {
-        try this.validateHashSignature(hash, signer, signature) {
-            isValid = true;
-        } catch (bytes memory) {
-            isValid = false;
-        }
+        // HACK: `validateHashSignature()` is stateless so we can just perform
+        // a staticcall against the implementation contract. This avoids the
+        // overhead of going through the proxy. If `validateHashSignature()` ever
+        // becomes stateful this would need to change.
+        (isValid, ) = _implementation.staticcall(
+            abi.encodeWithSelector(
+                this.validateHashSignature.selector,
+                hash,
+                signer,
+                signature
+            )
+        );
     }
 
     /// @dev Validates a hash-only signature type. Low-level, hidden variant.

contracts/zero-ex/contracts/src/features/TransformERC20.sol

@@ -31,9 +31,11 @@ import "../external/FlashWallet.sol";
 import "../storage/LibTransformERC20Storage.sol";
 import "../transformers/IERC20Transformer.sol";
 import "../transformers/LibERC20Transformer.sol";
+import "./libs/LibSignedCallData.sol";
 import "./ITransformERC20.sol";
 import "./ITokenSpender.sol";
 import "./IFeature.sol";
+import "./ISignatureValidator.sol";
 import "./ISimpleFunctionRegistry.sol";
 
 
@@ -43,6 +45,8 @@ contract TransformERC20 is
     ITransformERC20,
     FixinCommon
 {
+    using LibSafeMathV06 for uint256;
+    using LibRichErrorsV06 for bytes;
 
     /// @dev Stack vars for `_transformERC20Private()`.
     struct TransformERC20PrivateState {
@@ -55,10 +59,7 @@ contract TransformERC20 is
     /// @dev Name of this feature.
     string public constant override FEATURE_NAME = "TransformERC20";
     /// @dev Version of this feature.
-    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 1, 0);
-
-    using LibSafeMathV06 for uint256;
-    using LibRichErrorsV06 for bytes;
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 2, 0);
 
     constructor() public FixinCommon() {
         // solhint-disable-next-line no-empty-blocks
@@ -76,6 +77,8 @@ contract TransformERC20 is
         _registerFeatureFunction(this.createTransformWallet.selector);
         _registerFeatureFunction(this.getTransformWallet.selector);
         _registerFeatureFunction(this.setTransformerDeployer.selector);
+        _registerFeatureFunction(this.setQuoteSigner.selector);
+        _registerFeatureFunction(this.getQuoteSigner.selector);
         _registerFeatureFunction(this.transformERC20.selector);
         _registerFeatureFunction(this._transformERC20.selector);
         this.createTransformWallet();
@@ -95,6 +98,18 @@ contract TransformERC20 is
         emit TransformerDeployerUpdated(transformerDeployer);
     }
 
+    /// @dev Replace the optional signer for `transformERC20()` calldata.
+    ///      Only callable by the owner.
+    /// @param quoteSigner The address of the new calldata signer.
+    function setQuoteSigner(address quoteSigner)
+        external
+        override
+        onlyOwner
+    {
+        LibTransformERC20Storage.getStorage().quoteSigner = quoteSigner;
+        emit QuoteSignerUpdated(quoteSigner);
+    }
+
     /// @dev Return the allowed deployer for transformers.
     /// @return deployer The transform deployer address.
     function getTransformerDeployer()
@@ -106,6 +121,17 @@ contract TransformERC20 is
         return LibTransformERC20Storage.getStorage().transformerDeployer;
     }
 
+    /// @dev Return the optional signer for `transformERC20()` calldata.
+    /// @return signer The signer address.
+    function getQuoteSigner()
+        public
+        override
+        view
+        returns (address signer)
+    {
+        return LibTransformERC20Storage.getStorage().quoteSigner;
+    }
+
     /// @dev Deploy a new wallet instance and replace the current one with it.
     ///      Useful if we somehow break the current wallet instance.
     ///      Only callable by the owner.
@@ -147,42 +173,26 @@ contract TransformERC20 is
         payable
         returns (uint256 outputTokenAmount)
     {
+        (bytes32 callDataHash, bytes memory callDataSignature) =
+            LibSignedCallData.parseCallData(msg.data);
         return _transformERC20Private(
-            keccak256(msg.data),
-            msg.sender,
-            inputToken,
-            outputToken,
-            inputTokenAmount,
-            minOutputTokenAmount,
-            transformations
+            TransformERC20Args({
+                taker: msg.sender,
+                inputToken: inputToken,
+                outputToken: outputToken,
+                inputTokenAmount: inputTokenAmount,
+                minOutputTokenAmount: minOutputTokenAmount,
+                transformations: transformations,
+                callDataHash: callDataHash,
+                callDataSignature: callDataSignature
+            })
         );
     }
 
     /// @dev Internal version of `transformERC20()`. Only callable from within.
-    /// @param callDataHash Hash of the ingress calldata.
-    /// @param taker The taker address.
-    /// @param inputToken The token being provided by the taker.
-    ///        If `0xeee...`, ETH is implied and should be provided with the call.`
-    /// @param outputToken The token to be acquired by the taker.
-    ///        `0xeee...` implies ETH.
-    /// @param inputTokenAmount The amount of `inputToken` to take from the taker.
-    ///        If set to `uint256(-1)`, the entire spendable balance of the taker
-    ///        will be solt.
-    /// @param minOutputTokenAmount The minimum amount of `outputToken` the taker
-    ///        must receive for the entire transformation to succeed. If set to zero,
-    ///        the minimum output token transfer will not be asserted.
-    /// @param transformations The transformations to execute on the token balance(s)
-    ///        in sequence.
+    /// @param args A `TransformERC20Args` struct.
     /// @return outputTokenAmount The amount of `outputToken` received by the taker.
-    function _transformERC20(
-        bytes32 callDataHash,
-        address payable taker,
-        IERC20TokenV06 inputToken,
-        IERC20TokenV06 outputToken,
-        uint256 inputTokenAmount,
-        uint256 minOutputTokenAmount,
-        Transformation[] memory transformations
-    )
+    function _transformERC20(TransformERC20Args memory args)
         public
         virtual
         override
@@ -190,50 +200,21 @@ contract TransformERC20 is
         onlySelf
         returns (uint256 outputTokenAmount)
     {
-        return _transformERC20Private(
-            callDataHash,
-            taker,
-            inputToken,
-            outputToken,
-            inputTokenAmount,
-            minOutputTokenAmount,
-            transformations
-        );
+        return _transformERC20Private(args);
     }
 
     /// @dev Private version of `transformERC20()`.
-    /// @param callDataHash Hash of the ingress calldata.
-    /// @param taker The taker address.
-    /// @param inputToken The token being provided by the taker.
-    ///        If `0xeee...`, ETH is implied and should be provided with the call.`
-    /// @param outputToken The token to be acquired by the taker.
-    ///        `0xeee...` implies ETH.
-    /// @param inputTokenAmount The amount of `inputToken` to take from the taker.
-    ///        If set to `uint256(-1)`, the entire spendable balance of the taker
-    ///        will be solt.
-    /// @param minOutputTokenAmount The minimum amount of `outputToken` the taker
-    ///        must receive for the entire transformation to succeed. If set to zero,
-    ///        the minimum output token transfer will not be asserted.
-    /// @param transformations The transformations to execute on the token balance(s)
-    ///        in sequence.
+    /// @param args A `TransformERC20Args` struct.
     /// @return outputTokenAmount The amount of `outputToken` received by the taker.
-    function _transformERC20Private(
-        bytes32 callDataHash,
-        address payable taker,
-        IERC20TokenV06 inputToken,
-        IERC20TokenV06 outputToken,
-        uint256 inputTokenAmount,
-        uint256 minOutputTokenAmount,
-        Transformation[] memory transformations
-    )
+    function _transformERC20Private(TransformERC20Args memory args)
         private
         returns (uint256 outputTokenAmount)
     {
         // If the input token amount is -1, transform the taker's entire
         // spendable balance.
-        if (inputTokenAmount == uint256(-1)) {
-            inputTokenAmount = ITokenSpender(address(this))
-                .getSpendableERC20BalanceOf(inputToken, taker);
+        if (args.inputTokenAmount == uint256(-1)) {
+            args.inputTokenAmount = ITokenSpender(address(this))
+                .getSpendableERC20BalanceOf(args.inputToken, args.taker);
         }
 
         TransformERC20PrivateState memory state;
@@ -242,55 +223,65 @@ contract TransformERC20 is
 
         // Remember the initial output token balance of the taker.
         state.takerOutputTokenBalanceBefore =
-            LibERC20Transformer.getTokenBalanceOf(outputToken, taker);
+            LibERC20Transformer.getTokenBalanceOf(args.outputToken, args.taker);
 
         // Pull input tokens from the taker to the wallet and transfer attached ETH.
         _transferInputTokensAndAttachedEth(
-            inputToken,
-            taker,
+            args.inputToken,
+            args.taker,
             address(state.wallet),
-            inputTokenAmount
+            args.inputTokenAmount
         );
 
+        {
+            // Validate that the calldata was signed by the quote signer.
+            // `validCallDataHash` will be 0x0 if not.
+            bytes32 validCallDataHash = _getValidCallDataHash(
+                args.callDataHash,
+                args.callDataSignature
+            );
             // Perform transformations.
-        for (uint256 i = 0; i < transformations.length; ++i) {
+            for (uint256 i = 0; i < args.transformations.length; ++i) {
                 _executeTransformation(
                     state.wallet,
-                transformations[i],
+                    args.transformations[i],
                     state.transformerDeployer,
-                taker,
-                callDataHash
+                    args.taker,
+                    // Transformers will receive a null calldata hash if
+                    // the calldata was not properly signed.
+                    validCallDataHash
                 );
             }
+        }
 
         // Compute how much output token has been transferred to the taker.
         state.takerOutputTokenBalanceAfter =
-            LibERC20Transformer.getTokenBalanceOf(outputToken, taker);
+            LibERC20Transformer.getTokenBalanceOf(args.outputToken, args.taker);
         if (state.takerOutputTokenBalanceAfter > state.takerOutputTokenBalanceBefore) {
             outputTokenAmount = state.takerOutputTokenBalanceAfter.safeSub(
                 state.takerOutputTokenBalanceBefore
             );
         } else if (state.takerOutputTokenBalanceAfter < state.takerOutputTokenBalanceBefore) {
             LibTransformERC20RichErrors.NegativeTransformERC20OutputError(
-                address(outputToken),
+                address(args.outputToken),
                 state.takerOutputTokenBalanceBefore - state.takerOutputTokenBalanceAfter
             ).rrevert();
         }
         // Ensure enough output token has been sent to the taker.
-        if (outputTokenAmount < minOutputTokenAmount) {
+        if (outputTokenAmount < args.minOutputTokenAmount) {
             LibTransformERC20RichErrors.IncompleteTransformERC20Error(
-                address(outputToken),
+                address(args.outputToken),
                 outputTokenAmount,
-                minOutputTokenAmount
+                args.minOutputTokenAmount
             ).rrevert();
         }
 
         // Emit an event.
         emit TransformedERC20(
-            taker,
-            address(inputToken),
-            address(outputToken),
-            inputTokenAmount,
+            args.taker,
+            address(args.inputToken),
+            address(args.outputToken),
+            args.inputTokenAmount,
             outputTokenAmount
         );
     }
@@ -385,4 +376,29 @@ contract TransformERC20 is
             ).rrevert();
         }
     }
+
+    /// @dev Check if a call data hash is signed by the quote signer.
+    /// @param callDataHash The hash of the callData.
+    /// @param signature The signature provided by `getQuoteSigner()`.
+    /// @return validCallDataHash `callDataHash` if so and `0x0` otherwise.
+    function _getValidCallDataHash(
+        bytes32 callDataHash,
+        bytes memory signature
+    )
+        private
+        view
+        returns (bytes32 validCallDataHash)
+    {
+        if (signature.length == 0) {
+            return bytes32(0);
+        }
+
+        if (ISignatureValidator(address(this)).isValidHashSignature(
+            callDataHash,
+            getQuoteSigner(),
+            signature
+        )) {
+            return callDataHash;
+        }
+    }
 }

contracts/zero-ex/contracts/src/features/libs/LibSignedCallData.sol

@@ -0,0 +1,72 @@
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/v06/LibBytesV06.sol";
+
+
+/// @dev Library for working with signed calldata.
+library LibSignedCallData {
+    using LibBytesV06 for bytes;
+
+    // bytes4(keccak256('SignedCallDataSignature(bytes)'))
+    bytes4 constant private SIGNATURE_SELECTOR = 0xf86d1d92;
+
+    /// @dev Try to parse potentially signed calldata into its hash and signature
+    ///      components. Signed calldata has signature data appended to it.
+    /// @param callData the raw call data.
+    /// @return callDataHash If a signature is detected, this will be the hash of
+    ///         the bytes preceding the signature data. Otherwise, this
+    ///         will be the hash of the entire `callData`.
+    /// @return signature The signature bytes, if present.
+    function parseCallData(bytes memory callData)
+        internal
+        pure
+        returns (bytes32 callDataHash, bytes memory signature)
+    {
+        // Signed calldata has a 70 byte signature appended as:
+        // ```
+        //   abi.encodePacked(
+        //     callData,
+        //     bytes4(keccak256('SignedCallDataSignature(bytes)')),
+        //     signature // 66 bytes
+        //   );
+        // ```
+
+        // Try to detect an appended signature. This isn't foolproof, but an
+        // accidental false positive should highly unlikely. Additinally, the
+        // signature would also have to pass verification, so the risk here is
+        // low.
+        if (
+            // Signed callData has to be at least 70 bytes long.
+            callData.length < 70 ||
+            // The bytes4 at offset -70 should equal `SIGNATURE_SELECTOR`.
+            SIGNATURE_SELECTOR != callData.readBytes4(callData.length - 70)
+        ) {
+            return (keccak256(callData), signature);
+        }
+        // Consider everything before the signature selector as the original
+        // calldata and everything after as the signature.
+        assembly {
+            callDataHash := keccak256(add(callData, 32), sub(mload(callData), 70))
+        }
+        signature = callData.slice(callData.length - 66, callData.length);
+    }
+}

contracts/zero-ex/contracts/src/storage/LibTransformERC20Storage.sol

@@ -32,6 +32,8 @@ library LibTransformERC20Storage {
         IFlashWallet wallet;
         // The transformer deployer address.
         address transformerDeployer;
+        // The optional signer for `transformERC20()` calldata.
+        address quoteSigner;
     }
 
     /// @dev Get the storage bucket for this contract.

contracts/zero-ex/contracts/test/TestMetaTransactionsTransformERC20Feature.sol

@@ -28,24 +28,17 @@ contract TestMetaTransactionsTransformERC20Feature is
     event TransformERC20Called(
         address sender,
         uint256 value,
-        bytes32 callDataHash,
         address taker,
         IERC20TokenV06 inputToken,
         IERC20TokenV06 outputToken,
         uint256 inputTokenAmount,
         uint256 minOutputTokenAmount,
-        Transformation[] transformations
+        Transformation[] transformations,
+        bytes32 callDataHash,
+        bytes callDataSignature
     );
 
-    function _transformERC20(
-        bytes32 callDataHash,
-        address payable taker,
-        IERC20TokenV06 inputToken,
-        IERC20TokenV06 outputToken,
-        uint256 inputTokenAmount,
-        uint256 minOutputTokenAmount,
-        Transformation[] memory transformations
-    )
+    function _transformERC20(TransformERC20Args memory args)
         public
         override
         payable
@@ -58,13 +51,14 @@ contract TestMetaTransactionsTransformERC20Feature is
         emit TransformERC20Called(
             msg.sender,
             msg.value,
-            callDataHash,
-            taker,
-            inputToken,
-            outputToken,
-            inputTokenAmount,
-            minOutputTokenAmount,
-            transformations
+            args.taker,
+            args.inputToken,
+            args.outputToken,
+            args.inputTokenAmount,
+            args.minOutputTokenAmount,
+            args.transformations,
+            args.callDataHash,
+            args.callDataSignature
         );
         return 1337;
     }

contracts/zero-ex/package.json

@@ -39,9 +39,9 @@
         "publish:private": "yarn build && gitpkg publish"
     },
     "config": {
-        "publicInterfaceContracts": "ZeroEx,FullMigration,InitialMigration,IFlashWallet,IAllowanceTarget,IERC20Transformer,IOwnable,ISimpleFunctionRegistry,ITokenSpender,ITransformERC20,FillQuoteTransformer,PayTakerTransformer,WethTransformer,Ownable,SimpleFunctionRegistry,TransformERC20,TokenSpender,AffiliateFeeTransformer,SignatureValidator,MetaTransactions",
+        "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IAllowanceTarget,IERC20Transformer,IOwnable,ISimpleFunctionRegistry,ITokenSpender,ITransformERC20,FillQuoteTransformer,PayTakerTransformer,WethTransformer,Ownable,SimpleFunctionRegistry,TransformERC20,TokenSpender,AffiliateFeeTransformer,SignatureValidator,MetaTransactions",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|AllowanceTarget|Bootstrap|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinGasToken|FlashWallet|FullMigration|IAllowanceTarget|IBootstrap|IERC20Bridge|IERC20Transformer|IExchange|IFeature|IFlashWallet|IGasToken|IMetaTransactions|IOwnable|ISignatureValidator|ISimpleFunctionRegistry|ITestSimpleFunctionRegistryFeature|ITokenSpender|ITransformERC20|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibSpenderRichErrors|LibStorage|LibTokenSpenderStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|MetaTransactions|Ownable|PayTakerTransformer|SignatureValidator|SimpleFunctionRegistry|TestCallTarget|TestDelegateCaller|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFullMigration|TestInitialMigration|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestTokenSpender|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestWeth|TestWethTransformerHost|TestZeroExFeature|TokenSpender|TransformERC20|Transformer|TransformerDeployer|WethTransformer|ZeroEx).json"
+        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|AllowanceTarget|Bootstrap|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinGasToken|FlashWallet|FullMigration|IAllowanceTarget|IBootstrap|IERC20Bridge|IERC20Transformer|IExchange|IFeature|IFlashWallet|IGasToken|IMetaTransactions|IOwnable|ISignatureValidator|ISimpleFunctionRegistry|ITestSimpleFunctionRegistryFeature|ITokenSpender|ITransformERC20|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibSignatureRichErrors|LibSignedCallData|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibSpenderRichErrors|LibStorage|LibTokenSpenderStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|MetaTransactions|Ownable|PayTakerTransformer|SignatureValidator|SimpleFunctionRegistry|TestCallTarget|TestDelegateCaller|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFullMigration|TestInitialMigration|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestTokenSpender|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestWeth|TestWethTransformerHost|TestZeroExFeature|TokenSpender|TransformERC20|Transformer|TransformerDeployer|WethTransformer|ZeroEx).json"
     },
     "repository": {
         "type": "git",

contracts/zero-ex/src/artifacts.ts

@@ -16,6 +16,7 @@ import * as IOwnable from '../generated-artifacts/IOwnable.json';
 import * as ISimpleFunctionRegistry from '../generated-artifacts/ISimpleFunctionRegistry.json';
 import * as ITokenSpender from '../generated-artifacts/ITokenSpender.json';
 import * as ITransformERC20 from '../generated-artifacts/ITransformERC20.json';
+import * as IZeroEx from '../generated-artifacts/IZeroEx.json';
 import * as MetaTransactions from '../generated-artifacts/MetaTransactions.json';
 import * as Ownable from '../generated-artifacts/Ownable.json';
 import * as PayTakerTransformer from '../generated-artifacts/PayTakerTransformer.json';
@@ -26,6 +27,7 @@ import * as TransformERC20 from '../generated-artifacts/TransformERC20.json';
 import * as WethTransformer from '../generated-artifacts/WethTransformer.json';
 import * as ZeroEx from '../generated-artifacts/ZeroEx.json';
 export const artifacts = {
+    IZeroEx: IZeroEx as ContractArtifact,
     ZeroEx: ZeroEx as ContractArtifact,
     FullMigration: FullMigration as ContractArtifact,
     InitialMigration: InitialMigration as ContractArtifact,

contracts/zero-ex/src/index.ts

@@ -8,6 +8,7 @@ export {
     ISimpleFunctionRegistryEvents,
     ITokenSpenderContract,
     ITransformERC20Contract,
+    IZeroExContract,
     PayTakerTransformerContract,
     WethTransformerContract,
     ZeroExContract,
@@ -45,3 +46,4 @@ export {
 
 export * from './nonce_utils';
 export * from './migration';
+export * from './signed_call_data';

contracts/zero-ex/src/signed_call_data.ts

@@ -0,0 +1,29 @@
+import { SignatureType } from '@0x/types';
+import { hexUtils } from '@0x/utils';
+import * as ethjs from 'ethereumjs-util';
+
+/**
+ * Generate calldata with a signature appended.
+ */
+export function signCallData(callData: string, privateKey: string): string {
+    const prefix = ethjs.sha3('SignedCallDataSignature(bytes)').slice(0, 4);
+    return hexUtils.concat(callData, prefix, generateCallDataSignature(callData, privateKey));
+}
+
+/**
+ * Generate a signature for calldata.
+ */
+export function generateCallDataSignature(callData: string, privateKey: string): string {
+    return generateCallDataHashSignature(hexUtils.hash(callData), privateKey);
+}
+
+/**
+ * Generate a signature for calldata hash.
+ */
+export function generateCallDataHashSignature(callDataHash: string, privateKey: string): string {
+    const { r, s, v } = ethjs.ecsign(
+        ethjs.hashPersonalMessage(ethjs.toBuffer(callDataHash)),
+        ethjs.toBuffer(privateKey),
+    );
+    return hexUtils.concat(v, r, s, SignatureType.EthSign);
+}

contracts/zero-ex/src/wrappers.ts

@@ -13,6 +13,7 @@ export * from '../generated-wrappers/i_ownable';
 export * from '../generated-wrappers/i_simple_function_registry';
 export * from '../generated-wrappers/i_token_spender';
 export * from '../generated-wrappers/i_transform_erc20';
+export * from '../generated-wrappers/i_zero_ex';
 export * from '../generated-wrappers/initial_migration';
 export * from '../generated-wrappers/meta_transactions';
 export * from '../generated-wrappers/ownable';

contracts/zero-ex/test/artifacts.ts

@@ -30,6 +30,7 @@ import * as ISimpleFunctionRegistry from '../test/generated-artifacts/ISimpleFun
 import * as ITestSimpleFunctionRegistryFeature from '../test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json';
 import * as ITokenSpender from '../test/generated-artifacts/ITokenSpender.json';
 import * as ITransformERC20 from '../test/generated-artifacts/ITransformERC20.json';
+import * as IZeroEx from '../test/generated-artifacts/IZeroEx.json';
 import * as LibBootstrap from '../test/generated-artifacts/LibBootstrap.json';
 import * as LibCommonRichErrors from '../test/generated-artifacts/LibCommonRichErrors.json';
 import * as LibERC20Transformer from '../test/generated-artifacts/LibERC20Transformer.json';
@@ -41,6 +42,7 @@ import * as LibOwnableStorage from '../test/generated-artifacts/LibOwnableStorag
 import * as LibProxyRichErrors from '../test/generated-artifacts/LibProxyRichErrors.json';
 import * as LibProxyStorage from '../test/generated-artifacts/LibProxyStorage.json';
 import * as LibSignatureRichErrors from '../test/generated-artifacts/LibSignatureRichErrors.json';
+import * as LibSignedCallData from '../test/generated-artifacts/LibSignedCallData.json';
 import * as LibSimpleFunctionRegistryRichErrors from '../test/generated-artifacts/LibSimpleFunctionRegistryRichErrors.json';
 import * as LibSimpleFunctionRegistryStorage from '../test/generated-artifacts/LibSimpleFunctionRegistryStorage.json';
 import * as LibSpenderRichErrors from '../test/generated-artifacts/LibSpenderRichErrors.json';
@@ -83,6 +85,7 @@ import * as TransformerDeployer from '../test/generated-artifacts/TransformerDep
 import * as WethTransformer from '../test/generated-artifacts/WethTransformer.json';
 import * as ZeroEx from '../test/generated-artifacts/ZeroEx.json';
 export const artifacts = {
+    IZeroEx: IZeroEx as ContractArtifact,
     ZeroEx: ZeroEx as ContractArtifact,
     LibCommonRichErrors: LibCommonRichErrors as ContractArtifact,
     LibMetaTransactionsRichErrors: LibMetaTransactionsRichErrors as ContractArtifact,
@@ -113,6 +116,7 @@ export const artifacts = {
     SimpleFunctionRegistry: SimpleFunctionRegistry as ContractArtifact,
     TokenSpender: TokenSpender as ContractArtifact,
     TransformERC20: TransformERC20 as ContractArtifact,
+    LibSignedCallData: LibSignedCallData as ContractArtifact,
     FixinCommon: FixinCommon as ContractArtifact,
     FixinEIP712: FixinEIP712 as ContractArtifact,
     FixinGasToken: FixinGasToken as ContractArtifact,

contracts/zero-ex/test/features/meta_transactions_test.ts

@@ -11,6 +11,7 @@ import { ExchangeProxyMetaTransaction } from '@0x/types';
 import { BigNumber, hexUtils, StringRevertError, ZeroExRevertErrors } from '@0x/utils';
 import * as _ from 'lodash';
 
+import { generateCallDataSignature, signCallData } from '../../src/signed_call_data';
 import { MetaTransactionsContract, ZeroExContract } from '../../src/wrappers';
 import { artifacts } from '../artifacts';
 import { abis } from '../utils/abis';
@@ -22,7 +23,7 @@ import {
     TestMintableERC20TokenContract,
 } from '../wrappers';
 
-const { NULL_ADDRESS, ZERO_AMOUNT } = constants;
+const { NULL_ADDRESS, NULL_BYTES, ZERO_AMOUNT } = constants;
 
 blockchainTests.resets('MetaTransactions feature', env => {
     let owner: string;
@@ -161,6 +162,50 @@ blockchainTests.resets('MetaTransactions feature', env => {
                         value: mtx.value,
                         callDataHash: hexUtils.hash(mtx.callData),
                         taker: mtx.signer,
+                        callDataSignature: NULL_BYTES,
+                    },
+                ],
+                TestMetaTransactionsTransformERC20FeatureEvents.TransformERC20Called,
+            );
+        });
+
+        it('can call `TransformERC20.transformERC20()` with signed calldata', async () => {
+            const args = getRandomTransformERC20Args();
+            const callData = transformERC20Feature
+                .transformERC20(
+                    args.inputToken,
+                    args.outputToken,
+                    args.inputTokenAmount,
+                    args.minOutputTokenAmount,
+                    args.transformations,
+                )
+                .getABIEncodedTransactionData();
+            const callDataSignerKey = hexUtils.random();
+            const callDataSignature = generateCallDataSignature(callData, callDataSignerKey);
+            const signedCallData = signCallData(callData, callDataSignerKey);
+            const mtx = getRandomMetaTransaction({ callData: signedCallData });
+            const signature = await signMetaTransactionAsync(mtx);
+            const callOpts = {
+                gasPrice: mtx.minGasPrice,
+                value: mtx.value,
+            };
+            const rawResult = await feature.executeMetaTransaction(mtx, signature).callAsync(callOpts);
+            expect(rawResult).to.eq(RAW_SUCCESS_RESULT);
+            const receipt = await feature.executeMetaTransaction(mtx, signature).awaitTransactionSuccessAsync(callOpts);
+            verifyEventsFromLogs(
+                receipt.logs,
+                [
+                    {
+                        inputToken: args.inputToken,
+                        outputToken: args.outputToken,
+                        inputTokenAmount: args.inputTokenAmount,
+                        minOutputTokenAmount: args.minOutputTokenAmount,
+                        transformations: args.transformations,
+                        sender: zeroEx.address,
+                        value: mtx.value,
+                        callDataHash: hexUtils.hash(callData),
+                        taker: mtx.signer,
+                        callDataSignature,
                     },
                 ],
                 TestMetaTransactionsTransformERC20FeatureEvents.TransformERC20Called,
@@ -237,15 +282,16 @@ blockchainTests.resets('MetaTransactions feature', env => {
             };
             const tx = feature.executeMetaTransaction(mtx, signature).callAsync(callOpts);
             const actualCallData = transformERC20Feature
-                ._transformERC20(
-                    hexUtils.hash(mtx.callData),
-                    mtx.signer,
-                    args.inputToken,
-                    args.outputToken,
-                    args.inputTokenAmount,
-                    args.minOutputTokenAmount,
-                    args.transformations,
-                )
+                ._transformERC20({
+                    taker: mtx.signer,
+                    inputToken: args.inputToken,
+                    outputToken: args.outputToken,
+                    inputTokenAmount: args.inputTokenAmount,
+                    minOutputTokenAmount: args.minOutputTokenAmount,
+                    transformations: args.transformations,
+                    callDataHash: hexUtils.hash(mtx.callData),
+                    callDataSignature: NULL_BYTES,
+                })
                 .getABIEncodedTransactionData();
             return expect(tx).to.revertWith(
                 new ZeroExRevertErrors.MetaTransactions.MetaTransactionCallFailedError(

contracts/zero-ex/test/features/transform_erc20_test.ts

@@ -10,7 +10,10 @@ import {
 } from '@0x/contracts-test-utils';
 import { ETH_TOKEN_ADDRESS } from '@0x/order-utils';
 import { AbiEncoder, hexUtils, OwnableRevertErrors, ZeroExRevertErrors } from '@0x/utils';
+import { DecodedLogEntry } from 'ethereum-types';
+import * as ethjs from 'ethereumjs-util';
 
+import { generateCallDataHashSignature, signCallData } from '../../src/signed_call_data';
 import { TransformERC20Contract, ZeroExContract } from '../../src/wrappers';
 import { artifacts } from '../artifacts';
 import { abis } from '../utils/abis';
@@ -21,10 +24,17 @@ import {
     TestMintableERC20TokenContract,
     TestMintTokenERC20TransformerContract,
     TestMintTokenERC20TransformerEvents,
+    TestMintTokenERC20TransformerMintTransformEventArgs,
     TransformERC20Events,
 } from '../wrappers';
 
+const { NULL_BYTES, NULL_BYTES32 } = constants;
+
+type MintTokenTransformerEvent = DecodedLogEntry<TestMintTokenERC20TransformerMintTransformEventArgs>;
+
 blockchainTests.resets('TransformERC20 feature', env => {
+    const callDataSignerKey = hexUtils.random();
+    const callDataSigner = ethjs.bufferToHex(ethjs.privateToAddress(ethjs.toBuffer(callDataSignerKey)));
     let owner: string;
     let taker: string;
     let transformerDeployer: string;
@@ -54,6 +64,7 @@ blockchainTests.resets('TransformERC20 feature', env => {
         allowanceTarget = await new ITokenSpenderContract(zeroEx.address, env.provider, env.txDefaults)
             .getAllowanceTarget()
             .callAsync();
+        await feature.setQuoteSigner(callDataSigner).awaitTransactionSuccessAsync();
     });
 
     const { MAX_UINT256, ZERO_AMOUNT } = constants;
@@ -101,7 +112,29 @@ blockchainTests.resets('TransformERC20 feature', env => {
         });
     });
 
-    describe('_transformERC20()', () => {
+    describe('quote signer', () => {
+        it('`getQuoteSigner()` returns the quote signer', async () => {
+            const actualSigner = await feature.getQuoteSigner().callAsync();
+            expect(actualSigner).to.eq(callDataSigner);
+        });
+
+        it('owner can set the quote signer with `setQuoteSigner()`', async () => {
+            const newSigner = randomAddress();
+            const receipt = await feature.setQuoteSigner(newSigner).awaitTransactionSuccessAsync({ from: owner });
+            verifyEventsFromLogs(receipt.logs, [{ quoteSigner: newSigner }], TransformERC20Events.QuoteSignerUpdated);
+            const actualSigner = await feature.getQuoteSigner().callAsync();
+            expect(actualSigner).to.eq(newSigner);
+        });
+
+        it('non-owner cannot set the quote signer with `setQuoteSigner()`', async () => {
+            const newSigner = randomAddress();
+            const notOwner = randomAddress();
+            const tx = feature.setQuoteSigner(newSigner).callAsync({ from: notOwner });
+            return expect(tx).to.revertWith(new OwnableRevertErrors.OnlyOwnerError(notOwner, owner));
+        });
+    });
+
+    describe('_transformERC20()/transformERC20()', () => {
         let inputToken: TestMintableERC20TokenContract;
         let outputToken: TestMintableERC20TokenContract;
         let mintTransformer: TestMintTokenERC20TransformerContract;
@@ -187,6 +220,7 @@ blockchainTests.resets('TransformERC20 feature', env => {
             };
         }
 
+        describe('_transformERC20()', () => {
             it("succeeds if taker's output token balance increases by exactly minOutputTokenAmount", async () => {
                 const startingOutputTokenBalance = getRandomInteger(0, '100e18');
                 const startingInputTokenBalance = getRandomInteger(0, '100e18');
@@ -202,15 +236,16 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     inputTokenBurnAmunt: inputTokenAmount,
                 });
                 const receipt = await feature
-                ._transformERC20(
-                    callDataHash,
+                    ._transformERC20({
                         taker,
-                    inputToken.address,
-                    outputToken.address,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
                         inputTokenAmount,
                         minOutputTokenAmount,
-                    [transformation],
-                )
+                        transformations: [transformation],
+                        callDataHash,
+                        callDataSignature: NULL_BYTES,
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 verifyEventsFromLogs(
                     receipt.logs,
@@ -229,7 +264,7 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     receipt.logs,
                     [
                         {
-                        callDataHash,
+                            callDataHash: NULL_BYTES32,
                             taker,
                             context: wallet.address,
                             caller: zeroEx.address,
@@ -257,15 +292,16 @@ blockchainTests.resets('TransformERC20 feature', env => {
                 });
                 const startingOutputTokenBalance = await env.web3Wrapper.getBalanceInWeiAsync(taker);
                 const receipt = await feature
-                ._transformERC20(
-                    callDataHash,
+                    ._transformERC20({
                         taker,
-                    inputToken.address,
-                    ETH_TOKEN_ADDRESS,
+                        inputToken: inputToken.address,
+                        outputToken: ETH_TOKEN_ADDRESS,
                         inputTokenAmount,
                         minOutputTokenAmount,
-                    [transformation],
-                )
+                        transformations: [transformation],
+                        callDataHash,
+                        callDataSignature: NULL_BYTES,
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 verifyEventsFromLogs(
                     receipt.logs,
@@ -284,7 +320,7 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     receipt.logs,
                     [
                         {
-                        callDataHash,
+                            callDataHash: NULL_BYTES32,
                             taker,
                             context: wallet.address,
                             caller: zeroEx.address,
@@ -315,15 +351,16 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     inputTokenBurnAmunt: inputTokenAmount,
                 });
                 const receipt = await feature
-                ._transformERC20(
-                    callDataHash,
+                    ._transformERC20({
                         taker,
-                    inputToken.address,
-                    outputToken.address,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
                         inputTokenAmount,
                         minOutputTokenAmount,
-                    [transformation],
-                )
+                        transformations: [transformation],
+                        callDataHash,
+                        callDataSignature: NULL_BYTES,
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 verifyEventsFromLogs(
                     receipt.logs,
@@ -342,7 +379,7 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     receipt.logs,
                     [
                         {
-                        callDataHash,
+                            callDataHash: NULL_BYTES32,
                             taker,
                             context: wallet.address,
                             caller: zeroEx.address,
@@ -365,20 +402,21 @@ blockchainTests.resets('TransformERC20 feature', env => {
                 const outputTokenMintAmount = minOutputTokenAmount.minus(1);
                 const callValue = getRandomInteger(1, '1e18');
                 const tx = feature
-                ._transformERC20(
-                    hexUtils.random(),
+                    ._transformERC20({
+                        callDataHash: hexUtils.random(),
                         taker,
-                    inputToken.address,
-                    outputToken.address,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
                         inputTokenAmount,
                         minOutputTokenAmount,
-                    [
+                        callDataSignature: NULL_BYTES,
+                        transformations: [
                             createMintTokenTransformation({
                                 outputTokenMintAmount,
                                 inputTokenBurnAmunt: inputTokenAmount,
                             }),
                         ],
-                )
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 const expectedError = new ZeroExRevertErrors.TransformERC20.IncompleteTransformERC20Error(
                     outputToken.address,
@@ -398,20 +436,21 @@ blockchainTests.resets('TransformERC20 feature', env => {
                 const outputTokenFeeAmount = 1;
                 const callValue = getRandomInteger(1, '1e18');
                 const tx = feature
-                ._transformERC20(
-                    hexUtils.random(),
+                    ._transformERC20({
+                        callDataHash: hexUtils.random(),
                         taker,
-                    inputToken.address,
-                    outputToken.address,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
                         inputTokenAmount,
                         minOutputTokenAmount,
-                    [
+                        callDataSignature: NULL_BYTES,
+                        transformations: [
                             createMintTokenTransformation({
                                 outputTokenFeeAmount,
                                 inputTokenBurnAmunt: inputTokenAmount,
                             }),
                         ],
-                )
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 const expectedError = new ZeroExRevertErrors.TransformERC20.NegativeTransformERC20OutputError(
                     outputToken.address,
@@ -442,21 +481,22 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     }),
                 ];
                 const receipt = await feature
-                ._transformERC20(
-                    callDataHash,
+                    ._transformERC20({
                         taker,
-                    inputToken.address,
-                    outputToken.address,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
                         inputTokenAmount,
                         minOutputTokenAmount,
                         transformations,
-                )
+                        callDataHash,
+                        callDataSignature: NULL_BYTES,
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 verifyEventsFromLogs(
                     receipt.logs,
                     [
                         {
-                        callDataHash,
+                            callDataHash: NULL_BYTES32,
                             taker,
                             context: wallet.address,
                             caller: zeroEx.address,
@@ -465,7 +505,7 @@ blockchainTests.resets('TransformERC20 feature', env => {
                             ethBalance: callValue,
                         },
                         {
-                        callDataHash,
+                            callDataHash: NULL_BYTES32,
                             taker,
                             context: wallet.address,
                             caller: zeroEx.address,
@@ -489,15 +529,16 @@ blockchainTests.resets('TransformERC20 feature', env => {
                 const callDataHash = hexUtils.random();
                 const transformations = [createMintTokenTransformation({ deploymentNonce: 1337 })];
                 const tx = feature
-                ._transformERC20(
-                    callDataHash,
+                    ._transformERC20({
                         taker,
-                    inputToken.address,
-                    outputToken.address,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
                         inputTokenAmount,
                         minOutputTokenAmount,
                         transformations,
-                )
+                        callDataHash,
+                        callDataSignature: NULL_BYTES,
+                    })
                     .awaitTransactionSuccessAsync({ value: callValue });
                 return expect(tx).to.revertWith(
                     new ZeroExRevertErrors.TransformERC20.TransformerFailedError(
@@ -507,5 +548,224 @@ blockchainTests.resets('TransformERC20 feature', env => {
                     ),
                 );
             });
+
+            it('passes the calldata hash to transformer with proper signature', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const callDataHash = hexUtils.random();
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const receipt = await feature
+                    ._transformERC20({
+                        taker,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
+                        inputTokenAmount,
+                        minOutputTokenAmount,
+                        transformations: [transformation],
+                        callDataHash,
+                        callDataSignature: generateCallDataHashSignature(callDataHash, callDataSignerKey),
+                    })
+                    .awaitTransactionSuccessAsync({ value: callValue });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(callDataHash);
+            });
+
+            it('passes empty calldata hash to transformer with improper signature', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const callDataHash = hexUtils.random();
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const receipt = await feature
+                    ._transformERC20({
+                        taker,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
+                        inputTokenAmount,
+                        minOutputTokenAmount,
+                        transformations: [transformation],
+                        callDataHash,
+                        callDataSignature: generateCallDataHashSignature(callDataHash, hexUtils.random()),
+                    })
+                    .awaitTransactionSuccessAsync({ value: callValue });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(NULL_BYTES32);
+            });
+
+            it('passes empty calldata hash to transformer with no signature', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const callDataHash = hexUtils.random();
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const receipt = await feature
+                    ._transformERC20({
+                        taker,
+                        inputToken: inputToken.address,
+                        outputToken: outputToken.address,
+                        inputTokenAmount,
+                        minOutputTokenAmount,
+                        transformations: [transformation],
+                        callDataHash,
+                        callDataSignature: NULL_BYTES,
+                    })
+                    .awaitTransactionSuccessAsync({ value: callValue });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(NULL_BYTES32);
+            });
+        });
+
+        describe('transformERC20()', () => {
+            it('passes the calldata hash to transformer with properly signed calldata', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const bakedCall = feature.transformERC20(
+                    inputToken.address,
+                    outputToken.address,
+                    inputTokenAmount,
+                    minOutputTokenAmount,
+                    [transformation],
+                );
+                const callData = bakedCall.getABIEncodedTransactionData();
+                const signedCallData = signCallData(callData, callDataSignerKey);
+                const receipt = await bakedCall.awaitTransactionSuccessAsync({
+                    from: taker,
+                    value: callValue,
+                    data: signedCallData,
+                });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(hexUtils.hash(callData));
+            });
+
+            it('passes empty calldata hash to transformer with improperly signed calldata', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const bakedCall = feature.transformERC20(
+                    inputToken.address,
+                    outputToken.address,
+                    inputTokenAmount,
+                    minOutputTokenAmount,
+                    [transformation],
+                );
+                const callData = bakedCall.getABIEncodedTransactionData();
+                const signedCallData = signCallData(callData, hexUtils.random());
+                const receipt = await bakedCall.awaitTransactionSuccessAsync({
+                    from: taker,
+                    value: callValue,
+                    data: signedCallData,
+                });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(NULL_BYTES32);
+            });
+
+            it('passes empty calldata hash to transformer with unsigned calldata', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const bakedCall = feature.transformERC20(
+                    inputToken.address,
+                    outputToken.address,
+                    inputTokenAmount,
+                    minOutputTokenAmount,
+                    [transformation],
+                );
+                const callData = bakedCall.getABIEncodedTransactionData();
+                const receipt = await bakedCall.awaitTransactionSuccessAsync({
+                    from: taker,
+                    value: callValue,
+                    data: callData,
+                });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(NULL_BYTES32);
+            });
+
+            it('passes empty calldata hash to transformer with calldata with malformed signature', async () => {
+                const startingOutputTokenBalance = getRandomInteger(0, '100e18');
+                const startingInputTokenBalance = getRandomInteger(0, '100e18');
+                await outputToken.mint(taker, startingOutputTokenBalance).awaitTransactionSuccessAsync();
+                await inputToken.mint(taker, startingInputTokenBalance).awaitTransactionSuccessAsync();
+                const inputTokenAmount = getRandomPortion(startingInputTokenBalance);
+                const minOutputTokenAmount = getRandomInteger(1, '1e18');
+                const outputTokenMintAmount = minOutputTokenAmount;
+                const callValue = getRandomInteger(1, '1e18');
+                const transformation = createMintTokenTransformation({
+                    outputTokenMintAmount,
+                    inputTokenBurnAmunt: inputTokenAmount,
+                });
+                const bakedCall = feature.transformERC20(
+                    inputToken.address,
+                    outputToken.address,
+                    inputTokenAmount,
+                    minOutputTokenAmount,
+                    [transformation],
+                );
+                const callData = bakedCall.getABIEncodedTransactionData();
+                const signedCallData = hexUtils.concat(
+                    hexUtils.slice(signCallData(callData, hexUtils.random()), 0, -1),
+                    127,
+                );
+                const receipt = await bakedCall.awaitTransactionSuccessAsync({
+                    from: taker,
+                    value: callValue,
+                    data: signedCallData,
+                });
+                const { callDataHash: actualCallDataHash } = (receipt.logs[0] as MintTokenTransformerEvent).args;
+                expect(actualCallDataHash).to.eq(NULL_BYTES32);
+            });
+        });
     });
 });

contracts/zero-ex/test/full_migration_test.ts

@@ -81,6 +81,8 @@ blockchainTests.resets('Full migration', env => {
                 'createTransformWallet',
                 'getTransformWallet',
                 'setTransformerDeployer',
+                'getQuoteSigner',
+                'setQuoteSigner',
             ],
         },
         SignatureValidator: {

contracts/zero-ex/test/wrappers.ts

@@ -27,6 +27,7 @@ export * from '../test/generated-wrappers/i_simple_function_registry';
 export * from '../test/generated-wrappers/i_test_simple_function_registry_feature';
 export * from '../test/generated-wrappers/i_token_spender';
 export * from '../test/generated-wrappers/i_transform_erc20';
+export * from '../test/generated-wrappers/i_zero_ex';
 export * from '../test/generated-wrappers/initial_migration';
 export * from '../test/generated-wrappers/lib_bootstrap';
 export * from '../test/generated-wrappers/lib_common_rich_errors';
@@ -39,6 +40,7 @@ export * from '../test/generated-wrappers/lib_ownable_storage';
 export * from '../test/generated-wrappers/lib_proxy_rich_errors';
 export * from '../test/generated-wrappers/lib_proxy_storage';
 export * from '../test/generated-wrappers/lib_signature_rich_errors';
+export * from '../test/generated-wrappers/lib_signed_call_data';
 export * from '../test/generated-wrappers/lib_simple_function_registry_rich_errors';
 export * from '../test/generated-wrappers/lib_simple_function_registry_storage';
 export * from '../test/generated-wrappers/lib_spender_rich_errors';

contracts/zero-ex/tsconfig.json

@@ -13,6 +13,7 @@
         "generated-artifacts/ISimpleFunctionRegistry.json",
         "generated-artifacts/ITokenSpender.json",
         "generated-artifacts/ITransformERC20.json",
+        "generated-artifacts/IZeroEx.json",
         "generated-artifacts/InitialMigration.json",
         "generated-artifacts/MetaTransactions.json",
         "generated-artifacts/Ownable.json",
@@ -47,6 +48,7 @@
         "test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json",
         "test/generated-artifacts/ITokenSpender.json",
         "test/generated-artifacts/ITransformERC20.json",
+        "test/generated-artifacts/IZeroEx.json",
         "test/generated-artifacts/InitialMigration.json",
         "test/generated-artifacts/LibBootstrap.json",
         "test/generated-artifacts/LibCommonRichErrors.json",
@@ -59,6 +61,7 @@
         "test/generated-artifacts/LibProxyRichErrors.json",
         "test/generated-artifacts/LibProxyStorage.json",
         "test/generated-artifacts/LibSignatureRichErrors.json",
+        "test/generated-artifacts/LibSignedCallData.json",
         "test/generated-artifacts/LibSimpleFunctionRegistryRichErrors.json",
         "test/generated-artifacts/LibSimpleFunctionRegistryStorage.json",
         "test/generated-artifacts/LibSpenderRichErrors.json",

packages/abi-gen/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "5.4.0",
+        "changes": [
+            {
+                "note": "Allow overriding of `data` with contract calls and transactions",
+                "pr": 2626
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "5.3.1",

packages/abi-gen/templates/TypeScript/partials/method_call.handlebars

@@ -8,10 +8,10 @@ async callAsync(
     if (self._deployedBytecodeIfExists) {
         rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
     } else {
-        rawCallResult = await self._performCallAsync({ ...callData, data: this.getABIEncodedTransactionData() }, defaultBlock);
+        rawCallResult = await self._performCallAsync({ data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock);
     }
     {{else}}
-    const rawCallResult = await self._performCallAsync({ ...callData, data: this.getABIEncodedTransactionData() }, defaultBlock);
+    const rawCallResult = await self._performCallAsync({ data: this.getABIEncodedTransactionData(), ...callData }, defaultBlock);
     {{/ifEquals}}
     const abiEncoder = self._lookupAbiEncoder(functionSignature);
     BaseContract._throwIfUnexpectedEmptyCallResult(rawCallResult, abiEncoder);

packages/abi-gen/templates/TypeScript/partials/method_tx.handlebars

@@ -3,7 +3,7 @@ async sendTransactionAsync(
     opts: SendTransactionOpts = { shouldValidate: true },
 ): Promise<string> {
     const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-        { ...txData, data: this.getABIEncodedTransactionData() },
+        { data: this.getABIEncodedTransactionData(), ...txData },
         this.estimateGasAsync.bind(this),
     );
     if (opts.shouldValidate !== false) {
@@ -21,7 +21,7 @@ async estimateGasAsync(
     txData?: Partial<TxData> | undefined,
 ): Promise<number> {
     const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-        { ...txData, data: this.getABIEncodedTransactionData() }
+        { data: this.getABIEncodedTransactionData(), ...txData }
     );
     return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
 },

packages/abi-gen/test-cli/output/typescript/abi_gen_dummy.ts

@@ -997,7 +997,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1023,7 +1023,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1069,7 +1069,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1114,7 +1114,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1137,7 +1137,7 @@ export class AbiGenDummyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1153,15 +1153,15 @@ export class AbiGenDummyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1193,7 +1193,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1226,7 +1226,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1258,7 +1258,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1285,7 +1285,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1315,7 +1315,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1353,7 +1353,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1387,7 +1387,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1421,7 +1421,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1457,7 +1457,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1485,7 +1485,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1508,7 +1508,7 @@ export class AbiGenDummyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1524,15 +1524,15 @@ export class AbiGenDummyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1554,7 +1554,7 @@ export class AbiGenDummyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1570,15 +1570,15 @@ export class AbiGenDummyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1603,7 +1603,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1629,7 +1629,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1654,7 +1654,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1679,7 +1679,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1704,7 +1704,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1733,7 +1733,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1762,7 +1762,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1787,7 +1787,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1813,7 +1813,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1838,7 +1838,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1863,7 +1863,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1894,7 +1894,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1931,7 +1931,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1972,7 +1972,7 @@ export class AbiGenDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -1996,7 +1996,7 @@ export class AbiGenDummyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2012,15 +2012,15 @@ export class AbiGenDummyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/abi-gen/test-cli/output/typescript/test_lib_dummy.ts

@@ -280,7 +280,7 @@ export class TestLibDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }
@@ -306,7 +306,7 @@ export class TestLibDummyContract extends BaseContract {
                     rawCallResult = await self._evmExecAsync(this.getABIEncodedTransactionData());
                 } else {
                     rawCallResult = await self._performCallAsync(
-                        { ...callData, data: this.getABIEncodedTransactionData() },
+                        { data: this.getABIEncodedTransactionData(), ...callData },
                         defaultBlock,
                     );
                 }

packages/contract-artifacts/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "3.8.0",
+        "changes": [
+            {
+                "note": "Add `IZeroEx` artifact",
+                "pr": 2626
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "3.7.1",

packages/contract-artifacts/artifacts/CoordinatorRegistry.json

@@ -47,16 +47,16 @@
         },
         "evm": {
             "bytecode": {
-                "object": "0x608060405234801561001057600080fd5b506103e9806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635b2388be1461003b5780636c90fedb146100ad575b600080fd5b6100ab6004803603602081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b509092509050610155565b005b6100e0600480360360208110156100c357600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610227565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561011a578181015183820152602001610102565b50505050905090810190601f1680156101475780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b33600081815260208190526040902061016f9084846102fb565b507fd060052768902f3eecb84b8eae9d3a2608a1a9e60811a33968b46b8d552f266e818484604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001806020018281038252848482818152602001925080828437600083820152604051601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016909201829003965090945050505050a1505050565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081815260409182902080548351601f60027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101006001861615020190931692909204918201849004840281018401909452808452606093928301828280156102ef5780601f106102c4576101008083540402835291602001916102ef565b820191906000526020600020905b8154815290600101906020018083116102d257829003601f168201915b50505050509050919050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035a578280017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00823516178555610387565b82800160010185558215610387579182015b8281111561038757823582559160200191906001019061036c565b50610393929150610397565b5090565b6103b191905b80821115610393576000815560010161039d565b9056fea265627a7a72315820e93b5d7674acdd9933b6d0a1751b8cbceb8b51d6f0182e77f449213a4d321fc264736f6c63430005100032"
+                "object": "0x608060405234801561001057600080fd5b506103e9806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80635b2388be1461003b5780636c90fedb146100ad575b600080fd5b6100ab6004803603602081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b509092509050610155565b005b6100e0600480360360208110156100c357600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610227565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561011a578181015183820152602001610102565b50505050905090810190601f1680156101475780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b33600081815260208190526040902061016f9084846102fb565b507fd060052768902f3eecb84b8eae9d3a2608a1a9e60811a33968b46b8d552f266e818484604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001806020018281038252848482818152602001925080828437600083820152604051601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016909201829003965090945050505050a1505050565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081815260409182902080548351601f60027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101006001861615020190931692909204918201849004840281018401909452808452606093928301828280156102ef5780601f106102c4576101008083540402835291602001916102ef565b820191906000526020600020905b8154815290600101906020018083116102d257829003601f168201915b50505050509050919050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035a578280017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00823516178555610387565b82800160010185558215610387579182015b8281111561038757823582559160200191906001019061036c565b50610393929150610397565b5090565b6103b191905b80821115610393576000815560010161039d565b9056fea265627a7a723158209cc2a91500814c4a416a32432823efbf6f7dbf13ab2e764101a70f6ef77fcb4a64736f6c63430005110032"
             },
             "deployedBytecode": {
-                "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635b2388be1461003b5780636c90fedb146100ad575b600080fd5b6100ab6004803603602081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b509092509050610155565b005b6100e0600480360360208110156100c357600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610227565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561011a578181015183820152602001610102565b50505050905090810190601f1680156101475780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b33600081815260208190526040902061016f9084846102fb565b507fd060052768902f3eecb84b8eae9d3a2608a1a9e60811a33968b46b8d552f266e818484604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001806020018281038252848482818152602001925080828437600083820152604051601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016909201829003965090945050505050a1505050565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081815260409182902080548351601f60027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101006001861615020190931692909204918201849004840281018401909452808452606093928301828280156102ef5780601f106102c4576101008083540402835291602001916102ef565b820191906000526020600020905b8154815290600101906020018083116102d257829003601f168201915b50505050509050919050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035a578280017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00823516178555610387565b82800160010185558215610387579182015b8281111561038757823582559160200191906001019061036c565b50610393929150610397565b5090565b6103b191905b80821115610393576000815560010161039d565b9056fea265627a7a72315820e93b5d7674acdd9933b6d0a1751b8cbceb8b51d6f0182e77f449213a4d321fc264736f6c63430005100032"
+                "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80635b2388be1461003b5780636c90fedb146100ad575b600080fd5b6100ab6004803603602081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b509092509050610155565b005b6100e0600480360360208110156100c357600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610227565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561011a578181015183820152602001610102565b50505050905090810190601f1680156101475780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b33600081815260208190526040902061016f9084846102fb565b507fd060052768902f3eecb84b8eae9d3a2608a1a9e60811a33968b46b8d552f266e818484604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001806020018281038252848482818152602001925080828437600083820152604051601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016909201829003965090945050505050a1505050565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081815260409182902080548351601f60027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101006001861615020190931692909204918201849004840281018401909452808452606093928301828280156102ef5780601f106102c4576101008083540402835291602001916102ef565b820191906000526020600020905b8154815290600101906020018083116102d257829003601f168201915b50505050509050919050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035a578280017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00823516178555610387565b82800160010185558215610387579182015b8281111561038757823582559160200191906001019061036c565b50610393929150610397565b5090565b6103b191905b80821115610393576000815560010161039d565b9056fea265627a7a723158209cc2a91500814c4a416a32432823efbf6f7dbf13ab2e764101a70f6ef77fcb4a64736f6c63430005110032"
             }
         }
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "soljson-v0.5.17+commit.d19bba13.js",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/ERC20Token.json

@@ -135,16 +135,16 @@
         },
         "evm": {
             "bytecode": {
-                "object": "0x608060405234801561001057600080fd5b506106bf806100206000396000f3fe608060405234801561001057600080fd5b50600436106100725760003560e01c806370a082311161005057806370a0823114610121578063a9059cbb14610154578063dd62ed3e1461018d57610072565b8063095ea7b31461007757806318160ddd146100c457806323b872dd146100de575b600080fd5b6100b06004803603604081101561008d57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356101c8565b604080519115158252519081900360200190f35b6100cc61023b565b60408051918252519081900360200190f35b6100b0600480360360608110156100f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610241565b6100cc6004803603602081101561013757600080fd5b503573ffffffffffffffffffffffffffffffffffffffff1661049d565b6100b06004803603604081101561016a57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356104c5565b6100cc600480360360408110156101a357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81358116916020013516610652565b33600081815260016020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60025490565b73ffffffffffffffffffffffffffffffffffffffff83166000908152602081905260408120548211156102d557604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8416600090815260016020908152604080832033845290915290205482111561037457604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f45524332305f494e53554646494349454e545f414c4c4f57414e434500000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8316600090815260208190526040902054828101101561040a57604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff80841660008181526020818152604080832080548801905593881680835284832080548890039055600182528483203384528252918490208054879003905583518681529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060019392505050565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561054357604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110156105d957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b336000818152602081815260408083208054879003905573ffffffffffffffffffffffffffffffffffffffff871680845292819020805487019055805186815290519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff91821660009081526001602090815260408083209390941682529190915220549056fea265627a7a723158202ec4258d9cc44c3c6b86d5f8b40d57549ae0a8d26d000de443ed7eb3f5fd6cf064736f6c63430005100032"
+                "object": "0x608060405234801561001057600080fd5b506106bf806100206000396000f3fe608060405234801561001057600080fd5b50600436106100725760003560e01c806370a082311161005057806370a0823114610121578063a9059cbb14610154578063dd62ed3e1461018d57610072565b8063095ea7b31461007757806318160ddd146100c457806323b872dd146100de575b600080fd5b6100b06004803603604081101561008d57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356101c8565b604080519115158252519081900360200190f35b6100cc61023b565b60408051918252519081900360200190f35b6100b0600480360360608110156100f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610241565b6100cc6004803603602081101561013757600080fd5b503573ffffffffffffffffffffffffffffffffffffffff1661049d565b6100b06004803603604081101561016a57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356104c5565b6100cc600480360360408110156101a357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81358116916020013516610652565b33600081815260016020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60025490565b73ffffffffffffffffffffffffffffffffffffffff83166000908152602081905260408120548211156102d557604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8416600090815260016020908152604080832033845290915290205482111561037457604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f45524332305f494e53554646494349454e545f414c4c4f57414e434500000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8316600090815260208190526040902054828101101561040a57604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff80841660008181526020818152604080832080548801905593881680835284832080548890039055600182528483203384528252918490208054879003905583518681529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060019392505050565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561054357604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110156105d957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b336000818152602081815260408083208054879003905573ffffffffffffffffffffffffffffffffffffffff871680845292819020805487019055805186815290519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff91821660009081526001602090815260408083209390941682529190915220549056fea265627a7a7231582070f49f484b4453d39e46e7ea480d884eab704629143f1e11635201cbb0995b2164736f6c63430005110032"
             },
             "deployedBytecode": {
-                "object": "0x608060405234801561001057600080fd5b50600436106100725760003560e01c806370a082311161005057806370a0823114610121578063a9059cbb14610154578063dd62ed3e1461018d57610072565b8063095ea7b31461007757806318160ddd146100c457806323b872dd146100de575b600080fd5b6100b06004803603604081101561008d57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356101c8565b604080519115158252519081900360200190f35b6100cc61023b565b60408051918252519081900360200190f35b6100b0600480360360608110156100f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610241565b6100cc6004803603602081101561013757600080fd5b503573ffffffffffffffffffffffffffffffffffffffff1661049d565b6100b06004803603604081101561016a57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356104c5565b6100cc600480360360408110156101a357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81358116916020013516610652565b33600081815260016020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60025490565b73ffffffffffffffffffffffffffffffffffffffff83166000908152602081905260408120548211156102d557604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8416600090815260016020908152604080832033845290915290205482111561037457604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f45524332305f494e53554646494349454e545f414c4c4f57414e434500000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8316600090815260208190526040902054828101101561040a57604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff80841660008181526020818152604080832080548801905593881680835284832080548890039055600182528483203384528252918490208054879003905583518681529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060019392505050565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561054357604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110156105d957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b336000818152602081815260408083208054879003905573ffffffffffffffffffffffffffffffffffffffff871680845292819020805487019055805186815290519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff91821660009081526001602090815260408083209390941682529190915220549056fea265627a7a723158202ec4258d9cc44c3c6b86d5f8b40d57549ae0a8d26d000de443ed7eb3f5fd6cf064736f6c63430005100032"
+                "object": "0x608060405234801561001057600080fd5b50600436106100725760003560e01c806370a082311161005057806370a0823114610121578063a9059cbb14610154578063dd62ed3e1461018d57610072565b8063095ea7b31461007757806318160ddd146100c457806323b872dd146100de575b600080fd5b6100b06004803603604081101561008d57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356101c8565b604080519115158252519081900360200190f35b6100cc61023b565b60408051918252519081900360200190f35b6100b0600480360360608110156100f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610241565b6100cc6004803603602081101561013757600080fd5b503573ffffffffffffffffffffffffffffffffffffffff1661049d565b6100b06004803603604081101561016a57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81351690602001356104c5565b6100cc600480360360408110156101a357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff81358116916020013516610652565b33600081815260016020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b60025490565b73ffffffffffffffffffffffffffffffffffffffff83166000908152602081905260408120548211156102d557604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8416600090815260016020908152604080832033845290915290205482111561037457604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f45524332305f494e53554646494349454e545f414c4c4f57414e434500000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff8316600090815260208190526040902054828101101561040a57604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff80841660008181526020818152604080832080548801905593881680835284832080548890039055600182528483203384528252918490208054879003905583518681529351929391927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060019392505050565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205490565b3360009081526020819052604081205482111561054357604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f45524332305f494e53554646494349454e545f42414c414e4345000000000000604482015290519081900360640190fd5b73ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110156105d957604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f55494e543235365f4f564552464c4f5700000000000000000000000000000000604482015290519081900360640190fd5b336000818152602081815260408083208054879003905573ffffffffffffffffffffffffffffffffffffffff871680845292819020805487019055805186815290519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a350600192915050565b73ffffffffffffffffffffffffffffffffffffffff91821660009081526001602090815260408083209390941682529190915220549056fea265627a7a7231582070f49f484b4453d39e46e7ea480d884eab704629143f1e11635201cbb0995b2164736f6c63430005110032"
             }
         }
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "soljson-v0.5.17+commit.d19bba13.js",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/GodsUnchainedValidator.json

@@ -35,16 +35,16 @@
         },
         "evm": {
             "bytecode": {
-                "object": "0x608060405234801561001057600080fd5b5060405161042b38038061042b83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610082565b600060208284031215610065578081fd5b81516001600160a01b038116811461007b578182fd5b9392505050565b61039a806100916000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80639256050a14610030575b600080fd5b61004361003e3660046101fd565b610045565b005b60008061005483850185610197565b600080546040517fb93a89f700000000000000000000000000000000000000000000000000000000815293955091935091829173ffffffffffffffffffffffffffffffffffffffff169063b93a89f7906100b2908a9060040161032c565b604080518083038186803b1580156100c957600080fd5b505afa1580156100dd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061010191908101906101cf565b915091508361ffff168261ffff161461014f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610146906102cf565b60405180910390fd5b8260ff168160ff161461018e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161014690610272565b50505050505050565b600080604083850312156101a9578182fd5b82356101b481610335565b915060208301356101c481610348565b809150509250929050565b600080604083850312156101e1578182fd5b82516101ec81610335565b60208401519092506101c481610348565b600080600060408486031215610211578081fd5b83359250602084013567ffffffffffffffff8082111561022f578283fd5b81860187601f820112610240578384fd5b8035925081831115610250578384fd5b876020848301011115610261578384fd5b949760209095019650909450505050565b60208082526027908201527f476f6473556e636861696e656456616c696461746f722f5155414c4954595f4d60408201527f49534d4154434800000000000000000000000000000000000000000000000000606082015260800190565b60208082526025908201527f476f6473556e636861696e656456616c696461746f722f50524f544f5f4d495360408201527f4d41544348000000000000000000000000000000000000000000000000000000606082015260800190565b90815260200190565b61ffff8116811461034557600080fd5b50565b60ff8116811461034557600080fdfea365627a7a723158203028b97b542e7c9694b2dfadb335cd83bec3bff6276b5f2cdb1d7c1abed796e46c6578706572696d656e74616cf564736f6c63430005100040"
+                "object": "0x608060405234801561001057600080fd5b5060405161042b38038061042b83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610082565b600060208284031215610065578081fd5b81516001600160a01b038116811461007b578182fd5b9392505050565b61039a806100916000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80639256050a14610030575b600080fd5b61004361003e3660046101fd565b610045565b005b60008061005483850185610197565b600080546040517fb93a89f700000000000000000000000000000000000000000000000000000000815293955091935091829173ffffffffffffffffffffffffffffffffffffffff169063b93a89f7906100b2908a9060040161032c565b604080518083038186803b1580156100c957600080fd5b505afa1580156100dd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061010191908101906101cf565b915091508361ffff168261ffff161461014f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610146906102cf565b60405180910390fd5b8260ff168160ff161461018e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161014690610272565b50505050505050565b600080604083850312156101a9578182fd5b82356101b481610335565b915060208301356101c481610348565b809150509250929050565b600080604083850312156101e1578182fd5b82516101ec81610335565b60208401519092506101c481610348565b600080600060408486031215610211578081fd5b83359250602084013567ffffffffffffffff8082111561022f578283fd5b81860187601f820112610240578384fd5b8035925081831115610250578384fd5b876020848301011115610261578384fd5b949760209095019650909450505050565b60208082526027908201527f476f6473556e636861696e656456616c696461746f722f5155414c4954595f4d60408201527f49534d4154434800000000000000000000000000000000000000000000000000606082015260800190565b60208082526025908201527f476f6473556e636861696e656456616c696461746f722f50524f544f5f4d495360408201527f4d41544348000000000000000000000000000000000000000000000000000000606082015260800190565b90815260200190565b61ffff8116811461034557600080fd5b50565b60ff8116811461034557600080fdfea365627a7a723158202821782e13a836dcbb710cbd9e62c24ec15b337cdce6d8201315aaf776f1ecd66c6578706572696d656e74616cf564736f6c63430005110040"
             },
             "deployedBytecode": {
-                "object": "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c80639256050a14610030575b600080fd5b61004361003e3660046101fd565b610045565b005b60008061005483850185610197565b600080546040517fb93a89f700000000000000000000000000000000000000000000000000000000815293955091935091829173ffffffffffffffffffffffffffffffffffffffff169063b93a89f7906100b2908a9060040161032c565b604080518083038186803b1580156100c957600080fd5b505afa1580156100dd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061010191908101906101cf565b915091508361ffff168261ffff161461014f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610146906102cf565b60405180910390fd5b8260ff168160ff161461018e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161014690610272565b50505050505050565b600080604083850312156101a9578182fd5b82356101b481610335565b915060208301356101c481610348565b809150509250929050565b600080604083850312156101e1578182fd5b82516101ec81610335565b60208401519092506101c481610348565b600080600060408486031215610211578081fd5b83359250602084013567ffffffffffffffff8082111561022f578283fd5b81860187601f820112610240578384fd5b8035925081831115610250578384fd5b876020848301011115610261578384fd5b949760209095019650909450505050565b60208082526027908201527f476f6473556e636861696e656456616c696461746f722f5155414c4954595f4d60408201527f49534d4154434800000000000000000000000000000000000000000000000000606082015260800190565b60208082526025908201527f476f6473556e636861696e656456616c696461746f722f50524f544f5f4d495360408201527f4d41544348000000000000000000000000000000000000000000000000000000606082015260800190565b90815260200190565b61ffff8116811461034557600080fd5b50565b60ff8116811461034557600080fdfea365627a7a723158203028b97b542e7c9694b2dfadb335cd83bec3bff6276b5f2cdb1d7c1abed796e46c6578706572696d656e74616cf564736f6c63430005100040"
+                "object": "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c80639256050a14610030575b600080fd5b61004361003e3660046101fd565b610045565b005b60008061005483850185610197565b600080546040517fb93a89f700000000000000000000000000000000000000000000000000000000815293955091935091829173ffffffffffffffffffffffffffffffffffffffff169063b93a89f7906100b2908a9060040161032c565b604080518083038186803b1580156100c957600080fd5b505afa1580156100dd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061010191908101906101cf565b915091508361ffff168261ffff161461014f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610146906102cf565b60405180910390fd5b8260ff168160ff161461018e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161014690610272565b50505050505050565b600080604083850312156101a9578182fd5b82356101b481610335565b915060208301356101c481610348565b809150509250929050565b600080604083850312156101e1578182fd5b82516101ec81610335565b60208401519092506101c481610348565b600080600060408486031215610211578081fd5b83359250602084013567ffffffffffffffff8082111561022f578283fd5b81860187601f820112610240578384fd5b8035925081831115610250578384fd5b876020848301011115610261578384fd5b949760209095019650909450505050565b60208082526027908201527f476f6473556e636861696e656456616c696461746f722f5155414c4954595f4d60408201527f49534d4154434800000000000000000000000000000000000000000000000000606082015260800190565b60208082526025908201527f476f6473556e636861696e656456616c696461746f722f50524f544f5f4d495360408201527f4d41544348000000000000000000000000000000000000000000000000000000606082015260800190565b90815260200190565b61ffff8116811461034557600080fd5b50565b60ff8116811461034557600080fdfea365627a7a723158202821782e13a836dcbb710cbd9e62c24ec15b337cdce6d8201315aaf776f1ecd66c6578706572696d656e74616cf564736f6c63430005110040"
             }
         }
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "soljson-v0.5.17+commit.d19bba13.js",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/IAssetProxy.json

@@ -48,7 +48,7 @@
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "0.5.17+commit.d19bba13",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/ITransformERC20.json

@@ -3,6 +3,12 @@
     "contractName": "ITransformERC20",
     "compilerOutput": {
         "abi": [
+            {
+                "anonymous": false,
+                "inputs": [{ "indexed": false, "internalType": "address", "name": "quoteSigner", "type": "address" }],
+                "name": "QuoteSignerUpdated",
+                "type": "event"
+            },
             {
                 "anonymous": false,
                 "inputs": [
@@ -25,7 +31,8 @@
             },
             {
                 "inputs": [
-                    { "internalType": "bytes32", "name": "callDataHash", "type": "bytes32" },
+                    {
+                        "components": [
                             { "internalType": "address payable", "name": "taker", "type": "address" },
                             { "internalType": "contract IERC20TokenV06", "name": "inputToken", "type": "address" },
                             { "internalType": "contract IERC20TokenV06", "name": "outputToken", "type": "address" },
@@ -39,6 +46,13 @@
                                 "internalType": "struct ITransformERC20.Transformation[]",
                                 "name": "transformations",
                                 "type": "tuple[]"
+                            },
+                            { "internalType": "bytes32", "name": "callDataHash", "type": "bytes32" },
+                            { "internalType": "bytes", "name": "callDataSignature", "type": "bytes" }
+                        ],
+                        "internalType": "struct ITransformERC20.TransformERC20Args",
+                        "name": "args",
+                        "type": "tuple"
                     }
                 ],
                 "name": "_transformERC20",
@@ -53,6 +67,13 @@
                 "stateMutability": "nonpayable",
                 "type": "function"
             },
+            {
+                "inputs": [],
+                "name": "getQuoteSigner",
+                "outputs": [{ "internalType": "address", "name": "signer", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
             {
                 "inputs": [],
                 "name": "getTransformWallet",
@@ -67,6 +88,13 @@
                 "stateMutability": "view",
                 "type": "function"
             },
+            {
+                "inputs": [{ "internalType": "address", "name": "quoteSigner", "type": "address" }],
+                "name": "setQuoteSigner",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
             {
                 "inputs": [{ "internalType": "address", "name": "transformerDeployer", "type": "address" }],
                 "name": "setTransformerDeployer",
@@ -98,24 +126,41 @@
         ],
         "devdoc": {
             "details": "Feature to composably transform between ERC20 tokens.",
-            "methods": {
-                "_transformERC20(bytes32,address,address,address,uint256,uint256,(uint32,bytes)[])": {
-                    "details": "Internal version of `transformERC20()`. Only callable from within.",
+            "events": {
+                "QuoteSignerUpdated(address)": {
+                    "details": "Raised when `setQuoteSigner()` is called.",
+                    "params": { "quoteSigner": "The new quote signer." }
+                },
+                "TransformedERC20(address,address,address,uint256,uint256)": {
+                    "details": "Raised upon a successful `transformERC20`.",
                     "params": {
-                        "callDataHash": "Hash of the ingress calldata.",
                         "inputToken": "The token being provided by the taker.        If `0xeee...`, ETH is implied and should be provided with the call.`",
                         "inputTokenAmount": "The amount of `inputToken` to take from the taker.",
-                        "minOutputTokenAmount": "The minimum amount of `outputToken` the taker        must receive for the entire transformation to succeed.",
                         "outputToken": "The token to be acquired by the taker.        `0xeee...` implies ETH.",
-                        "taker": "The taker address.",
-                        "transformations": "The transformations to execute on the token balance(s)        in sequence."
+                        "outputTokenAmount": "The amount of `outputToken` received by the taker.",
+                        "taker": "The taker (caller) address."
+                    }
                 },
+                "TransformerDeployerUpdated(address)": {
+                    "details": "Raised when `setTransformerDeployer()` is called.",
+                    "params": { "transformerDeployer": "The new deployer address." }
+                }
+            },
+            "kind": "dev",
+            "methods": {
+                "_transformERC20((address,address,address,uint256,uint256,(uint32,bytes)[],bytes32,bytes))": {
+                    "details": "Internal version of `transformERC20()`. Only callable from within.",
+                    "params": { "args": "A `TransformERC20Args` struct." },
                     "returns": { "outputTokenAmount": "The amount of `outputToken` received by the taker." }
                 },
                 "createTransformWallet()": {
-                    "details": "Deploy a new flash wallet instance and replace the current one with it.      Useful if we somehow break the current wallet instance.      Anyone can call this.",
+                    "details": "Deploy a new flash wallet instance and replace the current one with it.      Useful if we somehow break the current wallet instance.       Only callable by the owner.",
                     "returns": { "wallet": "The new wallet instance." }
                 },
+                "getQuoteSigner()": {
+                    "details": "Return the optional signer for `transformERC20()` calldata.",
+                    "returns": { "signer": "The transform deployer address." }
+                },
                 "getTransformWallet()": {
                     "details": "Return the current wallet instance that will serve as the execution      context for transformations.",
                     "returns": { "wallet": "The wallet instance." }
@@ -124,9 +169,15 @@
                     "details": "Return the allowed deployer for transformers.",
                     "returns": { "deployer": "The transform deployer address." }
                 },
+                "setQuoteSigner(address)": {
+                    "details": "Replace the optional signer for `transformERC20()` calldata.      Only callable by the owner.",
+                    "params": { "quoteSigner": "The address of the new calldata signer." }
+                },
                 "setTransformerDeployer(address)": {
                     "details": "Replace the allowed deployer for transformers.      Only callable by the owner.",
-                    "params": { "transformerDeployer": "The address of the trusted deployer for transformers." }
+                    "params": {
+                        "transformerDeployer": "The address of the new trusted deployer        for transformers."
+                    }
                 },
                 "transformERC20(address,address,uint256,uint256,(uint32,bytes)[])": {
                     "details": "Executes a series of transformations to convert an ERC20 `inputToken`      to an ERC20 `outputToken`.",
@@ -139,13 +190,14 @@
                     },
                     "returns": { "outputTokenAmount": "The amount of `outputToken` received by the sender." }
                 }
-            }
+            },
+            "version": 1
         },
         "evm": { "bytecode": { "object": "0x" }, "deployedBytecode": { "immutableReferences": {}, "object": "0x" } }
     },
     "compiler": {
         "name": "solc",
-        "version": "0.6.9+commit.3e3065ac",
+        "version": "0.6.12+commit.27d51765",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/IWallet.json

@@ -29,7 +29,7 @@
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "soljson-v0.5.17+commit.d19bba13.js",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/IZeroEx.json

@@ -0,0 +1,618 @@
+{
+    "schemaVersion": "2.0.0",
+    "contractName": "IZeroEx",
+    "compilerOutput": {
+        "abi": [
+            {
+                "anonymous": false,
+                "inputs": [
+                    { "indexed": false, "internalType": "bytes32", "name": "hash", "type": "bytes32" },
+                    { "indexed": true, "internalType": "bytes4", "name": "selector", "type": "bytes4" },
+                    { "indexed": false, "internalType": "address", "name": "signer", "type": "address" },
+                    { "indexed": false, "internalType": "address", "name": "sender", "type": "address" }
+                ],
+                "name": "MetaTransactionExecuted",
+                "type": "event"
+            },
+            {
+                "anonymous": false,
+                "inputs": [
+                    { "indexed": false, "internalType": "address", "name": "caller", "type": "address" },
+                    { "indexed": false, "internalType": "address", "name": "migrator", "type": "address" },
+                    { "indexed": false, "internalType": "address", "name": "newOwner", "type": "address" }
+                ],
+                "name": "Migrated",
+                "type": "event"
+            },
+            {
+                "anonymous": false,
+                "inputs": [
+                    { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
+                    { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
+                ],
+                "name": "OwnershipTransferred",
+                "type": "event"
+            },
+            {
+                "anonymous": false,
+                "inputs": [
+                    { "indexed": true, "internalType": "bytes4", "name": "selector", "type": "bytes4" },
+                    { "indexed": false, "internalType": "address", "name": "oldImpl", "type": "address" },
+                    { "indexed": false, "internalType": "address", "name": "newImpl", "type": "address" }
+                ],
+                "name": "ProxyFunctionUpdated",
+                "type": "event"
+            },
+            {
+                "anonymous": false,
+                "inputs": [{ "indexed": false, "internalType": "address", "name": "quoteSigner", "type": "address" }],
+                "name": "QuoteSignerUpdated",
+                "type": "event"
+            },
+            {
+                "anonymous": false,
+                "inputs": [
+                    { "indexed": true, "internalType": "address", "name": "taker", "type": "address" },
+                    { "indexed": false, "internalType": "address", "name": "inputToken", "type": "address" },
+                    { "indexed": false, "internalType": "address", "name": "outputToken", "type": "address" },
+                    { "indexed": false, "internalType": "uint256", "name": "inputTokenAmount", "type": "uint256" },
+                    { "indexed": false, "internalType": "uint256", "name": "outputTokenAmount", "type": "uint256" }
+                ],
+                "name": "TransformedERC20",
+                "type": "event"
+            },
+            {
+                "anonymous": false,
+                "inputs": [
+                    { "indexed": false, "internalType": "address", "name": "transformerDeployer", "type": "address" }
+                ],
+                "name": "TransformerDeployerUpdated",
+                "type": "event"
+            },
+            {
+                "inputs": [
+                    { "internalType": "address", "name": "sender", "type": "address" },
+                    {
+                        "components": [
+                            { "internalType": "address payable", "name": "signer", "type": "address" },
+                            { "internalType": "address", "name": "sender", "type": "address" },
+                            { "internalType": "uint256", "name": "minGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "maxGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "expirationTimeSeconds", "type": "uint256" },
+                            { "internalType": "uint256", "name": "salt", "type": "uint256" },
+                            { "internalType": "bytes", "name": "callData", "type": "bytes" },
+                            { "internalType": "uint256", "name": "value", "type": "uint256" },
+                            { "internalType": "contract IERC20TokenV06", "name": "feeToken", "type": "address" },
+                            { "internalType": "uint256", "name": "feeAmount", "type": "uint256" }
+                        ],
+                        "internalType": "struct IMetaTransactions.MetaTransactionData",
+                        "name": "mtx",
+                        "type": "tuple"
+                    },
+                    { "internalType": "bytes", "name": "signature", "type": "bytes" }
+                ],
+                "name": "_executeMetaTransaction",
+                "outputs": [{ "internalType": "bytes", "name": "returnResult", "type": "bytes" }],
+                "stateMutability": "payable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "contract IERC20TokenV06", "name": "token", "type": "address" },
+                    { "internalType": "address", "name": "owner", "type": "address" },
+                    { "internalType": "address", "name": "to", "type": "address" },
+                    { "internalType": "uint256", "name": "amount", "type": "uint256" }
+                ],
+                "name": "_spendERC20Tokens",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            { "internalType": "address payable", "name": "taker", "type": "address" },
+                            { "internalType": "contract IERC20TokenV06", "name": "inputToken", "type": "address" },
+                            { "internalType": "contract IERC20TokenV06", "name": "outputToken", "type": "address" },
+                            { "internalType": "uint256", "name": "inputTokenAmount", "type": "uint256" },
+                            { "internalType": "uint256", "name": "minOutputTokenAmount", "type": "uint256" },
+                            {
+                                "components": [
+                                    { "internalType": "uint32", "name": "deploymentNonce", "type": "uint32" },
+                                    { "internalType": "bytes", "name": "data", "type": "bytes" }
+                                ],
+                                "internalType": "struct ITransformERC20.Transformation[]",
+                                "name": "transformations",
+                                "type": "tuple[]"
+                            },
+                            { "internalType": "bytes32", "name": "callDataHash", "type": "bytes32" },
+                            { "internalType": "bytes", "name": "callDataSignature", "type": "bytes" }
+                        ],
+                        "internalType": "struct ITransformERC20.TransformERC20Args",
+                        "name": "args",
+                        "type": "tuple"
+                    }
+                ],
+                "name": "_transformERC20",
+                "outputs": [{ "internalType": "uint256", "name": "outputTokenAmount", "type": "uint256" }],
+                "stateMutability": "payable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            { "internalType": "address payable", "name": "signer", "type": "address" },
+                            { "internalType": "address", "name": "sender", "type": "address" },
+                            { "internalType": "uint256", "name": "minGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "maxGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "expirationTimeSeconds", "type": "uint256" },
+                            { "internalType": "uint256", "name": "salt", "type": "uint256" },
+                            { "internalType": "bytes", "name": "callData", "type": "bytes" },
+                            { "internalType": "uint256", "name": "value", "type": "uint256" },
+                            { "internalType": "contract IERC20TokenV06", "name": "feeToken", "type": "address" },
+                            { "internalType": "uint256", "name": "feeAmount", "type": "uint256" }
+                        ],
+                        "internalType": "struct IMetaTransactions.MetaTransactionData[]",
+                        "name": "mtxs",
+                        "type": "tuple[]"
+                    },
+                    { "internalType": "bytes[]", "name": "signatures", "type": "bytes[]" }
+                ],
+                "name": "batchExecuteMetaTransactions",
+                "outputs": [{ "internalType": "bytes[]", "name": "returnResults", "type": "bytes[]" }],
+                "stateMutability": "payable",
+                "type": "function"
+            },
+            {
+                "inputs": [],
+                "name": "createTransformWallet",
+                "outputs": [{ "internalType": "contract IFlashWallet", "name": "wallet", "type": "address" }],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            { "internalType": "address payable", "name": "signer", "type": "address" },
+                            { "internalType": "address", "name": "sender", "type": "address" },
+                            { "internalType": "uint256", "name": "minGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "maxGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "expirationTimeSeconds", "type": "uint256" },
+                            { "internalType": "uint256", "name": "salt", "type": "uint256" },
+                            { "internalType": "bytes", "name": "callData", "type": "bytes" },
+                            { "internalType": "uint256", "name": "value", "type": "uint256" },
+                            { "internalType": "contract IERC20TokenV06", "name": "feeToken", "type": "address" },
+                            { "internalType": "uint256", "name": "feeAmount", "type": "uint256" }
+                        ],
+                        "internalType": "struct IMetaTransactions.MetaTransactionData",
+                        "name": "mtx",
+                        "type": "tuple"
+                    },
+                    { "internalType": "bytes", "name": "signature", "type": "bytes" }
+                ],
+                "name": "executeMetaTransaction",
+                "outputs": [{ "internalType": "bytes", "name": "returnResult", "type": "bytes" }],
+                "stateMutability": "payable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "bytes4", "name": "selector", "type": "bytes4" },
+                    { "internalType": "address", "name": "impl", "type": "address" }
+                ],
+                "name": "extend",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [],
+                "name": "getAllowanceTarget",
+                "outputs": [{ "internalType": "address", "name": "target", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [{ "internalType": "bytes4", "name": "selector", "type": "bytes4" }],
+                "name": "getFunctionImplementation",
+                "outputs": [{ "internalType": "address", "name": "impl", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            { "internalType": "address payable", "name": "signer", "type": "address" },
+                            { "internalType": "address", "name": "sender", "type": "address" },
+                            { "internalType": "uint256", "name": "minGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "maxGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "expirationTimeSeconds", "type": "uint256" },
+                            { "internalType": "uint256", "name": "salt", "type": "uint256" },
+                            { "internalType": "bytes", "name": "callData", "type": "bytes" },
+                            { "internalType": "uint256", "name": "value", "type": "uint256" },
+                            { "internalType": "contract IERC20TokenV06", "name": "feeToken", "type": "address" },
+                            { "internalType": "uint256", "name": "feeAmount", "type": "uint256" }
+                        ],
+                        "internalType": "struct IMetaTransactions.MetaTransactionData",
+                        "name": "mtx",
+                        "type": "tuple"
+                    }
+                ],
+                "name": "getMetaTransactionExecutedBlock",
+                "outputs": [{ "internalType": "uint256", "name": "blockNumber", "type": "uint256" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            { "internalType": "address payable", "name": "signer", "type": "address" },
+                            { "internalType": "address", "name": "sender", "type": "address" },
+                            { "internalType": "uint256", "name": "minGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "maxGasPrice", "type": "uint256" },
+                            { "internalType": "uint256", "name": "expirationTimeSeconds", "type": "uint256" },
+                            { "internalType": "uint256", "name": "salt", "type": "uint256" },
+                            { "internalType": "bytes", "name": "callData", "type": "bytes" },
+                            { "internalType": "uint256", "name": "value", "type": "uint256" },
+                            { "internalType": "contract IERC20TokenV06", "name": "feeToken", "type": "address" },
+                            { "internalType": "uint256", "name": "feeAmount", "type": "uint256" }
+                        ],
+                        "internalType": "struct IMetaTransactions.MetaTransactionData",
+                        "name": "mtx",
+                        "type": "tuple"
+                    }
+                ],
+                "name": "getMetaTransactionHash",
+                "outputs": [{ "internalType": "bytes32", "name": "mtxHash", "type": "bytes32" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [{ "internalType": "bytes32", "name": "mtxHash", "type": "bytes32" }],
+                "name": "getMetaTransactionHashExecutedBlock",
+                "outputs": [{ "internalType": "uint256", "name": "blockNumber", "type": "uint256" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [],
+                "name": "getQuoteSigner",
+                "outputs": [{ "internalType": "address", "name": "signer", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "bytes4", "name": "selector", "type": "bytes4" },
+                    { "internalType": "uint256", "name": "idx", "type": "uint256" }
+                ],
+                "name": "getRollbackEntryAtIndex",
+                "outputs": [{ "internalType": "address", "name": "impl", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [{ "internalType": "bytes4", "name": "selector", "type": "bytes4" }],
+                "name": "getRollbackLength",
+                "outputs": [{ "internalType": "uint256", "name": "rollbackLength", "type": "uint256" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "contract IERC20TokenV06", "name": "token", "type": "address" },
+                    { "internalType": "address", "name": "owner", "type": "address" }
+                ],
+                "name": "getSpendableERC20BalanceOf",
+                "outputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [],
+                "name": "getTransformWallet",
+                "outputs": [{ "internalType": "contract IFlashWallet", "name": "wallet", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [],
+                "name": "getTransformerDeployer",
+                "outputs": [{ "internalType": "address", "name": "deployer", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "bytes32", "name": "hash", "type": "bytes32" },
+                    { "internalType": "address", "name": "signer", "type": "address" },
+                    { "internalType": "bytes", "name": "signature", "type": "bytes" }
+                ],
+                "name": "isValidHashSignature",
+                "outputs": [{ "internalType": "bool", "name": "isValid", "type": "bool" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "address", "name": "target", "type": "address" },
+                    { "internalType": "bytes", "name": "data", "type": "bytes" },
+                    { "internalType": "address", "name": "newOwner", "type": "address" }
+                ],
+                "name": "migrate",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [],
+                "name": "owner",
+                "outputs": [{ "internalType": "address", "name": "ownerAddress", "type": "address" }],
+                "stateMutability": "view",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "bytes4", "name": "selector", "type": "bytes4" },
+                    { "internalType": "address", "name": "targetImpl", "type": "address" }
+                ],
+                "name": "rollback",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [{ "internalType": "address", "name": "quoteSigner", "type": "address" }],
+                "name": "setQuoteSigner",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [{ "internalType": "address", "name": "transformerDeployer", "type": "address" }],
+                "name": "setTransformerDeployer",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
+                "name": "transferOwnership",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "contract IERC20TokenV06", "name": "inputToken", "type": "address" },
+                    { "internalType": "contract IERC20TokenV06", "name": "outputToken", "type": "address" },
+                    { "internalType": "uint256", "name": "inputTokenAmount", "type": "uint256" },
+                    { "internalType": "uint256", "name": "minOutputTokenAmount", "type": "uint256" },
+                    {
+                        "components": [
+                            { "internalType": "uint32", "name": "deploymentNonce", "type": "uint32" },
+                            { "internalType": "bytes", "name": "data", "type": "bytes" }
+                        ],
+                        "internalType": "struct ITransformERC20.Transformation[]",
+                        "name": "transformations",
+                        "type": "tuple[]"
+                    }
+                ],
+                "name": "transformERC20",
+                "outputs": [{ "internalType": "uint256", "name": "outputTokenAmount", "type": "uint256" }],
+                "stateMutability": "payable",
+                "type": "function"
+            },
+            {
+                "inputs": [
+                    { "internalType": "bytes32", "name": "hash", "type": "bytes32" },
+                    { "internalType": "address", "name": "signer", "type": "address" },
+                    { "internalType": "bytes", "name": "signature", "type": "bytes" }
+                ],
+                "name": "validateHashSignature",
+                "outputs": [],
+                "stateMutability": "view",
+                "type": "function"
+            }
+        ],
+        "devdoc": {
+            "details": "Interface for a fully featured Exchange Proxy.",
+            "kind": "dev",
+            "methods": {
+                "_executeMetaTransaction(address,(address,address,uint256,uint256,uint256,uint256,bytes,uint256,address,uint256),bytes)": {
+                    "details": "Execute a meta-transaction via `sender`. Privileged variant.      Only callable from within.",
+                    "params": {
+                        "mtx": "The meta-transaction.",
+                        "sender": "Who is executing the meta-transaction..",
+                        "signature": "The signature by `mtx.signer`."
+                    },
+                    "returns": { "returnResult": "The ABI-encoded result of the underlying call." }
+                },
+                "_spendERC20Tokens(address,address,address,uint256)": {
+                    "details": "Transfers ERC20 tokens from `owner` to `to`.      Only callable from within.",
+                    "params": {
+                        "amount": "The amount of `token` to transfer.",
+                        "owner": "The owner of the tokens.",
+                        "to": "The recipient of the tokens.",
+                        "token": "The token to spend."
+                    }
+                },
+                "_transformERC20((address,address,address,uint256,uint256,(uint32,bytes)[],bytes32,bytes))": {
+                    "details": "Internal version of `transformERC20()`. Only callable from within.",
+                    "params": { "args": "A `TransformERC20Args` struct." },
+                    "returns": { "outputTokenAmount": "The amount of `outputToken` received by the taker." }
+                },
+                "batchExecuteMetaTransactions((address,address,uint256,uint256,uint256,uint256,bytes,uint256,address,uint256)[],bytes[])": {
+                    "details": "Execute multiple meta-transactions.",
+                    "params": {
+                        "mtxs": "The meta-transactions.",
+                        "signatures": "The signature by each respective `mtx.signer`."
+                    },
+                    "returns": { "returnResults": "The ABI-encoded results of the underlying calls." }
+                },
+                "createTransformWallet()": {
+                    "details": "Deploy a new flash wallet instance and replace the current one with it.      Useful if we somehow break the current wallet instance.       Only callable by the owner.",
+                    "returns": { "wallet": "The new wallet instance." }
+                },
+                "executeMetaTransaction((address,address,uint256,uint256,uint256,uint256,bytes,uint256,address,uint256),bytes)": {
+                    "details": "Execute a single meta-transaction.",
+                    "params": { "mtx": "The meta-transaction.", "signature": "The signature by `mtx.signer`." },
+                    "returns": { "returnResult": "The ABI-encoded result of the underlying call." }
+                },
+                "extend(bytes4,address)": {
+                    "details": "Register or replace a function.",
+                    "params": {
+                        "impl": "The implementation contract for the function.",
+                        "selector": "The function selector."
+                    }
+                },
+                "getAllowanceTarget()": {
+                    "details": "Get the address of the allowance target.",
+                    "returns": { "target": "The target of token allowances." }
+                },
+                "getFunctionImplementation(bytes4)": {
+                    "details": "Get the implementation contract of a registered function.",
+                    "params": { "selector": "The function selector." },
+                    "returns": { "impl": "The implementation contract address." }
+                },
+                "getMetaTransactionExecutedBlock((address,address,uint256,uint256,uint256,uint256,bytes,uint256,address,uint256))": {
+                    "details": "Get the block at which a meta-transaction has been executed.",
+                    "params": { "mtx": "The meta-transaction." },
+                    "returns": { "blockNumber": "The block height when the meta-transactioin was executed." }
+                },
+                "getMetaTransactionHash((address,address,uint256,uint256,uint256,uint256,bytes,uint256,address,uint256))": {
+                    "details": "Get the EIP712 hash of a meta-transaction.",
+                    "params": { "mtx": "The meta-transaction." },
+                    "returns": { "mtxHash": "The EIP712 hash of `mtx`." }
+                },
+                "getMetaTransactionHashExecutedBlock(bytes32)": {
+                    "details": "Get the block at which a meta-transaction hash has been executed.",
+                    "params": { "mtxHash": "The meta-transaction hash." },
+                    "returns": { "blockNumber": "The block height when the meta-transactioin was executed." }
+                },
+                "getQuoteSigner()": {
+                    "details": "Return the optional signer for `transformERC20()` calldata.",
+                    "returns": { "signer": "The transform deployer address." }
+                },
+                "getRollbackEntryAtIndex(bytes4,uint256)": {
+                    "details": "Retrieve an entry in the rollback history for a function.",
+                    "params": { "idx": "The index in the rollback history.", "selector": "The function selector." },
+                    "returns": { "impl": "An implementation address for the function at         index `idx`." }
+                },
+                "getRollbackLength(bytes4)": {
+                    "details": "Retrieve the length of the rollback history for a function.",
+                    "params": { "selector": "The function selector." },
+                    "returns": {
+                        "rollbackLength": "The number of items in the rollback history for         the function."
+                    }
+                },
+                "getSpendableERC20BalanceOf(address,address)": {
+                    "details": "Gets the maximum amount of an ERC20 token `token` that can be      pulled from `owner`.",
+                    "params": { "owner": "The owner of the tokens.", "token": "The token to spend." },
+                    "returns": { "amount": "The amount of tokens that can be pulled." }
+                },
+                "getTransformWallet()": {
+                    "details": "Return the current wallet instance that will serve as the execution      context for transformations.",
+                    "returns": { "wallet": "The wallet instance." }
+                },
+                "getTransformerDeployer()": {
+                    "details": "Return the allowed deployer for transformers.",
+                    "returns": { "deployer": "The transform deployer address." }
+                },
+                "isValidHashSignature(bytes32,address,bytes)": {
+                    "details": "Check that `hash` was signed by `signer` given `signature`.",
+                    "params": {
+                        "hash": "The hash that was signed.",
+                        "signature": "The signature. The last byte of this signature should        be a member of the `SignatureType` enum.",
+                        "signer": "The signer of the hash."
+                    },
+                    "returns": { "isValid": "`true` on success." }
+                },
+                "migrate(address,bytes,address)": {
+                    "details": "Execute a migration function in the context of the ZeroEx contract.      The result of the function being called should be the magic bytes      0x2c64c5ef (`keccack('MIGRATE_SUCCESS')`). Only callable by the owner.      The owner will be temporarily set to `address(this)` inside the call.      Before returning, the owner will be set to `newOwner`.",
+                    "params": {
+                        "data": "The call data.",
+                        "newOwner": "The address of the new owner.",
+                        "target": "The migrator contract address."
+                    }
+                },
+                "owner()": {
+                    "details": "The owner of this contract.",
+                    "returns": { "ownerAddress": "The owner address." }
+                },
+                "rollback(bytes4,address)": {
+                    "details": "Roll back to a prior implementation of a function.",
+                    "params": {
+                        "selector": "The function selector.",
+                        "targetImpl": "The address of an older implementation of the function."
+                    }
+                },
+                "setQuoteSigner(address)": {
+                    "details": "Replace the optional signer for `transformERC20()` calldata.      Only callable by the owner.",
+                    "params": { "quoteSigner": "The address of the new calldata signer." }
+                },
+                "setTransformerDeployer(address)": {
+                    "details": "Replace the allowed deployer for transformers.      Only callable by the owner.",
+                    "params": {
+                        "transformerDeployer": "The address of the new trusted deployer        for transformers."
+                    }
+                },
+                "transferOwnership(address)": {
+                    "details": "Transfers ownership of the contract to a new address.",
+                    "params": { "newOwner": "The address that will become the owner." }
+                },
+                "transformERC20(address,address,uint256,uint256,(uint32,bytes)[])": {
+                    "details": "Executes a series of transformations to convert an ERC20 `inputToken`      to an ERC20 `outputToken`.",
+                    "params": {
+                        "inputToken": "The token being provided by the sender.        If `0xeee...`, ETH is implied and should be provided with the call.`",
+                        "inputTokenAmount": "The amount of `inputToken` to take from the sender.",
+                        "minOutputTokenAmount": "The minimum amount of `outputToken` the sender        must receive for the entire transformation to succeed.",
+                        "outputToken": "The token to be acquired by the sender.        `0xeee...` implies ETH.",
+                        "transformations": "The transformations to execute on the token balance(s)        in sequence."
+                    },
+                    "returns": { "outputTokenAmount": "The amount of `outputToken` received by the sender." }
+                },
+                "validateHashSignature(bytes32,address,bytes)": {
+                    "details": "Validate that `hash` was signed by `signer` given `signature`.      Reverts otherwise.",
+                    "params": {
+                        "hash": "The hash that was signed.",
+                        "signature": "The signature. The last byte of this signature should        be a member of the `SignatureType` enum.",
+                        "signer": "The signer of the hash."
+                    }
+                }
+            },
+            "version": 1
+        },
+        "evm": { "bytecode": { "object": "0x" }, "deployedBytecode": { "immutableReferences": {}, "object": "0x" } }
+    },
+    "compiler": {
+        "name": "solc",
+        "version": "0.6.12+commit.27d51765",
+        "settings": {
+            "optimizer": {
+                "enabled": true,
+                "runs": 1000000,
+                "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
+            },
+            "outputSelection": {
+                "*": {
+                    "*": [
+                        "abi",
+                        "devdoc",
+                        "evm.bytecode.object",
+                        "evm.bytecode.sourceMap",
+                        "evm.deployedBytecode.object",
+                        "evm.deployedBytecode.sourceMap"
+                    ]
+                }
+            },
+            "evmVersion": "istanbul"
+        }
+    },
+    "chains": {}
+}

packages/contract-artifacts/artifacts/StaticCallProxy.json

@@ -46,16 +46,16 @@
         },
         "evm": {
             "bytecode": {
-                "object": "0x608060405234801561001057600080fd5b50610505806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063a85e59e41461003b578063ae25532e146100d3575b600080fd5b6100d16004803603608081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b919350915073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610110565b005b6100db6103a5565b604080517fffffffff000000000000000000000000000000000000000000000000000000009092168252519081900360200190f35b6000606060006101656004898990508a8a8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092949392505063ffffffff6103c5169050565b806020019051606081101561017957600080fd5b8151602083018051604051929492938301929190846401000000008211156101a057600080fd5b9083019060208201858111156101b557600080fd5b82516401000000008111828201881017156101cf57600080fd5b82525081516020918201929091019080838360005b838110156101fc5781810151838201526020016101e4565b50505050905090810190601f1680156102295780820380516001836020036101000a031916815260200191505b5060405260200180519060200190929190505050925092509250600060608473ffffffffffffffffffffffffffffffffffffffff16846040518082805190602001908083835b602083106102ac57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161026f565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d806000811461030c576040519150601f19603f3d011682016040523d82523d6000602084013e610311565b606091505b50915091508161032357805160208201fd5b8051602082012083811461039857604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f554e45585045435445445f5354415449435f43414c4c5f524553554c54000000604482015290519081900360640190fd5b5050505050505050505050565b600060405180806104b06021913960210190506040518091039020905090565b6060818311156103e3576103e36103de60008585610408565b6104a7565b83518211156103fc576103fc6103de6001848751610408565b50819003910190815290565b6060632800659560e01b8484846040516024018084600781111561042857fe5b60ff1681526020018381526020018281526020019350505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090509392505050565b805160208201fdfe53746174696343616c6c28616464726573732c62797465732c6279746573333229a265627a7a72315820810f2cccbd051a63dec5e6c05ccc9a965c4ae8a93e1c2d15b511b833529dfa1064736f6c63430005100032"
+                "object": "0x608060405234801561001057600080fd5b50610505806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063a85e59e41461003b578063ae25532e146100d3575b600080fd5b6100d16004803603608081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b919350915073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610110565b005b6100db6103a5565b604080517fffffffff000000000000000000000000000000000000000000000000000000009092168252519081900360200190f35b6000606060006101656004898990508a8a8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092949392505063ffffffff6103c5169050565b806020019051606081101561017957600080fd5b8151602083018051604051929492938301929190846401000000008211156101a057600080fd5b9083019060208201858111156101b557600080fd5b82516401000000008111828201881017156101cf57600080fd5b82525081516020918201929091019080838360005b838110156101fc5781810151838201526020016101e4565b50505050905090810190601f1680156102295780820380516001836020036101000a031916815260200191505b5060405260200180519060200190929190505050925092509250600060608473ffffffffffffffffffffffffffffffffffffffff16846040518082805190602001908083835b602083106102ac57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161026f565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d806000811461030c576040519150601f19603f3d011682016040523d82523d6000602084013e610311565b606091505b50915091508161032357805160208201fd5b8051602082012083811461039857604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f554e45585045435445445f5354415449435f43414c4c5f524553554c54000000604482015290519081900360640190fd5b5050505050505050505050565b600060405180806104b06021913960210190506040518091039020905090565b6060818311156103e3576103e36103de60008585610408565b6104a7565b83518211156103fc576103fc6103de6001848751610408565b50819003910190815290565b6060632800659560e01b8484846040516024018084600781111561042857fe5b60ff1681526020018381526020018281526020019350505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090509392505050565b805160208201fdfe53746174696343616c6c28616464726573732c62797465732c6279746573333229a265627a7a72315820e0bbdfc729189e053bb150f25953e9cbba2143f29cb7441e1605fc05a7d4b2e464736f6c63430005110032"
             },
             "deployedBytecode": {
-                "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063a85e59e41461003b578063ae25532e146100d3575b600080fd5b6100d16004803603608081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b919350915073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610110565b005b6100db6103a5565b604080517fffffffff000000000000000000000000000000000000000000000000000000009092168252519081900360200190f35b6000606060006101656004898990508a8a8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092949392505063ffffffff6103c5169050565b806020019051606081101561017957600080fd5b8151602083018051604051929492938301929190846401000000008211156101a057600080fd5b9083019060208201858111156101b557600080fd5b82516401000000008111828201881017156101cf57600080fd5b82525081516020918201929091019080838360005b838110156101fc5781810151838201526020016101e4565b50505050905090810190601f1680156102295780820380516001836020036101000a031916815260200191505b5060405260200180519060200190929190505050925092509250600060608473ffffffffffffffffffffffffffffffffffffffff16846040518082805190602001908083835b602083106102ac57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161026f565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d806000811461030c576040519150601f19603f3d011682016040523d82523d6000602084013e610311565b606091505b50915091508161032357805160208201fd5b8051602082012083811461039857604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f554e45585045435445445f5354415449435f43414c4c5f524553554c54000000604482015290519081900360640190fd5b5050505050505050505050565b600060405180806104b06021913960210190506040518091039020905090565b6060818311156103e3576103e36103de60008585610408565b6104a7565b83518211156103fc576103fc6103de6001848751610408565b50819003910190815290565b6060632800659560e01b8484846040516024018084600781111561042857fe5b60ff1681526020018381526020018281526020019350505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090509392505050565b805160208201fdfe53746174696343616c6c28616464726573732c62797465732c6279746573333229a265627a7a72315820810f2cccbd051a63dec5e6c05ccc9a965c4ae8a93e1c2d15b511b833529dfa1064736f6c63430005100032"
+                "object": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063a85e59e41461003b578063ae25532e146100d3575b600080fd5b6100d16004803603608081101561005157600080fd5b81019060208101813564010000000081111561006c57600080fd5b82018360208201111561007e57600080fd5b803590602001918460018302840111640100000000831117156100a057600080fd5b919350915073ffffffffffffffffffffffffffffffffffffffff813581169160208101359091169060400135610110565b005b6100db6103a5565b604080517fffffffff000000000000000000000000000000000000000000000000000000009092168252519081900360200190f35b6000606060006101656004898990508a8a8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092949392505063ffffffff6103c5169050565b806020019051606081101561017957600080fd5b8151602083018051604051929492938301929190846401000000008211156101a057600080fd5b9083019060208201858111156101b557600080fd5b82516401000000008111828201881017156101cf57600080fd5b82525081516020918201929091019080838360005b838110156101fc5781810151838201526020016101e4565b50505050905090810190601f1680156102295780820380516001836020036101000a031916815260200191505b5060405260200180519060200190929190505050925092509250600060608473ffffffffffffffffffffffffffffffffffffffff16846040518082805190602001908083835b602083106102ac57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161026f565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855afa9150503d806000811461030c576040519150601f19603f3d011682016040523d82523d6000602084013e610311565b606091505b50915091508161032357805160208201fd5b8051602082012083811461039857604080517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f554e45585045435445445f5354415449435f43414c4c5f524553554c54000000604482015290519081900360640190fd5b5050505050505050505050565b600060405180806104b06021913960210190506040518091039020905090565b6060818311156103e3576103e36103de60008585610408565b6104a7565b83518211156103fc576103fc6103de6001848751610408565b50819003910190815290565b6060632800659560e01b8484846040516024018084600781111561042857fe5b60ff1681526020018381526020018281526020019350505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090509392505050565b805160208201fdfe53746174696343616c6c28616464726573732c62797465732c6279746573333229a265627a7a72315820e0bbdfc729189e053bb150f25953e9cbba2143f29cb7441e1605fc05a7d4b2e464736f6c63430005110032"
             }
         }
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "0.5.17+commit.d19bba13",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/WETH9.json

@@ -158,16 +158,16 @@
         "devdoc": { "methods": {} },
         "evm": {
             "bytecode": {
-                "object": "0x60c0604052600d60808190526c2bb930b83832b21022ba3432b960991b60a090815261002e916000919061007a565b50604080518082019091526004808252630ae8aa8960e31b602090920191825261005a9160019161007a565b506002805460ff1916601217905534801561007457600080fd5b50610115565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100bb57805160ff19168380011785556100e8565b828001600101855582156100e8579182015b828111156100e85782518255916020019190600101906100cd565b506100f49291506100f8565b5090565b61011291905b808211156100f457600081556001016100fe565b90565b6107f9806101246000396000f3fe6080604052600436106100bc5760003560e01c8063313ce56711610074578063a9059cbb1161004e578063a9059cbb146102cb578063d0e30db0146100bc578063dd62ed3e14610311576100bc565b8063313ce5671461024b57806370a082311461027657806395d89b41146102b6576100bc565b806318160ddd116100a557806318160ddd146101aa57806323b872dd146101d15780632e1a7d4d14610221576100bc565b806306fdde03146100c6578063095ea7b314610150575b6100c4610359565b005b3480156100d257600080fd5b506100db6103a8565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101155781810151838201526020016100fd565b50505050905090810190601f1680156101425780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015c57600080fd5b506101966004803603604081101561017357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610454565b604080519115158252519081900360200190f35b3480156101b657600080fd5b506101bf6104c7565b60408051918252519081900360200190f35b3480156101dd57600080fd5b50610196600480360360608110156101f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135811691602081013590911690604001356104cb565b34801561022d57600080fd5b506100c46004803603602081101561024457600080fd5b503561066b565b34801561025757600080fd5b50610260610700565b6040805160ff9092168252519081900360200190f35b34801561028257600080fd5b506101bf6004803603602081101561029957600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610709565b3480156102c257600080fd5b506100db61071b565b3480156102d757600080fd5b50610196600480360360408110156102ee57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610793565b34801561031d57600080fd5b506101bf6004803603604081101561033457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160200135166107a7565b33600081815260036020908152604091829020805434908101909155825190815291517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9281900390910190a2565b6000805460408051602060026001851615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b4790565b73ffffffffffffffffffffffffffffffffffffffff83166000908152600360205260408120548211156104fd57600080fd5b73ffffffffffffffffffffffffffffffffffffffff84163314801590610573575073ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14155b156105ed5773ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020548211156105b557600080fd5b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020805483900390555b73ffffffffffffffffffffffffffffffffffffffff808516600081815260036020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a35060019392505050565b3360009081526003602052604090205481111561068757600080fd5b33600081815260036020526040808220805485900390555183156108fc0291849190818181858888f193505050501580156106c6573d6000803e3d6000fd5b5060408051828152905133917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a250565b60025460ff1681565b60036020526000908152604090205481565b60018054604080516020600284861615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b60006107a03384846104cb565b9392505050565b60046020908152600092835260408084209091529082529020548156fea265627a7a723158201d2ffc56fd216e25b5193800153d8fc3a68d6c94bdd8d1320a5a64ec406bf7a564736f6c63430005100032"
+                "object": "0x60c0604052600d60808190526c2bb930b83832b21022ba3432b960991b60a090815261002e916000919061007a565b50604080518082019091526004808252630ae8aa8960e31b602090920191825261005a9160019161007a565b506002805460ff1916601217905534801561007457600080fd5b50610115565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100bb57805160ff19168380011785556100e8565b828001600101855582156100e8579182015b828111156100e85782518255916020019190600101906100cd565b506100f49291506100f8565b5090565b61011291905b808211156100f457600081556001016100fe565b90565b6107f9806101246000396000f3fe6080604052600436106100bc5760003560e01c8063313ce56711610074578063a9059cbb1161004e578063a9059cbb146102cb578063d0e30db0146100bc578063dd62ed3e14610311576100bc565b8063313ce5671461024b57806370a082311461027657806395d89b41146102b6576100bc565b806318160ddd116100a557806318160ddd146101aa57806323b872dd146101d15780632e1a7d4d14610221576100bc565b806306fdde03146100c6578063095ea7b314610150575b6100c4610359565b005b3480156100d257600080fd5b506100db6103a8565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101155781810151838201526020016100fd565b50505050905090810190601f1680156101425780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015c57600080fd5b506101966004803603604081101561017357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610454565b604080519115158252519081900360200190f35b3480156101b657600080fd5b506101bf6104c7565b60408051918252519081900360200190f35b3480156101dd57600080fd5b50610196600480360360608110156101f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135811691602081013590911690604001356104cb565b34801561022d57600080fd5b506100c46004803603602081101561024457600080fd5b503561066b565b34801561025757600080fd5b50610260610700565b6040805160ff9092168252519081900360200190f35b34801561028257600080fd5b506101bf6004803603602081101561029957600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610709565b3480156102c257600080fd5b506100db61071b565b3480156102d757600080fd5b50610196600480360360408110156102ee57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610793565b34801561031d57600080fd5b506101bf6004803603604081101561033457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160200135166107a7565b33600081815260036020908152604091829020805434908101909155825190815291517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9281900390910190a2565b6000805460408051602060026001851615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b4790565b73ffffffffffffffffffffffffffffffffffffffff83166000908152600360205260408120548211156104fd57600080fd5b73ffffffffffffffffffffffffffffffffffffffff84163314801590610573575073ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14155b156105ed5773ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020548211156105b557600080fd5b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020805483900390555b73ffffffffffffffffffffffffffffffffffffffff808516600081815260036020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a35060019392505050565b3360009081526003602052604090205481111561068757600080fd5b33600081815260036020526040808220805485900390555183156108fc0291849190818181858888f193505050501580156106c6573d6000803e3d6000fd5b5060408051828152905133917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a250565b60025460ff1681565b60036020526000908152604090205481565b60018054604080516020600284861615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b60006107a03384846104cb565b9392505050565b60046020908152600092835260408084209091529082529020548156fea265627a7a723158203cd1ca14603fcfa858fca0001d639d0e3bd2280e97e110042bb4613ca89b20c864736f6c63430005110032"
             },
             "deployedBytecode": {
-                "object": "0x6080604052600436106100bc5760003560e01c8063313ce56711610074578063a9059cbb1161004e578063a9059cbb146102cb578063d0e30db0146100bc578063dd62ed3e14610311576100bc565b8063313ce5671461024b57806370a082311461027657806395d89b41146102b6576100bc565b806318160ddd116100a557806318160ddd146101aa57806323b872dd146101d15780632e1a7d4d14610221576100bc565b806306fdde03146100c6578063095ea7b314610150575b6100c4610359565b005b3480156100d257600080fd5b506100db6103a8565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101155781810151838201526020016100fd565b50505050905090810190601f1680156101425780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015c57600080fd5b506101966004803603604081101561017357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610454565b604080519115158252519081900360200190f35b3480156101b657600080fd5b506101bf6104c7565b60408051918252519081900360200190f35b3480156101dd57600080fd5b50610196600480360360608110156101f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135811691602081013590911690604001356104cb565b34801561022d57600080fd5b506100c46004803603602081101561024457600080fd5b503561066b565b34801561025757600080fd5b50610260610700565b6040805160ff9092168252519081900360200190f35b34801561028257600080fd5b506101bf6004803603602081101561029957600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610709565b3480156102c257600080fd5b506100db61071b565b3480156102d757600080fd5b50610196600480360360408110156102ee57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610793565b34801561031d57600080fd5b506101bf6004803603604081101561033457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160200135166107a7565b33600081815260036020908152604091829020805434908101909155825190815291517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9281900390910190a2565b6000805460408051602060026001851615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b4790565b73ffffffffffffffffffffffffffffffffffffffff83166000908152600360205260408120548211156104fd57600080fd5b73ffffffffffffffffffffffffffffffffffffffff84163314801590610573575073ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14155b156105ed5773ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020548211156105b557600080fd5b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020805483900390555b73ffffffffffffffffffffffffffffffffffffffff808516600081815260036020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a35060019392505050565b3360009081526003602052604090205481111561068757600080fd5b33600081815260036020526040808220805485900390555183156108fc0291849190818181858888f193505050501580156106c6573d6000803e3d6000fd5b5060408051828152905133917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a250565b60025460ff1681565b60036020526000908152604090205481565b60018054604080516020600284861615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b60006107a03384846104cb565b9392505050565b60046020908152600092835260408084209091529082529020548156fea265627a7a723158201d2ffc56fd216e25b5193800153d8fc3a68d6c94bdd8d1320a5a64ec406bf7a564736f6c63430005100032"
+                "object": "0x6080604052600436106100bc5760003560e01c8063313ce56711610074578063a9059cbb1161004e578063a9059cbb146102cb578063d0e30db0146100bc578063dd62ed3e14610311576100bc565b8063313ce5671461024b57806370a082311461027657806395d89b41146102b6576100bc565b806318160ddd116100a557806318160ddd146101aa57806323b872dd146101d15780632e1a7d4d14610221576100bc565b806306fdde03146100c6578063095ea7b314610150575b6100c4610359565b005b3480156100d257600080fd5b506100db6103a8565b6040805160208082528351818301528351919283929083019185019080838360005b838110156101155781810151838201526020016100fd565b50505050905090810190601f1680156101425780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015c57600080fd5b506101966004803603604081101561017357600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610454565b604080519115158252519081900360200190f35b3480156101b657600080fd5b506101bf6104c7565b60408051918252519081900360200190f35b3480156101dd57600080fd5b50610196600480360360608110156101f457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135811691602081013590911690604001356104cb565b34801561022d57600080fd5b506100c46004803603602081101561024457600080fd5b503561066b565b34801561025757600080fd5b50610260610700565b6040805160ff9092168252519081900360200190f35b34801561028257600080fd5b506101bf6004803603602081101561029957600080fd5b503573ffffffffffffffffffffffffffffffffffffffff16610709565b3480156102c257600080fd5b506100db61071b565b3480156102d757600080fd5b50610196600480360360408110156102ee57600080fd5b5073ffffffffffffffffffffffffffffffffffffffff8135169060200135610793565b34801561031d57600080fd5b506101bf6004803603604081101561033457600080fd5b5073ffffffffffffffffffffffffffffffffffffffff813581169160200135166107a7565b33600081815260036020908152604091829020805434908101909155825190815291517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c9281900390910190a2565b6000805460408051602060026001851615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b505050505081565b33600081815260046020908152604080832073ffffffffffffffffffffffffffffffffffffffff8716808552908352818420869055815186815291519394909390927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925928290030190a350600192915050565b4790565b73ffffffffffffffffffffffffffffffffffffffff83166000908152600360205260408120548211156104fd57600080fd5b73ffffffffffffffffffffffffffffffffffffffff84163314801590610573575073ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14155b156105ed5773ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020548211156105b557600080fd5b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602090815260408083203384529091529020805483900390555b73ffffffffffffffffffffffffffffffffffffffff808516600081815260036020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a35060019392505050565b3360009081526003602052604090205481111561068757600080fd5b33600081815260036020526040808220805485900390555183156108fc0291849190818181858888f193505050501580156106c6573d6000803e3d6000fd5b5060408051828152905133917f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65919081900360200190a250565b60025460ff1681565b60036020526000908152604090205481565b60018054604080516020600284861615610100027fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0190941693909304601f8101849004840282018401909252818152929183018282801561044c5780601f106104215761010080835404028352916020019161044c565b60006107a03384846104cb565b9392505050565b60046020908152600092835260408084209091529082529020548156fea265627a7a723158203cd1ca14603fcfa858fca0001d639d0e3bd2280e97e110042bb4613ca89b20c864736f6c63430005110032"
             }
         }
     },
     "compiler": {
         "name": "solc",
-        "version": "soljson-v0.5.16+commit.9c3226ce.js",
+        "version": "soljson-v0.5.17+commit.d19bba13.js",
         "settings": {
             "optimizer": {
                 "enabled": true,

packages/contract-artifacts/artifacts/ZRXToken.json

@@ -116,10 +116,10 @@
         },
         "evm": {
             "bytecode": {
-                "object": "0x60606040526b033b2e3c9fd0803ce8000000600355341561001c57fe5b5b600354600160a060020a0333166000908152602081905260409020555b5b61078d8061004a6000396000f300606060405236156100965763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde038114610098578063095ea7b31461014657806318160ddd1461018657806323b872dd146101a8578063313ce567146101ee57806370a082311461021457806395d89b411461024f578063a9059cbb146102fd578063dd62ed3e1461033d575bfe5b34156100a057fe5b6100a861037e565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561014e57fe5b61017273ffffffffffffffffffffffffffffffffffffffff600435166024356103b5565b604080519115158252519081900360200190f35b341561018e57fe5b61019661042d565b60408051918252519081900360200190f35b34156101b057fe5b61017273ffffffffffffffffffffffffffffffffffffffff60043581169060243516604435610433565b604080519115158252519081900360200190f35b34156101f657fe5b6101fe6105d4565b6040805160ff9092168252519081900360200190f35b341561021c57fe5b61019673ffffffffffffffffffffffffffffffffffffffff600435166105d9565b60408051918252519081900360200190f35b341561025757fe5b6100a8610605565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561030557fe5b61017273ffffffffffffffffffffffffffffffffffffffff6004351660243561063c565b604080519115158252519081900360200190f35b341561034557fe5b61019673ffffffffffffffffffffffffffffffffffffffff60043581169060243516610727565b60408051918252519081900360200190f35b60408051808201909152601181527f30782050726f746f636f6c20546f6b656e000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60035481565b73ffffffffffffffffffffffffffffffffffffffff808416600081815260016020908152604080832033909516835293815283822054928252819052918220548390108015906104835750828110155b80156104b6575073ffffffffffffffffffffffffffffffffffffffff841660009081526020819052604090205483810110155b156105c65773ffffffffffffffffffffffffffffffffffffffff808516600090815260208190526040808220805487019055918716815220805484900390557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8110156105585773ffffffffffffffffffffffffffffffffffffffff808616600090815260016020908152604080832033909416835292905220805484900390555b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef856040518082815260200191505060405180910390a3600191506105cb565b600091505b5b509392505050565b601281565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081905260409020545b919050565b60408051808201909152600381527f5a52580000000000000000000000000000000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff3316600090815260208190526040812054829010801590610699575073ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110155b156107185773ffffffffffffffffffffffffffffffffffffffff33811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610427565b506000610427565b5b92915050565b73ffffffffffffffffffffffffffffffffffffffff8083166000908152600160209081526040808320938516835292905220545b929150505600a165627a7a72305820da020366d75ca3a9f2ac8c2e8caa46722a6f27bae293974b944c9572e028e1790029"
+                "object": "0x60606040526b033b2e3c9fd0803ce8000000600355341561001c57fe5b5b600354600160a060020a0333166000908152602081905260409020555b5b61078d8061004a6000396000f300606060405236156100965763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde038114610098578063095ea7b31461014657806318160ddd1461018657806323b872dd146101a8578063313ce567146101ee57806370a082311461021457806395d89b411461024f578063a9059cbb146102fd578063dd62ed3e1461033d575bfe5b34156100a057fe5b6100a861037e565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561014e57fe5b61017273ffffffffffffffffffffffffffffffffffffffff600435166024356103b5565b604080519115158252519081900360200190f35b341561018e57fe5b61019661042d565b60408051918252519081900360200190f35b34156101b057fe5b61017273ffffffffffffffffffffffffffffffffffffffff60043581169060243516604435610433565b604080519115158252519081900360200190f35b34156101f657fe5b6101fe6105d4565b6040805160ff9092168252519081900360200190f35b341561021c57fe5b61019673ffffffffffffffffffffffffffffffffffffffff600435166105d9565b60408051918252519081900360200190f35b341561025757fe5b6100a8610605565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561030557fe5b61017273ffffffffffffffffffffffffffffffffffffffff6004351660243561063c565b604080519115158252519081900360200190f35b341561034557fe5b61019673ffffffffffffffffffffffffffffffffffffffff60043581169060243516610727565b60408051918252519081900360200190f35b60408051808201909152601181527f30782050726f746f636f6c20546f6b656e000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60035481565b73ffffffffffffffffffffffffffffffffffffffff808416600081815260016020908152604080832033909516835293815283822054928252819052918220548390108015906104835750828110155b80156104b6575073ffffffffffffffffffffffffffffffffffffffff841660009081526020819052604090205483810110155b156105c65773ffffffffffffffffffffffffffffffffffffffff808516600090815260208190526040808220805487019055918716815220805484900390557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8110156105585773ffffffffffffffffffffffffffffffffffffffff808616600090815260016020908152604080832033909416835292905220805484900390555b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef856040518082815260200191505060405180910390a3600191506105cb565b600091505b5b509392505050565b601281565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081905260409020545b919050565b60408051808201909152600381527f5a52580000000000000000000000000000000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff3316600090815260208190526040812054829010801590610699575073ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110155b156107185773ffffffffffffffffffffffffffffffffffffffff33811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610427565b506000610427565b5b92915050565b73ffffffffffffffffffffffffffffffffffffffff8083166000908152600160209081526040808320938516835292905220545b929150505600a165627a7a72305820ed1258581d81c9784322a395f1d964704760df40d638285300bbe445e268746d0029"
             },
             "deployedBytecode": {
-                "object": "0x606060405236156100965763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde038114610098578063095ea7b31461014657806318160ddd1461018657806323b872dd146101a8578063313ce567146101ee57806370a082311461021457806395d89b411461024f578063a9059cbb146102fd578063dd62ed3e1461033d575bfe5b34156100a057fe5b6100a861037e565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561014e57fe5b61017273ffffffffffffffffffffffffffffffffffffffff600435166024356103b5565b604080519115158252519081900360200190f35b341561018e57fe5b61019661042d565b60408051918252519081900360200190f35b34156101b057fe5b61017273ffffffffffffffffffffffffffffffffffffffff60043581169060243516604435610433565b604080519115158252519081900360200190f35b34156101f657fe5b6101fe6105d4565b6040805160ff9092168252519081900360200190f35b341561021c57fe5b61019673ffffffffffffffffffffffffffffffffffffffff600435166105d9565b60408051918252519081900360200190f35b341561025757fe5b6100a8610605565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561030557fe5b61017273ffffffffffffffffffffffffffffffffffffffff6004351660243561063c565b604080519115158252519081900360200190f35b341561034557fe5b61019673ffffffffffffffffffffffffffffffffffffffff60043581169060243516610727565b60408051918252519081900360200190f35b60408051808201909152601181527f30782050726f746f636f6c20546f6b656e000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60035481565b73ffffffffffffffffffffffffffffffffffffffff808416600081815260016020908152604080832033909516835293815283822054928252819052918220548390108015906104835750828110155b80156104b6575073ffffffffffffffffffffffffffffffffffffffff841660009081526020819052604090205483810110155b156105c65773ffffffffffffffffffffffffffffffffffffffff808516600090815260208190526040808220805487019055918716815220805484900390557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8110156105585773ffffffffffffffffffffffffffffffffffffffff808616600090815260016020908152604080832033909416835292905220805484900390555b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef856040518082815260200191505060405180910390a3600191506105cb565b600091505b5b509392505050565b601281565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081905260409020545b919050565b60408051808201909152600381527f5a52580000000000000000000000000000000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff3316600090815260208190526040812054829010801590610699575073ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110155b156107185773ffffffffffffffffffffffffffffffffffffffff33811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610427565b506000610427565b5b92915050565b73ffffffffffffffffffffffffffffffffffffffff8083166000908152600160209081526040808320938516835292905220545b929150505600a165627a7a72305820da020366d75ca3a9f2ac8c2e8caa46722a6f27bae293974b944c9572e028e1790029"
+                "object": "0x606060405236156100965763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde038114610098578063095ea7b31461014657806318160ddd1461018657806323b872dd146101a8578063313ce567146101ee57806370a082311461021457806395d89b411461024f578063a9059cbb146102fd578063dd62ed3e1461033d575bfe5b34156100a057fe5b6100a861037e565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561014e57fe5b61017273ffffffffffffffffffffffffffffffffffffffff600435166024356103b5565b604080519115158252519081900360200190f35b341561018e57fe5b61019661042d565b60408051918252519081900360200190f35b34156101b057fe5b61017273ffffffffffffffffffffffffffffffffffffffff60043581169060243516604435610433565b604080519115158252519081900360200190f35b34156101f657fe5b6101fe6105d4565b6040805160ff9092168252519081900360200190f35b341561021c57fe5b61019673ffffffffffffffffffffffffffffffffffffffff600435166105d9565b60408051918252519081900360200190f35b341561025757fe5b6100a8610605565b60408051602080825283518183015283519192839290830191850190808383821561010c575b80518252602083111561010c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016100ce565b505050905090810190601f1680156101385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561030557fe5b61017273ffffffffffffffffffffffffffffffffffffffff6004351660243561063c565b604080519115158252519081900360200190f35b341561034557fe5b61019673ffffffffffffffffffffffffffffffffffffffff60043581169060243516610727565b60408051918252519081900360200190f35b60408051808201909152601181527f30782050726f746f636f6c20546f6b656e000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60035481565b73ffffffffffffffffffffffffffffffffffffffff808416600081815260016020908152604080832033909516835293815283822054928252819052918220548390108015906104835750828110155b80156104b6575073ffffffffffffffffffffffffffffffffffffffff841660009081526020819052604090205483810110155b156105c65773ffffffffffffffffffffffffffffffffffffffff808516600090815260208190526040808220805487019055918716815220805484900390557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8110156105585773ffffffffffffffffffffffffffffffffffffffff808616600090815260016020908152604080832033909416835292905220805484900390555b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef856040518082815260200191505060405180910390a3600191506105cb565b600091505b5b509392505050565b601281565b73ffffffffffffffffffffffffffffffffffffffff81166000908152602081905260409020545b919050565b60408051808201909152600381527f5a52580000000000000000000000000000000000000000000000000000000000602082015281565b73ffffffffffffffffffffffffffffffffffffffff3316600090815260208190526040812054829010801590610699575073ffffffffffffffffffffffffffffffffffffffff831660009081526020819052604090205482810110155b156107185773ffffffffffffffffffffffffffffffffffffffff33811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610427565b506000610427565b5b92915050565b73ffffffffffffffffffffffffffffffffffffffff8083166000908152600160209081526040808320938516835292905220545b929150505600a165627a7a72305820ed1258581d81c9784322a395f1d964704760df40d638285300bbe445e268746d0029"
             }
         }
     },

packages/contract-artifacts/src/index.ts

@@ -20,6 +20,7 @@ import * as IAssetProxy from '../artifacts/IAssetProxy.json';
 import * as ITransformERC20 from '../artifacts/ITransformERC20.json';
 import * as IValidator from '../artifacts/IValidator.json';
 import * as IWallet from '../artifacts/IWallet.json';
+import * as IZeroEx from '../artifacts/IZeroEx.json';
 import * as MultiAssetProxy from '../artifacts/MultiAssetProxy.json';
 import * as Staking from '../artifacts/Staking.json';
 import * as StakingProxy from '../artifacts/StakingProxy.json';
@@ -58,4 +59,5 @@ export {
     ZrxVault,
     ERC20BridgeSampler,
     ITransformERC20,
+    IZeroEx,
 };

packages/contract-artifacts/tsconfig.json

@@ -37,6 +37,7 @@
         "./artifacts/ZrxVault.json",
         "./artifacts/ERC20BridgeProxy.json",
         "./artifacts/ERC20BridgeSampler.json",
-        "./artifacts/ITransformERC20.json"
+        "./artifacts/ITransformERC20.json",
+        "./artifacts/IZeroEx.json"
     ]
 }

packages/contract-wrappers/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "13.9.0",
+        "changes": [
+            {
+                "note": "Add `IZeroEx` wrapper",
+                "pr": 2626
+            }
+        ]
+    },
     {
         "version": "13.8.0",
         "changes": [

packages/contract-wrappers/package.json

@@ -32,7 +32,7 @@
         "wrappers:generate": "abi-gen --abis  ${npm_package_config_abis} --output src/generated-wrappers --backend ethers"
     },
     "config": {
-        "abis": "../contract-artifacts/artifacts/@(DevUtils|ERC20Token|ERC721Token|Exchange|Forwarder|IAssetData|LibTransactionDecoder|WETH9|Coordinator|Staking|StakingProxy|IERC20BridgeSampler|ERC20BridgeSampler|GodsUnchainedValidator|Broker|ILiquidityProvider|ILiquidityProviderRegistry|MaximumGasPrice|ITransformERC20).json"
+        "abis": "../contract-artifacts/artifacts/@(DevUtils|ERC20Token|ERC721Token|Exchange|Forwarder|IAssetData|LibTransactionDecoder|WETH9|Coordinator|Staking|StakingProxy|IERC20BridgeSampler|ERC20BridgeSampler|GodsUnchainedValidator|Broker|ILiquidityProvider|ILiquidityProviderRegistry|MaximumGasPrice|ITransformERC20|IZeroEx).json"
     },
     "gitpkg": {
         "registry": "git@github.com:0xProject/gitpkg-registry.git"

packages/contract-wrappers/src/generated-wrappers/broker.ts

@@ -624,7 +624,7 @@ export class BrokerContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -640,8 +640,8 @@ export class BrokerContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -659,7 +659,7 @@ export class BrokerContract extends BaseContract {
             > {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -756,7 +756,7 @@ export class BrokerContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -772,8 +772,8 @@ export class BrokerContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -789,7 +789,7 @@ export class BrokerContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -846,7 +846,7 @@ export class BrokerContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -862,15 +862,15 @@ export class BrokerContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/erc20_bridge_sampler.ts

@@ -896,7 +896,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -931,7 +931,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -986,7 +986,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1042,7 +1042,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1083,7 +1083,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1121,7 +1121,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1162,7 +1162,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1208,7 +1208,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1248,7 +1248,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1280,7 +1280,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1317,7 +1317,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1356,7 +1356,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1398,7 +1398,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1437,7 +1437,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1478,7 +1478,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1524,7 +1524,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1564,7 +1564,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1596,7 +1596,7 @@ export class ERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/erc20_token.ts

@@ -435,7 +435,7 @@ export class ERC20TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -465,7 +465,7 @@ export class ERC20TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -481,15 +481,15 @@ export class ERC20TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -515,7 +515,7 @@ export class ERC20TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -539,7 +539,7 @@ export class ERC20TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -569,7 +569,7 @@ export class ERC20TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -585,15 +585,15 @@ export class ERC20TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -625,7 +625,7 @@ export class ERC20TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -641,15 +641,15 @@ export class ERC20TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/erc721_token.ts

@@ -534,7 +534,7 @@ export class ERC721TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -550,15 +550,15 @@ export class ERC721TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -585,7 +585,7 @@ export class ERC721TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -611,7 +611,7 @@ export class ERC721TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -633,7 +633,7 @@ export class ERC721TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -660,7 +660,7 @@ export class ERC721TokenContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -692,7 +692,7 @@ export class ERC721TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -708,15 +708,15 @@ export class ERC721TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -764,7 +764,7 @@ export class ERC721TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -780,15 +780,15 @@ export class ERC721TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -823,7 +823,7 @@ export class ERC721TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -839,15 +839,15 @@ export class ERC721TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -881,7 +881,7 @@ export class ERC721TokenContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -897,15 +897,15 @@ export class ERC721TokenContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/exchange.ts

@@ -3233,7 +3233,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3253,7 +3253,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3275,7 +3275,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3320,7 +3320,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3336,15 +3336,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3384,7 +3384,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3400,15 +3400,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3469,7 +3469,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3485,8 +3485,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -3504,7 +3504,7 @@ export class ExchangeContract extends BaseContract {
             > {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3573,7 +3573,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3589,8 +3589,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -3608,7 +3608,7 @@ export class ExchangeContract extends BaseContract {
             > {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3677,7 +3677,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3693,8 +3693,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -3712,7 +3712,7 @@ export class ExchangeContract extends BaseContract {
             > {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3811,7 +3811,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3827,8 +3827,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -3855,7 +3855,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3969,7 +3969,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3985,8 +3985,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -4013,7 +4013,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4078,7 +4078,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4094,15 +4094,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4131,7 +4131,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4147,15 +4147,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4176,7 +4176,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4196,7 +4196,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4222,7 +4222,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4238,15 +4238,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4285,7 +4285,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4301,15 +4301,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4367,7 +4367,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4383,8 +4383,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -4400,7 +4400,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4464,7 +4464,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4480,8 +4480,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -4497,7 +4497,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4524,7 +4524,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4550,7 +4550,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4595,7 +4595,7 @@ export class ExchangeContract extends BaseContract {
             ): Promise<{ orderStatus: number; orderHash: string; orderTakerAssetFilledAmount: BigNumber }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4629,7 +4629,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4676,7 +4676,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4713,7 +4713,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4772,7 +4772,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4788,8 +4788,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -4805,7 +4805,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4871,7 +4871,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4887,8 +4887,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -4904,7 +4904,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -4969,7 +4969,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -4985,8 +4985,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -5002,7 +5002,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5068,7 +5068,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5084,8 +5084,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -5101,7 +5101,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5196,7 +5196,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5212,8 +5212,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -5240,7 +5240,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5351,7 +5351,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5367,8 +5367,8 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -5395,7 +5395,7 @@ export class ExchangeContract extends BaseContract {
             }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5439,7 +5439,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5459,7 +5459,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5487,7 +5487,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5503,15 +5503,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5533,7 +5533,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5553,7 +5553,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5573,7 +5573,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5601,7 +5601,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5617,15 +5617,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5653,7 +5653,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5669,15 +5669,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5704,7 +5704,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5720,15 +5720,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5758,7 +5758,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5774,15 +5774,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5825,7 +5825,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5841,15 +5841,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5870,7 +5870,7 @@ export class ExchangeContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -5897,7 +5897,7 @@ export class ExchangeContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -5913,15 +5913,15 @@ export class ExchangeContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/forwarder.ts

@@ -785,7 +785,7 @@ export class ForwarderContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -805,7 +805,7 @@ export class ForwarderContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -825,7 +825,7 @@ export class ForwarderContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -856,7 +856,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -872,15 +872,15 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -943,7 +943,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -959,8 +959,8 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -970,7 +970,7 @@ export class ForwarderContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1037,7 +1037,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1053,8 +1053,8 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -1064,7 +1064,7 @@ export class ForwarderContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1128,7 +1128,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1144,8 +1144,8 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
@@ -1155,7 +1155,7 @@ export class ForwarderContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1202,7 +1202,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1218,15 +1218,15 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1274,7 +1274,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1290,15 +1290,15 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1324,7 +1324,7 @@ export class ForwarderContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1351,7 +1351,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1367,15 +1367,15 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1405,7 +1405,7 @@ export class ForwarderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1421,15 +1421,15 @@ export class ForwarderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts

@@ -296,7 +296,7 @@ export class GodsUnchainedValidatorContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts

@@ -377,7 +377,7 @@ export class IAssetDataContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -393,15 +393,15 @@ export class IAssetDataContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -437,7 +437,7 @@ export class IAssetDataContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -453,15 +453,15 @@ export class IAssetDataContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -492,7 +492,7 @@ export class IAssetDataContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -508,15 +508,15 @@ export class IAssetDataContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -545,7 +545,7 @@ export class IAssetDataContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -561,15 +561,15 @@ export class IAssetDataContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -601,7 +601,7 @@ export class IAssetDataContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -617,15 +617,15 @@ export class IAssetDataContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -662,7 +662,7 @@ export class IAssetDataContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -678,15 +678,15 @@ export class IAssetDataContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/i_erc20_bridge_sampler.ts

@@ -865,7 +865,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -900,7 +900,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -954,7 +954,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1008,7 +1008,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1049,7 +1049,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1088,7 +1088,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1129,7 +1129,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1175,7 +1175,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1215,7 +1215,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1247,7 +1247,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1284,7 +1284,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1323,7 +1323,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1361,7 +1361,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1402,7 +1402,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1448,7 +1448,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1488,7 +1488,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1520,7 +1520,7 @@ export class IERC20BridgeSamplerContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts

@@ -359,7 +359,7 @@ export class ILiquidityProviderContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -375,15 +375,15 @@ export class ILiquidityProviderContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -420,7 +420,7 @@ export class ILiquidityProviderContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -455,7 +455,7 @@ export class ILiquidityProviderContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider_registry.ts

@@ -280,7 +280,7 @@ export class ILiquidityProviderRegistryContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts

@@ -36,14 +36,20 @@ import * as ethers from 'ethers';
 // tslint:enable:no-unused-variable
 
 export type ITransformERC20EventArgs =
+    | ITransformERC20QuoteSignerUpdatedEventArgs
     | ITransformERC20TransformedERC20EventArgs
     | ITransformERC20TransformerDeployerUpdatedEventArgs;
 
 export enum ITransformERC20Events {
+    QuoteSignerUpdated = 'QuoteSignerUpdated',
     TransformedERC20 = 'TransformedERC20',
     TransformerDeployerUpdated = 'TransformerDeployerUpdated',
 }
 
+export interface ITransformERC20QuoteSignerUpdatedEventArgs extends DecodedLogArgs {
+    quoteSigner: string;
+}
+
 export interface ITransformERC20TransformedERC20EventArgs extends DecodedLogArgs {
     taker: string;
     inputToken: string;
@@ -173,6 +179,19 @@ export class ITransformERC20Contract extends BaseContract {
      */
     public static ABI(): ContractAbi {
         const abi = [
+            {
+                anonymous: false,
+                inputs: [
+                    {
+                        name: 'quoteSigner',
+                        type: 'address',
+                        indexed: false,
+                    },
+                ],
+                name: 'QuoteSignerUpdated',
+                outputs: [],
+                type: 'event',
+            },
             {
                 anonymous: false,
                 inputs: [
@@ -222,9 +241,9 @@ export class ITransformERC20Contract extends BaseContract {
             {
                 inputs: [
                     {
-                        name: 'callDataHash',
-                        type: 'bytes32',
-                    },
+                        name: 'args',
+                        type: 'tuple',
+                        components: [
                             {
                                 name: 'taker',
                                 type: 'address',
@@ -259,6 +278,16 @@ export class ITransformERC20Contract extends BaseContract {
                                     },
                                 ],
                             },
+                            {
+                                name: 'callDataHash',
+                                type: 'bytes32',
+                            },
+                            {
+                                name: 'callDataSignature',
+                                type: 'bytes',
+                            },
+                        ],
+                    },
                 ],
                 name: '_transformERC20',
                 outputs: [
@@ -282,6 +311,18 @@ export class ITransformERC20Contract extends BaseContract {
                 stateMutability: 'nonpayable',
                 type: 'function',
             },
+            {
+                inputs: [],
+                name: 'getQuoteSigner',
+                outputs: [
+                    {
+                        name: 'signer',
+                        type: 'address',
+                    },
+                ],
+                stateMutability: 'view',
+                type: 'function',
+            },
             {
                 inputs: [],
                 name: 'getTransformWallet',
@@ -306,6 +347,18 @@ export class ITransformERC20Contract extends BaseContract {
                 stateMutability: 'view',
                 type: 'function',
             },
+            {
+                inputs: [
+                    {
+                        name: 'quoteSigner',
+                        type: 'address',
+                    },
+                ],
+                name: 'setQuoteSigner',
+                outputs: [],
+                stateMutability: 'nonpayable',
+                type: 'function',
+            },
             {
                 inputs: [
                     {
@@ -442,36 +495,22 @@ export class ITransformERC20Contract extends BaseContract {
 
     /**
      * Internal version of `transformERC20()`. Only callable from within.
-     * @param callDataHash Hash of the ingress calldata.
-     * @param taker The taker address.
-     * @param inputToken The token being provided by the taker.        If
-     *     `0xeee...`, ETH is implied and should be provided with the call.`
-     * @param outputToken The token to be acquired by the taker.        `0xeee...`
-     *     implies ETH.
-     * @param inputTokenAmount The amount of `inputToken` to take from the taker.
-     * @param minOutputTokenAmount The minimum amount of `outputToken` the taker
-     *         must receive for the entire transformation to succeed.
-     * @param transformations The transformations to execute on the token
-     *     balance(s)        in sequence.
+     * @param args A `TransformERC20Args` struct.
      */
-    public _transformERC20(
-        callDataHash: string,
-        taker: string,
-        inputToken: string,
-        outputToken: string,
-        inputTokenAmount: BigNumber,
-        minOutputTokenAmount: BigNumber,
-        transformations: Array<{ deploymentNonce: number | BigNumber; data: string }>,
-    ): ContractTxFunctionObj<BigNumber> {
+    public _transformERC20(args: {
+        taker: string;
+        inputToken: string;
+        outputToken: string;
+        inputTokenAmount: BigNumber;
+        minOutputTokenAmount: BigNumber;
+        transformations: Array<{ deploymentNonce: number | BigNumber; data: string }>;
+        callDataHash: string;
+        callDataSignature: string;
+    }): ContractTxFunctionObj<BigNumber> {
         const self = (this as any) as ITransformERC20Contract;
-        assert.isString('callDataHash', callDataHash);
-        assert.isString('taker', taker);
-        assert.isString('inputToken', inputToken);
-        assert.isString('outputToken', outputToken);
-        assert.isBigNumber('inputTokenAmount', inputTokenAmount);
-        assert.isBigNumber('minOutputTokenAmount', minOutputTokenAmount);
-        assert.isArray('transformations', transformations);
-        const functionSignature = '_transformERC20(bytes32,address,address,address,uint256,uint256,(uint32,bytes)[])';
+
+        const functionSignature =
+            '_transformERC20((address,address,address,uint256,uint256,(uint32,bytes)[],bytes32,bytes))';
 
         return {
             async sendTransactionAsync(
@@ -479,7 +518,7 @@ export class ITransformERC20Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -495,15 +534,15 @@ export class ITransformERC20Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -511,22 +550,14 @@ export class ITransformERC20Contract extends BaseContract {
                 return abiEncoder.strictDecodeReturnValue<BigNumber>(rawCallResult);
             },
             getABIEncodedTransactionData(): string {
-                return self._strictEncodeArguments(functionSignature, [
-                    callDataHash,
-                    taker.toLowerCase(),
-                    inputToken.toLowerCase(),
-                    outputToken.toLowerCase(),
-                    inputTokenAmount,
-                    minOutputTokenAmount,
-                    transformations,
-                ]);
+                return self._strictEncodeArguments(functionSignature, [args]);
             },
         };
     }
     /**
      * Deploy a new flash wallet instance and replace the current one with it.
      * Useful if we somehow break the current wallet instance.
-     * Anyone can call this.
+     * Only callable by the owner.
      */
     public createTransformWallet(): ContractTxFunctionObj<string> {
         const self = (this as any) as ITransformERC20Contract;
@@ -538,7 +569,7 @@ export class ITransformERC20Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -554,15 +585,64 @@ export class ITransformERC20Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
+                    defaultBlock,
+                );
+                const abiEncoder = self._lookupAbiEncoder(functionSignature);
+                BaseContract._throwIfUnexpectedEmptyCallResult(rawCallResult, abiEncoder);
+                return abiEncoder.strictDecodeReturnValue<string>(rawCallResult);
+            },
+            getABIEncodedTransactionData(): string {
+                return self._strictEncodeArguments(functionSignature, []);
+            },
+        };
+    }
+    /**
+     * Return the optional signer for `transformERC20()` calldata.
+     */
+    public getQuoteSigner(): ContractTxFunctionObj<string> {
+        const self = (this as any) as ITransformERC20Contract;
+        const functionSignature = 'getQuoteSigner()';
+
+        return {
+            async sendTransactionAsync(
+                txData?: Partial<TxData> | undefined,
+                opts: SendTransactionOpts = { shouldValidate: true },
+            ): Promise<string> {
+                const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
+                    { data: this.getABIEncodedTransactionData(), ...txData },
+                    this.estimateGasAsync.bind(this),
+                );
+                if (opts.shouldValidate !== false) {
+                    await this.callAsync(txDataWithDefaults);
+                }
+                return self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            },
+            awaitTransactionSuccessAsync(
+                txData?: Partial<TxData>,
+                opts: AwaitTransactionSuccessOpts = { shouldValidate: true },
+            ): PromiseWithTransactionHash<TransactionReceiptWithDecodedLogs> {
+                return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts);
+            },
+            async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
+                const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
+                    data: this.getABIEncodedTransactionData(),
+                    ...txData,
+                });
+                return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            },
+            async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
+                BaseContract._assertCallParams(callData, defaultBlock);
+                const rawCallResult = await self._performCallAsync(
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -588,7 +668,7 @@ export class ITransformERC20Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -604,15 +684,15 @@ export class ITransformERC20Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -637,7 +717,7 @@ export class ITransformERC20Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -653,15 +733,15 @@ export class ITransformERC20Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -674,15 +754,14 @@ export class ITransformERC20Contract extends BaseContract {
         };
     }
     /**
-     * Replace the allowed deployer for transformers.
+     * Replace the optional signer for `transformERC20()` calldata.
      * Only callable by the owner.
-     * @param transformerDeployer The address of the trusted deployer for
-     *     transformers.
+     * @param quoteSigner The address of the new calldata signer.
      */
-    public setTransformerDeployer(transformerDeployer: string): ContractTxFunctionObj<void> {
+    public setQuoteSigner(quoteSigner: string): ContractTxFunctionObj<void> {
         const self = (this as any) as ITransformERC20Contract;
-        assert.isString('transformerDeployer', transformerDeployer);
-        const functionSignature = 'setTransformerDeployer(address)';
+        assert.isString('quoteSigner', quoteSigner);
+        const functionSignature = 'setQuoteSigner(address)';
 
         return {
             async sendTransactionAsync(
@@ -690,7 +769,7 @@ export class ITransformERC20Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -706,15 +785,68 @@ export class ITransformERC20Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
+                    defaultBlock,
+                );
+                const abiEncoder = self._lookupAbiEncoder(functionSignature);
+                BaseContract._throwIfUnexpectedEmptyCallResult(rawCallResult, abiEncoder);
+                return abiEncoder.strictDecodeReturnValue<void>(rawCallResult);
+            },
+            getABIEncodedTransactionData(): string {
+                return self._strictEncodeArguments(functionSignature, [quoteSigner.toLowerCase()]);
+            },
+        };
+    }
+    /**
+     * Replace the allowed deployer for transformers.
+     * Only callable by the owner.
+     * @param transformerDeployer The address of the new trusted deployer
+     *     for transformers.
+     */
+    public setTransformerDeployer(transformerDeployer: string): ContractTxFunctionObj<void> {
+        const self = (this as any) as ITransformERC20Contract;
+        assert.isString('transformerDeployer', transformerDeployer);
+        const functionSignature = 'setTransformerDeployer(address)';
+
+        return {
+            async sendTransactionAsync(
+                txData?: Partial<TxData> | undefined,
+                opts: SendTransactionOpts = { shouldValidate: true },
+            ): Promise<string> {
+                const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
+                    { data: this.getABIEncodedTransactionData(), ...txData },
+                    this.estimateGasAsync.bind(this),
+                );
+                if (opts.shouldValidate !== false) {
+                    await this.callAsync(txDataWithDefaults);
+                }
+                return self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+            },
+            awaitTransactionSuccessAsync(
+                txData?: Partial<TxData>,
+                opts: AwaitTransactionSuccessOpts = { shouldValidate: true },
+            ): PromiseWithTransactionHash<TransactionReceiptWithDecodedLogs> {
+                return self._promiseWithTransactionHash(this.sendTransactionAsync(txData, opts), opts);
+            },
+            async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
+                const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
+                    data: this.getABIEncodedTransactionData(),
+                    ...txData,
+                });
+                return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+            },
+            async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
+                BaseContract._assertCallParams(callData, defaultBlock);
+                const rawCallResult = await self._performCallAsync(
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -760,7 +892,7 @@ export class ITransformERC20Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -776,15 +908,15 @@ export class ITransformERC20Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts

@@ -263,7 +263,7 @@ export class MaximumGasPriceContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -290,7 +290,7 @@ export class MaximumGasPriceContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/staking.ts

@@ -1709,7 +1709,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1725,15 +1725,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1760,7 +1760,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1776,15 +1776,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1810,7 +1810,7 @@ export class StakingContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1833,7 +1833,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1854,7 +1854,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1874,7 +1874,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1894,7 +1894,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1922,7 +1922,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1948,7 +1948,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1982,7 +1982,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1998,15 +1998,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2026,7 +2026,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2046,7 +2046,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2079,7 +2079,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2095,15 +2095,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2131,7 +2131,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2147,15 +2147,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2175,7 +2175,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2206,7 +2206,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2222,15 +2222,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2254,7 +2254,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2280,7 +2280,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2311,7 +2311,7 @@ export class StakingContract extends BaseContract {
             ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2349,7 +2349,7 @@ export class StakingContract extends BaseContract {
             ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2380,7 +2380,7 @@ export class StakingContract extends BaseContract {
             ): Promise<[BigNumber, number, BigNumber, number, number]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2416,7 +2416,7 @@ export class StakingContract extends BaseContract {
             ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2448,7 +2448,7 @@ export class StakingContract extends BaseContract {
             ): Promise<{ operator: string; operatorShare: number }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2479,7 +2479,7 @@ export class StakingContract extends BaseContract {
             ): Promise<{ feesCollected: BigNumber; weightedStake: BigNumber; membersStake: BigNumber }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2509,7 +2509,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2541,7 +2541,7 @@ export class StakingContract extends BaseContract {
             ): Promise<{ currentEpoch: BigNumber; currentEpochBalance: BigNumber; nextEpochBalance: BigNumber }> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2570,7 +2570,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2595,7 +2595,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2622,7 +2622,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2638,15 +2638,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2673,7 +2673,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2689,15 +2689,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2717,7 +2717,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2737,7 +2737,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2773,7 +2773,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2789,15 +2789,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2817,7 +2817,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2855,7 +2855,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2871,15 +2871,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2904,7 +2904,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2932,7 +2932,7 @@ export class StakingContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -2959,7 +2959,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -2975,15 +2975,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3012,7 +3012,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3028,15 +3028,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3063,7 +3063,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3079,15 +3079,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3107,7 +3107,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3128,7 +3128,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3172,7 +3172,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3188,15 +3188,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3230,7 +3230,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3246,15 +3246,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3274,7 +3274,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3301,7 +3301,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3317,15 +3317,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3354,7 +3354,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3370,15 +3370,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3399,7 +3399,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3419,7 +3419,7 @@ export class StakingContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -3447,7 +3447,7 @@ export class StakingContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -3463,15 +3463,15 @@ export class StakingContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts

@@ -836,7 +836,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -852,15 +852,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -886,7 +886,7 @@ export class StakingProxyContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -911,7 +911,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -938,7 +938,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -954,15 +954,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -983,7 +983,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1004,7 +1004,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1032,7 +1032,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1048,15 +1048,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1076,7 +1076,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1096,7 +1096,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1116,7 +1116,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1136,7 +1136,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1161,7 +1161,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1177,15 +1177,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1205,7 +1205,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1229,7 +1229,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string[]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1249,7 +1249,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1269,7 +1269,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1289,7 +1289,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1310,7 +1310,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1338,7 +1338,7 @@ export class StakingProxyContract extends BaseContract {
             ): Promise<[BigNumber, BigNumber, BigNumber]> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1365,7 +1365,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1381,15 +1381,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1418,7 +1418,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1434,15 +1434,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1462,7 +1462,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1483,7 +1483,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1503,7 +1503,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1530,7 +1530,7 @@ export class StakingProxyContract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -1546,15 +1546,15 @@ export class StakingProxyContract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1575,7 +1575,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -1595,7 +1595,7 @@ export class StakingProxyContract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/generated-wrappers/weth9.ts

@@ -559,7 +559,7 @@ export class WETH9Contract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -583,7 +583,7 @@ export class WETH9Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -599,15 +599,15 @@ export class WETH9Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -628,7 +628,7 @@ export class WETH9Contract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -648,7 +648,7 @@ export class WETH9Contract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<number> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -670,7 +670,7 @@ export class WETH9Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -686,15 +686,15 @@ export class WETH9Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -714,7 +714,7 @@ export class WETH9Contract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -734,7 +734,7 @@ export class WETH9Contract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -754,7 +754,7 @@ export class WETH9Contract extends BaseContract {
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<BigNumber> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -778,7 +778,7 @@ export class WETH9Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -794,15 +794,15 @@ export class WETH9Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -827,7 +827,7 @@ export class WETH9Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -843,15 +843,15 @@ export class WETH9Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<boolean> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);
@@ -874,7 +874,7 @@ export class WETH9Contract extends BaseContract {
                 opts: SendTransactionOpts = { shouldValidate: true },
             ): Promise<string> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
-                    { ...txData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...txData },
                     this.estimateGasAsync.bind(this),
                 );
                 if (opts.shouldValidate !== false) {
@@ -890,15 +890,15 @@ export class WETH9Contract extends BaseContract {
             },
             async estimateGasAsync(txData?: Partial<TxData> | undefined): Promise<number> {
                 const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({
-                    ...txData,
                     data: this.getABIEncodedTransactionData(),
+                    ...txData,
                 });
                 return self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
             },
             async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<void> {
                 BaseContract._assertCallParams(callData, defaultBlock);
                 const rawCallResult = await self._performCallAsync(
-                    { ...callData, data: this.getABIEncodedTransactionData() },
+                    { data: this.getABIEncodedTransactionData(), ...callData },
                     defaultBlock,
                 );
                 const abiEncoder = self._lookupAbiEncoder(functionSignature);

packages/contract-wrappers/src/index.ts

@@ -87,9 +87,22 @@ export {
     ITransformERC20Contract,
     ITransformERC20EventArgs,
     ITransformERC20Events,
+    ITransformERC20QuoteSignerUpdatedEventArgs,
     ITransformERC20TransformerDeployerUpdatedEventArgs,
     ITransformERC20TransformedERC20EventArgs,
 } from './generated-wrappers/i_transform_erc20';
+export {
+    IZeroExContract,
+    IZeroExEventArgs,
+    IZeroExEvents,
+    IZeroExMetaTransactionExecutedEventArgs,
+    IZeroExMigratedEventArgs,
+    IZeroExOwnershipTransferredEventArgs,
+    IZeroExProxyFunctionUpdatedEventArgs,
+    IZeroExQuoteSignerUpdatedEventArgs,
+    IZeroExTransformedERC20EventArgs,
+    IZeroExTransformerDeployerUpdatedEventArgs,
+} from './generated-wrappers/i_zero_ex';
 export {
     BlockRange,
     SupportedProvider,