add multiplex TokenForEth functions to metatransactions

* Remove TestAuthorizable

* Remove contracts/utils Authorizable and IAuthorizable

* Remove contracts/utils D18 contract

* Remove contracts/utils LibAddress contracts

* Remove contracts/utils LogDecoding contracts

* Remove contracts/utils Refundable contracts

* Remove contracts/utils LibAuthorizableRichErrors contracts

* Remove contracts/utils EIP712 contracts

* Remove contracts/utils TestRefundableReceiver contracts

* Remove contracts/utils EIP1271 contracts

* Remove contracts/utils ReentrancyGuardV06 contracts

* Remove contracts/utils LibMath contracts

* Remove contracts/utils LibFractions contracts

* Remove contracts/utils LibMathRichErrors contracts

* Remove DeploymentConstants as per PR review
https://github.com/0xProject/protocol/pull/643#pullrequestreview-1264963784

.github/workflows/ci.yml

@@ -84,6 +84,14 @@ jobs:
 
       - name: Run Forge tests
         working-directory: contracts/zero-ex
+        env:
+          ARBITRUM_RPC_URL: ${{ secrets.ARBITRUM_RPC_URL }}
+          AVALANCHE_RPC_URL: ${{ secrets.AVALANCHE_RPC_URL }}
+          BSC_RPC_URL: ${{ secrets.BSC_RPC_URL }}
+          FANTOM_RPC_URL: ${{ secrets.FANTOM_RPC_URL }}
+          MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
+          OPTIMISM_RPC_URL: ${{ secrets.OPTIMISM_RPC_URL }}
+          POLYGON_RPC_URL: ${{ secrets.POLYGON_RPC_URL }}
         run: |
           forge test -vvv --gas-report
 
@@ -98,8 +106,3 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           base-path: ./contracts/zero-ex/
           path-to-lcov: ./contracts/zero-ex/lcov.info
-
-
-
-
-

.gitignore

@@ -82,6 +82,9 @@ generated-artifacts/
 # generated contract wrappers
 generated-wrappers/
 
+# forge std-lib
+contracts/zero-ex/contracts/deps/forge-std
+
 # foundry artifacts
 foundry-artifacts/
 

.solhint.json

@@ -7,7 +7,7 @@
         "avoid-tx-origin": "warn",
         "code-complexity": "off",
         "const-name-snakecase": "error",
-        "function-max-lines": "off",
+        "function-max-lines": ["error", 350],
         "max-line-length": ["error", 120],
         "no-inline-assembly": "off",
         "quotes": ["error", "double"],

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "3.3.57",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "3.3.56",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1674517560,
         "version": "3.3.55",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.57 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v3.3.56 - _January 30, 2023_
+
+    * Dependencies updated
+
 ## v3.3.55 - _January 23, 2023_
 
     * Dependencies updated

contracts/erc20/contracts/src/v06/WETH9V06.sol

@@ -0,0 +1,755 @@
+// Copyright (C) 2015, 2016, 2017 Dapphub
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// solhint-disable
+pragma solidity ^0.6.0;
+
+contract WETH9V06 {
+    string public name = "Wrapped Ether";
+    string public symbol = "WETH";
+    uint8 public decimals = 18;
+
+    event Approval(address indexed _owner, address indexed _spender, uint _value);
+    event Transfer(address indexed _from, address indexed _to, uint _value);
+    event Deposit(address indexed _owner, uint _value);
+    event Withdrawal(address indexed _owner, uint _value);
+
+    mapping(address => uint) public balanceOf;
+    mapping(address => mapping(address => uint)) public allowance;
+
+    receive() external payable {
+        deposit();
+    }
+
+    function deposit() public payable {
+        balanceOf[msg.sender] += msg.value;
+        emit Deposit(msg.sender, msg.value);
+    }
+
+    function withdraw(uint wad) public {
+        require(balanceOf[msg.sender] >= wad);
+        balanceOf[msg.sender] -= wad;
+        msg.sender.transfer(wad);
+        emit Withdrawal(msg.sender, wad);
+    }
+
+    function totalSupply() public view returns (uint) {
+        return address(this).balance;
+    }
+
+    function approve(address guy, uint wad) public returns (bool) {
+        allowance[msg.sender][guy] = wad;
+        emit Approval(msg.sender, guy, wad);
+        return true;
+    }
+
+    function transfer(address dst, uint wad) public returns (bool) {
+        return transferFrom(msg.sender, dst, wad);
+    }
+
+    function transferFrom(address src, address dst, uint wad) public returns (bool) {
+        require(balanceOf[src] >= wad);
+
+        if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {
+            require(allowance[src][msg.sender] >= wad);
+            allowance[src][msg.sender] -= wad;
+        }
+
+        balanceOf[src] -= wad;
+        balanceOf[dst] += wad;
+
+        emit Transfer(src, dst, wad);
+
+        return true;
+    }
+}
+
+/*
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+*/

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.55",
+    "version": "3.3.57",
     "engines": {
         "node": ">=6.12"
     },
@@ -32,7 +32,7 @@
     },
     "config": {
         "publicInterfaceContracts": "DummyERC20Token,ERC20Token,WETH9,ZRXToken,DummyNoReturnERC20Token,DummyMultipleReturnERC20Token",
-        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IERC20TokenV08|IEtherToken|IEtherTokenV06|IEtherTokenV08|LibERC20Token|LibERC20TokenV06|LibERC20TokenV08|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|ZRXToken).json",
+        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IERC20TokenV08|IEtherToken|IEtherTokenV06|IEtherTokenV08|LibERC20Token|LibERC20TokenV06|LibERC20TokenV08|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|WETH9V06|ZRXToken).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -47,8 +47,8 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.45",
-        "@0x/contracts-utils": "^4.8.36",
+        "@0x/contracts-test-utils": "^5.4.47",
+        "@0x/contracts-utils": "^4.8.38",
         "@0x/dev-utils": "^5.0.0",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",

contracts/erc20/test/artifacts.ts

@@ -24,6 +24,7 @@ import * as TestLibERC20TokenTarget from '../test/generated-artifacts/TestLibERC
 import * as UnlimitedAllowanceERC20Token from '../test/generated-artifacts/UnlimitedAllowanceERC20Token.json';
 import * as UntransferrableDummyERC20Token from '../test/generated-artifacts/UntransferrableDummyERC20Token.json';
 import * as WETH9 from '../test/generated-artifacts/WETH9.json';
+import * as WETH9V06 from '../test/generated-artifacts/WETH9V06.json';
 import * as ZRXToken from '../test/generated-artifacts/ZRXToken.json';
 export const artifacts = {
     ERC20Token: ERC20Token as ContractArtifact,
@@ -37,6 +38,7 @@ export const artifacts = {
     IERC20TokenV06: IERC20TokenV06 as ContractArtifact,
     IEtherTokenV06: IEtherTokenV06 as ContractArtifact,
     LibERC20TokenV06: LibERC20TokenV06 as ContractArtifact,
+    WETH9V06: WETH9V06 as ContractArtifact,
     IERC20TokenV08: IERC20TokenV08 as ContractArtifact,
     IEtherTokenV08: IEtherTokenV08 as ContractArtifact,
     LibERC20TokenV08: LibERC20TokenV08 as ContractArtifact,

contracts/erc20/test/wrappers.ts

@@ -22,4 +22,5 @@ export * from '../test/generated-wrappers/test_lib_erc20_token_target';
 export * from '../test/generated-wrappers/unlimited_allowance_erc20_token';
 export * from '../test/generated-wrappers/untransferrable_dummy_erc20_token';
 export * from '../test/generated-wrappers/weth9';
+export * from '../test/generated-wrappers/weth9v06';
 export * from '../test/generated-wrappers/zrx_token';

contracts/erc20/tsconfig.json

@@ -28,6 +28,7 @@
         "test/generated-artifacts/UnlimitedAllowanceERC20Token.json",
         "test/generated-artifacts/UntransferrableDummyERC20Token.json",
         "test/generated-artifacts/WETH9.json",
+        "test/generated-artifacts/WETH9V06.json",
         "test/generated-artifacts/ZRXToken.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "5.4.47",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "5.4.46",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1674517560,
         "version": "5.4.45",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.47 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v5.4.46 - _January 30, 2023_
+
+    * Dependencies updated
+
 ## v5.4.45 - _January 23, 2023_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.45",
+    "version": "5.4.47",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,7 +41,7 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.0.1",
+        "@0x/contract-addresses": "^8.0.3",
         "@0x/dev-utils": "^5.0.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",

contracts/test-utils/src/types.ts

@@ -90,7 +90,6 @@ export enum ContractName {
     DummyERC721Token = 'DummyERC721Token',
     TestLibBytes = 'TestLibBytes',
     TestWallet = 'TestWallet',
-    Authorizable = 'Authorizable',
     Whitelist = 'Whitelist',
     Forwarder = 'Forwarder',
     BalanceThresholdFilter = 'BalanceThresholdFilter',

contracts/treasury/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "1.4.40",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "1.4.39",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1674517560,
         "version": "1.4.38",

contracts/treasury/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.4.40 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v1.4.39 - _January 30, 2023_
+
+    * Dependencies updated
+
 ## v1.4.38 - _January 23, 2023_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.38",
+    "version": "1.4.40",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,12 +46,12 @@
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^8.0.1",
+        "@0x/contract-addresses": "^8.0.3",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.55",
+        "@0x/contracts-erc20": "^3.3.57",
         "@0x/contracts-gen": "^2.0.48",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.45",
+        "@0x/contracts-test-utils": "^5.4.47",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
         "@types/isomorphic-fetch": "^0.0.35",
@@ -73,7 +73,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.17.4",
+        "@0x/protocol-utils": "^11.17.6",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "4.8.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "4.8.37",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1674517560,
         "version": "4.8.36",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.8.38 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v4.8.37 - _January 30, 2023_
+
+    * Dependencies updated
+
 ## v4.8.36 - _January 23, 2023_
 
     * Dependencies updated

contracts/utils/contracts/src/Authorizable.sol

@@ -1,122 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "./interfaces/IAuthorizable.sol";
-import "./LibAuthorizableRichErrors.sol";
-import "./LibRichErrors.sol";
-import "./Ownable.sol";
-
-contract Authorizable is Ownable, IAuthorizable {
-    /// @dev Only authorized addresses can invoke functions with this modifier.
-    modifier onlyAuthorized() {
-        _assertSenderIsAuthorized();
-        _;
-    }
-
-    /// @dev Whether an adderss is authorized to call privileged functions.
-    /// @param 0 Address to query.
-    /// @return 0 Whether the address is authorized.
-    mapping(address => bool) public authorized;
-    /// @dev Whether an adderss is authorized to call privileged functions.
-    /// @param 0 Index of authorized address.
-    /// @return 0 Authorized address.
-    address[] public authorities;
-
-    /// @dev Initializes the `owner` address.
-    constructor() public Ownable() {}
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target) external onlyOwner {
-        _addAuthorizedAddress(target);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target) external onlyOwner {
-        if (!authorized[target]) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.TargetNotAuthorizedError(target));
-        }
-        for (uint256 i = 0; i < authorities.length; i++) {
-            if (authorities[i] == target) {
-                _removeAuthorizedAddressAtIndex(target, i);
-                break;
-            }
-        }
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function removeAuthorizedAddressAtIndex(address target, uint256 index) external onlyOwner {
-        _removeAuthorizedAddressAtIndex(target, index);
-    }
-
-    /// @dev Gets all authorized addresses.
-    /// @return Array of authorized addresses.
-    function getAuthorizedAddresses() external view returns (address[] memory) {
-        return authorities;
-    }
-
-    /// @dev Reverts if msg.sender is not authorized.
-    function _assertSenderIsAuthorized() internal view {
-        if (!authorized[msg.sender]) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.SenderNotAuthorizedError(msg.sender));
-        }
-    }
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function _addAuthorizedAddress(address target) internal {
-        // Ensure that the target is not the zero address.
-        if (target == address(0)) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.ZeroCantBeAuthorizedError());
-        }
-
-        // Ensure that the target is not already authorized.
-        if (authorized[target]) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.TargetAlreadyAuthorizedError(target));
-        }
-
-        authorized[target] = true;
-        authorities.push(target);
-        emit AuthorizedAddressAdded(target, msg.sender);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function _removeAuthorizedAddressAtIndex(address target, uint256 index) internal {
-        if (!authorized[target]) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.TargetNotAuthorizedError(target));
-        }
-        if (index >= authorities.length) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.IndexOutOfBoundsError(index, authorities.length));
-        }
-        if (authorities[index] != target) {
-            LibRichErrors.rrevert(LibAuthorizableRichErrors.AuthorizedAddressMismatchError(authorities[index], target));
-        }
-
-        delete authorized[target];
-        authorities[index] = authorities[authorities.length - 1];
-        authorities.length -= 1;
-        emit AuthorizedAddressRemoved(target, msg.sender);
-    }
-}

contracts/utils/contracts/src/D18.sol

@@ -1,159 +0,0 @@
-/*
-
-  Copyright 2019 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.5.16;
-
-/// @dev A library for working with 18 digit, base 10 decimals.
-library D18 {
-    /// @dev Decimal places for dydx value quantities.
-    uint256 private constant PRECISION = 18;
-    /// @dev 1.0 in base-18 decimal.
-    int256 private constant DECIMAL_ONE = int256(10 ** PRECISION);
-    /// @dev Minimum signed integer value.
-    int256 private constant MIN_INT256_VALUE =
-        int256(0x8000000000000000000000000000000000000000000000000000000000000000);
-
-    /// @dev Return `1.0`
-    function one() internal pure returns (int256 r) {
-        r = DECIMAL_ONE;
-    }
-
-    /// @dev Add two decimals.
-    function add(int256 a, int256 b) internal pure returns (int256 r) {
-        r = _add(a, b);
-    }
-
-    /// @dev Add two decimals.
-    function add(uint256 a, int256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), b);
-    }
-
-    /// @dev Add two decimals.
-    function add(int256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(a, int256(b));
-    }
-
-    /// @dev Add two decimals.
-    function add(uint256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), int256(b));
-    }
-
-    /// @dev Subract two decimals.
-    function sub(int256 a, int256 b) internal pure returns (int256 r) {
-        r = _add(a, -b);
-    }
-
-    /// @dev Subract two decimals.
-    function sub(uint256 a, int256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), -b);
-    }
-
-    /// @dev Subract two decimals.
-    function sub(uint256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), -int256(b));
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(int256 a, int256 b) internal pure returns (int256 r) {
-        r = _div(_mul(a, b), DECIMAL_ONE);
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(uint256 a, int256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), b), DECIMAL_ONE);
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(int256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(a, int256(b)), DECIMAL_ONE);
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(uint256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), int256(b)), DECIMAL_ONE);
-    }
-
-    /// @dev Divide two decimals.
-    function div(int256 a, int256 b) internal pure returns (int256 r) {
-        r = _div(_mul(a, DECIMAL_ONE), b);
-    }
-
-    /// @dev Divide two decimals.
-    function div(uint256 a, int256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), DECIMAL_ONE), b);
-    }
-
-    /// @dev Divide two decimals.
-    function div(int256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(a, DECIMAL_ONE), int256(b));
-    }
-
-    /// @dev Divide two decimals.
-    function div(uint256 a, uint256 b) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), DECIMAL_ONE), int256(b));
-    }
-
-    /// @dev Safely convert an unsigned integer into a signed integer.
-    function toSigned(uint256 a) internal pure returns (int256 r) {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = int256(a);
-    }
-
-    /// @dev Clip a signed value to be positive.
-    function clip(int256 a) internal pure returns (int256 r) {
-        r = a < 0 ? 0 : a;
-    }
-
-    /// @dev Safely multiply two signed integers.
-    function _mul(int256 a, int256 b) private pure returns (int256 r) {
-        if (a == 0 || b == 0) {
-            return 0;
-        }
-        r = a * b;
-        require(r / a == b && r / b == a, "D18/DECIMAL_MUL_OVERFLOW");
-        return r;
-    }
-
-    /// @dev Safely divide two signed integers.
-    function _div(int256 a, int256 b) private pure returns (int256 r) {
-        require(b != 0, "D18/DECIMAL_DIV_BY_ZERO");
-        require(a != MIN_INT256_VALUE || b != -1, "D18/DECIMAL_DIV_OVERFLOW");
-        r = a / b;
-    }
-
-    /// @dev Safely add two signed integers.
-    function _add(int256 a, int256 b) private pure returns (int256 r) {
-        r = a + b;
-        require(!((a < 0 && b < 0 && r > a) || (a > 0 && b > 0 && r < a)), "D18/DECIMAL_ADD_OVERFLOW");
-    }
-}

contracts/utils/contracts/src/DeploymentConstants.sol

@@ -1,251 +0,0 @@
-/*
-
-  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.5.9;
-
-contract DeploymentConstants {
-    // Mainnet addresses ///////////////////////////////////////////////////////
-    /// @dev Mainnet address of the WETH contract.
-    address private constant WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
-    /// @dev Mainnet address of the KyberNetworkProxy contract.
-    address private constant KYBER_NETWORK_PROXY_ADDRESS = 0x9AAb3f75489902f3a48495025729a0AF77d4b11e;
-    /// @dev Mainnet address of the KyberHintHandler contract.
-    address private constant KYBER_HINT_HANDLER_ADDRESS = 0xa1C0Fa73c39CFBcC11ec9Eb1Afc665aba9996E2C;
-    /// @dev Mainnet address of the `UniswapExchangeFactory` contract.
-    address private constant UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95;
-    /// @dev Mainnet address of the `UniswapV2Router01` contract.
-    address private constant UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
-    address private constant ETH2DAI_ADDRESS = 0x794e6e91555438aFc3ccF1c5076A74F42133d08D;
-    /// @dev Mainnet address of the `ERC20BridgeProxy` contract
-    address private constant ERC20_BRIDGE_PROXY_ADDRESS = 0x8ED95d1746bf1E4dAb58d8ED4724f1Ef95B20Db0;
-    ///@dev Mainnet address of the `Dai` (multi-collateral) contract
-    address private constant DAI_ADDRESS = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
-    /// @dev Mainnet address of the `Chai` contract
-    address private constant CHAI_ADDRESS = 0x06AF07097C9Eeb7fD685c692751D5C66dB49c215;
-    /// @dev Mainnet address of the 0x DevUtils contract.
-    address private constant DEV_UTILS_ADDRESS = 0x74134CF88b21383713E096a5ecF59e297dc7f547;
-    /// @dev Kyber ETH pseudo-address.
-    address internal constant KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    /// @dev Mainnet address of the dYdX contract.
-    address private constant DYDX_ADDRESS = 0x1E0447b19BB6EcFdAe1e4AE1694b0C3659614e4e;
-    /// @dev Mainnet address of the GST2 contract
-    address private constant GST_ADDRESS = 0x0000000000b3F879cb30FE243b4Dfee438691c04;
-    /// @dev Mainnet address of the GST Collector
-    address private constant GST_COLLECTOR_ADDRESS = 0x000000D3b08566BE75A6DB803C03C85C0c1c5B96;
-    /// @dev Mainnet address of the mStable mUSD contract.
-    address private constant MUSD_ADDRESS = 0xe2f2a5C287993345a840Db3B0845fbC70f5935a5;
-    /// @dev Mainnet address of the Mooniswap Registry contract
-    address private constant MOONISWAP_REGISTRY = 0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303;
-    /// @dev Mainnet address of the DODO Registry (ZOO) contract
-    address private constant DODO_REGISTRY = 0x3A97247DF274a17C59A3bd12735ea3FcDFb49950;
-    /// @dev Mainnet address of the DODO Helper contract
-    address private constant DODO_HELPER = 0x533dA777aeDCE766CEAe696bf90f8541A4bA80Eb;
-
-    // // Ropsten addresses ///////////////////////////////////////////////////////
-    /// @dev Mainnet address of the WETH contract.
-    // address constant private WETH_ADDRESS = 0xc778417E063141139Fce010982780140Aa0cD5Ab;
-    /// @dev Mainnet address of the KyberNetworkProxy contract.
-    // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0xd719c34261e099Fdb33030ac8909d5788D3039C4;
-    /// @dev Mainnet address of the `UniswapExchangeFactory` contract.
-    // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0x9c83dCE8CA20E9aAF9D3efc003b2ea62aBC08351;
-    /// @dev Mainnet address of the `UniswapV2Router01` contract.
-    // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
-    // address constant private ETH2DAI_ADDRESS = address(0);
-    /// @dev Mainnet address of the `ERC20BridgeProxy` contract
-    // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xb344afeD348de15eb4a9e180205A2B0739628339;
-    // ///@dev Mainnet address of the `Dai` (multi-collateral) contract
-    // address constant private DAI_ADDRESS = address(0);
-    /// @dev Mainnet address of the `Chai` contract
-    // address constant private CHAI_ADDRESS = address(0);
-    /// @dev Mainnet address of the 0x DevUtils contract.
-    // address constant private DEV_UTILS_ADDRESS = 0xC812AF3f3fBC62F76ea4262576EC0f49dB8B7f1c;
-    /// @dev Kyber ETH pseudo-address.
-    // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    /// @dev Mainnet address of the dYdX contract.
-    // address constant private DYDX_ADDRESS = address(0);
-    /// @dev Mainnet address of the GST2 contract
-    // address constant private GST_ADDRESS = address(0);
-    /// @dev Mainnet address of the GST Collector
-    // address constant private GST_COLLECTOR_ADDRESS = address(0);
-    /// @dev Mainnet address of the mStable mUSD contract.
-    // address constant private MUSD_ADDRESS = 0x4E1000616990D83e56f4b5fC6CC8602DcfD20459;
-
-    // // Rinkeby addresses ///////////////////////////////////////////////////////
-    /// @dev Mainnet address of the WETH contract.
-    // address constant private WETH_ADDRESS = 0xc778417E063141139Fce010982780140Aa0cD5Ab;
-    /// @dev Mainnet address of the KyberNetworkProxy contract.
-    // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x0d5371e5EE23dec7DF251A8957279629aa79E9C5;
-    /// @dev Mainnet address of the `UniswapExchangeFactory` contract.
-    // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xf5D915570BC477f9B8D6C0E980aA81757A3AaC36;
-    /// @dev Mainnet address of the `UniswapV2Router01` contract.
-    // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
-    // address constant private ETH2DAI_ADDRESS = address(0);
-    /// @dev Mainnet address of the `ERC20BridgeProxy` contract
-    // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xA2AA4bEFED748Fba27a3bE7Dfd2C4b2c6DB1F49B;
-    // ///@dev Mainnet address of the `Dai` (multi-collateral) contract
-    // address constant private DAI_ADDRESS = address(0);
-    /// @dev Mainnet address of the `Chai` contract
-    // address constant private CHAI_ADDRESS = address(0);
-    /// @dev Mainnet address of the 0x DevUtils contract.
-    // address constant private DEV_UTILS_ADDRESS = 0x46B5BC959e8A754c0256FFF73bF34A52Ad5CdfA9;
-    /// @dev Kyber ETH pseudo-address.
-    // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    /// @dev Mainnet address of the dYdX contract.
-    // address constant private DYDX_ADDRESS = address(0);
-    /// @dev Mainnet address of the GST2 contract
-    // address constant private GST_ADDRESS = address(0);
-    /// @dev Mainnet address of the GST Collector
-    // address constant private GST_COLLECTOR_ADDRESS = address(0);
-    /// @dev Mainnet address of the mStable mUSD contract.
-    // address constant private MUSD_ADDRESS = address(0);
-
-    // // Kovan addresses /////////////////////////////////////////////////////////
-    /// @dev Kovan address of the WETH contract.
-    // address constant private WETH_ADDRESS = 0xd0A1E359811322d97991E03f863a0C30C2cF029C;
-    /// @dev Kovan address of the KyberNetworkProxy contract.
-    // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x692f391bCc85cefCe8C237C01e1f636BbD70EA4D;
-    /// @dev Kovan address of the `UniswapExchangeFactory` contract.
-    // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xD3E51Ef092B2845f10401a0159B2B96e8B6c3D30;
-    /// @dev Kovan address of the `UniswapV2Router01` contract.
-    // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract.
-    // address constant private ETH2DAI_ADDRESS = 0xe325acB9765b02b8b418199bf9650972299235F4;
-    /// @dev Kovan address of the `ERC20BridgeProxy` contract
-    // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0x3577552C1Fb7A44aD76BeEB7aB53251668A21F8D;
-    /// @dev Kovan address of the `Chai` contract
-    // address constant private CHAI_ADDRESS = address(0);
-    /// @dev Kovan address of the `Dai` (multi-collateral) contract
-    // address constant private DAI_ADDRESS = 0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa;
-    /// @dev Kovan address of the 0x DevUtils contract.
-    // address constant private DEV_UTILS_ADDRESS = 0x9402639A828BdF4E9e4103ac3B69E1a6E522eB59;
-    /// @dev Kyber ETH pseudo-address.
-    // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    /// @dev Kovan address of the dYdX contract.
-    // address constant private DYDX_ADDRESS = address(0);
-    /// @dev Kovan address of the GST2 contract
-    // address constant private GST_ADDRESS = address(0);
-    /// @dev Kovan address of the GST Collector
-    // address constant private GST_COLLECTOR_ADDRESS = address(0);
-    /// @dev Mainnet address of the mStable mUSD contract.
-    // address constant private MUSD_ADDRESS = address(0);
-
-    /// @dev Overridable way to get the `KyberNetworkProxy` address.
-    /// @return kyberAddress The `IKyberNetworkProxy` address.
-    function _getKyberNetworkProxyAddress() internal view returns (address kyberAddress) {
-        return KYBER_NETWORK_PROXY_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the `KyberHintHandler` address.
-    /// @return kyberAddress The `IKyberHintHandler` address.
-    function _getKyberHintHandlerAddress() internal view returns (address hintHandlerAddress) {
-        return KYBER_HINT_HANDLER_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the WETH address.
-    /// @return wethAddress The WETH address.
-    function _getWethAddress() internal view returns (address wethAddress) {
-        return WETH_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the `UniswapExchangeFactory` address.
-    /// @return uniswapAddress The `UniswapExchangeFactory` address.
-    function _getUniswapExchangeFactoryAddress() internal view returns (address uniswapAddress) {
-        return UNISWAP_EXCHANGE_FACTORY_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the `UniswapV2Router01` address.
-    /// @return uniswapRouterAddress The `UniswapV2Router01` address.
-    function _getUniswapV2Router01Address() internal view returns (address uniswapRouterAddress) {
-        return UNISWAP_V2_ROUTER_01_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the Eth2Dai `MatchingMarket` contract.
-    /// @return eth2daiAddress The Eth2Dai `MatchingMarket` contract.
-    function _getEth2DaiAddress() internal view returns (address eth2daiAddress) {
-        return ETH2DAI_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the `ERC20BridgeProxy` contract.
-    /// @return erc20BridgeProxyAddress The `ERC20BridgeProxy` contract.
-    function _getERC20BridgeProxyAddress() internal view returns (address erc20BridgeProxyAddress) {
-        return ERC20_BRIDGE_PROXY_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the `Dai` contract.
-    /// @return daiAddress The `Dai` contract.
-    function _getDaiAddress() internal view returns (address daiAddress) {
-        return DAI_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the `Chai` contract.
-    /// @return chaiAddress The `Chai` contract.
-    function _getChaiAddress() internal view returns (address chaiAddress) {
-        return CHAI_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the 0x `DevUtils` contract address.
-    /// @return devUtils The 0x `DevUtils` contract address.
-    function _getDevUtilsAddress() internal view returns (address devUtils) {
-        return DEV_UTILS_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the DyDx contract.
-    /// @return exchange The DyDx exchange contract.
-    function _getDydxAddress() internal view returns (address dydxAddress) {
-        return DYDX_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the GST2 contract address.
-    /// @return gst The GST contract.
-    function _getGstAddress() internal view returns (address gst) {
-        return GST_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the GST Collector address.
-    /// @return collector The GST collector address.
-    function _getGstCollectorAddress() internal view returns (address collector) {
-        return GST_COLLECTOR_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the mStable mUSD address.
-    /// @return musd The mStable mUSD address.
-    function _getMUsdAddress() internal view returns (address musd) {
-        return MUSD_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the Mooniswap registry address.
-    /// @return registry The Mooniswap registry address.
-    function _getMooniswapAddress() internal view returns (address) {
-        return MOONISWAP_REGISTRY;
-    }
-
-    /// @dev An overridable way to retrieve the DODO Registry contract address.
-    /// @return registry The DODO Registry contract address.
-    function _getDODORegistryAddress() internal view returns (address) {
-        return DODO_REGISTRY;
-    }
-
-    /// @dev An overridable way to retrieve the DODO Helper contract address.
-    /// @return registry The DODO Helper contract address.
-    function _getDODOHelperAddress() internal view returns (address) {
-        return DODO_HELPER;
-    }
-}

contracts/utils/contracts/src/LibAddress.sol

@@ -1,46 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-/**
- * Utility library of inline functions on addresses
- */
-library LibAddress {
-    /**
-     * Returns whether the target address is a contract
-     * @dev This function will return false if invoked during the constructor of a contract,
-     * as the code is not actually created until after the constructor finishes.
-     * @param account address of the account to check
-     * @return whether the target address is a contract
-     */
-    function isContract(address account) internal view returns (bool) {
-        uint256 size;
-        // XXX Currently there is no better way to check if there is a contract in an address
-        // than to check the size of the code at that address.
-        // See https://ethereum.stackexchange.com/a/14016/36603
-        // for more details about how this works.
-        // TODO Check this again before the Serenity release, because all addresses will be
-        // contracts then.
-        // solium-disable-next-line security/no-inline-assembly
-        assembly {
-            size := extcodesize(account)
-        }
-        return size > 0;
-    }
-}

contracts/utils/contracts/src/LibAddressArray.sol

@@ -1,153 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "./LibAddressArrayRichErrors.sol";
-import "./LibBytes.sol";
-import "./LibRichErrors.sol";
-
-library LibAddressArray {
-    /// @dev Append a new address to an array of addresses.
-    ///      The `addressArray` may need to be reallocated to make space
-    ///      for the new address. Because of this we return the resulting
-    ///      memory location of `addressArray`.
-    /// @param addressArray Array of addresses.
-    /// @param addressToAppend  Address to append.
-    /// @return Array of addresses: [... addressArray, addressToAppend]
-    function append(address[] memory addressArray, address addressToAppend) internal pure returns (address[] memory) {
-        // Get stats on address array and free memory
-        uint256 freeMemPtr = 0;
-        uint256 addressArrayBeginPtr = 0;
-        uint256 addressArrayEndPtr = 0;
-        uint256 addressArrayLength = addressArray.length;
-        uint256 addressArrayMemSizeInBytes = 32 + (32 * addressArrayLength);
-        assembly {
-            freeMemPtr := mload(0x40)
-            addressArrayBeginPtr := addressArray
-            addressArrayEndPtr := add(addressArray, addressArrayMemSizeInBytes)
-        }
-
-        // Cases for `freeMemPtr`:
-        //  `freeMemPtr` == `addressArrayEndPtr`: Nothing occupies memory after `addressArray`
-        //  `freeMemPtr` > `addressArrayEndPtr`: Some value occupies memory after `addressArray`
-        //  `freeMemPtr` < `addressArrayEndPtr`: Memory has not been managed properly.
-        if (freeMemPtr < addressArrayEndPtr) {
-            LibRichErrors.rrevert(LibAddressArrayRichErrors.MismanagedMemoryError(freeMemPtr, addressArrayEndPtr));
-        }
-
-        // If free memory begins at the end of `addressArray`
-        // then we can append `addressToAppend` directly.
-        // Otherwise, we must copy the array to free memory
-        // before appending new values to it.
-        if (freeMemPtr > addressArrayEndPtr) {
-            LibBytes.memCopy(freeMemPtr, addressArrayBeginPtr, addressArrayMemSizeInBytes);
-            assembly {
-                addressArray := freeMemPtr
-                addressArrayBeginPtr := addressArray
-            }
-        }
-
-        // Append `addressToAppend`
-        addressArrayLength += 1;
-        addressArrayMemSizeInBytes += 32;
-        addressArrayEndPtr = addressArrayBeginPtr + addressArrayMemSizeInBytes;
-        freeMemPtr = addressArrayEndPtr;
-        assembly {
-            // Store new array length
-            mstore(addressArray, addressArrayLength)
-
-            // Update `freeMemPtr`
-            mstore(0x40, freeMemPtr)
-        }
-        addressArray[addressArrayLength - 1] = addressToAppend;
-        return addressArray;
-    }
-
-    /// @dev Checks if an address array contains the target address.
-    /// @param addressArray Array of addresses.
-    /// @param target Address to search for in array.
-    /// @return True if the addressArray contains the target.
-    function contains(address[] memory addressArray, address target) internal pure returns (bool success) {
-        assembly {
-            // Calculate byte length of array
-            let arrayByteLen := mul(mload(addressArray), 32)
-            // Calculate beginning of array contents
-            let arrayContentsStart := add(addressArray, 32)
-            // Calclulate end of array contents
-            let arrayContentsEnd := add(arrayContentsStart, arrayByteLen)
-
-            // Loop through array
-            for {
-                let i := arrayContentsStart
-            } lt(i, arrayContentsEnd) {
-                i := add(i, 32)
-            } {
-                // Load array element
-                let arrayElement := mload(i)
-
-                // Return true if array element equals target
-                if eq(target, arrayElement) {
-                    // Set success to true
-                    success := 1
-                    // Break loop
-                    i := arrayContentsEnd
-                }
-            }
-        }
-        return success;
-    }
-
-    /// @dev Finds the index of an address within an array.
-    /// @param addressArray Array of addresses.
-    /// @param target Address to search for in array.
-    /// @return Existence and index of the target in the array.
-    function indexOf(
-        address[] memory addressArray,
-        address target
-    ) internal pure returns (bool success, uint256 index) {
-        assembly {
-            // Calculate byte length of array
-            let arrayByteLen := mul(mload(addressArray), 32)
-            // Calculate beginning of array contents
-            let arrayContentsStart := add(addressArray, 32)
-            // Calclulate end of array contents
-            let arrayContentsEnd := add(arrayContentsStart, arrayByteLen)
-
-            // Loop through array
-            for {
-                let i := arrayContentsStart
-            } lt(i, arrayContentsEnd) {
-                i := add(i, 32)
-            } {
-                // Load array element
-                let arrayElement := mload(i)
-
-                // Return true if array element equals target
-                if eq(target, arrayElement) {
-                    // Set success and index
-                    success := 1
-                    index := div(sub(i, arrayContentsStart), 32)
-                    // Break loop
-                    i := arrayContentsEnd
-                }
-            }
-        }
-        return (success, index);
-    }
-}

contracts/utils/contracts/src/LibAddressArrayRichErrors.sol

@@ -1,31 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-library LibAddressArrayRichErrors {
-    // bytes4(keccak256("MismanagedMemoryError(uint256,uint256)"))
-    bytes4 internal constant MISMANAGED_MEMORY_ERROR_SELECTOR = 0x5fc83722;
-
-    function MismanagedMemoryError(
-        uint256 freeMemPtr,
-        uint256 addressArrayEndPtr
-    ) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(MISMANAGED_MEMORY_ERROR_SELECTOR, freeMemPtr, addressArrayEndPtr);
-    }
-}

contracts/utils/contracts/src/LibAuthorizableRichErrors.sol

@@ -1,63 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-library LibAuthorizableRichErrors {
-    // bytes4(keccak256("AuthorizedAddressMismatchError(address,address)"))
-    bytes4 internal constant AUTHORIZED_ADDRESS_MISMATCH_ERROR_SELECTOR = 0x140a84db;
-
-    // bytes4(keccak256("IndexOutOfBoundsError(uint256,uint256)"))
-    bytes4 internal constant INDEX_OUT_OF_BOUNDS_ERROR_SELECTOR = 0xe9f83771;
-
-    // bytes4(keccak256("SenderNotAuthorizedError(address)"))
-    bytes4 internal constant SENDER_NOT_AUTHORIZED_ERROR_SELECTOR = 0xb65a25b9;
-
-    // bytes4(keccak256("TargetAlreadyAuthorizedError(address)"))
-    bytes4 internal constant TARGET_ALREADY_AUTHORIZED_ERROR_SELECTOR = 0xde16f1a0;
-
-    // bytes4(keccak256("TargetNotAuthorizedError(address)"))
-    bytes4 internal constant TARGET_NOT_AUTHORIZED_ERROR_SELECTOR = 0xeb5108a2;
-
-    // bytes4(keccak256("ZeroCantBeAuthorizedError()"))
-    bytes internal constant ZERO_CANT_BE_AUTHORIZED_ERROR_BYTES = hex"57654fe4";
-
-    function AuthorizedAddressMismatchError(address authorized, address target) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(AUTHORIZED_ADDRESS_MISMATCH_ERROR_SELECTOR, authorized, target);
-    }
-
-    function IndexOutOfBoundsError(uint256 index, uint256 length) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(INDEX_OUT_OF_BOUNDS_ERROR_SELECTOR, index, length);
-    }
-
-    function SenderNotAuthorizedError(address sender) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(SENDER_NOT_AUTHORIZED_ERROR_SELECTOR, sender);
-    }
-
-    function TargetAlreadyAuthorizedError(address target) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(TARGET_ALREADY_AUTHORIZED_ERROR_SELECTOR, target);
-    }
-
-    function TargetNotAuthorizedError(address target) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(TARGET_NOT_AUTHORIZED_ERROR_SELECTOR, target);
-    }
-
-    function ZeroCantBeAuthorizedError() internal pure returns (bytes memory) {
-        return ZERO_CANT_BE_AUTHORIZED_ERROR_BYTES;
-    }
-}

contracts/utils/contracts/src/LibEIP1271.sol

@@ -1,25 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-contract LibEIP1271 {
-    /// @dev Magic bytes returned by EIP1271 wallets on success.
-    /// @return 0 Magic bytes.
-    bytes4 public constant EIP1271_MAGIC_VALUE = 0x20c13b0b;
-}

contracts/utils/contracts/src/LibEIP712.sol

@@ -1,103 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-library LibEIP712 {
-    // Hash of the EIP712 Domain Separator Schema
-    // keccak256(abi.encodePacked(
-    //     "EIP712Domain(",
-    //     "string name,",
-    //     "string version,",
-    //     "uint256 chainId,",
-    //     "address verifyingContract",
-    //     ")"
-    // ))
-    bytes32 internal constant _EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH =
-        0x8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f;
-
-    /// @dev Calculates a EIP712 domain separator.
-    /// @param name The EIP712 domain name.
-    /// @param version The EIP712 domain version.
-    /// @param verifyingContract The EIP712 verifying contract.
-    /// @return EIP712 domain separator.
-    function hashEIP712Domain(
-        string memory name,
-        string memory version,
-        uint256 chainId,
-        address verifyingContract
-    ) internal pure returns (bytes32 result) {
-        bytes32 schemaHash = _EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH;
-
-        // Assembly for more efficient computing:
-        // keccak256(abi.encodePacked(
-        //     _EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH,
-        //     keccak256(bytes(name)),
-        //     keccak256(bytes(version)),
-        //     chainId,
-        //     uint256(verifyingContract)
-        // ))
-
-        assembly {
-            // Calculate hashes of dynamic data
-            let nameHash := keccak256(add(name, 32), mload(name))
-            let versionHash := keccak256(add(version, 32), mload(version))
-
-            // Load free memory pointer
-            let memPtr := mload(64)
-
-            // Store params in memory
-            mstore(memPtr, schemaHash)
-            mstore(add(memPtr, 32), nameHash)
-            mstore(add(memPtr, 64), versionHash)
-            mstore(add(memPtr, 96), chainId)
-            mstore(add(memPtr, 128), verifyingContract)
-
-            // Compute hash
-            result := keccak256(memPtr, 160)
-        }
-        return result;
-    }
-
-    /// @dev Calculates EIP712 encoding for a hash struct with a given domain hash.
-    /// @param eip712DomainHash Hash of the domain domain separator data, computed
-    ///                         with getDomainHash().
-    /// @param hashStruct The EIP712 hash struct.
-    /// @return EIP712 hash applied to the given EIP712 Domain.
-    function hashEIP712Message(bytes32 eip712DomainHash, bytes32 hashStruct) internal pure returns (bytes32 result) {
-        // Assembly for more efficient computing:
-        // keccak256(abi.encodePacked(
-        //     EIP191_HEADER,
-        //     EIP712_DOMAIN_HASH,
-        //     hashStruct
-        // ));
-
-        assembly {
-            // Load free memory pointer
-            let memPtr := mload(64)
-
-            mstore(memPtr, 0x1901000000000000000000000000000000000000000000000000000000000000) // EIP191 header
-            mstore(add(memPtr, 2), eip712DomainHash) // EIP712 domain hash
-            mstore(add(memPtr, 34), hashStruct) // Hash of struct
-
-            // Compute hash
-            result := keccak256(memPtr, 66)
-        }
-        return result;
-    }
-}

contracts/utils/contracts/src/LibFractions.sol

@@ -1,96 +0,0 @@
-pragma solidity ^0.5.9;
-
-import "./LibSafeMath.sol";
-
-library LibFractions {
-    using LibSafeMath for uint256;
-
-    /// @dev Safely adds two fractions `n1/d1 + n2/d2`
-    /// @param n1 numerator of `1`
-    /// @param d1 denominator of `1`
-    /// @param n2 numerator of `2`
-    /// @param d2 denominator of `2`
-    /// @return numerator Numerator of sum
-    /// @return denominator Denominator of sum
-    function add(
-        uint256 n1,
-        uint256 d1,
-        uint256 n2,
-        uint256 d2
-    ) internal pure returns (uint256 numerator, uint256 denominator) {
-        if (n1 == 0) {
-            return (numerator = n2, denominator = d2);
-        }
-        if (n2 == 0) {
-            return (numerator = n1, denominator = d1);
-        }
-        numerator = n1.safeMul(d2).safeAdd(n2.safeMul(d1));
-        denominator = d1.safeMul(d2);
-        return (numerator, denominator);
-    }
-
-    /// @dev Rescales a fraction to prevent overflows during addition if either
-    ///      the numerator or the denominator are > `maxValue`.
-    /// @param numerator The numerator.
-    /// @param denominator The denominator.
-    /// @param maxValue The maximum value allowed for both the numerator and
-    ///        denominator.
-    /// @return scaledNumerator The rescaled numerator.
-    /// @return scaledDenominator The rescaled denominator.
-    function normalize(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 maxValue
-    ) internal pure returns (uint256 scaledNumerator, uint256 scaledDenominator) {
-        // If either the numerator or the denominator are > `maxValue`,
-        // re-scale them by `maxValue` to prevent overflows in future operations.
-        if (numerator > maxValue || denominator > maxValue) {
-            uint256 rescaleBase = numerator >= denominator ? numerator : denominator;
-            rescaleBase = rescaleBase.safeDiv(maxValue);
-            scaledNumerator = numerator.safeDiv(rescaleBase);
-            scaledDenominator = denominator.safeDiv(rescaleBase);
-        } else {
-            scaledNumerator = numerator;
-            scaledDenominator = denominator;
-        }
-        return (scaledNumerator, scaledDenominator);
-    }
-
-    /// @dev Rescales a fraction to prevent overflows during addition if either
-    ///      the numerator or the denominator are > 2 ** 127.
-    /// @param numerator The numerator.
-    /// @param denominator The denominator.
-    /// @return scaledNumerator The rescaled numerator.
-    /// @return scaledDenominator The rescaled denominator.
-    function normalize(
-        uint256 numerator,
-        uint256 denominator
-    ) internal pure returns (uint256 scaledNumerator, uint256 scaledDenominator) {
-        return normalize(numerator, denominator, 2 ** 127);
-    }
-
-    /// @dev Safely scales the difference between two fractions.
-    /// @param n1 numerator of `1`
-    /// @param d1 denominator of `1`
-    /// @param n2 numerator of `2`
-    /// @param d2 denominator of `2`
-    /// @param s scalar to multiply by difference.
-    /// @return result `s * (n1/d1 - n2/d2)`.
-    function scaleDifference(
-        uint256 n1,
-        uint256 d1,
-        uint256 n2,
-        uint256 d2,
-        uint256 s
-    ) internal pure returns (uint256 result) {
-        if (s == 0) {
-            return 0;
-        }
-        if (n2 == 0) {
-            return result = s.safeMul(n1).safeDiv(d1);
-        }
-        uint256 numerator = n1.safeMul(d2).safeSub(n2.safeMul(d1));
-        uint256 tmp = numerator.safeDiv(d2);
-        return s.safeMul(tmp).safeDiv(d1);
-    }
-}

contracts/utils/contracts/src/LibMath.sol

@@ -1,174 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "./LibSafeMath.sol";
-import "./LibRichErrors.sol";
-import "./LibMathRichErrors.sol";
-
-library LibMath {
-    using LibSafeMath for uint256;
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded down.
-    function safeGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        if (isRoundingErrorFloor(numerator, denominator, target)) {
-            LibRichErrors.rrevert(LibMathRichErrors.RoundingError(numerator, denominator, target));
-        }
-
-        partialAmount = numerator.safeMul(target).safeDiv(denominator);
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded up.
-    function safeGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        if (isRoundingErrorCeil(numerator, denominator, target)) {
-            LibRichErrors.rrevert(LibMathRichErrors.RoundingError(numerator, denominator, target));
-        }
-
-        // safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
-        //       ceil(a / b) = floor((a + b - 1) / b)
-        // To implement `ceil(a / b)` using safeDiv.
-        partialAmount = numerator.safeMul(target).safeAdd(denominator.safeSub(1)).safeDiv(denominator);
-
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded down.
-    function getPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        partialAmount = numerator.safeMul(target).safeDiv(denominator);
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded up.
-    function getPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        // safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
-        //       ceil(a / b) = floor((a + b - 1) / b)
-        // To implement `ceil(a / b)` using safeDiv.
-        partialAmount = numerator.safeMul(target).safeAdd(denominator.safeSub(1)).safeDiv(denominator);
-
-        return partialAmount;
-    }
-
-    /// @dev Checks if rounding error >= 0.1% when rounding down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingErrorFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (bool isError) {
-        if (denominator == 0) {
-            LibRichErrors.rrevert(LibMathRichErrors.DivisionByZeroError());
-        }
-
-        // The absolute rounding error is the difference between the rounded
-        // value and the ideal value. The relative rounding error is the
-        // absolute rounding error divided by the absolute value of the
-        // ideal value. This is undefined when the ideal value is zero.
-        //
-        // The ideal value is `numerator * target / denominator`.
-        // Let's call `numerator * target % denominator` the remainder.
-        // The absolute error is `remainder / denominator`.
-        //
-        // When the ideal value is zero, we require the absolute error to
-        // be zero. Fortunately, this is always the case. The ideal value is
-        // zero iff `numerator == 0` and/or `target == 0`. In this case the
-        // remainder and absolute error are also zero.
-        if (target == 0 || numerator == 0) {
-            return false;
-        }
-
-        // Otherwise, we want the relative rounding error to be strictly
-        // less than 0.1%.
-        // The relative error is `remainder / (numerator * target)`.
-        // We want the relative error less than 1 / 1000:
-        //        remainder / (numerator * denominator)  <  1 / 1000
-        // or equivalently:
-        //        1000 * remainder  <  numerator * target
-        // so we have a rounding error iff:
-        //        1000 * remainder  >=  numerator * target
-        uint256 remainder = mulmod(target, numerator, denominator);
-        isError = remainder.safeMul(1000) >= numerator.safeMul(target);
-        return isError;
-    }
-
-    /// @dev Checks if rounding error >= 0.1% when rounding up.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingErrorCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (bool isError) {
-        if (denominator == 0) {
-            LibRichErrors.rrevert(LibMathRichErrors.DivisionByZeroError());
-        }
-
-        // See the comments in `isRoundingError`.
-        if (target == 0 || numerator == 0) {
-            // When either is zero, the ideal value and rounded value are zero
-            // and there is no rounding error. (Although the relative error
-            // is undefined.)
-            return false;
-        }
-        // Compute remainder as before
-        uint256 remainder = mulmod(target, numerator, denominator);
-        remainder = denominator.safeSub(remainder) % denominator;
-        isError = remainder.safeMul(1000) >= numerator.safeMul(target);
-        return isError;
-    }
-}

contracts/utils/contracts/src/LibMathRichErrors.sol

@@ -1,21 +0,0 @@
-pragma solidity ^0.5.9;
-
-library LibMathRichErrors {
-    // bytes4(keccak256("DivisionByZeroError()"))
-    bytes internal constant DIVISION_BY_ZERO_ERROR = hex"a791837c";
-
-    // bytes4(keccak256("RoundingError(uint256,uint256,uint256)"))
-    bytes4 internal constant ROUNDING_ERROR_SELECTOR = 0x339f3de2;
-
-    function DivisionByZeroError() internal pure returns (bytes memory) {
-        return DIVISION_BY_ZERO_ERROR;
-    }
-
-    function RoundingError(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(ROUNDING_ERROR_SELECTOR, numerator, denominator, target);
-    }
-}

contracts/utils/contracts/src/Refundable.sol

@@ -1,74 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "./ReentrancyGuard.sol";
-
-contract Refundable is ReentrancyGuard {
-    // This bool is used by the refund modifier to allow for lazily evaluated refunds.
-    bool internal _shouldNotRefund;
-
-    modifier refundFinalBalance() {
-        _;
-        _refundNonZeroBalanceIfEnabled();
-    }
-
-    modifier refundFinalBalanceNoReentry() {
-        _lockMutexOrThrowIfAlreadyLocked();
-        _;
-        _refundNonZeroBalanceIfEnabled();
-        _unlockMutex();
-    }
-
-    modifier disableRefundUntilEnd() {
-        if (_areRefundsDisabled()) {
-            _;
-        } else {
-            _disableRefund();
-            _;
-            _enableAndRefundNonZeroBalance();
-        }
-    }
-
-    function _refundNonZeroBalanceIfEnabled() internal {
-        if (!_areRefundsDisabled()) {
-            _refundNonZeroBalance();
-        }
-    }
-
-    function _refundNonZeroBalance() internal {
-        uint256 balance = address(this).balance;
-        if (balance > 0) {
-            msg.sender.transfer(balance);
-        }
-    }
-
-    function _disableRefund() internal {
-        _shouldNotRefund = true;
-    }
-
-    function _enableAndRefundNonZeroBalance() internal {
-        _shouldNotRefund = false;
-        _refundNonZeroBalance();
-    }
-
-    function _areRefundsDisabled() internal view returns (bool) {
-        return _shouldNotRefund;
-    }
-}

contracts/utils/contracts/src/interfaces/IAuthorizable.sol

@@ -1,46 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "./IOwnable.sol";
-
-contract IAuthorizable is IOwnable {
-    // Event logged when a new address is authorized.
-    event AuthorizedAddressAdded(address indexed target, address indexed caller);
-
-    // Event logged when a currently authorized address is unauthorized.
-    event AuthorizedAddressRemoved(address indexed target, address indexed caller);
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target) external;
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target) external;
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function removeAuthorizedAddressAtIndex(address target, uint256 index) external;
-
-    /// @dev Gets all authorized addresses.
-    /// @return Array of authorized addresses.
-    function getAuthorizedAddresses() external view returns (address[] memory);
-}

contracts/utils/contracts/src/v06/ReentrancyGuardV06.sol

@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-
-import "./errors/LibReentrancyGuardRichErrorsV06.sol";
-import "./errors/LibRichErrorsV06.sol";
-
-contract ReentrancyGuardV06 {
-    // Locked state of mutex.
-    bool private _locked = false;
-
-    /// @dev Functions with this modifer cannot be reentered. The mutex will be locked
-    ///      before function execution and unlocked after.
-    modifier nonReentrant() {
-        _lockMutexOrThrowIfAlreadyLocked();
-        _;
-        _unlockMutex();
-    }
-
-    function _lockMutexOrThrowIfAlreadyLocked() internal {
-        // Ensure mutex is unlocked.
-        if (_locked) {
-            LibRichErrorsV06.rrevert(LibReentrancyGuardRichErrorsV06.IllegalReentrancyError());
-        }
-        // Lock mutex.
-        _locked = true;
-    }
-
-    function _unlockMutex() internal {
-        // Unlock mutex.
-        _locked = false;
-    }
-}

contracts/utils/contracts/test/TestAuthorizable.sol

@@ -1,25 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "../src/Authorizable.sol";
-
-contract TestAuthorizable is Authorizable {
-    function onlyAuthorizedFn() external view onlyAuthorized {}
-}

contracts/utils/contracts/test/TestLibAddress.sol

@@ -1,29 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "../src/LibAddress.sol";
-
-contract TestLibAddress {
-    using LibAddress for address;
-
-    function externalIsContract(address account) external view returns (bool) {
-        return account.isContract();
-    }
-}

contracts/utils/contracts/test/TestLibAddressArray.sol

@@ -1,89 +0,0 @@
-/*
-
-  Copyright 2019 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.5.5;
-
-import "../src/LibAddressArray.sol";
-
-contract TestLibAddressArray {
-    using LibAddressArray for address[];
-
-    /// @dev Append a new address to an array of addresses.
-    ///      The `addressArray` may need to be reallocated to make space
-    ///      for the new address. Because of this we return the resulting
-    ///      memory location of `addressArray`.
-    /// @param addressArray Array of addresses.
-    /// @param addressToAppend  Address to append.
-    /// @return Array of addresses: [... addressArray, addressToAppend]
-    function publicAppend(
-        address[] memory addressArray,
-        address addressToAppend
-    ) public pure returns (address[] memory) {
-        return addressArray.append(addressToAppend);
-    }
-
-    /// @dev Moves the free memory pointer by `freeMemOffset` bytes,
-    ///      then performs the append.
-    ///      This tests the behavior of the address array being reallocated if
-    ///      the memory immediately after the old array is claimed.
-    /// @param addressArray Array of addresses.
-    /// @param freeMemOffset Number of (signed) bytes to offset the free memory pointer (0x40).
-    /// @param addressToAppend Address to append.
-    /// @return The new address array.
-    /// @return The memory address of the old address array.
-    /// @return The memory address of the new address array.
-    function testAppendRealloc(
-        address[] memory addressArray,
-        int256 freeMemOffset,
-        address addressToAppend
-    ) public pure returns (address[] memory result, uint256 oldArrayMemStart, uint256 newArrayMemStart) {
-        assembly {
-            // Remember the original memory address of the array.
-            oldArrayMemStart := addressArray
-            // Move the free memory pointer.
-            mstore(0x40, add(mload(0x40), freeMemOffset))
-        }
-
-        // Call append.
-        result = addressArray.append(addressToAppend);
-
-        // Get the new array memory address.
-        assembly {
-            newArrayMemStart := result
-        }
-    }
-
-    /// @dev Checks if an address array contains the target address.
-    /// @param addressArray Array of addresses.
-    /// @param target Address to search for in array.
-    /// @return True if the addressArray contains the target.
-    function publicContains(address[] memory addressArray, address target) public pure returns (bool success) {
-        return addressArray.contains(target);
-    }
-
-    /// @dev Finds the index of an address within an array.
-    /// @param addressArray Array of addresses.
-    /// @param target Address to search for in array.
-    /// @return Existence and index of the target in the array.
-    function publicIndexOf(
-        address[] memory addressArray,
-        address target
-    ) public pure returns (bool success, uint256 index) {
-        (success, index) = addressArray.indexOf(target);
-    }
-}

contracts/utils/contracts/test/TestLibEIP712.sol

@@ -1,36 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "../src/LibEIP712.sol";
-
-contract TestLibEIP712 {
-    function externalHashEIP712DomainSeperator(
-        string calldata name,
-        string calldata version,
-        uint256 chainid,
-        address verifyingcontractaddress
-    ) external pure returns (bytes32) {
-        return LibEIP712.hashEIP712Domain(name, version, chainid, verifyingcontractaddress);
-    }
-
-    function externalHashEIP712Message(bytes32 eip712DomainHash, bytes32 hashStruct) external pure returns (bytes32) {
-        return LibEIP712.hashEIP712Message(eip712DomainHash, hashStruct);
-    }
-}

contracts/utils/contracts/test/TestLibMath.sol

@@ -1,104 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-pragma experimental ABIEncoderV2;
-
-import "../src/LibMath.sol";
-
-contract TestLibMath {
-    /// @dev Calculates partial value given a numerator and denominator.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function safeGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) public pure returns (uint256 partialAmount) {
-        return LibMath.safeGetPartialAmountFloor(numerator, denominator, target);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function safeGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) public pure returns (uint256 partialAmount) {
-        return LibMath.safeGetPartialAmountCeil(numerator, denominator, target);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function getPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) public pure returns (uint256 partialAmount) {
-        return LibMath.getPartialAmountFloor(numerator, denominator, target);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function getPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) public pure returns (uint256 partialAmount) {
-        return LibMath.getPartialAmountCeil(numerator, denominator, target);
-    }
-
-    /// @dev Checks if rounding error >= 0.1%.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingErrorFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) public pure returns (bool isError) {
-        return LibMath.isRoundingErrorFloor(numerator, denominator, target);
-    }
-
-    /// @dev Checks if rounding error >= 0.1%.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingErrorCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) public pure returns (bool isError) {
-        return LibMath.isRoundingErrorCeil(numerator, denominator, target);
-    }
-}

contracts/utils/contracts/test/TestLogDecoding.sol

@@ -1,43 +0,0 @@
-/*
-
-  Copyright 2018 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.5.5;
-
-import "./TestLogDecodingDownstream.sol";
-
-contract TestLogDecoding {
-    /// @dev arbitrary event; fields to not matter.
-    event TestEvent(uint256 foo, bytes bar, string car);
-
-    /// @dev Emits a local event
-    function emitEvent() public {
-        emit TestEvent(256, hex"1234", "4321");
-    }
-
-    /// @dev Emits an event in a downstream contract
-    function emitEventDownstream() public {
-        TestLogDecodingDownstream testLogDecodingDownstream = new TestLogDecodingDownstream();
-        ITestLogDecodingDownstream(testLogDecodingDownstream).emitEvent();
-    }
-
-    /// @dev Emits a local event and a downstream event
-    function emitEventsLocalAndDownstream() public {
-        emitEvent();
-        emitEventDownstream();
-    }
-}

contracts/utils/contracts/test/TestLogDecodingDownstream.sol

@@ -1,37 +0,0 @@
-/*
-
-  Copyright 2018 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.5.5;
-
-contract ITestLogDecodingDownstream {
-    /// @dev Emits a local event
-    function emitEvent() external;
-}
-
-contract TestLogDecodingDownstream is ITestLogDecodingDownstream {
-    /// @dev event with fields different than those in `TestLogDecoding.TestEvent`
-    /// Note: do not include this in the interface
-    /// For testing, we want to emit an event that is
-    /// not known by the calling contract.
-    event TestEvent2(uint256 lorem, string ipsum);
-
-    /// @dev Emits a local event
-    function emitEvent() external {
-        emit TestEvent2(256, "4321");
-    }
-}

contracts/utils/contracts/test/TestRefundable.sol

@@ -1,49 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "../src/Refundable.sol";
-
-contract TestRefundable is Refundable {
-    function refundNonZeroBalanceExternal() external payable {
-        _refundNonZeroBalance();
-    }
-
-    function setShouldNotRefund(bool shouldNotRefundNew) external {
-        _shouldNotRefund = shouldNotRefundNew;
-    }
-
-    function getShouldNotRefund() external view returns (bool) {
-        return _shouldNotRefund;
-    }
-
-    function refundFinalBalanceFunction() public payable refundFinalBalance {}
-
-    function disableRefundUntilEndFunction() public payable disableRefundUntilEnd {}
-
-    function nestedDisableRefundUntilEndFunction() public payable disableRefundUntilEnd returns (uint256) {
-        disableRefundUntilEndFunction();
-        return address(this).balance;
-    }
-
-    function mixedRefundModifierFunction() public payable disableRefundUntilEnd returns (uint256) {
-        refundFinalBalanceFunction();
-        return address(this).balance;
-    }
-}

contracts/utils/contracts/test/TestRefundableReceiver.sol

@@ -1,154 +0,0 @@
-/*
-
-  Copyright 2019 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.5.9;
-
-import "./TestRefundable.sol";
-
-contract TestRefundableReceiver {
-    /// @dev A payable fallback function is necessary to receive refunds from the `TestRefundable` contract.
-    ///      This function ensures that zero value is not sent to the contract, which tests the feature of
-    ///      of the `refundNonzeroBalance` that doesn't transfer if the balance is zero.
-    function() external payable {
-        // Ensure that a value of zero was not transferred to the contract.
-        require(msg.value != 0, "Zero value should not be sent to this contract.");
-    }
-
-    /// @dev This function tests the behavior of the `refundNonzeroBalance` function by checking whether or
-    ///      not the `callCounter` state variable changes after the `refundNonzeroBalance` is called.
-    /// @param testRefundable The TestRefundable that should be tested against.
-    function testRefundNonZeroBalance(TestRefundable testRefundable) external payable {
-        // Call `refundNonzeroBalance()` and forward all of the eth sent to the contract.
-        testRefundable.refundNonZeroBalanceExternal.value(msg.value)();
-
-        // If the value sent was nonzero, a check that a refund was received will be executed. Otherwise, the fallback
-        // function contains a check that will fail in the event that a value of zero was sent to the contract.
-        if (msg.value > 0) {
-            // Ensure that a full refund was provided to this contract.
-            require(address(this).balance == msg.value, "A full refund was not provided by `refundNonzeroBalance`");
-        }
-    }
-
-    /// @dev This function tests the behavior to a simple call to `refundFinalBalanceFunction`. This
-    ///      test will verify that the correct refund was provided after the call (depending on whether
-    ///      a refund should be provided), and it will ensure that the `shouldNotRefund` state variable
-    ///      remains unaltered after the function call.
-    /// @param testRefundable The TestRefundable that should be tested against.
-    /// @param shouldNotRefund The value that shouldNotRefund should be set to before the call to TestRefundable.
-    function testRefundFinalBalance(TestRefundable testRefundable, bool shouldNotRefund) external payable {
-        // Set `shouldNotRefund` to the specified bool.
-        testRefundable.setShouldNotRefund(shouldNotRefund);
-
-        // Call `refundFinalBalanceFunction` and forward all value from the contract.
-        testRefundable.refundFinalBalanceFunction.value(msg.value)();
-
-        // Assert that the expected refunds happened and that the `shouldNotRefund` value was
-        // set back to an unaltered state after the call.
-        requireCorrectFinalBalancesAndState(testRefundable, shouldNotRefund);
-    }
-
-    /// @dev This function tests the behavior to a simple call to `disableRefundUntilEndFunction`. This
-    ///      test will verify that the correct refund was provided after the call (depending on whether
-    ///      a refund should be provided), and it will ensure that the `shouldNotRefund` state variable
-    ///      remains unaltered after the function call.
-    /// @param testRefundable The TestRefundable that should be tested against.
-    /// @param shouldNotRefund The value that shouldNotRefund should be set to before the call to TestRefundable.
-    function testDisableRefundUntilEnd(TestRefundable testRefundable, bool shouldNotRefund) external payable {
-        // Set `shouldNotRefund` to the specified bool.
-        testRefundable.setShouldNotRefund(shouldNotRefund);
-
-        // Call `disableRefundUntilEndFunction` and forward all value from the contract.
-        testRefundable.disableRefundUntilEndFunction.value(msg.value)();
-
-        // Assert that the expected refunds happened and that the `shouldNotRefund` value was
-        // set back to an unaltered state after the call.
-        requireCorrectFinalBalancesAndState(testRefundable, shouldNotRefund);
-    }
-
-    /// @dev This function tests the behavior of a call to a function that has the `disableRefundUntilEndFunction`.
-    ///      The function that is called also uses the `disableRefundUntilEndFunction`, so this function's role is
-    ///      to verify that both the inner and outer modifiers worked correctly.
-    /// @param testRefundable The TestRefundable that should be tested against.
-    /// @param shouldNotRefund The value that shouldNotRefund should be set to before the call to TestRefundable.
-    function testNestedDisableRefundUntilEnd(TestRefundable testRefundable, bool shouldNotRefund) external payable {
-        // Set `shouldNotRefund` to the specified bool.
-        testRefundable.setShouldNotRefund(shouldNotRefund);
-
-        // Call `nestedDisableRefundUntilEndFunction` and forward all value from the contract.
-        uint256 balanceWithinCall = testRefundable.nestedDisableRefundUntilEndFunction.value(msg.value)();
-
-        // Ensure that the balance within the call was equal to `msg.value` since the inner refund should
-        // not have been triggered regardless of the value of `shouldNotRefund`.
-        require(balanceWithinCall == msg.value, "Incorrect inner balance");
-
-        // Assert that the expected refunds happened and that the `shouldNotRefund` value was
-        // set back to an unaltered state after the call.
-        requireCorrectFinalBalancesAndState(testRefundable, shouldNotRefund);
-    }
-
-    /// @dev This function tests the behavior of a call to a function that has the `disableRefundUntilEndFunction`.
-    ///      The function that is called uses the `refundFinalBalanceFunction`, so this function's role is
-    ///      to verify that both the inner and outer modifiers worked correctly.
-    /// @param testRefundable The TestRefundable that should be tested against.
-    /// @param shouldNotRefund The value that shouldNotRefund should be set to before the call to TestRefundable.
-    function testMixedRefunds(TestRefundable testRefundable, bool shouldNotRefund) external payable {
-        // Set `shouldNotRefund` to the specified bool.
-        testRefundable.setShouldNotRefund(shouldNotRefund);
-
-        // Call `mixedRefundModifierFunction` and forward all value from the contract.
-        uint256 balanceWithinCall = testRefundable.mixedRefundModifierFunction.value(msg.value)();
-
-        // Ensure that the balance within the call was equal to `msg.value` since the inner refund should
-        // not have been triggered regardless of the value of `shouldNotRefund`.
-        require(balanceWithinCall == msg.value, "Incorrect inner balance");
-
-        // Assert that the expected refunds happened and that the `shouldNotRefund` value was
-        // set back to an unaltered state after the call.
-        requireCorrectFinalBalancesAndState(testRefundable, shouldNotRefund);
-    }
-
-    /// @dev This helper function verifies the final balances of this receiver contract and a specified
-    ///      refundable contract and verifies that the `shouldNotRefund` value remains unaltered.
-    /// @param testRefundable The TestRefundable that should be tested against.
-    /// @param shouldNotRefund The value that shouldNotRefund was set to before the call to TestRefundable.
-    function requireCorrectFinalBalancesAndState(TestRefundable testRefundable, bool shouldNotRefund) internal {
-        // If `shouldNotRefund` was true, then this contract should have a balance of zero,
-        // and `testRefundable` should have a balance of `msg.value`. Otherwise, the opposite
-        // should be true.
-        if (shouldNotRefund) {
-            // Ensure that this contract's balance is zero.
-            require(address(this).balance == 0, "Incorrect balance for TestRefundableReceiver");
-
-            // Ensure that the other contract's balance is equal to `msg.value`.
-            require(address(testRefundable).balance == msg.value, "Incorrect balance for TestRefundable");
-        } else {
-            // Ensure that this contract's balance is `msg.value`.
-            require(address(this).balance == msg.value, "Incorrect balance for TestRefundableReceiver");
-
-            // Ensure that the other contract's balance is equal to zero.
-            require(address(testRefundable).balance == 0, "Incorrect balance for TestRefundable");
-        }
-
-        // Ensure that `shouldNotRefund` in TestRefundable is set to the parameter `shouldNotRefund`
-        // after the call (i.e. the value didn't change during the function call).
-        require(testRefundable.getShouldNotRefund() == shouldNotRefund, "Incorrect shouldNotRefund value");
-
-        // Drain the contract of funds so that subsequent tests don't have to account for leftover ether.
-        msg.sender.transfer(address(this).balance);
-    }
-}

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.36",
+    "version": "4.8.38",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,9 +30,9 @@
         "contracts:copy": "contracts-gen copy"
     },
     "config": {
-        "publicInterfaceContracts": "Authorizable,IAuthorizable,IOwnable,LibAddress,LibAddressArray,LibAddressArrayRichErrors,LibAuthorizableRichErrors,LibBytes,LibBytesRichErrors,LibEIP1271,LibEIP712,LibFractions,LibOwnableRichErrors,LibReentrancyGuardRichErrors,LibRichErrors,LibMath,LibMathRichErrors,LibSafeMath,LibSafeMathRichErrors,Ownable,ReentrancyGuard,Refundable",
+        "publicInterfaceContracts": "IOwnable,LibBytes,LibBytesRichErrors,LibOwnableRichErrors,LibReentrancyGuardRichErrors,LibRichErrors,LibSafeMath,LibSafeMathRichErrors,Ownable,ReentrancyGuard",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(Authorizable|AuthorizableV06|AuthorizableV08|D18|DeploymentConstants|IAuthorizable|IAuthorizableV06|IAuthorizableV08|IOwnable|IOwnableV06|IOwnableV08|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibAuthorizableRichErrorsV06|LibAuthorizableRichErrorsV08|LibBytes|LibBytesRichErrors|LibBytesRichErrorsV06|LibBytesRichErrorsV08|LibBytesV06|LibBytesV08|LibEIP1271|LibEIP712|LibFractions|LibMath|LibMathRichErrors|LibMathRichErrorsV06|LibMathRichErrorsV08|LibMathV06|LibMathV08|LibOwnableRichErrors|LibOwnableRichErrorsV06|LibOwnableRichErrorsV08|LibReentrancyGuardRichErrors|LibReentrancyGuardRichErrorsV06|LibReentrancyGuardRichErrorsV08|LibRichErrors|LibRichErrorsV06|LibRichErrorsV08|LibSafeMath|LibSafeMathRichErrors|LibSafeMathRichErrorsV06|LibSafeMathRichErrorsV08|LibSafeMathV06|Ownable|OwnableV06|OwnableV08|ReentrancyGuard|ReentrancyGuardV06|ReentrancyGuardV08|Refundable|TestAuthorizable|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibMath|TestLibRichErrors|TestLibSafeMath|TestLogDecoding|TestLogDecodingDownstream|TestOwnable|TestReentrancyGuard|TestRefundable|TestRefundableReceiver).json"
+        "abis": "./test/generated-artifacts/@(AuthorizableV06|AuthorizableV08|IAuthorizableV06|IAuthorizableV08|IOwnable|IOwnableV06|IOwnableV08|LibAuthorizableRichErrorsV06|LibAuthorizableRichErrorsV08|LibBytes|LibBytesRichErrors|LibBytesRichErrorsV06|LibBytesRichErrorsV08|LibBytesV06|LibBytesV08|LibMathRichErrorsV06|LibMathRichErrorsV08|LibMathV06|LibMathV08|LibOwnableRichErrors|LibOwnableRichErrorsV06|LibOwnableRichErrorsV08|LibReentrancyGuardRichErrors|LibReentrancyGuardRichErrorsV06|LibReentrancyGuardRichErrorsV08|LibRichErrors|LibRichErrorsV06|LibRichErrorsV08|LibSafeMath|LibSafeMathRichErrors|LibSafeMathRichErrorsV06|LibSafeMathRichErrorsV08|LibSafeMathV06|Ownable|OwnableV06|OwnableV08|ReentrancyGuard|ReentrancyGuardV08|TestLibBytes|TestLibRichErrors|TestLibSafeMath|TestOwnable|TestReentrancyGuard).json"
     },
     "repository": {
         "type": "git",
@@ -46,7 +46,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.45",
+        "@0x/contracts-test-utils": "^5.4.47",
         "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",

contracts/utils/src/artifacts.ts

@@ -5,20 +5,9 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
-import * as Authorizable from '../generated-artifacts/Authorizable.json';
-import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
 import * as IOwnable from '../generated-artifacts/IOwnable.json';
-import * as LibAddress from '../generated-artifacts/LibAddress.json';
-import * as LibAddressArray from '../generated-artifacts/LibAddressArray.json';
-import * as LibAddressArrayRichErrors from '../generated-artifacts/LibAddressArrayRichErrors.json';
-import * as LibAuthorizableRichErrors from '../generated-artifacts/LibAuthorizableRichErrors.json';
 import * as LibBytes from '../generated-artifacts/LibBytes.json';
 import * as LibBytesRichErrors from '../generated-artifacts/LibBytesRichErrors.json';
-import * as LibEIP1271 from '../generated-artifacts/LibEIP1271.json';
-import * as LibEIP712 from '../generated-artifacts/LibEIP712.json';
-import * as LibFractions from '../generated-artifacts/LibFractions.json';
-import * as LibMath from '../generated-artifacts/LibMath.json';
-import * as LibMathRichErrors from '../generated-artifacts/LibMathRichErrors.json';
 import * as LibOwnableRichErrors from '../generated-artifacts/LibOwnableRichErrors.json';
 import * as LibReentrancyGuardRichErrors from '../generated-artifacts/LibReentrancyGuardRichErrors.json';
 import * as LibRichErrors from '../generated-artifacts/LibRichErrors.json';
@@ -26,28 +15,15 @@ import * as LibSafeMath from '../generated-artifacts/LibSafeMath.json';
 import * as LibSafeMathRichErrors from '../generated-artifacts/LibSafeMathRichErrors.json';
 import * as Ownable from '../generated-artifacts/Ownable.json';
 import * as ReentrancyGuard from '../generated-artifacts/ReentrancyGuard.json';
-import * as Refundable from '../generated-artifacts/Refundable.json';
 export const artifacts = {
-    Authorizable: Authorizable as ContractArtifact,
-    IAuthorizable: IAuthorizable as ContractArtifact,
     IOwnable: IOwnable as ContractArtifact,
-    LibAddress: LibAddress as ContractArtifact,
-    LibAddressArray: LibAddressArray as ContractArtifact,
-    LibAddressArrayRichErrors: LibAddressArrayRichErrors as ContractArtifact,
-    LibAuthorizableRichErrors: LibAuthorizableRichErrors as ContractArtifact,
     LibBytes: LibBytes as ContractArtifact,
     LibBytesRichErrors: LibBytesRichErrors as ContractArtifact,
-    LibEIP1271: LibEIP1271 as ContractArtifact,
-    LibEIP712: LibEIP712 as ContractArtifact,
-    LibFractions: LibFractions as ContractArtifact,
     LibOwnableRichErrors: LibOwnableRichErrors as ContractArtifact,
     LibReentrancyGuardRichErrors: LibReentrancyGuardRichErrors as ContractArtifact,
     LibRichErrors: LibRichErrors as ContractArtifact,
-    LibMath: LibMath as ContractArtifact,
-    LibMathRichErrors: LibMathRichErrors as ContractArtifact,
     LibSafeMath: LibSafeMath as ContractArtifact,
     LibSafeMathRichErrors: LibSafeMathRichErrors as ContractArtifact,
     Ownable: Ownable as ContractArtifact,
     ReentrancyGuard: ReentrancyGuard as ContractArtifact,
-    Refundable: Refundable as ContractArtifact,
 };

contracts/utils/src/reference_functions.ts

@@ -52,77 +52,3 @@ export function safeDiv(a: BigNumber, b: BigNumber): BigNumber {
     }
     return a.dividedToIntegerBy(b);
 }
-
-// LibMath
-
-/**
- * Checks if rounding error >= 0.1% when rounding down.
- */
-export function isRoundingErrorFloor(numerator: BigNumber, denominator: BigNumber, target: BigNumber): boolean {
-    if (denominator.eq(0)) {
-        throw new LibMathRevertErrors.DivisionByZeroError();
-    }
-    if (numerator.eq(0) || target.eq(0)) {
-        return false;
-    }
-    const remainder = numerator.times(target).mod(denominator);
-    // Need to do this separately because solidity evaluates RHS of the comparison expression first.
-    const rhs = safeMul(numerator, target);
-    const lhs = safeMul(remainder, new BigNumber(1000));
-    return lhs.gte(rhs);
-}
-
-/**
- * Checks if rounding error >= 0.1% when rounding up.
- */
-export function isRoundingErrorCeil(numerator: BigNumber, denominator: BigNumber, target: BigNumber): boolean {
-    if (denominator.eq(0)) {
-        throw new LibMathRevertErrors.DivisionByZeroError();
-    }
-    if (numerator.eq(0) || target.eq(0)) {
-        return false;
-    }
-    let remainder = numerator.times(target).mod(denominator);
-    remainder = safeSub(denominator, remainder).mod(denominator);
-    // Need to do this separately because solidity evaluates RHS of the comparison expression first.
-    const rhs = safeMul(numerator, target);
-    const lhs = safeMul(remainder, new BigNumber(1000));
-    return lhs.gte(rhs);
-}
-
-/**
- * Calculates partial value given a numerator and denominator rounded down.
- *      Reverts if rounding error is >= 0.1%
- */
-export function safeGetPartialAmountFloor(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber {
-    if (isRoundingErrorFloor(numerator, denominator, target)) {
-        throw new LibMathRevertErrors.RoundingError(numerator, denominator, target);
-    }
-    return safeDiv(safeMul(numerator, target), denominator);
-}
-
-/**
- * Calculates partial value given a numerator and denominator rounded down.
- *      Reverts if rounding error is >= 0.1%
- */
-export function safeGetPartialAmountCeil(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber {
-    if (isRoundingErrorCeil(numerator, denominator, target)) {
-        throw new LibMathRevertErrors.RoundingError(numerator, denominator, target);
-    }
-    return safeDiv(safeAdd(safeMul(numerator, target), safeSub(denominator, new BigNumber(1))), denominator);
-}
-
-/**
- * Calculates partial value given a numerator and denominator rounded down.
- */
-export function getPartialAmountFloor(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber {
-    return safeDiv(safeMul(numerator, target), denominator);
-}
-
-/**
- * Calculates partial value given a numerator and denominator rounded down.
- */
-export function getPartialAmountCeil(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber {
-    const sub = safeSub(denominator, new BigNumber(1)); // This is computed first to simulate Solidity's order of operations
-    return safeDiv(safeAdd(safeMul(numerator, target), sub), denominator);
-}

contracts/utils/src/wrappers.ts

@@ -3,20 +3,9 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
-export * from '../generated-wrappers/authorizable';
-export * from '../generated-wrappers/i_authorizable';
 export * from '../generated-wrappers/i_ownable';
-export * from '../generated-wrappers/lib_address';
-export * from '../generated-wrappers/lib_address_array';
-export * from '../generated-wrappers/lib_address_array_rich_errors';
-export * from '../generated-wrappers/lib_authorizable_rich_errors';
 export * from '../generated-wrappers/lib_bytes';
 export * from '../generated-wrappers/lib_bytes_rich_errors';
-export * from '../generated-wrappers/lib_e_i_p1271';
-export * from '../generated-wrappers/lib_e_i_p712';
-export * from '../generated-wrappers/lib_fractions';
-export * from '../generated-wrappers/lib_math';
-export * from '../generated-wrappers/lib_math_rich_errors';
 export * from '../generated-wrappers/lib_ownable_rich_errors';
 export * from '../generated-wrappers/lib_reentrancy_guard_rich_errors';
 export * from '../generated-wrappers/lib_rich_errors';
@@ -24,4 +13,3 @@ export * from '../generated-wrappers/lib_safe_math';
 export * from '../generated-wrappers/lib_safe_math_rich_errors';
 export * from '../generated-wrappers/ownable';
 export * from '../generated-wrappers/reentrancy_guard';
-export * from '../generated-wrappers/refundable';

contracts/utils/test/artifacts.ts

@@ -5,21 +5,13 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
-import * as Authorizable from '../test/generated-artifacts/Authorizable.json';
 import * as AuthorizableV06 from '../test/generated-artifacts/AuthorizableV06.json';
 import * as AuthorizableV08 from '../test/generated-artifacts/AuthorizableV08.json';
-import * as D18 from '../test/generated-artifacts/D18.json';
-import * as DeploymentConstants from '../test/generated-artifacts/DeploymentConstants.json';
-import * as IAuthorizable from '../test/generated-artifacts/IAuthorizable.json';
 import * as IAuthorizableV06 from '../test/generated-artifacts/IAuthorizableV06.json';
 import * as IAuthorizableV08 from '../test/generated-artifacts/IAuthorizableV08.json';
 import * as IOwnable from '../test/generated-artifacts/IOwnable.json';
 import * as IOwnableV06 from '../test/generated-artifacts/IOwnableV06.json';
 import * as IOwnableV08 from '../test/generated-artifacts/IOwnableV08.json';
-import * as LibAddress from '../test/generated-artifacts/LibAddress.json';
-import * as LibAddressArray from '../test/generated-artifacts/LibAddressArray.json';
-import * as LibAddressArrayRichErrors from '../test/generated-artifacts/LibAddressArrayRichErrors.json';
-import * as LibAuthorizableRichErrors from '../test/generated-artifacts/LibAuthorizableRichErrors.json';
 import * as LibAuthorizableRichErrorsV06 from '../test/generated-artifacts/LibAuthorizableRichErrorsV06.json';
 import * as LibAuthorizableRichErrorsV08 from '../test/generated-artifacts/LibAuthorizableRichErrorsV08.json';
 import * as LibBytes from '../test/generated-artifacts/LibBytes.json';
@@ -28,11 +20,6 @@ import * as LibBytesRichErrorsV06 from '../test/generated-artifacts/LibBytesRich
 import * as LibBytesRichErrorsV08 from '../test/generated-artifacts/LibBytesRichErrorsV08.json';
 import * as LibBytesV06 from '../test/generated-artifacts/LibBytesV06.json';
 import * as LibBytesV08 from '../test/generated-artifacts/LibBytesV08.json';
-import * as LibEIP1271 from '../test/generated-artifacts/LibEIP1271.json';
-import * as LibEIP712 from '../test/generated-artifacts/LibEIP712.json';
-import * as LibFractions from '../test/generated-artifacts/LibFractions.json';
-import * as LibMath from '../test/generated-artifacts/LibMath.json';
-import * as LibMathRichErrors from '../test/generated-artifacts/LibMathRichErrors.json';
 import * as LibMathRichErrorsV06 from '../test/generated-artifacts/LibMathRichErrorsV06.json';
 import * as LibMathRichErrorsV08 from '../test/generated-artifacts/LibMathRichErrorsV08.json';
 import * as LibMathV06 from '../test/generated-artifacts/LibMathV06.json';
@@ -55,38 +42,15 @@ import * as Ownable from '../test/generated-artifacts/Ownable.json';
 import * as OwnableV06 from '../test/generated-artifacts/OwnableV06.json';
 import * as OwnableV08 from '../test/generated-artifacts/OwnableV08.json';
 import * as ReentrancyGuard from '../test/generated-artifacts/ReentrancyGuard.json';
-import * as ReentrancyGuardV06 from '../test/generated-artifacts/ReentrancyGuardV06.json';
 import * as ReentrancyGuardV08 from '../test/generated-artifacts/ReentrancyGuardV08.json';
-import * as Refundable from '../test/generated-artifacts/Refundable.json';
-import * as TestAuthorizable from '../test/generated-artifacts/TestAuthorizable.json';
-import * as TestLibAddress from '../test/generated-artifacts/TestLibAddress.json';
-import * as TestLibAddressArray from '../test/generated-artifacts/TestLibAddressArray.json';
 import * as TestLibBytes from '../test/generated-artifacts/TestLibBytes.json';
-import * as TestLibEIP712 from '../test/generated-artifacts/TestLibEIP712.json';
-import * as TestLibMath from '../test/generated-artifacts/TestLibMath.json';
 import * as TestLibRichErrors from '../test/generated-artifacts/TestLibRichErrors.json';
 import * as TestLibSafeMath from '../test/generated-artifacts/TestLibSafeMath.json';
-import * as TestLogDecoding from '../test/generated-artifacts/TestLogDecoding.json';
-import * as TestLogDecodingDownstream from '../test/generated-artifacts/TestLogDecodingDownstream.json';
 import * as TestOwnable from '../test/generated-artifacts/TestOwnable.json';
 import * as TestReentrancyGuard from '../test/generated-artifacts/TestReentrancyGuard.json';
-import * as TestRefundable from '../test/generated-artifacts/TestRefundable.json';
-import * as TestRefundableReceiver from '../test/generated-artifacts/TestRefundableReceiver.json';
 export const artifacts = {
-    Authorizable: Authorizable as ContractArtifact,
-    D18: D18 as ContractArtifact,
-    DeploymentConstants: DeploymentConstants as ContractArtifact,
-    LibAddress: LibAddress as ContractArtifact,
-    LibAddressArray: LibAddressArray as ContractArtifact,
-    LibAddressArrayRichErrors: LibAddressArrayRichErrors as ContractArtifact,
-    LibAuthorizableRichErrors: LibAuthorizableRichErrors as ContractArtifact,
     LibBytes: LibBytes as ContractArtifact,
     LibBytesRichErrors: LibBytesRichErrors as ContractArtifact,
-    LibEIP1271: LibEIP1271 as ContractArtifact,
-    LibEIP712: LibEIP712 as ContractArtifact,
-    LibFractions: LibFractions as ContractArtifact,
-    LibMath: LibMath as ContractArtifact,
-    LibMathRichErrors: LibMathRichErrors as ContractArtifact,
     LibOwnableRichErrors: LibOwnableRichErrors as ContractArtifact,
     LibReentrancyGuardRichErrors: LibReentrancyGuardRichErrors as ContractArtifact,
     LibRichErrors: LibRichErrors as ContractArtifact,
@@ -94,15 +58,12 @@ export const artifacts = {
     LibSafeMathRichErrors: LibSafeMathRichErrors as ContractArtifact,
     Ownable: Ownable as ContractArtifact,
     ReentrancyGuard: ReentrancyGuard as ContractArtifact,
-    Refundable: Refundable as ContractArtifact,
-    IAuthorizable: IAuthorizable as ContractArtifact,
     IOwnable: IOwnable as ContractArtifact,
     AuthorizableV06: AuthorizableV06 as ContractArtifact,
     LibBytesV06: LibBytesV06 as ContractArtifact,
     LibMathV06: LibMathV06 as ContractArtifact,
     LibSafeMathV06: LibSafeMathV06 as ContractArtifact,
     OwnableV06: OwnableV06 as ContractArtifact,
-    ReentrancyGuardV06: ReentrancyGuardV06 as ContractArtifact,
     LibAuthorizableRichErrorsV06: LibAuthorizableRichErrorsV06 as ContractArtifact,
     LibBytesRichErrorsV06: LibBytesRichErrorsV06 as ContractArtifact,
     LibMathRichErrorsV06: LibMathRichErrorsV06 as ContractArtifact,
@@ -126,18 +87,9 @@ export const artifacts = {
     LibSafeMathRichErrorsV08: LibSafeMathRichErrorsV08 as ContractArtifact,
     IAuthorizableV08: IAuthorizableV08 as ContractArtifact,
     IOwnableV08: IOwnableV08 as ContractArtifact,
-    TestAuthorizable: TestAuthorizable as ContractArtifact,
-    TestLibAddress: TestLibAddress as ContractArtifact,
-    TestLibAddressArray: TestLibAddressArray as ContractArtifact,
     TestLibBytes: TestLibBytes as ContractArtifact,
-    TestLibEIP712: TestLibEIP712 as ContractArtifact,
-    TestLibMath: TestLibMath as ContractArtifact,
     TestLibRichErrors: TestLibRichErrors as ContractArtifact,
     TestLibSafeMath: TestLibSafeMath as ContractArtifact,
-    TestLogDecoding: TestLogDecoding as ContractArtifact,
-    TestLogDecodingDownstream: TestLogDecodingDownstream as ContractArtifact,
     TestOwnable: TestOwnable as ContractArtifact,
     TestReentrancyGuard: TestReentrancyGuard as ContractArtifact,
-    TestRefundable: TestRefundable as ContractArtifact,
-    TestRefundableReceiver: TestRefundableReceiver as ContractArtifact,
 };

contracts/utils/test/authorizable.ts

@@ -1,165 +0,0 @@
-import { blockchainTests, constants, expect } from '@0x/contracts-test-utils';
-import { AuthorizableRevertErrors, BigNumber, OwnableRevertErrors } from '@0x/utils';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-import { TestAuthorizableContract } from './wrappers';
-
-blockchainTests.resets('Authorizable', env => {
-    let owner: string;
-    let notOwner: string;
-    let address: string;
-    let authorizable: TestAuthorizableContract;
-
-    before(async () => {
-        const accounts = await env.getAccountAddressesAsync();
-        [owner, address, notOwner] = _.slice(accounts, 0, 3);
-        authorizable = await TestAuthorizableContract.deployFrom0xArtifactAsync(
-            artifacts.TestAuthorizable,
-            env.provider,
-            env.txDefaults,
-            artifacts,
-        );
-    });
-
-    describe('addAuthorizedAddress', () => {
-        it('should revert if not called by owner', async () => {
-            const expectedError = new OwnableRevertErrors.OnlyOwnerError(notOwner, owner);
-            const tx = authorizable.addAuthorizedAddress(notOwner).sendTransactionAsync({ from: notOwner });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should allow owner to add an authorized address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const isAuthorized = await authorizable.authorized(address).callAsync();
-            expect(isAuthorized).to.be.true();
-        });
-
-        it('should revert if owner attempts to authorize the zero address', async () => {
-            const expectedError = new AuthorizableRevertErrors.ZeroCantBeAuthorizedError();
-            const tx = authorizable.addAuthorizedAddress(constants.NULL_ADDRESS).sendTransactionAsync({ from: owner });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should revert if owner attempts to authorize a duplicate address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const expectedError = new AuthorizableRevertErrors.TargetAlreadyAuthorizedError(address);
-            const tx = authorizable.addAuthorizedAddress(address).sendTransactionAsync({ from: owner });
-            return expect(tx).to.revertWith(expectedError);
-        });
-    });
-
-    describe('onlyAuthorized', () => {
-        before(async () => {
-            await authorizable.addAuthorizedAddress(owner).awaitTransactionSuccessAsync({ from: owner });
-        });
-
-        after(async () => {
-            await authorizable.removeAuthorizedAddress(owner).awaitTransactionSuccessAsync({ from: owner });
-        });
-
-        it('should revert if sender is not authorized', async () => {
-            const tx = authorizable.onlyAuthorizedFn().callAsync({ from: notOwner });
-            const expectedError = new AuthorizableRevertErrors.SenderNotAuthorizedError(notOwner);
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should succeed if sender is authorized', async () => {
-            await authorizable.onlyAuthorizedFn().callAsync({ from: owner });
-        });
-    });
-
-    describe('removeAuthorizedAddress', () => {
-        it('should revert if not called by owner', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const expectedError = new OwnableRevertErrors.OnlyOwnerError(notOwner, owner);
-            const tx = authorizable.removeAuthorizedAddress(address).sendTransactionAsync({ from: notOwner });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should allow owner to remove an authorized address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            await authorizable.removeAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const isAuthorized = await authorizable.authorized(address).callAsync();
-            expect(isAuthorized).to.be.false();
-        });
-
-        it('should revert if owner attempts to remove an address that is not authorized', async () => {
-            const expectedError = new AuthorizableRevertErrors.TargetNotAuthorizedError(address);
-            const tx = authorizable.removeAuthorizedAddress(address).sendTransactionAsync({ from: owner });
-            return expect(tx).to.revertWith(expectedError);
-        });
-    });
-
-    describe('removeAuthorizedAddressAtIndex', () => {
-        it('should revert if not called by owner', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const index = new BigNumber(0);
-            const expectedError = new OwnableRevertErrors.OnlyOwnerError(notOwner, owner);
-            const tx = authorizable.removeAuthorizedAddressAtIndex(address, index).sendTransactionAsync({
-                from: notOwner,
-            });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should revert if index is >= authorities.length', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const index = new BigNumber(1);
-            const expectedError = new AuthorizableRevertErrors.IndexOutOfBoundsError(index, index);
-            const tx = authorizable.removeAuthorizedAddressAtIndex(address, index).sendTransactionAsync({
-                from: owner,
-            });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should revert if owner attempts to remove an address that is not authorized', async () => {
-            const index = new BigNumber(0);
-            const expectedError = new AuthorizableRevertErrors.TargetNotAuthorizedError(address);
-            const tx = authorizable.removeAuthorizedAddressAtIndex(address, index).sendTransactionAsync({
-                from: owner,
-            });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should revert if address at index does not match target', async () => {
-            const address1 = address;
-            const address2 = notOwner;
-            await authorizable.addAuthorizedAddress(address1).awaitTransactionSuccessAsync({ from: owner });
-            await authorizable.addAuthorizedAddress(address2).awaitTransactionSuccessAsync({ from: owner });
-            const address1Index = new BigNumber(0);
-            const expectedError = new AuthorizableRevertErrors.AuthorizedAddressMismatchError(address1, address2);
-            const tx = authorizable.removeAuthorizedAddressAtIndex(address2, address1Index).sendTransactionAsync({
-                from: owner,
-            });
-            return expect(tx).to.revertWith(expectedError);
-        });
-
-        it('should allow owner to remove an authorized address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const index = new BigNumber(0);
-            await authorizable.removeAuthorizedAddressAtIndex(address, index).awaitTransactionSuccessAsync({
-                from: owner,
-            });
-            const isAuthorized = await authorizable.authorized(address).callAsync();
-            expect(isAuthorized).to.be.false();
-        });
-    });
-
-    describe('getAuthorizedAddresses', () => {
-        it('should return correct authorized addresses', async () => {
-            // Initial Authorities
-            let authorities = await authorizable.getAuthorizedAddresses().callAsync();
-            expect(authorities).to.be.deep.eq([]);
-
-            // Authorities after addition
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            authorities = await authorizable.getAuthorizedAddresses().callAsync();
-            expect(authorities).to.be.deep.eq([address]);
-
-            // Authorities after removal
-            await authorizable.removeAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            authorities = await authorizable.getAuthorizedAddresses().callAsync();
-            expect(authorities).to.be.deep.eq([]);
-        });
-    });
-});

contracts/utils/test/lib_address.ts

@@ -1,43 +0,0 @@
-import { chaiSetup, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import * as chai from 'chai';
-
-import { artifacts } from './artifacts';
-import { TestLibAddressContract } from './wrappers';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('LibAddress', () => {
-    let lib: TestLibAddressContract;
-    let nonContract: string;
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-        nonContract = (await web3Wrapper.getAvailableAddressesAsync())[0];
-        // Deploy LibAddress
-        lib = await TestLibAddressContract.deployFrom0xArtifactAsync(
-            artifacts.TestLibAddress,
-            provider,
-            txDefaults,
-            {},
-        );
-    });
-
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('isContract', () => {
-        it('should return false for a non-contract address', async () => {
-            const isContract = await lib.externalIsContract(nonContract).callAsync();
-            expect(isContract).to.be.false();
-        });
-
-        it('should return true for a non-contract address', async () => {
-            const isContract = await lib.externalIsContract(lib.address).callAsync();
-            expect(isContract).to.be.true();
-        });
-    });
-});

contracts/utils/test/lib_address_array.ts

@@ -1,144 +0,0 @@
-import { chaiSetup, provider, randomAddress, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { BigNumber, LibAddressArrayRevertErrors } from '@0x/utils';
-import * as chai from 'chai';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-import { TestLibAddressArrayContract } from './wrappers';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('LibAddressArray', () => {
-    let lib: TestLibAddressArrayContract;
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-        // Deploy LibAddressArray
-        lib = await TestLibAddressArrayContract.deployFrom0xArtifactAsync(
-            artifacts.TestLibAddressArray,
-            provider,
-            txDefaults,
-            artifacts,
-        );
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('append', () => {
-        it('should append to empty array', async () => {
-            const addr = randomAddress();
-            const result = await lib.publicAppend([], addr).callAsync();
-            const expected = [addr];
-            expect(result).to.deep.equal(expected);
-        });
-
-        it('should append to non-empty array', async () => {
-            const arr = _.times(3, () => randomAddress());
-            const addr = randomAddress();
-            const expected = [...arr, addr];
-            const result = await lib.publicAppend(arr, addr).callAsync();
-            expect(result).to.deep.equal(expected);
-        });
-
-        it('should revert if the free memory pointer was moved to before the end of the array', async () => {
-            const arr = _.times(3, () => randomAddress());
-            const addr = randomAddress();
-            const freeMemOffset = new BigNumber(-1);
-            const addressArrayEndPtr = new BigNumber(256);
-            const expectedError = new LibAddressArrayRevertErrors.MismanagedMemoryError(
-                addressArrayEndPtr.plus(freeMemOffset),
-                addressArrayEndPtr,
-            );
-            return expect(lib.testAppendRealloc(arr, freeMemOffset, addr).callAsync()).to.revertWith(expectedError);
-        });
-
-        it('should keep the same memory address if free memory pointer does not move', async () => {
-            const arr = _.times(3, () => randomAddress());
-            const addr = randomAddress();
-            const freeMemOffset = new BigNumber(0);
-            const expected = [...arr, addr];
-            const [result, oldArrayMemStart, newArrayMemStart] = await lib
-                .testAppendRealloc(arr, freeMemOffset, addr)
-                .callAsync();
-            expect(result).to.deep.equal(expected);
-            expect(newArrayMemStart).bignumber.to.be.equal(oldArrayMemStart);
-        });
-
-        it('should change memory address if free memory pointer advances', async () => {
-            const arr = _.times(3, () => randomAddress());
-            const addr = randomAddress();
-            const freeMemOffset = new BigNumber(1);
-            const expectedArray = [...arr, addr];
-            const [result, oldArrayMemStart, newArrayMemStart] = await lib
-                .testAppendRealloc(arr, freeMemOffset, addr)
-                .callAsync();
-            // The new location should be the end of the old array + freeMemOffset.
-            const expectedNewArrayMemStart = oldArrayMemStart.plus((arr.length + 1) * 32).plus(freeMemOffset);
-            expect(result).to.deep.equal(expectedArray);
-            expect(newArrayMemStart).bignumber.to.be.equal(expectedNewArrayMemStart);
-        });
-    });
-
-    describe('contains', () => {
-        it('should return false on an empty array', async () => {
-            const addr = randomAddress();
-            const isFound = await lib.publicContains([], addr).callAsync();
-            expect(isFound).to.equal(false);
-        });
-
-        it('should return false on a missing item', async () => {
-            const arr = _.times(3, () => randomAddress());
-            const addr = randomAddress();
-            const isFound = await lib.publicContains(arr, addr).callAsync();
-            expect(isFound).to.equal(false);
-        });
-
-        it('should return true on an included item', async () => {
-            const arr = _.times(4, () => randomAddress());
-            const addr = _.sample(arr) as string;
-            const isFound = await lib.publicContains(arr, addr).callAsync();
-            expect(isFound).to.equal(true);
-        });
-
-        it('should return true on the only item in the array', async () => {
-            const arr = _.times(1, () => randomAddress());
-            const isFound = await lib.publicContains(arr, arr[0]).callAsync();
-            expect(isFound).to.equal(true);
-        });
-    });
-
-    describe('indexOf', () => {
-        it('should fail on an empty array', async () => {
-            const addr = randomAddress();
-            const [isSuccess] = await lib.publicIndexOf([], addr).callAsync();
-            expect(isSuccess).to.equal(false);
-        });
-
-        it('should fail on a missing item', async () => {
-            const arr = _.times(3, () => randomAddress());
-            const addr = randomAddress();
-            const [isSuccess] = await lib.publicIndexOf(arr, addr).callAsync();
-            expect(isSuccess).to.equal(false);
-        });
-
-        it('should succeed on an included item', async () => {
-            const arr = _.times(4, () => randomAddress());
-            const expectedIndexOf = _.random(0, arr.length - 1);
-            const addr = arr[expectedIndexOf];
-            const [isSuccess, index] = await lib.publicIndexOf(arr, addr).callAsync();
-            expect(isSuccess).to.equal(true);
-            expect(index).bignumber.to.equal(expectedIndexOf);
-        });
-
-        it('should succeed on the only item in the array', async () => {
-            const arr = _.times(1, () => randomAddress());
-            const [isSuccess, index] = await lib.publicIndexOf(arr, arr[0]).callAsync();
-            expect(isSuccess).to.equal(true);
-            expect(index).bignumber.to.equal(0);
-        });
-    });
-});

contracts/utils/test/lib_eip712.ts

@@ -1,108 +0,0 @@
-import { chaiSetup, constants, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { BigNumber, hexUtils, signTypedDataUtils } from '@0x/utils';
-import * as chai from 'chai';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-import { TestLibEIP712Contract } from './wrappers';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('LibEIP712', () => {
-    let lib: TestLibEIP712Contract;
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-        // Deploy LibEIP712
-        lib = await TestLibEIP712Contract.deployFrom0xArtifactAsync(artifacts.TestLibEIP712, provider, txDefaults, {});
-    });
-
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    /**
-     * Tests a specific instance of EIP712 domain hashing.
-     * @param lib The LibEIP712 contract to call.
-     * @param name The name of the domain.
-     * @param version The version of the domain.
-     * @param chainId The chain id of the domain.
-     * @param verifyingContract The verifying contract address of the domain.
-     */
-    async function testHashEIP712DomainAsync(
-        name: string,
-        version: string,
-        chainId: number,
-        verifyingContract: string,
-    ): Promise<void> {
-        const expectedHash = signTypedDataUtils.generateDomainHash({
-            name,
-            version,
-            chainId,
-            verifyingContract,
-        });
-        const actualHash = await lib
-            .externalHashEIP712DomainSeperator(name, version, new BigNumber(chainId), verifyingContract)
-            .callAsync();
-        expect(actualHash).to.be.eq(hexUtils.concat(expectedHash));
-    }
-
-    describe('_hashEIP712Domain', async () => {
-        it('should correctly hash empty input', async () => {
-            await testHashEIP712DomainAsync('', '', 0, constants.NULL_ADDRESS);
-        });
-
-        it('should correctly hash non-empty input', async () => {
-            await testHashEIP712DomainAsync('_hashEIP712Domain', '1.0', 62, lib.address);
-        });
-
-        it('should correctly hash non-empty input', async () => {
-            await testHashEIP712DomainAsync('_hashEIP712Domain', '2.0', 0, lib.address);
-        });
-    });
-
-    /**
-     * Tests a specific instance of EIP712 message hashing.
-     * @param lib The LibEIP712 contract to call.
-     * @param domainHash The hash of the EIP712 domain of this instance.
-     * @param hashStruct The hash of the struct of this instance.
-     */
-    async function testHashEIP712MessageAsync(domainHash: string, hashStruct: string): Promise<void> {
-        // Remove the hex prefix from the domain hash and the hash struct
-        const unprefixedDomainHash = domainHash.slice(2, domainHash.length);
-        const unprefixedHashStruct = hashStruct.slice(2, hashStruct.length);
-
-        // Hash the provided input to get the expected hash
-        const input = '0x1901'.concat(unprefixedDomainHash.concat(unprefixedHashStruct));
-        const expectedHash = hexUtils.hash(input);
-
-        // Get the actual hash by calling the smart contract
-        const actualHash = await lib.externalHashEIP712Message(domainHash, hashStruct).callAsync();
-
-        // Verify that the actual hash matches the expected hash
-        expect(actualHash).to.be.eq(expectedHash);
-    }
-
-    describe('_hashEIP712Message', () => {
-        it('should correctly hash empty input', async () => {
-            await testHashEIP712MessageAsync(constants.NULL_BYTES32, constants.NULL_BYTES32);
-        });
-
-        it('should correctly hash non-empty input', async () => {
-            await testHashEIP712MessageAsync(
-                '0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6', // keccak256(abi.encode(1))
-                '0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace', // keccak256(abi.encode(2))
-            );
-        });
-
-        it('should correctly hash non-empty input', async () => {
-            await testHashEIP712MessageAsync(
-                '0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace', // keccak256(abi.encode(2))
-                '0xc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b', // keccak256(abi.encode(3))
-            );
-        });
-    });
-});

contracts/utils/test/lib_math.ts

@@ -1,421 +0,0 @@
-import {
-    blockchainTests,
-    constants,
-    describe,
-    expect,
-    testCombinatoriallyWithReferenceFunc,
-    uint256Values,
-} from '@0x/contracts-test-utils';
-import { BigNumber, LibMathRevertErrors, SafeMathRevertErrors } from '@0x/utils';
-
-import {
-    getPartialAmountCeil,
-    getPartialAmountFloor,
-    isRoundingErrorCeil,
-    isRoundingErrorFloor,
-    safeGetPartialAmountCeil,
-    safeGetPartialAmountFloor,
-} from '../src/reference_functions';
-
-import { artifacts } from './artifacts';
-import { TestLibMathContract } from './wrappers';
-
-blockchainTests('LibMath', env => {
-    const { ONE_ETHER, MAX_UINT256, MAX_UINT256_ROOT, ZERO_AMOUNT } = constants;
-    let libsContract: TestLibMathContract;
-
-    before(async () => {
-        libsContract = await TestLibMathContract.deployFrom0xArtifactAsync(
-            artifacts.TestLibMath,
-            env.provider,
-            env.txDefaults,
-            {},
-        );
-    });
-
-    // Wrap a reference function with identical arguments in a promise.
-    function createAsyncReferenceFunction<T>(ref: (...args: any[]) => T): (...args: any[]) => Promise<T> {
-        return async (...args: any[]): Promise<T> => {
-            return ref(...args);
-        };
-    }
-
-    function createContractTestFunction<T>(name: string): (...args: any[]) => Promise<T> {
-        return async (...args: any[]): Promise<T> => {
-            return (libsContract as any)[name](...args).callAsync;
-        };
-    }
-
-    describe('getPartialAmountFloor', () => {
-        describe.optional('combinatorial tests', () => {
-            testCombinatoriallyWithReferenceFunc(
-                'getPartialAmountFloor',
-                createAsyncReferenceFunction(getPartialAmountFloor),
-                createContractTestFunction('getPartialAmountFloor'),
-                [uint256Values, uint256Values, uint256Values],
-            );
-        });
-
-        describe('explicit tests', () => {
-            it('matches the reference function output', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = ONE_ETHER.times(0.01);
-                const expected = getPartialAmountFloor(numerator, denominator, target);
-                const actual = await libsContract.getPartialAmountFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('rounds down when computing the partial amount', async () => {
-                const numerator = ONE_ETHER.times(0.6);
-                const denominator = ONE_ETHER.times(1.8);
-                const target = ONE_ETHER;
-                const expected = ONE_ETHER.dividedToIntegerBy(3);
-                const actual = await libsContract.getPartialAmountFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('reverts if `denominator` is zero', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ZERO_AMOUNT;
-                const target = ONE_ETHER.times(0.01);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.DivisionByZero,
-                    numerator.times(target),
-                    denominator,
-                );
-                return expect(
-                    libsContract.getPartialAmountFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `numerator * target` overflows', async () => {
-                const numerator = MAX_UINT256;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = MAX_UINT256_ROOT.times(2);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
-                    numerator,
-                    target,
-                );
-                return expect(
-                    libsContract.getPartialAmountFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-        });
-    });
-
-    describe('getPartialAmountCeil', () => {
-        describe.optional('combinatorial tests', () => {
-            testCombinatoriallyWithReferenceFunc(
-                'getPartialAmountCeil',
-                createAsyncReferenceFunction(getPartialAmountCeil),
-                createContractTestFunction('getPartialAmountCeil'),
-                [uint256Values, uint256Values, uint256Values],
-            );
-        });
-
-        describe('explicit tests', () => {
-            it('matches the reference function output', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = ONE_ETHER.times(0.01);
-                const expected = getPartialAmountCeil(numerator, denominator, target);
-                const actual = await libsContract.getPartialAmountCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('rounds up when computing the partial amount', async () => {
-                const numerator = ONE_ETHER.times(0.6);
-                const denominator = ONE_ETHER.times(1.8);
-                const target = ONE_ETHER;
-                const expected = ONE_ETHER.dividedToIntegerBy(3).plus(1);
-                const actual = await libsContract.getPartialAmountCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('reverts if `denominator` is zero', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ZERO_AMOUNT;
-                const target = ONE_ETHER.times(0.01);
-                // This will actually manifest as a subtraction underflow.
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.SubtractionUnderflow,
-                    denominator,
-                    new BigNumber(1),
-                );
-                return expect(
-                    libsContract.getPartialAmountCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `numerator * target` overflows', async () => {
-                const numerator = MAX_UINT256;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = MAX_UINT256_ROOT.times(2);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
-                    numerator,
-                    target,
-                );
-                return expect(
-                    libsContract.getPartialAmountCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-        });
-    });
-
-    describe('safeGetPartialAmountFloor', () => {
-        describe.optional('combinatorial tests', () => {
-            testCombinatoriallyWithReferenceFunc(
-                'safeGetPartialAmountFloor',
-                createAsyncReferenceFunction(safeGetPartialAmountFloor),
-                createContractTestFunction('safeGetPartialAmountFloor'),
-                [uint256Values, uint256Values, uint256Values],
-            );
-        });
-
-        describe('explicit tests', () => {
-            it('matches the reference function output', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = ONE_ETHER.times(0.01);
-                const expected = safeGetPartialAmountFloor(numerator, denominator, target);
-                const actual = await libsContract.safeGetPartialAmountFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('rounds down when computing the partial amount', async () => {
-                const numerator = ONE_ETHER.times(0.6);
-                const denominator = ONE_ETHER.times(1.8);
-                const target = ONE_ETHER;
-                const expected = ONE_ETHER.dividedToIntegerBy(3);
-                const actual = await libsContract.safeGetPartialAmountFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('reverts for a rounding error', async () => {
-                const numerator = new BigNumber(1e3);
-                const denominator = new BigNumber(1e4);
-                const target = new BigNumber(333);
-                const expectedError = new LibMathRevertErrors.RoundingError(numerator, denominator, target);
-                return expect(
-                    libsContract.safeGetPartialAmountFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `denominator` is zero', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ZERO_AMOUNT;
-                const target = ONE_ETHER.times(0.01);
-                const expectedError = new LibMathRevertErrors.DivisionByZeroError();
-                return expect(
-                    libsContract.safeGetPartialAmountFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `numerator * target` overflows', async () => {
-                const numerator = MAX_UINT256;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = MAX_UINT256_ROOT.times(2);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
-                    numerator,
-                    target,
-                );
-                return expect(
-                    libsContract.safeGetPartialAmountFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-        });
-    });
-
-    describe('safeGetPartialAmountCeil', () => {
-        describe.optional('combinatorial tests', () => {
-            testCombinatoriallyWithReferenceFunc(
-                'safeGetPartialAmountCeil',
-                createAsyncReferenceFunction(safeGetPartialAmountCeil),
-                createContractTestFunction('safeGetPartialAmountCeil'),
-                [uint256Values, uint256Values, uint256Values],
-            );
-        });
-
-        describe('explicit tests', () => {
-            it('matches the reference function output', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = ONE_ETHER.times(0.01);
-                const expected = safeGetPartialAmountCeil(numerator, denominator, target);
-                const actual = await libsContract.safeGetPartialAmountCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('rounds up when computing the partial amount', async () => {
-                const numerator = ONE_ETHER.times(0.6);
-                const denominator = ONE_ETHER.times(1.8);
-                const target = ONE_ETHER;
-                const expected = ONE_ETHER.dividedToIntegerBy(3).plus(1);
-                const actual = await libsContract.safeGetPartialAmountCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.bignumber.eq(expected);
-            });
-
-            it('reverts for a rounding error', async () => {
-                const numerator = new BigNumber(1e3);
-                const denominator = new BigNumber(1e4);
-                const target = new BigNumber(333);
-                const expectedError = new LibMathRevertErrors.RoundingError(numerator, denominator, target);
-                return expect(
-                    libsContract.safeGetPartialAmountCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `denominator` is zero', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ZERO_AMOUNT;
-                const target = ONE_ETHER.times(0.01);
-                const expectedError = new LibMathRevertErrors.DivisionByZeroError();
-                return expect(
-                    libsContract.safeGetPartialAmountCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `numerator * target` overflows', async () => {
-                const numerator = MAX_UINT256;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = MAX_UINT256_ROOT.times(2);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
-                    numerator,
-                    target,
-                );
-                return expect(
-                    libsContract.safeGetPartialAmountCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-        });
-    });
-
-    describe('isRoundingErrorFloor', () => {
-        describe.optional('combinatorial tests', () => {
-            testCombinatoriallyWithReferenceFunc(
-                'isRoundingErrorFloor',
-                createAsyncReferenceFunction(isRoundingErrorFloor),
-                createContractTestFunction('isRoundingErrorFloor'),
-                [uint256Values, uint256Values, uint256Values],
-            );
-        });
-
-        describe('explicit tests', () => {
-            it('returns true when `numerator * target / denominator` produces an error >= 0.1%', async () => {
-                const numerator = new BigNumber(100);
-                const denominator = new BigNumber(102);
-                const target = new BigNumber(52);
-                const actual = await libsContract.isRoundingErrorFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.eq(true);
-            });
-
-            it('returns false when `numerator * target / denominator` produces an error < 0.1%', async () => {
-                const numerator = new BigNumber(100);
-                const denominator = new BigNumber(101);
-                const target = new BigNumber(92);
-                const actual = await libsContract.isRoundingErrorFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.eq(false);
-            });
-
-            it('matches the reference function output', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = ONE_ETHER.times(0.01);
-                const expected = isRoundingErrorFloor(numerator, denominator, target);
-                const actual = await libsContract.isRoundingErrorFloor(numerator, denominator, target).callAsync();
-                expect(actual).to.eq(expected);
-            });
-
-            it('reverts if `denominator` is zero', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ZERO_AMOUNT;
-                const target = ONE_ETHER.times(0.01);
-                const expectedError = new LibMathRevertErrors.DivisionByZeroError();
-                return expect(
-                    libsContract.isRoundingErrorFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `numerator * target` overflows', async () => {
-                const numerator = MAX_UINT256;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = MAX_UINT256_ROOT.times(2);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
-                    numerator,
-                    target,
-                );
-                return expect(
-                    libsContract.isRoundingErrorFloor(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-        });
-    });
-
-    describe('isRoundingErrorCeil', () => {
-        describe.optional('combinatorial tests', () => {
-            testCombinatoriallyWithReferenceFunc(
-                'isRoundingErrorCeil',
-                createAsyncReferenceFunction(isRoundingErrorCeil),
-                createContractTestFunction('isRoundingErrorCeil'),
-                [uint256Values, uint256Values, uint256Values],
-            );
-        });
-
-        describe('explicit tests', () => {
-            it('returns true when `numerator * target / (denominator - 1)` produces an error >= 0.1%', async () => {
-                const numerator = new BigNumber(100);
-                const denominator = new BigNumber(101);
-                const target = new BigNumber(92);
-                const actual = await libsContract.isRoundingErrorCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.eq(true);
-            });
-
-            it('returns false when `numerator * target / (denominator - 1)` produces an error < 0.1%', async () => {
-                const numerator = new BigNumber(100);
-                const denominator = new BigNumber(102);
-                const target = new BigNumber(52);
-                const actual = await libsContract.isRoundingErrorCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.eq(false);
-            });
-
-            it('matches the reference function output', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = ONE_ETHER.times(0.01);
-                const expected = isRoundingErrorCeil(numerator, denominator, target);
-                const actual = await libsContract.isRoundingErrorCeil(numerator, denominator, target).callAsync();
-                expect(actual).to.eq(expected);
-            });
-
-            it('reverts if `denominator` is zero', async () => {
-                const numerator = ONE_ETHER;
-                const denominator = ZERO_AMOUNT;
-                const target = ONE_ETHER.times(0.01);
-                const expectedError = new LibMathRevertErrors.DivisionByZeroError();
-                return expect(
-                    libsContract.isRoundingErrorCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-
-            it('reverts if `numerator * target` overflows', async () => {
-                const numerator = MAX_UINT256;
-                const denominator = ONE_ETHER.dividedToIntegerBy(2);
-                const target = MAX_UINT256_ROOT.times(2);
-                const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
-                    SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
-                    numerator,
-                    target,
-                );
-                return expect(
-                    libsContract.isRoundingErrorCeil(numerator, denominator, target).callAsync(),
-                ).to.revertWith(expectedError);
-            });
-        });
-    });
-});

contracts/utils/test/log_decoding.ts

@@ -1,98 +0,0 @@
-import { chaiSetup, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { BigNumber } from '@0x/utils';
-import * as chai from 'chai';
-import { DecodedLogArgs, LogWithDecodedArgs } from 'ethereum-types';
-
-import { artifacts } from './artifacts';
-import { TestLogDecodingContract } from './wrappers';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('TestLogDecoding', () => {
-    let testLogDecodingWithDependencies: TestLogDecodingContract;
-    let testLogDecodingDeployedWithoutDependencies: TestLogDecodingContract;
-    const expectedEvent = {
-        foo: new BigNumber(256),
-        bar: '0x1234',
-        car: '4321',
-    };
-    const expectedDownstreamEvent = {
-        lorem: new BigNumber(256),
-        ipsum: '4321',
-    };
-    const emptyDependencyList = {};
-
-    before(async () => {
-        testLogDecodingDeployedWithoutDependencies = await TestLogDecodingContract.deployFrom0xArtifactAsync(
-            artifacts.TestLogDecoding,
-            provider,
-            txDefaults,
-            emptyDependencyList,
-        );
-        testLogDecodingWithDependencies = await TestLogDecodingContract.deployFrom0xArtifactAsync(
-            artifacts.TestLogDecoding,
-            provider,
-            txDefaults,
-            artifacts,
-        );
-    });
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('Decoding Log Arguments', () => {
-        it('should decode locally emitted event args when no dependencies are passed into wrapper', async () => {
-            const txReceipt = await testLogDecodingDeployedWithoutDependencies
-                .emitEvent()
-                .awaitTransactionSuccessAsync();
-            expect(txReceipt.logs.length).to.be.equal(1);
-            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
-        });
-        it('should not decode event args when no dependencies are passed into wrapper', async () => {
-            const txReceipt = await testLogDecodingDeployedWithoutDependencies
-                .emitEventDownstream()
-                .awaitTransactionSuccessAsync();
-            expect(txReceipt.logs.length).to.be.equal(1);
-            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.undefined();
-        });
-        it('should decode args for local but not downstream event when no dependencies are passed into wrapper', async () => {
-            const txReceipt = await testLogDecodingDeployedWithoutDependencies
-                .emitEventsLocalAndDownstream()
-                .awaitTransactionSuccessAsync();
-            expect(txReceipt.logs.length).to.be.equal(2);
-            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
-            expect((txReceipt.logs[1] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.undefined();
-        });
-        it('should decode locally emitted event args when dependencies are passed into wrapper', async () => {
-            const txReceipt = await testLogDecodingWithDependencies.emitEvent().awaitTransactionSuccessAsync();
-            expect(txReceipt.logs.length).to.be.equal(1);
-            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
-        });
-        it('should decode downstream event args when dependencies are passed into wrapper', async () => {
-            const txReceipt = await testLogDecodingWithDependencies
-                .emitEventDownstream()
-                .awaitTransactionSuccessAsync();
-            expect(txReceipt.logs.length).to.be.equal(1);
-            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(
-                expectedDownstreamEvent,
-            );
-        });
-        it('should decode args for both local and downstream events when dependencies are passed into wrapper', async () => {
-            const txReceipt = await testLogDecodingWithDependencies
-                .emitEventsLocalAndDownstream()
-                .awaitTransactionSuccessAsync();
-            expect(txReceipt.logs.length).to.be.equal(2);
-            expect((txReceipt.logs[0] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(expectedEvent);
-            expect((txReceipt.logs[1] as LogWithDecodedArgs<DecodedLogArgs>).args).to.be.deep.equal(
-                expectedDownstreamEvent,
-            );
-        });
-    });
-});

contracts/utils/test/refundable.ts

@@ -1,141 +0,0 @@
-import { blockchainTests, constants } from '@0x/contracts-test-utils';
-import { BigNumber } from '@0x/utils';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-import { TestRefundableContract, TestRefundableReceiverContract } from './wrappers';
-
-blockchainTests('Refundable', env => {
-    let refundable: TestRefundableContract;
-    let receiver: TestRefundableReceiverContract;
-
-    const ONE_HUNDRED = new BigNumber(100);
-    const ONE_THOUSAND = new BigNumber(1000);
-
-    before(async () => {
-        // Create the refundable contract.
-        refundable = await TestRefundableContract.deployFrom0xArtifactAsync(
-            artifacts.TestRefundable,
-            env.provider,
-            env.txDefaults,
-            {},
-        );
-
-        // Create the receiver contract.
-        receiver = await TestRefundableReceiverContract.deployFrom0xArtifactAsync(
-            artifacts.TestRefundableReceiver,
-            env.provider,
-            env.txDefaults,
-            {},
-        );
-    });
-
-    // The contents of these typescript tests is not adequate to understand the assertions that are made during
-    // these calls. For a more accurate picture, checkout out "./contracts/test/TestRefundableReceiver.sol". Specifically,
-    // the function `testRefundNonzeroBalance()` is used in this test suite.
-    blockchainTests.resets('refundNonzeroBalance', () => {
-        it('should not send a refund when no value is sent', async () => {
-            // Send 100 wei to the refundable contract that should be refunded.
-            await receiver.testRefundNonZeroBalance(refundable.address).awaitTransactionSuccessAsync({
-                value: constants.ZERO_AMOUNT,
-            });
-        });
-
-        it('should send a full refund when nonzero value is sent', async () => {
-            // Send 100 wei to the refundable contract that should be refunded.
-            await receiver.testRefundNonZeroBalance(refundable.address).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-    });
-
-    // The contents of these typescript tests is not adequate to understand the assertions that are made during
-    // these calls. For a more accurate picture, checkout out "./contracts/test/TestRefundableReceiver.sol".
-    blockchainTests.resets('refundFinalBalance', () => {
-        it('should fully refund the sender when `shouldNotRefund` is false', async () => {
-            // Send 100 wei to the refundable contract that should be refunded to the receiver contract.
-            await receiver.testRefundFinalBalance(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-
-        // This test may not be necessary, but it is included here as a sanity check.
-        it('should fully refund the sender when `shouldNotRefund` is false for two calls in a row', async () => {
-            // Send 100 wei to the refundable contract that should be refunded to the receiver contract.
-            await receiver.testRefundFinalBalance(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-
-            // Send 1000 wei to the refundable contract that should be refunded to the receiver contract.
-            await receiver.testRefundFinalBalance(refundable.address, false).awaitTransactionSuccessAsync({
-                value: new BigNumber(1000),
-            });
-        });
-
-        it('should not refund the sender if `shouldNotRefund` is true', async () => {
-            /// Send 100 wei to the refundable contract that should not be refunded.
-            await receiver.testRefundFinalBalance(refundable.address, true).awaitTransactionSuccessAsync({
-                value: new BigNumber(1000),
-            });
-        });
-    });
-
-    // The contents of these typescript tests is not adequate to understand the assertions that are made during
-    // these calls. For a more accurate picture, checkout out "./contracts/test/TestRefundableReceiver.sol".
-    blockchainTests.resets('disableRefundUntilEnd', () => {
-        it('should fully refund the sender when `shouldNotRefund` is false', async () => {
-            // Send 100 wei to the refundable contract that should be refunded to the receiver contract.
-            await receiver.testDisableRefundUntilEnd(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-
-        // This test may not be necessary, but it is included here as a sanity check.
-        it('should fully refund the sender when `shouldNotRefund` is false for two calls in a row', async () => {
-            // Send 100 wei to the refundable contract that should be refunded to the receiver contract.
-            await receiver.testDisableRefundUntilEnd(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-
-            // Send 1000 wei to the refundable contract that should be refunded to the receiver contract.
-            await receiver.testDisableRefundUntilEnd(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_THOUSAND,
-            });
-        });
-
-        it('should not refund the sender if `shouldNotRefund` is true', async () => {
-            /// Send 100 wei to the refundable contract that should not be refunded.
-            await receiver.testDisableRefundUntilEnd(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-
-        it('should disable the `disableRefundUntilEnd` modifier and refund when `shouldNotRefund` is false', async () => {
-            /// Send 100 wei to the refundable contract that should be refunded.
-            await receiver.testNestedDisableRefundUntilEnd(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-
-        it('should disable the `refundFinalBalance` modifier and send no refund when `shouldNotRefund` is true', async () => {
-            /// Send 100 wei to the refundable contract that should not be refunded.
-            await receiver.testNestedDisableRefundUntilEnd(refundable.address, true).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-
-        it('should disable the `refundFinalBalance` modifier and refund when `shouldNotRefund` is false', async () => {
-            /// Send 100 wei to the refundable contract that should be refunded.
-            await receiver.testMixedRefunds(refundable.address, false).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-
-        it('should disable the `refundFinalBalance` modifier and send no refund when `shouldNotRefund` is true', async () => {
-            /// Send 100 wei to the refundable contract that should not be refunded.
-            await receiver.testMixedRefunds(refundable.address, true).awaitTransactionSuccessAsync({
-                value: ONE_HUNDRED,
-            });
-        });
-    });
-});

contracts/utils/test/wrappers.ts

@@ -3,21 +3,13 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
-export * from '../test/generated-wrappers/authorizable';
 export * from '../test/generated-wrappers/authorizable_v06';
 export * from '../test/generated-wrappers/authorizable_v08';
-export * from '../test/generated-wrappers/d18';
-export * from '../test/generated-wrappers/deployment_constants';
-export * from '../test/generated-wrappers/i_authorizable';
 export * from '../test/generated-wrappers/i_authorizable_v06';
 export * from '../test/generated-wrappers/i_authorizable_v08';
 export * from '../test/generated-wrappers/i_ownable';
 export * from '../test/generated-wrappers/i_ownable_v06';
 export * from '../test/generated-wrappers/i_ownable_v08';
-export * from '../test/generated-wrappers/lib_address';
-export * from '../test/generated-wrappers/lib_address_array';
-export * from '../test/generated-wrappers/lib_address_array_rich_errors';
-export * from '../test/generated-wrappers/lib_authorizable_rich_errors';
 export * from '../test/generated-wrappers/lib_authorizable_rich_errors_v06';
 export * from '../test/generated-wrappers/lib_authorizable_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_bytes';
@@ -26,11 +18,6 @@ export * from '../test/generated-wrappers/lib_bytes_rich_errors_v06';
 export * from '../test/generated-wrappers/lib_bytes_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_bytes_v06';
 export * from '../test/generated-wrappers/lib_bytes_v08';
-export * from '../test/generated-wrappers/lib_e_i_p1271';
-export * from '../test/generated-wrappers/lib_e_i_p712';
-export * from '../test/generated-wrappers/lib_fractions';
-export * from '../test/generated-wrappers/lib_math';
-export * from '../test/generated-wrappers/lib_math_rich_errors';
 export * from '../test/generated-wrappers/lib_math_rich_errors_v06';
 export * from '../test/generated-wrappers/lib_math_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_math_v06';
@@ -53,20 +40,9 @@ export * from '../test/generated-wrappers/ownable';
 export * from '../test/generated-wrappers/ownable_v06';
 export * from '../test/generated-wrappers/ownable_v08';
 export * from '../test/generated-wrappers/reentrancy_guard';
-export * from '../test/generated-wrappers/reentrancy_guard_v06';
 export * from '../test/generated-wrappers/reentrancy_guard_v08';
-export * from '../test/generated-wrappers/refundable';
-export * from '../test/generated-wrappers/test_authorizable';
-export * from '../test/generated-wrappers/test_lib_address';
-export * from '../test/generated-wrappers/test_lib_address_array';
 export * from '../test/generated-wrappers/test_lib_bytes';
-export * from '../test/generated-wrappers/test_lib_e_i_p712';
-export * from '../test/generated-wrappers/test_lib_math';
 export * from '../test/generated-wrappers/test_lib_rich_errors';
 export * from '../test/generated-wrappers/test_lib_safe_math';
-export * from '../test/generated-wrappers/test_log_decoding';
-export * from '../test/generated-wrappers/test_log_decoding_downstream';
 export * from '../test/generated-wrappers/test_ownable';
 export * from '../test/generated-wrappers/test_reentrancy_guard';
-export * from '../test/generated-wrappers/test_refundable';
-export * from '../test/generated-wrappers/test_refundable_receiver';

contracts/utils/tsconfig.json

@@ -3,20 +3,9 @@
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "generated-artifacts/Authorizable.json",
-        "generated-artifacts/IAuthorizable.json",
         "generated-artifacts/IOwnable.json",
-        "generated-artifacts/LibAddress.json",
-        "generated-artifacts/LibAddressArray.json",
-        "generated-artifacts/LibAddressArrayRichErrors.json",
-        "generated-artifacts/LibAuthorizableRichErrors.json",
         "generated-artifacts/LibBytes.json",
         "generated-artifacts/LibBytesRichErrors.json",
-        "generated-artifacts/LibEIP1271.json",
-        "generated-artifacts/LibEIP712.json",
-        "generated-artifacts/LibFractions.json",
-        "generated-artifacts/LibMath.json",
-        "generated-artifacts/LibMathRichErrors.json",
         "generated-artifacts/LibOwnableRichErrors.json",
         "generated-artifacts/LibReentrancyGuardRichErrors.json",
         "generated-artifacts/LibRichErrors.json",
@@ -24,22 +13,13 @@
         "generated-artifacts/LibSafeMathRichErrors.json",
         "generated-artifacts/Ownable.json",
         "generated-artifacts/ReentrancyGuard.json",
-        "generated-artifacts/Refundable.json",
-        "test/generated-artifacts/Authorizable.json",
         "test/generated-artifacts/AuthorizableV06.json",
         "test/generated-artifacts/AuthorizableV08.json",
-        "test/generated-artifacts/D18.json",
-        "test/generated-artifacts/DeploymentConstants.json",
-        "test/generated-artifacts/IAuthorizable.json",
         "test/generated-artifacts/IAuthorizableV06.json",
         "test/generated-artifacts/IAuthorizableV08.json",
         "test/generated-artifacts/IOwnable.json",
         "test/generated-artifacts/IOwnableV06.json",
         "test/generated-artifacts/IOwnableV08.json",
-        "test/generated-artifacts/LibAddress.json",
-        "test/generated-artifacts/LibAddressArray.json",
-        "test/generated-artifacts/LibAddressArrayRichErrors.json",
-        "test/generated-artifacts/LibAuthorizableRichErrors.json",
         "test/generated-artifacts/LibAuthorizableRichErrorsV06.json",
         "test/generated-artifacts/LibAuthorizableRichErrorsV08.json",
         "test/generated-artifacts/LibBytes.json",
@@ -48,11 +28,6 @@
         "test/generated-artifacts/LibBytesRichErrorsV08.json",
         "test/generated-artifacts/LibBytesV06.json",
         "test/generated-artifacts/LibBytesV08.json",
-        "test/generated-artifacts/LibEIP1271.json",
-        "test/generated-artifacts/LibEIP712.json",
-        "test/generated-artifacts/LibFractions.json",
-        "test/generated-artifacts/LibMath.json",
-        "test/generated-artifacts/LibMathRichErrors.json",
         "test/generated-artifacts/LibMathRichErrorsV06.json",
         "test/generated-artifacts/LibMathRichErrorsV08.json",
         "test/generated-artifacts/LibMathV06.json",
@@ -75,23 +50,12 @@
         "test/generated-artifacts/OwnableV06.json",
         "test/generated-artifacts/OwnableV08.json",
         "test/generated-artifacts/ReentrancyGuard.json",
-        "test/generated-artifacts/ReentrancyGuardV06.json",
         "test/generated-artifacts/ReentrancyGuardV08.json",
-        "test/generated-artifacts/Refundable.json",
-        "test/generated-artifacts/TestAuthorizable.json",
-        "test/generated-artifacts/TestLibAddress.json",
-        "test/generated-artifacts/TestLibAddressArray.json",
         "test/generated-artifacts/TestLibBytes.json",
-        "test/generated-artifacts/TestLibEIP712.json",
-        "test/generated-artifacts/TestLibMath.json",
         "test/generated-artifacts/TestLibRichErrors.json",
         "test/generated-artifacts/TestLibSafeMath.json",
-        "test/generated-artifacts/TestLogDecoding.json",
-        "test/generated-artifacts/TestLogDecodingDownstream.json",
         "test/generated-artifacts/TestOwnable.json",
-        "test/generated-artifacts/TestReentrancyGuard.json",
-        "test/generated-artifacts/TestRefundable.json",
-        "test/generated-artifacts/TestRefundableReceiver.json"
+        "test/generated-artifacts/TestReentrancyGuard.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/zero-ex/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "0.38.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "0.38.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1674517560,
         "version": "0.38.4",

contracts/zero-ex/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.38.6 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v0.38.5 - _January 30, 2023_
+
+    * Dependencies updated
+
 ## v0.38.4 - _January 23, 2023_
 
     * Dependencies updated

contracts/zero-ex/README.md

@@ -67,3 +67,22 @@ yarn lint
 ```bash
 yarn test
 ```
+
+### Run Integration Tests
+you will need to create a .env that the root of `/contracts/zero-ex` containing rpc's for all 7 chains the tests will be run on
+
+```sh
+ARBITRUM_RPC_URL=https://arb-mainnet........
+AVALANCHE_RPC_URL=https://avalanche-mainnet......
+BSC_RPC_URL=https://bsc-mainnet......
+FANTOM_RPC_URL=https://fantom-mainnet......
+MAINNET_RPC_URL=https://eth-mainnet......
+OPTIMISM_RPC_URL=https://opt-mainnet......
+POLYGON_RPC_URL=https://polygon-mainnet......
+```
+
+```bash
+git submodule update --init --recursive
+foundryup
+yarn test:integration
+```

contracts/zero-ex/compiler.json

@@ -110,6 +110,7 @@
         "./contracts/src/transformers/Transformer.sol",
         "./contracts/src/transformers/WethTransformer.sol",
         "./contracts/src/transformers/bridges/AbstractBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/BSCBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/BridgeProtocols.sol",

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibCommonRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibMetaTransactionsRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibNFTOrdersRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibNativeOrdersRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibOwnableRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibProxyRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibSignatureRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibSimpleFunctionRegistryRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibTransformERC20RichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/errors/LibWalletRichErrors.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/FeeCollector.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/FeeCollectorController.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/FlashWallet.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/IFlashWallet.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/ILiquidityProviderSandbox.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/LibFeeCollector.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/LiquidityProviderSandbox.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2020 ZeroEx Intl.
+  Copyright 2023 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

contracts/zero-ex/contracts/src/external/PermissionlessTransformerDeployer.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

contracts/zero-ex/contracts/src/external/TransformerDeployer.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2022 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2021 ZeroEx Intl.
+  Copyright 2023 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

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,25 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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-erc20/contracts/src/v06/IEtherTokenV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibBytesV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
@@ -32,6 +28,7 @@ import "../migrations/LibMigrate.sol";
 import "../storage/LibMetaTransactionsStorage.sol";
 import "./interfaces/IFeature.sol";
 import "./interfaces/IMetaTransactionsFeature.sol";
+import "./interfaces/IMultiplexFeature.sol";
 import "./interfaces/INativeOrdersFeature.sol";
 import "./interfaces/ITransformERC20Feature.sol";
 import "./libs/LibSignature.sol";
@@ -96,6 +93,9 @@ contract MetaTransactionsFeature is
             ")"
         );
 
+    /// @dev The WETH token contract.
+    IEtherTokenV06 private immutable WETH;
+
     /// @dev Refunds up to `msg.value` leftover ETH at the end of the call.
     modifier refundsAttachedEth() {
         _;
@@ -113,7 +113,12 @@ contract MetaTransactionsFeature is
         require(initialBalance <= address(this).balance, "MetaTransactionsFeature/ETH_LEAK");
     }
 
-    constructor(address zeroExAddress) public FixinCommon() FixinEIP712(zeroExAddress) {}
+    constructor(
+        address zeroExAddress,
+        IEtherTokenV06 weth
+    ) public FixinCommon() FixinEIP712(zeroExAddress) {
+        WETH = weth;
+    }
 
     /// @dev Initialize and register this feature.
     ///      Should be delegatecalled by `Migrate.migrate()`.
@@ -250,6 +255,14 @@ contract MetaTransactionsFeature is
             returnResult = _executeFillLimitOrderCall(state);
         } else if (state.selector == INativeOrdersFeature.fillRfqOrder.selector) {
             returnResult = _executeFillRfqOrderCall(state);
+        } else if (state.selector == IMultiplexFeature.multiplexBatchSellTokenForToken.selector) {
+            returnResult = _executeMultiplexBatchSellTokenForTokenCall(state);
+        } else if (state.selector == IMultiplexFeature.multiplexBatchSellTokenForEth.selector) {
+            returnResult = _executeMultiplexBatchSellTokenForEthCall(state);
+        } else if (state.selector == IMultiplexFeature.multiplexMultiHopSellTokenForToken.selector) {
+            returnResult = _executeMultiplexMultiHopSellTokenForTokenCall(state);
+        } else if (state.selector == IMultiplexFeature.multiplexMultiHopSellTokenForEth.selector) {
+            returnResult = _executeMultiplexMultiHopSellTokenForEthCall(state);
         } else {
             LibMetaTransactionsRichErrors.MetaTransactionUnsupportedFunctionError(state.hash, state.selector).rrevert();
         }
@@ -431,7 +444,7 @@ contract MetaTransactionsFeature is
 
     /// @dev Execute a `INativeOrdersFeature.fillRfqOrder()` meta-transaction call
     ///      by decoding the call args and translating the call to the internal
-    ///      `INativeOrdersFeature._fillRfqOrder()` variant, where we can overrideunimpleme
+    ///      `INativeOrdersFeature._fillRfqOrder()` variant, where we can override
     ///      the taker address.
     function _executeFillRfqOrderCall(ExecuteState memory state) private returns (bytes memory returnResult) {
         LibNativeOrder.RfqOrder memory order;
@@ -460,6 +473,162 @@ contract MetaTransactionsFeature is
             );
     }
 
+    /// @dev Execute a `IMultiplexFeature.multiplexBatchSellTokenForToken()` meta-transaction
+    ///      call by decoding the call args and translating the call to the internal
+    ///      `IMultiplexFeature._multiplexBatchSell()` variant, where we can override the
+    ///      msgSender address.
+    function _executeMultiplexBatchSellTokenForTokenCall(ExecuteState memory state) private returns (bytes memory returnResult) {
+        IERC20TokenV06 inputToken;
+        IERC20TokenV06 outputToken;
+        IMultiplexFeature.BatchSellSubcall[] memory calls;
+        uint256 sellAmount;
+        uint256 minBuyAmount;
+
+        bytes memory args = _extractArgumentsFromCallData(state.mtx.callData);
+        (inputToken, outputToken, calls, sellAmount, minBuyAmount) = abi.decode(
+            args,
+            (IERC20TokenV06, IERC20TokenV06, IMultiplexFeature.BatchSellSubcall[], uint256, uint256)
+        );
+
+        return
+            _callSelf(
+                state.hash,
+                abi.encodeWithSelector(
+                    IMultiplexFeature._multiplexBatchSell.selector,
+                    IMultiplexFeature.BatchSellParams({
+                        inputToken: inputToken,
+                        outputToken: outputToken,
+                        sellAmount: sellAmount,
+                        calls: calls,
+                        useSelfBalance: false,
+                        recipient: state.mtx.signer,
+                        msgSender: state.mtx.signer
+                    }),
+                    minBuyAmount
+                ),
+                state.mtx.value
+            );
+    }
+
+    /// @dev Execute a `IMultiplexFeature.multiplexBatchSellTokenForEth()` meta-transaction
+    ///      call by decoding the call args and translating the call to the internal
+    ///      `IMultiplexFeature._multiplexBatchSellTokenForEth()` variant, where we can override the
+    ///      msgSender address.
+    function _executeMultiplexBatchSellTokenForEthCall(ExecuteState memory state) private returns (bytes memory returnResult) {
+        IERC20TokenV06 inputToken;
+        IMultiplexFeature.BatchSellSubcall[] memory calls;
+        uint256 sellAmount;
+        uint256 minBuyAmount;
+
+        bytes memory args = _extractArgumentsFromCallData(state.mtx.callData);
+        (inputToken, calls, sellAmount, minBuyAmount) = abi.decode(
+            args,
+            (IERC20TokenV06, IMultiplexFeature.BatchSellSubcall[], uint256, uint256)
+        );
+
+        returnResult = _callSelf(
+            state.hash,
+            abi.encodeWithSelector(
+                IMultiplexFeature._multiplexBatchSell.selector,
+                IMultiplexFeature.BatchSellParams({
+                    inputToken: inputToken,
+                    outputToken: IERC20TokenV06(WETH),
+                    sellAmount: sellAmount,
+                    calls: calls,
+                    useSelfBalance: false,
+                    recipient: address(this),
+                    msgSender: state.mtx.signer
+                }),
+                minBuyAmount
+            ),
+            state.mtx.value
+        );
+
+        // Unwrap and transfer WETH
+        uint256 boughtAmount = abi.decode(returnResult, (uint256));
+        WETH.withdraw(boughtAmount);
+        _transferEth(state.mtx.signer, boughtAmount);
+    }
+
+    /// @dev Execute a `IMultiplexFeature.multiplexMultiHopSellTokenForToken()` meta-transaction
+    ///      call by decoding the call args and translating the call to the internal
+    ///      `IMultiplexFeature._multiplexMultiHopSell()` variant, where we can override the
+    ///      msgSender address.
+    function _executeMultiplexMultiHopSellTokenForTokenCall(ExecuteState memory state) private returns (bytes memory returnResult) {
+        address[] memory tokens;
+        IMultiplexFeature.MultiHopSellSubcall[] memory calls;
+        uint256 sellAmount;
+        uint256 minBuyAmount;
+
+        bytes memory args = _extractArgumentsFromCallData(state.mtx.callData);
+        (tokens, calls, sellAmount, minBuyAmount) = abi.decode(
+            args,
+            (address[], IMultiplexFeature.MultiHopSellSubcall[], uint256, uint256)
+        );
+
+        return
+            _callSelf(
+                state.hash,
+                abi.encodeWithSelector(
+                    IMultiplexFeature._multiplexMultiHopSell.selector,
+                    IMultiplexFeature.MultiHopSellParams({
+                        tokens: tokens,
+                        sellAmount: sellAmount,
+                        calls: calls,
+                        useSelfBalance: false,
+                        recipient: state.mtx.signer,
+                        msgSender: state.mtx.signer
+                    }),
+                    minBuyAmount
+                ),
+                state.mtx.value
+            );
+    }
+
+    /// @dev Execute a `IMultiplexFeature.multiplexMultiHopSellTokenForEth()` meta-transaction
+    ///      call by decoding the call args and translating the call to the internal
+    ///      `IMultiplexFeature._multiplexMultiHopSellTokenForEth()` variant, where we can override the
+    ///      msgSender address.
+    function _executeMultiplexMultiHopSellTokenForEthCall(ExecuteState memory state) private returns (bytes memory returnResult) {
+        address[] memory tokens;
+        IMultiplexFeature.MultiHopSellSubcall[] memory calls;
+        uint256 sellAmount;
+        uint256 minBuyAmount;
+
+        bytes memory args = _extractArgumentsFromCallData(state.mtx.callData);
+        (tokens, calls, sellAmount, minBuyAmount) = abi.decode(
+            args,
+            (address[], IMultiplexFeature.MultiHopSellSubcall[], uint256, uint256)
+        );
+
+        require(
+            tokens[tokens.length - 1] == address(WETH),
+            "MetaTransactionsFeature::multiplexMultiHopSellTokenForEth/NOT_WETH"
+        );
+
+        returnResult = _callSelf(
+            state.hash,
+            abi.encodeWithSelector(
+                IMultiplexFeature._multiplexMultiHopSell.selector,
+                IMultiplexFeature.MultiHopSellParams({
+                    tokens: tokens,
+                    sellAmount: sellAmount,
+                    calls: calls,
+                    useSelfBalance: false,
+                    recipient: address(this),
+                    msgSender: state.mtx.signer
+                }),
+                minBuyAmount
+            ),
+            state.mtx.value
+        );
+
+        // Unwrap and transfer WETH
+        uint256 boughtAmount = abi.decode(returnResult, (uint256));
+        WETH.withdraw(boughtAmount);
+        _transferEth(state.mtx.signer, boughtAmount);
+    }
+
     /// @dev Make an arbitrary internal, meta-transaction call.
     ///      Warning: Do not let unadulterated `callData` into this function.
     function _callSelf(bytes32 hash, bytes memory callData, uint256 value) private returns (bytes memory returnResult) {

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2020 ZeroEx Intl.
-
+  Copyright 2023 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;

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

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;
@@ -75,6 +70,7 @@ contract UniswapV3Feature is IFeature, IUniswapV3Feature, FixinCommon, FixinToke
         _registerFeatureFunction(this.sellEthForTokenToUniswapV3.selector);
         _registerFeatureFunction(this.sellTokenForEthToUniswapV3.selector);
         _registerFeatureFunction(this.sellTokenForTokenToUniswapV3.selector);
+        _registerFeatureFunction(this._sellTokenForTokenToUniswapV3.selector);
         _registerFeatureFunction(this._sellHeldTokenForTokenToUniswapV3.selector);
         _registerFeatureFunction(this.uniswapV3SwapCallback.selector);
         return LibMigrate.MIGRATE_SUCCESS;
@@ -144,6 +140,23 @@ contract UniswapV3Feature is IFeature, IUniswapV3Feature, FixinCommon, FixinToke
         buyAmount = _swap(encodedPath, sellAmount, minBuyAmount, msg.sender, _normalizeRecipient(recipient));
     }
 
+    /// @dev Sell a token for another token directly against uniswap v3. Internal variant.
+    /// @param encodedPath Uniswap-encoded path.
+    /// @param sellAmount amount of the first token in the path to sell.
+    /// @param minBuyAmount Minimum amount of the last token in the path to buy.
+    /// @param recipient The recipient of the bought tokens. Can be zero for payer.
+    /// @param payer The address to pull the sold tokens from.
+    /// @return buyAmount Amount of the last token in the path bought.
+    function _sellTokenForTokenToUniswapV3(
+        bytes memory encodedPath,
+        uint256 sellAmount,
+        uint256 minBuyAmount,
+        address recipient,
+        address payer
+    ) public override onlySelf returns (uint256 buyAmount) {
+        buyAmount = _swap(encodedPath, sellAmount, minBuyAmount, payer, _normalizeRecipient(recipient, payer));
+    }
+
     /// @dev Sell a token for another token directly against uniswap v3.
     ///      Private variant, uses tokens held by `address(this)`.
     /// @param encodedPath Uniswap-encoded path.
@@ -342,8 +355,13 @@ contract UniswapV3Feature is IFeature, IUniswapV3Feature, FixinCommon, FixinToke
         }
     }
 
+    // Convert null address values to fallback.
+    function _normalizeRecipient(address recipient, address alternative) private pure returns (address payable normalizedRecipient) {
+        return recipient == address(0) ? payable(alternative) : payable(recipient);
+    }
+
     // Convert null address values to msg.sender.
     function _normalizeRecipient(address recipient) private view returns (address payable normalizedRecipient) {
-        return recipient == address(0) ? msg.sender : payable(recipient);
+        return _normalizeRecipient(recipient, msg.sender);
     }
 }

contracts/zero-ex/contracts/src/features/interfaces/IBatchFillNativeOrdersFeature.sol

@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
-  Copyright 2021 ZeroEx Intl.
-
+  Copyright 2023 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;