diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..bf4d6e0418
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,372 @@
+version: 2.1
+
+parameters:
+    cache_version:
+        type: string
+        default: v5
+
+jobs:
+    build:
+        resource_class: xlarge
+        docker:
+            - image: node:16
+        environment:
+            NODE_OPTIONS: '--max-old-space-size=16384'
+        steps:
+            - checkout
+            - run: git submodule update --init --recursive
+            - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-feat/NerveMixinArbitrum
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - run:
+                  name: install-yarn
+                  command: npm install --force --global yarn@1.22.0
+            - run:
+                  name: yarn
+                  command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
+            - setup_remote_docker
+            - run: yarn build:ci
+            - save_cache:
+                  key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+                  paths:
+                      - ~/project/node_modules
+                      - ~/.cache/yarn
+            - save_cache:
+                  key: lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+                  paths:
+                      - ~/project/contracts/erc20/generated-artifacts/
+                      - ~/project/contracts/erc20/generated-wrappers/
+                      - ~/project/contracts/erc20/lib/
+                      - ~/project/contracts/erc20/node_modules
+                      - ~/project/contracts/erc20/test/generated-artifacts/
+                      - ~/project/contracts/erc20/test/generated-wrappers/
+                      - ~/project/contracts/test-utils/lib/
+                      - ~/project/contracts/test-utils/node_modules
+                      - ~/project/contracts/treasury/generated-artifacts/
+                      - ~/project/contracts/treasury/generated-wrappers/
+                      - ~/project/contracts/treasury/lib/
+                      - ~/project/contracts/treasury/node_modules
+                      - ~/project/contracts/treasury/test/generated-artifacts/
+                      - ~/project/contracts/treasury/test/generated-wrappers/
+                      - ~/project/contracts/utils/generated-artifacts/
+                      - ~/project/contracts/utils/generated-wrappers/
+                      - ~/project/contracts/utils/lib/
+                      - ~/project/contracts/utils/node_modules
+                      - ~/project/contracts/utils/test/generated-artifacts/
+                      - ~/project/contracts/utils/test/generated-wrappers/
+                      - ~/project/contracts/zero-ex/generated-artifacts/
+                      - ~/project/contracts/zero-ex/generated-wrappers/
+                      - ~/project/contracts/zero-ex/lib/
+                      - ~/project/contracts/zero-ex/node_modules
+                      - ~/project/contracts/zero-ex/test/generated-artifacts/
+                      - ~/project/contracts/zero-ex/test/generated-wrappers/
+                      - ~/project/packages/asset-swapper/node_modules
+                      - ~/project/packages/contract-addresses/lib/
+                      - ~/project/packages/contract-addresses/node_modules
+                      - ~/project/packages/contract-artifacts/lib/
+                      - ~/project/packages/contract-artifacts/node_modules
+                      - ~/project/packages/contract-wrappers/lib/
+                      - ~/project/packages/contract-wrappers/node_modules
+                      - ~/project/packages/protocol-utils/lib/
+                      - ~/project/packages/protocol-utils/node_modules
+            - store_artifacts:
+                  path: ~/repo/packages/abi-gen/test-cli/output
+            - store_artifacts:
+                  path: ~/repo/packages/contract-wrappers/generated_docs
+    test-exchange-ganache:
+        resource_class: xlarge
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
+    test-integrations-ganache:
+        resource_class: xlarge
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
+    test-contracts-staking-ganache:
+        resource_class: xlarge
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
+    test-contracts-extra-ganache:
+        resource_class: xlarge
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
+    test-contracts-rest-ganache:
+        resource_class: xlarge
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - run: |
+                  git diff --name-only development >> changed.txt
+                  if ! grep -q \.sol changed.txt; then
+                    circleci-agent step halt
+                  fi
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run: |
+                  yarn wsrun \
+                    -p @0x/contracts-multisig \
+                    -p @0x/contracts-utils \
+                    -p @0x/contracts-exchange-libs \
+                    -p @0x/contracts-erc20 \
+                    -p @0x/contracts-erc721 \
+                    -p @0x/contracts-erc1155 \
+                    -p @0x/contracts-asset-proxy \
+                    -p @0x/contracts-broker \
+                    -p @0x/contracts-zero-ex \
+                    -m --serial -c test:circleci
+    test-foundry-local:
+        resource_class: xlarge
+        docker:
+            # Using nightly as foundry:latest is ~2 months old
+            # which seems to cause an issue with latest forge-std
+            # https://github.com/foundry-rs/forge-std/issues/230
+            - image: ghcr.io/foundry-rs/foundry:nightly
+        steps:
+            - checkout
+            - run: |
+                  git diff --name-only development >> changed.txt
+                  cat changed.txt
+                  if ! grep -q \.sol changed.txt; then
+                    circleci-agent step halt
+                  fi
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run:
+                command: git submodule update --init --recursive
+            - run:
+                command: FOUNDRY_PROFILE=local && forge test
+                working_directory: ~/project/contracts/zero-ex
+    test-foundry-forked:
+        resource_class: xlarge
+        docker:
+            # Using nightly as foundry:latest is ~2 months old
+            # which seems to cause an issue with latest forge-std
+            # https://github.com/foundry-rs/forge-std/issues/230
+            - image: ghcr.io/foundry-rs/foundry:nightly
+        steps:
+            - checkout
+            - run: |
+                  git diff --name-only development >> changed.txt
+                  cat changed.txt
+                  if ! grep -q \.sol changed.txt; then
+                    circleci-agent step halt
+                  fi
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run:
+                command: git submodule update --init --recursive
+            - run:
+                command: FOUNDRY_PROFILE=forked && forge test
+                working_directory: ~/project/contracts/zero-ex
+    test-publish:
+        resource_class: large
+        environment:
+            NODE_OPTIONS: '--max-old-space-size=6442'
+        docker:
+            - image: node:16
+            - image: 0xorg/verdaccio
+        steps:
+            - checkout
+            - run: |
+                  git diff --name-only development >> changed.txt
+                  cat changed.txt
+                  if ! grep -q packages/ changed.txt; then
+                    circleci-agent step halt
+                  fi
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run:
+                  command: yarn test:publish:circleci
+                  no_output_timeout: 1800
+            - store_artifacts:
+                  path: ~/.npm/_logs
+    test-doc-generation:
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run:
+                  command: yarn test:generate_docs:circleci
+                  no_output_timeout: 1200
+    test-rest:
+        docker:
+            - image: node:16
+        environment:
+            RUST_ROUTER: 'true'
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/contract-wrappers-test -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/order-utils -m --serial -c test:circleci
+            - save_cache:
+                  key: coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
+                  paths:
+                      - ~/repo/packages/contract-wrappers-test/coverage/lcov.info
+            - save_cache:
+                  key: coverage-order-utils-{{ checksum "yarn.lock" }}
+                  paths:
+                      - ~/repo/packages/order-utils/coverage/lcov.info
+            - save_cache:
+                  key: coverage-web3-wrapper-{{ checksum "yarn.lock" }}
+                  paths:
+                      - ~/repo/packages/web3-wrapper/coverage/lcov.info
+    static-tests:
+        resource_class: large
+        docker:
+            - image: node:16
+        steps:
+            - checkout
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - run:
+                  command: yarn lerna run lint
+            - run:
+                  command: yarn prettier:ci
+            - run:
+                  command: yarn deps_versions:ci
+            - run:
+                  command: yarn diff_md_docs:ci
+            - run:
+                  command: yarn test:links
+    submit-coverage:
+        docker:
+            - image: node:16
+        steps:
+            - restore_cache:
+                  keys:
+                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
+            - restore_cache:
+                  keys:
+                      - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
+            - restore_cache:
+                  keys:
+                      - coverage-order-utils-{{ checksum "yarn.lock" }}
+            - restore_cache:
+                  keys:
+                      - coverage-contracts-{{ checksum "yarn.lock" }}
+            - run: yarn report_coverage
+workflows:
+    version: 2
+    main:
+        jobs:
+            - build
+            # Disabled until we begin actively developing on these packages again.
+            # - test-exchange-ganache:
+            #       requires:
+            #           - build
+            # - test-integrations-ganache:
+            #       requires:
+            #           - build
+            # - test-contracts-staking-ganache:
+            #       requires:
+            #           - build
+            # - test-contracts-extra-ganache:
+            #       requires:
+            #           - build
+            - test-foundry-local:
+                  requires:
+                      - build
+            - test-foundry-forked:
+                  requires:
+                      - build
+            - test-contracts-rest-ganache:
+                  requires:
+                      - build
+            - test-rest:
+                  requires:
+                      - build
+            - static-tests:
+                  requires:
+                      - build
+            - test-publish:
+                  requires:
+                      - build
+            - test-doc-generation:
+                  requires:
+                      - build
+            # Disabled until this repo has a coveralls API key
+            # - submit-coverage:
+            #       requires:
+            #           # Disabled until we begin actively developing on these packages again.
+            #           # - test-exchange-ganache
+            #           # - test-integrations-ganache
+            #           # - test-contracts-staking-ganache
+            #           # - test-contracts-extra-ganache
+            #           - test-contracts-rest-ganache
+            #           - test-rest
+            #           - static-tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6dac477503..a95bafb040 100644
--- a/.github/workflows/ci.yml
+++ b/.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
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
index b1d7daf0ca..30ad99d0bd 100644
--- a/.gitignore
+++ b/.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/
 
diff --git a/.prettierignore b/.prettierignore
index 7d5fed993f..40926617d7 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,92 @@
 lib
 deps
 .nyc_output
+/contracts/broker/generated-wrappers
+/contracts/broker/test/generated-wrappers
+/contracts/broker/generated-artifacts
+/contracts/broker/test/generated-artifacts
+/contracts/integrations/generated-wrappers
+/contracts/integrations/test/generated-wrappers
+/contracts/integrations/generated-artifacts
+/contracts/integrations/test/generated-artifacts
+/contracts/staking/generated-wrappers
+/contracts/staking/test/generated-wrappers
+/contracts/staking/generated-artifacts
+/contracts/staking/test/generated-artifacts
+/contracts/coordinator/generated-wrappers
+/contracts/coordinator/test/generated-wrappers
+/contracts/coordinator/generated-artifacts
+/contracts/coordinator/test/generated-artifacts
+/contracts/exchange/generated-wrappers
+/contracts/exchange/test/generated-wrappers
+/contracts/exchange/generated-artifacts
+/contracts/exchange/test/generated-artifacts
+/contracts/asset-proxy/generated-wrappers
+/contracts/asset-proxy/test/generated-wrappers
+/contracts/asset-proxy/generated-artifacts
+/contracts/asset-proxy/test/generated-artifacts
+/contracts/multisig/generated-wrappers
+/contracts/multisig/test/generated-wrappers
+/contracts/multisig/generated-artifacts
+/contracts/multisig/test/generated-artifacts
+/contracts/utils/generated-wrappers
+/contracts/utils/test/generated-wrappers
+/contracts/utils/generated-artifacts
+/contracts/utils/test/generated-artifacts
+/contracts/exchange-libs/generated-wrappers
+/contracts/exchange-libs/test/generated-wrappers
+/contracts/exchange-libs/generated-artifacts
+/contracts/exchange-libs/test/generated-artifacts
+/contracts/erc20/generated-wrappers
+/contracts/erc20/test/generated-wrappers
+/contracts/erc20/generated-artifacts
+/contracts/erc20/test/generated-artifacts
+/contracts/erc721/generated-wrappers
+/contracts/erc721/test/generated-wrappers
+/contracts/erc721/generated-artifacts
+/contracts/erc721/test/generated-artifacts
+/contracts/erc1155/generated-wrappers
+/contracts/erc1155/test/generated-wrappers
+/contracts/erc1155/generated-artifacts
+/contracts/erc1155/test/generated-artifacts
+/contracts/extensions/generated-wrappers
+/contracts/extensions/test/generated-wrappers
+/contracts/extensions/generated-artifacts
+/contracts/extensions/test/generated-artifacts
+/contracts/exchange-forwarder/generated-wrappers
+/contracts/exchange-forwarder/test/generated-wrappers
+/contracts/exchange-forwarder/generated-artifacts
+/contracts/exchange-forwarder/test/generated-artifacts
+/contracts/dev-utils/generated-wrappers
+/contracts/dev-utils/test/generated-wrappers
+/contracts/dev-utils/generated-artifacts
+/contracts/dev-utils/test/generated-artifacts
+/contracts/zero-ex/foundry-artifacts
+/contracts/zero-ex/generated-wrappers
+/contracts/zero-ex/test/generated-wrappers
+/contracts/zero-ex/generated-artifacts
+/contracts/zero-ex/test/generated-artifacts
+/contracts/treasury/generated-wrappers
+/contracts/treasury/test/generated-wrappers
+/contracts/treasury/generated-artifacts
+/contracts/treasury/test/generated-artifacts
+/contracts/staking/build/
+/contracts/coordinator/build/
+/contracts/exchange/build/
+/contracts/asset-proxy/build/
+/contracts/multisig/build/
+/contracts/utils/build/
+/contracts/exchange-libs/build/
+/contracts/erc20/build/
+/contracts/erc721/build/
+/contracts/erc1155/build/
+/contracts/zero-ex/foundry-artifacts
+/contracts/zero-ex/foundry-cache
+/contracts/zero-ex/contracts/deps
+/contracts/extensions/build/
+/contracts/exchange-forwarder/build/
+/packages/asset-swapper/
+/packages/contract-wrappers/src/generated-wrappers/
 generated-artifacts/
 generated-wrappers/
 foundry-artifacts/
diff --git a/.solhint.json b/.solhint.json
index ab7a3c2621..2d4b4600b0 100644
--- a/.solhint.json
+++ b/.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"],
diff --git a/contracts/erc20/contracts/src/v06/WETH9V06.sol b/contracts/erc20/contracts/src/v06/WETH9V06.sol
new file mode 100644
index 0000000000..41646d1a4c
--- /dev/null
+++ b/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>.
+
+*/
diff --git a/contracts/erc20/test/artifacts.ts b/contracts/erc20/test/artifacts.ts
index c81daa18c0..951aefd7ca 100644
--- a/contracts/erc20/test/artifacts.ts
+++ b/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,
diff --git a/contracts/erc20/test/wrappers.ts b/contracts/erc20/test/wrappers.ts
index b639834d47..369a56bb96 100644
--- a/contracts/erc20/test/wrappers.ts
+++ b/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';
diff --git a/contracts/erc20/tsconfig.json b/contracts/erc20/tsconfig.json
index 3589fc0b0b..f7a6dccaee 100644
--- a/contracts/erc20/tsconfig.json
+++ b/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"]
diff --git a/contracts/zero-ex/README.md b/contracts/zero-ex/README.md
index 25d275bd24..e149368564 100644
--- a/contracts/zero-ex/README.md
+++ b/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
+```
diff --git a/contracts/zero-ex/contracts/deps/forge-std b/contracts/zero-ex/contracts/deps/forge-std
index 1680d7fb3e..058d2004ac 160000
--- a/contracts/zero-ex/contracts/deps/forge-std
+++ b/contracts/zero-ex/contracts/deps/forge-std
@@ -1 +1 @@
-Subproject commit 1680d7fb3e00b7b197a7336e7c88e838c7e6a3ec
+Subproject commit 058d2004ac10cc8f194625fb107fb7a87c4e702d
diff --git a/contracts/zero-ex/contracts/src/IZeroEx.sol b/contracts/zero-ex/contracts/src/IZeroEx.sol
index 9bdfcc065a..2d7953a729 100644
--- a/contracts/zero-ex/contracts/src/IZeroEx.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/ZeroEx.sol b/contracts/zero-ex/contracts/src/ZeroEx.sol
index d4c327a06e..eb88437bb5 100644
--- a/contracts/zero-ex/contracts/src/ZeroEx.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/ZeroExOptimized.sol b/contracts/zero-ex/contracts/src/ZeroExOptimized.sol
index fb0dab8bae..eb140a2660 100644
--- a/contracts/zero-ex/contracts/src/ZeroExOptimized.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibCommonRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibCommonRichErrors.sol
index 7600f50841..4e9159d992 100644
--- a/contracts/zero-ex/contracts/src/errors/LibCommonRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol
index caf2392491..b58fbd80e3 100644
--- a/contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibMetaTransactionsRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibMetaTransactionsRichErrors.sol
index 62c2da17a6..d71d12f7c6 100644
--- a/contracts/zero-ex/contracts/src/errors/LibMetaTransactionsRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibNFTOrdersRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibNFTOrdersRichErrors.sol
index 622418bb64..a0ab4ec36a 100644
--- a/contracts/zero-ex/contracts/src/errors/LibNFTOrdersRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibNativeOrdersRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibNativeOrdersRichErrors.sol
index a7966d65ca..324728bcca 100644
--- a/contracts/zero-ex/contracts/src/errors/LibNativeOrdersRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibOwnableRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibOwnableRichErrors.sol
index 5ebd8a3763..c560d967f6 100644
--- a/contracts/zero-ex/contracts/src/errors/LibOwnableRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibProxyRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibProxyRichErrors.sol
index 0efc35a8a2..e50bfea0c7 100644
--- a/contracts/zero-ex/contracts/src/errors/LibProxyRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibSignatureRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibSignatureRichErrors.sol
index 501f5e07fc..661ef417a4 100644
--- a/contracts/zero-ex/contracts/src/errors/LibSignatureRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibSimpleFunctionRegistryRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibSimpleFunctionRegistryRichErrors.sol
index 84716d0e83..f994a6fbe2 100644
--- a/contracts/zero-ex/contracts/src/errors/LibSimpleFunctionRegistryRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibTransformERC20RichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibTransformERC20RichErrors.sol
index aa825ecdfa..2ef8048aeb 100644
--- a/contracts/zero-ex/contracts/src/errors/LibTransformERC20RichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/errors/LibWalletRichErrors.sol b/contracts/zero-ex/contracts/src/errors/LibWalletRichErrors.sol
index b5ef37c431..77cea2ab13 100644
--- a/contracts/zero-ex/contracts/src/errors/LibWalletRichErrors.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/FeeCollector.sol b/contracts/zero-ex/contracts/src/external/FeeCollector.sol
index 6d377d2d49..0445265180 100644
--- a/contracts/zero-ex/contracts/src/external/FeeCollector.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/FeeCollectorController.sol b/contracts/zero-ex/contracts/src/external/FeeCollectorController.sol
index 9e823f994d..e1de982b0d 100644
--- a/contracts/zero-ex/contracts/src/external/FeeCollectorController.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/FlashWallet.sol b/contracts/zero-ex/contracts/src/external/FlashWallet.sol
index f093750f89..a1e5ca52ba 100644
--- a/contracts/zero-ex/contracts/src/external/FlashWallet.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/IFlashWallet.sol b/contracts/zero-ex/contracts/src/external/IFlashWallet.sol
index eaecdce0e3..82acd87f93 100644
--- a/contracts/zero-ex/contracts/src/external/IFlashWallet.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/ILiquidityProviderSandbox.sol b/contracts/zero-ex/contracts/src/external/ILiquidityProviderSandbox.sol
index 428c8b474c..afb9df39b9 100644
--- a/contracts/zero-ex/contracts/src/external/ILiquidityProviderSandbox.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/LibFeeCollector.sol b/contracts/zero-ex/contracts/src/external/LibFeeCollector.sol
index f05b9f7db9..4d727dab8a 100644
--- a/contracts/zero-ex/contracts/src/external/LibFeeCollector.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/LiquidityProviderSandbox.sol b/contracts/zero-ex/contracts/src/external/LiquidityProviderSandbox.sol
index 853aec423a..19a16b365f 100644
--- a/contracts/zero-ex/contracts/src/external/LiquidityProviderSandbox.sol
+++ b/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
diff --git a/contracts/zero-ex/contracts/src/external/PermissionlessTransformerDeployer.sol b/contracts/zero-ex/contracts/src/external/PermissionlessTransformerDeployer.sol
index 6430449a7d..6fc147dc59 100644
--- a/contracts/zero-ex/contracts/src/external/PermissionlessTransformerDeployer.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/external/TransformerDeployer.sol b/contracts/zero-ex/contracts/src/external/TransformerDeployer.sol
index 2d344bc5f6..486a6dde69 100644
--- a/contracts/zero-ex/contracts/src/external/TransformerDeployer.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/BatchFillNativeOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/BatchFillNativeOrdersFeature.sol
index 2294f43d0e..6b1a2d28e1 100644
--- a/contracts/zero-ex/contracts/src/features/BatchFillNativeOrdersFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/BootstrapFeature.sol b/contracts/zero-ex/contracts/src/features/BootstrapFeature.sol
index 4f32c6fb80..1b5a550e49 100644
--- a/contracts/zero-ex/contracts/src/features/BootstrapFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/ERC165Feature.sol b/contracts/zero-ex/contracts/src/features/ERC165Feature.sol
index 604ab99d03..057ed2006c 100644
--- a/contracts/zero-ex/contracts/src/features/ERC165Feature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/FundRecoveryFeature.sol b/contracts/zero-ex/contracts/src/features/FundRecoveryFeature.sol
index 33a31168f2..04bcc18767 100644
--- a/contracts/zero-ex/contracts/src/features/FundRecoveryFeature.sol
+++ b/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
diff --git a/contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.sol b/contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.sol
index 5e91cc5de5..daf4c2881d 100644
--- a/contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol b/contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol
index 08d1f36860..d000261fb7 100644
--- a/contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol
index 74f12a9d59..c23800aba6 100644
--- a/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/OtcOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/OtcOrdersFeature.sol
index 2f1395d1e9..b25a06d08a 100644
--- a/contracts/zero-ex/contracts/src/features/OtcOrdersFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/OwnableFeature.sol b/contracts/zero-ex/contracts/src/features/OwnableFeature.sol
index 475e2f694d..4000654eeb 100644
--- a/contracts/zero-ex/contracts/src/features/OwnableFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/PancakeSwapFeature.sol b/contracts/zero-ex/contracts/src/features/PancakeSwapFeature.sol
index c13c950873..aa97cdcdf9 100644
--- a/contracts/zero-ex/contracts/src/features/PancakeSwapFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/SimpleFunctionRegistryFeature.sol b/contracts/zero-ex/contracts/src/features/SimpleFunctionRegistryFeature.sol
index 8f75581ae6..01574d9af9 100644
--- a/contracts/zero-ex/contracts/src/features/SimpleFunctionRegistryFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/TransformERC20Feature.sol b/contracts/zero-ex/contracts/src/features/TransformERC20Feature.sol
index 481f7fdc45..f729533415 100644
--- a/contracts/zero-ex/contracts/src/features/TransformERC20Feature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/UniswapFeature.sol b/contracts/zero-ex/contracts/src/features/UniswapFeature.sol
index 048214c397..2318e275b6 100644
--- a/contracts/zero-ex/contracts/src/features/UniswapFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/UniswapV3Feature.sol b/contracts/zero-ex/contracts/src/features/UniswapV3Feature.sol
index c3b24da411..f3fd666a6e 100644
--- a/contracts/zero-ex/contracts/src/features/UniswapV3Feature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IBatchFillNativeOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IBatchFillNativeOrdersFeature.sol
index 62dd7621d9..f7f666cac3 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IBatchFillNativeOrdersFeature.sol
+++ b/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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IBootstrapFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IBootstrapFeature.sol
index 9d6d8055fa..953b61dcdf 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IBootstrapFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IBootstrapFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IERC1155OrdersFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IERC1155OrdersFeature.sol
index 7cd25cf4c1..79a1976969 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IERC1155OrdersFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IERC1155OrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IERC165Feature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IERC165Feature.sol
index 63fd0d7cd9..5a03d1c66b 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IERC165Feature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IERC165Feature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol
index 5cb3311fc2..8fe97f8975 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IFeature.sol
index cf5ebc19d3..74be6e99c4 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IFundRecoveryFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IFundRecoveryFeature.sol
index f30b32c9f1..e9cfa8c99e 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IFundRecoveryFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IFundRecoveryFeature.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
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/ILiquidityProviderFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/ILiquidityProviderFeature.sol
index 509020eb2a..8c41dc6ce1 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/ILiquidityProviderFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/ILiquidityProviderFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IMetaTransactionsFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IMetaTransactionsFeature.sol
index ee5e0007af..93ef027d06 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IMetaTransactionsFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IMetaTransactionsFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IMultiplexFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IMultiplexFeature.sol
index f77171f274..0a5b25fb4b 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IMultiplexFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IMultiplexFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersEvents.sol b/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersEvents.sol
index 747f8740c6..1fac1b5c47 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersEvents.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersEvents.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersFeature.sol
index 0ac96f80bf..85b8c65b72 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/INativeOrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IOtcOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IOtcOrdersFeature.sol
index 671e35622f..d6a8acb169 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IOtcOrdersFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IOtcOrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IOwnableFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IOwnableFeature.sol
index 7dfe1b9f5e..7d6b2c82fd 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IOwnableFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IOwnableFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IPancakeSwapFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IPancakeSwapFeature.sol
index 7a193dab9e..943d3102d3 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IPancakeSwapFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IPancakeSwapFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/ISimpleFunctionRegistryFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/ISimpleFunctionRegistryFeature.sol
index 537302f078..481f84a751 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/ISimpleFunctionRegistryFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/ISimpleFunctionRegistryFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/ITokenSpenderFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/ITokenSpenderFeature.sol
index c92cb6a640..fc83b6e85e 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/ITokenSpenderFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/ITokenSpenderFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/ITransformERC20Feature.sol b/contracts/zero-ex/contracts/src/features/interfaces/ITransformERC20Feature.sol
index bbb42270f1..afe427dc74 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/ITransformERC20Feature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/ITransformERC20Feature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IUniswapFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IUniswapFeature.sol
index 8500bec429..d8ab30b85e 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IUniswapFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IUniswapFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IUniswapV3Feature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IUniswapV3Feature.sol
index 314c4794db..ed784dc898 100644
--- a/contracts/zero-ex/contracts/src/features/interfaces/IUniswapV3Feature.sol
+++ b/contracts/zero-ex/contracts/src/features/interfaces/IUniswapV3Feature.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;
diff --git a/contracts/zero-ex/contracts/src/features/libs/LibNFTOrder.sol b/contracts/zero-ex/contracts/src/features/libs/LibNFTOrder.sol
index 32238c02e8..e9e417185e 100644
--- a/contracts/zero-ex/contracts/src/features/libs/LibNFTOrder.sol
+++ b/contracts/zero-ex/contracts/src/features/libs/LibNFTOrder.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;
diff --git a/contracts/zero-ex/contracts/src/features/libs/LibNativeOrder.sol b/contracts/zero-ex/contracts/src/features/libs/LibNativeOrder.sol
index 8a54bb626c..93dc083e4f 100644
--- a/contracts/zero-ex/contracts/src/features/libs/LibNativeOrder.sol
+++ b/contracts/zero-ex/contracts/src/features/libs/LibNativeOrder.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;
diff --git a/contracts/zero-ex/contracts/src/features/libs/LibSignature.sol b/contracts/zero-ex/contracts/src/features/libs/LibSignature.sol
index 2c3873d7a0..7dfe102c3d 100644
--- a/contracts/zero-ex/contracts/src/features/libs/LibSignature.sol
+++ b/contracts/zero-ex/contracts/src/features/libs/LibSignature.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexFeature.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexFeature.sol
index cd94721e17..5b1aecfab6 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexLiquidityProvider.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexLiquidityProvider.sol
index 902d95bdfe..4460549ca6 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexLiquidityProvider.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexLiquidityProvider.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexOtc.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexOtc.sol
index 6f1e1a2730..49fd673efa 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexOtc.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexOtc.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexRfq.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexRfq.sol
index 9354d0c1e5..633e9e4efb 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexRfq.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexRfq.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexTransformERC20.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexTransformERC20.sol
index cb9f152377..289401e175 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexTransformERC20.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexTransformERC20.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV2.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV2.sol
index 0c16dce598..4848699985 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV2.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV2.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;
diff --git a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV3.sol b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV3.sol
index a5bd3e4d33..c113f3b7ac 100644
--- a/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV3.sol
+++ b/contracts/zero-ex/contracts/src/features/multiplex/MultiplexUniswapV3.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;
diff --git a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersCancellation.sol b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersCancellation.sol
index b720edbc62..af4ee9deb0 100644
--- a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersCancellation.sol
+++ b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersCancellation.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;
diff --git a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersInfo.sol b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersInfo.sol
index 7a33b3d6a0..9207135e71 100644
--- a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersInfo.sol
+++ b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersInfo.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;
diff --git a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersProtocolFees.sol b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersProtocolFees.sol
index 79d1689a61..5b8768922e 100644
--- a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersProtocolFees.sol
+++ b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersProtocolFees.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;
diff --git a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersSettlement.sol b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersSettlement.sol
index 3028a0d00f..164281ed50 100644
--- a/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersSettlement.sol
+++ b/contracts/zero-ex/contracts/src/features/native_orders/NativeOrdersSettlement.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;
diff --git a/contracts/zero-ex/contracts/src/features/nft_orders/ERC1155OrdersFeature.sol b/contracts/zero-ex/contracts/src/features/nft_orders/ERC1155OrdersFeature.sol
index 78c9277364..21bbb9eb47 100644
--- a/contracts/zero-ex/contracts/src/features/nft_orders/ERC1155OrdersFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/nft_orders/ERC1155OrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/nft_orders/ERC721OrdersFeature.sol b/contracts/zero-ex/contracts/src/features/nft_orders/ERC721OrdersFeature.sol
index fe7f17324f..44f3382ada 100644
--- a/contracts/zero-ex/contracts/src/features/nft_orders/ERC721OrdersFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/nft_orders/ERC721OrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/src/features/nft_orders/NFTOrders.sol b/contracts/zero-ex/contracts/src/features/nft_orders/NFTOrders.sol
index 381440c4e8..53371df5e1 100644
--- a/contracts/zero-ex/contracts/src/features/nft_orders/NFTOrders.sol
+++ b/contracts/zero-ex/contracts/src/features/nft_orders/NFTOrders.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinCommon.sol b/contracts/zero-ex/contracts/src/fixins/FixinCommon.sol
index 63ed69fe33..811252bd24 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinCommon.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinCommon.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinEIP712.sol b/contracts/zero-ex/contracts/src/fixins/FixinEIP712.sol
index 359f07addf..5b1afa243a 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinEIP712.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinEIP712.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinERC1155Spender.sol b/contracts/zero-ex/contracts/src/fixins/FixinERC1155Spender.sol
index f43c7930b2..ae72d2a61b 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinERC1155Spender.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinERC1155Spender.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinERC721Spender.sol b/contracts/zero-ex/contracts/src/fixins/FixinERC721Spender.sol
index 4ddb177047..726157b359 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinERC721Spender.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinERC721Spender.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinProtocolFees.sol b/contracts/zero-ex/contracts/src/fixins/FixinProtocolFees.sol
index 53d36ea3d7..4217f11ce1 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinProtocolFees.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinProtocolFees.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinReentrancyGuard.sol b/contracts/zero-ex/contracts/src/fixins/FixinReentrancyGuard.sol
index 9b39623a0b..2ddf7449a5 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinReentrancyGuard.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinReentrancyGuard.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;
diff --git a/contracts/zero-ex/contracts/src/fixins/FixinTokenSpender.sol b/contracts/zero-ex/contracts/src/fixins/FixinTokenSpender.sol
index 78c101129c..2e884e2e76 100644
--- a/contracts/zero-ex/contracts/src/fixins/FixinTokenSpender.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinTokenSpender.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;
diff --git a/contracts/zero-ex/contracts/src/liquidity-providers/CurveLiquidityProvider.sol b/contracts/zero-ex/contracts/src/liquidity-providers/CurveLiquidityProvider.sol
index 637b1d42a3..5dd433538c 100644
--- a/contracts/zero-ex/contracts/src/liquidity-providers/CurveLiquidityProvider.sol
+++ b/contracts/zero-ex/contracts/src/liquidity-providers/CurveLiquidityProvider.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;
diff --git a/contracts/zero-ex/contracts/src/liquidity-providers/MooniswapLiquidityProvider.sol b/contracts/zero-ex/contracts/src/liquidity-providers/MooniswapLiquidityProvider.sol
index e7205264db..60dbf3d8ae 100644
--- a/contracts/zero-ex/contracts/src/liquidity-providers/MooniswapLiquidityProvider.sol
+++ b/contracts/zero-ex/contracts/src/liquidity-providers/MooniswapLiquidityProvider.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;
diff --git a/contracts/zero-ex/contracts/src/migrations/FullMigration.sol b/contracts/zero-ex/contracts/src/migrations/FullMigration.sol
index 6801c657e3..32042deb7e 100644
--- a/contracts/zero-ex/contracts/src/migrations/FullMigration.sol
+++ b/contracts/zero-ex/contracts/src/migrations/FullMigration.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;
diff --git a/contracts/zero-ex/contracts/src/migrations/InitialMigration.sol b/contracts/zero-ex/contracts/src/migrations/InitialMigration.sol
index 7c528a7cbf..8c51f20ac6 100644
--- a/contracts/zero-ex/contracts/src/migrations/InitialMigration.sol
+++ b/contracts/zero-ex/contracts/src/migrations/InitialMigration.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;
diff --git a/contracts/zero-ex/contracts/src/migrations/LibBootstrap.sol b/contracts/zero-ex/contracts/src/migrations/LibBootstrap.sol
index 60b5b6c6c0..1f6a6db1ea 100644
--- a/contracts/zero-ex/contracts/src/migrations/LibBootstrap.sol
+++ b/contracts/zero-ex/contracts/src/migrations/LibBootstrap.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;
diff --git a/contracts/zero-ex/contracts/src/migrations/LibMigrate.sol b/contracts/zero-ex/contracts/src/migrations/LibMigrate.sol
index f8fb85878b..212e5951de 100644
--- a/contracts/zero-ex/contracts/src/migrations/LibMigrate.sol
+++ b/contracts/zero-ex/contracts/src/migrations/LibMigrate.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibERC1155OrdersStorage.sol b/contracts/zero-ex/contracts/src/storage/LibERC1155OrdersStorage.sol
index 7c3cc81c02..20637568ad 100644
--- a/contracts/zero-ex/contracts/src/storage/LibERC1155OrdersStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibERC1155OrdersStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibERC721OrdersStorage.sol b/contracts/zero-ex/contracts/src/storage/LibERC721OrdersStorage.sol
index 83c40cd079..18c814fbef 100644
--- a/contracts/zero-ex/contracts/src/storage/LibERC721OrdersStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibERC721OrdersStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibMetaTransactionsStorage.sol b/contracts/zero-ex/contracts/src/storage/LibMetaTransactionsStorage.sol
index 78ebf30a44..00f934be7b 100644
--- a/contracts/zero-ex/contracts/src/storage/LibMetaTransactionsStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibMetaTransactionsStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibNativeOrdersStorage.sol b/contracts/zero-ex/contracts/src/storage/LibNativeOrdersStorage.sol
index 3c7e7f1e17..3981bc0fe5 100644
--- a/contracts/zero-ex/contracts/src/storage/LibNativeOrdersStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibNativeOrdersStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibOtcOrdersStorage.sol b/contracts/zero-ex/contracts/src/storage/LibOtcOrdersStorage.sol
index dbfaf60719..f12e23d0a1 100644
--- a/contracts/zero-ex/contracts/src/storage/LibOtcOrdersStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibOtcOrdersStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibOwnableStorage.sol b/contracts/zero-ex/contracts/src/storage/LibOwnableStorage.sol
index c5f4e335b6..051b3136d4 100644
--- a/contracts/zero-ex/contracts/src/storage/LibOwnableStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibOwnableStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibProxyStorage.sol b/contracts/zero-ex/contracts/src/storage/LibProxyStorage.sol
index 7d74eb2ec1..3dc3df2ec8 100644
--- a/contracts/zero-ex/contracts/src/storage/LibProxyStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibProxyStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibReentrancyGuardStorage.sol b/contracts/zero-ex/contracts/src/storage/LibReentrancyGuardStorage.sol
index cb0fe38da1..5ee71d8d61 100644
--- a/contracts/zero-ex/contracts/src/storage/LibReentrancyGuardStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibReentrancyGuardStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibSimpleFunctionRegistryStorage.sol b/contracts/zero-ex/contracts/src/storage/LibSimpleFunctionRegistryStorage.sol
index a624d68452..f5e3045d24 100644
--- a/contracts/zero-ex/contracts/src/storage/LibSimpleFunctionRegistryStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibSimpleFunctionRegistryStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibStorage.sol b/contracts/zero-ex/contracts/src/storage/LibStorage.sol
index 7b7d579535..4d758e20ab 100644
--- a/contracts/zero-ex/contracts/src/storage/LibStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibStorage.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;
diff --git a/contracts/zero-ex/contracts/src/storage/LibTransformERC20Storage.sol b/contracts/zero-ex/contracts/src/storage/LibTransformERC20Storage.sol
index 38175a2136..61973a2b77 100644
--- a/contracts/zero-ex/contracts/src/storage/LibTransformERC20Storage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibTransformERC20Storage.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/AffiliateFeeTransformer.sol b/contracts/zero-ex/contracts/src/transformers/AffiliateFeeTransformer.sol
index d24a98eb80..5ab5d2260b 100644
--- a/contracts/zero-ex/contracts/src/transformers/AffiliateFeeTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/AffiliateFeeTransformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol b/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
index ac69fed068..f1ee7080f9 100644
--- a/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.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;
@@ -167,6 +162,7 @@ contract FillQuoteTransformer is Transformer {
     ///      to this call. `buyToken` and excess ETH will be transferred back to the caller.
     /// @param context Context information.
     /// @return magicBytes The success bytes (`LibERC20Transformer.TRANSFORMER_SUCCESS`).
+    /* solhint-disable function-max-lines */
     function transform(TransformContext calldata context) external override returns (bytes4 magicBytes) {
         TransformData memory data = abi.decode(context.data, (TransformData));
         FillState memory state;
@@ -281,6 +277,8 @@ contract FillQuoteTransformer is Transformer {
         return LibERC20Transformer.TRANSFORMER_SUCCESS;
     }
 
+    /* solhint-enable function-max-lines */
+
     // Fill a single bridge order.
     function _fillBridgeOrder(
         IBridgeAdapter.BridgeOrder memory order,
diff --git a/contracts/zero-ex/contracts/src/transformers/IERC20Transformer.sol b/contracts/zero-ex/contracts/src/transformers/IERC20Transformer.sol
index 822e7e9c23..e642883ec1 100644
--- a/contracts/zero-ex/contracts/src/transformers/IERC20Transformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/IERC20Transformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/LibERC20Transformer.sol b/contracts/zero-ex/contracts/src/transformers/LibERC20Transformer.sol
index 5a63e17189..d8bd17c891 100644
--- a/contracts/zero-ex/contracts/src/transformers/LibERC20Transformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/LibERC20Transformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/LogMetadataTransformer.sol b/contracts/zero-ex/contracts/src/transformers/LogMetadataTransformer.sol
index d746aa2e79..3066e61b9b 100644
--- a/contracts/zero-ex/contracts/src/transformers/LogMetadataTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/LogMetadataTransformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/PayTakerTransformer.sol b/contracts/zero-ex/contracts/src/transformers/PayTakerTransformer.sol
index e864e0e24b..8a4d774c07 100644
--- a/contracts/zero-ex/contracts/src/transformers/PayTakerTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/PayTakerTransformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/PositiveSlippageFeeTransformer.sol b/contracts/zero-ex/contracts/src/transformers/PositiveSlippageFeeTransformer.sol
index 651dd960c0..f1373a766a 100644
--- a/contracts/zero-ex/contracts/src/transformers/PositiveSlippageFeeTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/PositiveSlippageFeeTransformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/Transformer.sol b/contracts/zero-ex/contracts/src/transformers/Transformer.sol
index 4ea65da9bc..62544b7ec8 100644
--- a/contracts/zero-ex/contracts/src/transformers/Transformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/Transformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/WethTransformer.sol b/contracts/zero-ex/contracts/src/transformers/WethTransformer.sol
index 8066f9c26e..c7cedd4949 100644
--- a/contracts/zero-ex/contracts/src/transformers/WethTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/WethTransformer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/AbstractBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/AbstractBridgeAdapter.sol
index fc302c9e56..c78d91a37f 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/AbstractBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/AbstractBridgeAdapter.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
index d5280ef6c1..4d4eb0a6b5 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol
index 41b9a56353..5726fd4da1 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/AvalancheBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/BSCBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/BSCBridgeAdapter.sol
index 315e97bcdc..122e233e42 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BSCBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BSCBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol b/contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol
index 9b5f631788..f2c4ce73fd 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/CeloBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/CeloBridgeAdapter.sol
index 38e84366a9..b94b958367 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/CeloBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/CeloBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol
index ead5f04185..bb911510fd 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol
index ffe00718a8..ec6165703c 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/IBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/IBridgeAdapter.sol
index a99827959b..ffd45149d6 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/IBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/IBridgeAdapter.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol
index 38bc6dfe9d..c5a4115ed5 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol
@@ -1,6 +1,6 @@
 // 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
@@ -41,6 +41,7 @@ contract OptimismBridgeAdapter is
 {
     constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(true) {}
 
+    /* solhint-disable function-max-lines */
     function _trade(
         BridgeOrder memory order,
         IERC20TokenV06 sellToken,
@@ -98,4 +99,5 @@ contract OptimismBridgeAdapter is
 
         emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);
     }
+    /* solhint-enable function-max-lines */
 }
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol
index 16a44db66d..9ccb827ac3 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV2.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV2.sol
index f8e8233a73..35f4252fa5 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV2.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV2.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV3.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV3.sol
index 175aa1b42d..b3b9ba60ce 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV3.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV3.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancer.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancer.sol
index b751c945f0..60c63b5ff4 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancer.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol
index 4d3f853cdb..4054e381cf 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancor.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancor.sol
index 8d0c60a40b..46a6b35402 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancor.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancor.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancorV3.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancorV3.sol
index 0ec1a3ea10..91ed720d31 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancorV3.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancorV3.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCompound.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCompound.sol
index c7423a2d0b..24f99c1f6a 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCompound.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCompound.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCryptoCom.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCryptoCom.sol
index a3ec217c55..3d06a81c53 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCryptoCom.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCryptoCom.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurve.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurve.sol
index a51f8d6b13..1b016563f1 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurve.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurve.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurveV2.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurveV2.sol
index 17210ed3f5..9b3b7b7969 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurveV2.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinCurveV2.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodo.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodo.sol
index d36df63740..17986db954 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodo.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodo.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodoV2.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodoV2.sol
index 32d467ec40..a20a9e3200 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodoV2.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinDodoV2.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinGMX.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinGMX.sol
index 6ffe11a019..68eae45099 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinGMX.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinGMX.sol
@@ -1,7 +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
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol
index 1f9ed315c4..eb9f32c727 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
-
 /*
 
   Copyright 2021 ZeroEx Intl.
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinLido.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinLido.sol
index 0ab67c7f7d..040abc23ca 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinLido.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinLido.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMStable.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMStable.sol
index 0625a0965f..2c9816415f 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMStable.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMStable.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMakerPSM.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMakerPSM.sol
index dda4e0a7d4..efd982b69b 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMakerPSM.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMakerPSM.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol
index 35a346fe8a..9987886b31 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMooniswap.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinNerve.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinNerve.sol
index 074f37f7f5..9798cd10b6 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinNerve.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinNerve.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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinPlatypus.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinPlatypus.sol
index a5a1574c2e..a11777578e 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinPlatypus.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinPlatypus.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
index c64520b2b5..fee7c10611 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSolidly.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSolidly.sol
index cc6e239458..03cdd33cd7 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSolidly.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSolidly.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSynthetix.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSynthetix.sol
index da4d0547e3..75428942d8 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSynthetix.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSynthetix.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.5;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswap.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswap.sol
index 5d34221caf..22994382d6 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswap.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswap.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;
@@ -99,6 +94,7 @@ contract MixinUniswap {
         WETH = weth;
     }
 
+    //·solhint-disable-next-line·function-max-lines
     function _tradeUniswap(
         IERC20TokenV06 sellToken,
         IERC20TokenV06 buyToken,
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV2.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV2.sol
index 852303bad7..8efab70c20 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV2.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV2.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV3.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV3.sol
index 53f46a787a..94e6854be8 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV3.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinUniswapV3.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinWOOFi.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinWOOFi.sol
index 23c49811e2..7b208cfeeb 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinWOOFi.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinWOOFi.sol
@@ -1,7 +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
diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol
index ec72dfc7df..5de0d04968 100644
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinZeroExBridge.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/IERC1155Token.sol b/contracts/zero-ex/contracts/src/vendor/IERC1155Token.sol
index 7962c19209..0c6ac31c48 100644
--- a/contracts/zero-ex/contracts/src/vendor/IERC1155Token.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IERC1155Token.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/IERC721Token.sol b/contracts/zero-ex/contracts/src/vendor/IERC721Token.sol
index a27eec1cc2..c00a3b4230 100644
--- a/contracts/zero-ex/contracts/src/vendor/IERC721Token.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IERC721Token.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/IFeeRecipient.sol b/contracts/zero-ex/contracts/src/vendor/IFeeRecipient.sol
index 197c825982..6fd2384129 100644
--- a/contracts/zero-ex/contracts/src/vendor/IFeeRecipient.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IFeeRecipient.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/ILiquidityProvider.sol b/contracts/zero-ex/contracts/src/vendor/ILiquidityProvider.sol
index 45e48c67d7..4996dbd83d 100644
--- a/contracts/zero-ex/contracts/src/vendor/ILiquidityProvider.sol
+++ b/contracts/zero-ex/contracts/src/vendor/ILiquidityProvider.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/IMooniswapPool.sol b/contracts/zero-ex/contracts/src/vendor/IMooniswapPool.sol
index aea8933d21..4b6f5c5657 100644
--- a/contracts/zero-ex/contracts/src/vendor/IMooniswapPool.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IMooniswapPool.sol
@@ -1,21 +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;
diff --git a/contracts/zero-ex/contracts/src/vendor/IPropertyValidator.sol b/contracts/zero-ex/contracts/src/vendor/IPropertyValidator.sol
index 5674d92554..944993209f 100644
--- a/contracts/zero-ex/contracts/src/vendor/IPropertyValidator.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IPropertyValidator.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/ITakerCallback.sol b/contracts/zero-ex/contracts/src/vendor/ITakerCallback.sol
index 9ada07755b..64e2b27f14 100644
--- a/contracts/zero-ex/contracts/src/vendor/ITakerCallback.sol
+++ b/contracts/zero-ex/contracts/src/vendor/ITakerCallback.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/IUniswapV2Pair.sol b/contracts/zero-ex/contracts/src/vendor/IUniswapV2Pair.sol
index 5b3a2d4a3c..a561f1c8f8 100644
--- a/contracts/zero-ex/contracts/src/vendor/IUniswapV2Pair.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IUniswapV2Pair.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.12;
diff --git a/contracts/zero-ex/contracts/src/vendor/IUniswapV3Pool.sol b/contracts/zero-ex/contracts/src/vendor/IUniswapV3Pool.sol
index 0f8a7de3b3..4d6839a8b4 100644
--- a/contracts/zero-ex/contracts/src/vendor/IUniswapV3Pool.sol
+++ b/contracts/zero-ex/contracts/src/vendor/IUniswapV3Pool.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.12;
diff --git a/contracts/zero-ex/contracts/src/vendor/v3/IERC20Bridge.sol b/contracts/zero-ex/contracts/src/vendor/v3/IERC20Bridge.sol
index 2fc98101de..3f5504f3cf 100644
--- a/contracts/zero-ex/contracts/src/vendor/v3/IERC20Bridge.sol
+++ b/contracts/zero-ex/contracts/src/vendor/v3/IERC20Bridge.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;
diff --git a/contracts/zero-ex/contracts/src/vendor/v3/IStaking.sol b/contracts/zero-ex/contracts/src/vendor/v3/IStaking.sol
index ffa49757a1..312c6276fc 100644
--- a/contracts/zero-ex/contracts/src/vendor/v3/IStaking.sol
+++ b/contracts/zero-ex/contracts/src/vendor/v3/IStaking.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;
diff --git a/contracts/zero-ex/contracts/test/ITestSimpleFunctionRegistryFeature.sol b/contracts/zero-ex/contracts/test/ITestSimpleFunctionRegistryFeature.sol
index bb4824652d..3eebe2a53a 100644
--- a/contracts/zero-ex/contracts/test/ITestSimpleFunctionRegistryFeature.sol
+++ b/contracts/zero-ex/contracts/test/ITestSimpleFunctionRegistryFeature.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;
diff --git a/contracts/zero-ex/contracts/test/TestDelegateCaller.sol b/contracts/zero-ex/contracts/test/TestDelegateCaller.sol
index 4012e6e6ea..78f12f0f2f 100644
--- a/contracts/zero-ex/contracts/test/TestDelegateCaller.sol
+++ b/contracts/zero-ex/contracts/test/TestDelegateCaller.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;
diff --git a/contracts/zero-ex/contracts/test/TestFeeCollectorController.sol b/contracts/zero-ex/contracts/test/TestFeeCollectorController.sol
index a3ee26fae4..8935f4daef 100644
--- a/contracts/zero-ex/contracts/test/TestFeeCollectorController.sol
+++ b/contracts/zero-ex/contracts/test/TestFeeCollectorController.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;
diff --git a/contracts/zero-ex/contracts/test/TestFeeRecipient.sol b/contracts/zero-ex/contracts/test/TestFeeRecipient.sol
index e5f25b32c6..394407c557 100644
--- a/contracts/zero-ex/contracts/test/TestFeeRecipient.sol
+++ b/contracts/zero-ex/contracts/test/TestFeeRecipient.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;
diff --git a/contracts/zero-ex/contracts/test/TestFillQuoteTransformerBridge.sol b/contracts/zero-ex/contracts/test/TestFillQuoteTransformerBridge.sol
index 4d89fa7b7f..05ac512634 100644
--- a/contracts/zero-ex/contracts/test/TestFillQuoteTransformerBridge.sol
+++ b/contracts/zero-ex/contracts/test/TestFillQuoteTransformerBridge.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;
diff --git a/contracts/zero-ex/contracts/test/TestFillQuoteTransformerExchange.sol b/contracts/zero-ex/contracts/test/TestFillQuoteTransformerExchange.sol
index d971560003..5b2936300a 100644
--- a/contracts/zero-ex/contracts/test/TestFillQuoteTransformerExchange.sol
+++ b/contracts/zero-ex/contracts/test/TestFillQuoteTransformerExchange.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;
diff --git a/contracts/zero-ex/contracts/test/TestFillQuoteTransformerHost.sol b/contracts/zero-ex/contracts/test/TestFillQuoteTransformerHost.sol
index c406975203..e8217af9a8 100644
--- a/contracts/zero-ex/contracts/test/TestFillQuoteTransformerHost.sol
+++ b/contracts/zero-ex/contracts/test/TestFillQuoteTransformerHost.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;
diff --git a/contracts/zero-ex/contracts/test/TestFixinProtocolFees.sol b/contracts/zero-ex/contracts/test/TestFixinProtocolFees.sol
index bb497129aa..7a8ccb4f3d 100644
--- a/contracts/zero-ex/contracts/test/TestFixinProtocolFees.sol
+++ b/contracts/zero-ex/contracts/test/TestFixinProtocolFees.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;
diff --git a/contracts/zero-ex/contracts/test/TestFixinTokenSpender.sol b/contracts/zero-ex/contracts/test/TestFixinTokenSpender.sol
index a971f411a7..a511e0d1a5 100644
--- a/contracts/zero-ex/contracts/test/TestFixinTokenSpender.sol
+++ b/contracts/zero-ex/contracts/test/TestFixinTokenSpender.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;
diff --git a/contracts/zero-ex/contracts/test/TestFullMigration.sol b/contracts/zero-ex/contracts/test/TestFullMigration.sol
index 59e846589f..7325e08adc 100644
--- a/contracts/zero-ex/contracts/test/TestFullMigration.sol
+++ b/contracts/zero-ex/contracts/test/TestFullMigration.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;
diff --git a/contracts/zero-ex/contracts/test/TestInitialMigration.sol b/contracts/zero-ex/contracts/test/TestInitialMigration.sol
index c1d560b7f3..fc609c6dd2 100644
--- a/contracts/zero-ex/contracts/test/TestInitialMigration.sol
+++ b/contracts/zero-ex/contracts/test/TestInitialMigration.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;
diff --git a/contracts/zero-ex/contracts/test/TestLibNativeOrder.sol b/contracts/zero-ex/contracts/test/TestLibNativeOrder.sol
index dedfbb0b67..9b0ed2a4c9 100644
--- a/contracts/zero-ex/contracts/test/TestLibNativeOrder.sol
+++ b/contracts/zero-ex/contracts/test/TestLibNativeOrder.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 
diff --git a/contracts/zero-ex/contracts/test/TestLibSignature.sol b/contracts/zero-ex/contracts/test/TestLibSignature.sol
index 76fc360f5e..bec0e897cd 100644
--- a/contracts/zero-ex/contracts/test/TestLibSignature.sol
+++ b/contracts/zero-ex/contracts/test/TestLibSignature.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;
diff --git a/contracts/zero-ex/contracts/test/TestMetaTransactionsNativeOrdersFeature.sol b/contracts/zero-ex/contracts/test/TestMetaTransactionsNativeOrdersFeature.sol
index f0e93d635b..20e8b3ace8 100644
--- a/contracts/zero-ex/contracts/test/TestMetaTransactionsNativeOrdersFeature.sol
+++ b/contracts/zero-ex/contracts/test/TestMetaTransactionsNativeOrdersFeature.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;
diff --git a/contracts/zero-ex/contracts/test/TestMetaTransactionsTransformERC20Feature.sol b/contracts/zero-ex/contracts/test/TestMetaTransactionsTransformERC20Feature.sol
index cbcb1a738f..d2e29d681f 100644
--- a/contracts/zero-ex/contracts/test/TestMetaTransactionsTransformERC20Feature.sol
+++ b/contracts/zero-ex/contracts/test/TestMetaTransactionsTransformERC20Feature.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;
@@ -37,6 +32,7 @@ contract TestMetaTransactionsTransformERC20Feature is TransformERC20Feature {
 
     constructor() public TransformERC20Feature() {}
 
+    /* solhint-disable function-max-lines */
     function _transformERC20(
         TransformERC20Args memory args
     ) public payable override returns (uint256 outputTokenAmount) {
@@ -101,4 +97,5 @@ contract TestMetaTransactionsTransformERC20Feature is TransformERC20Feature {
         );
         return 1337;
     }
+    /* solhint-enable function-max-lines */
 }
diff --git a/contracts/zero-ex/contracts/test/TestMigrator.sol b/contracts/zero-ex/contracts/test/TestMigrator.sol
index 04024f974b..298c8867b2 100644
--- a/contracts/zero-ex/contracts/test/TestMigrator.sol
+++ b/contracts/zero-ex/contracts/test/TestMigrator.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;
diff --git a/contracts/zero-ex/contracts/test/TestMintTokenERC20Transformer.sol b/contracts/zero-ex/contracts/test/TestMintTokenERC20Transformer.sol
index 68193aae5c..b27978c1fb 100644
--- a/contracts/zero-ex/contracts/test/TestMintTokenERC20Transformer.sol
+++ b/contracts/zero-ex/contracts/test/TestMintTokenERC20Transformer.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;
diff --git a/contracts/zero-ex/contracts/test/TestNFTOrderPresigner.sol b/contracts/zero-ex/contracts/test/TestNFTOrderPresigner.sol
index 0e986ff2f6..1ea39dad1d 100644
--- a/contracts/zero-ex/contracts/test/TestNFTOrderPresigner.sol
+++ b/contracts/zero-ex/contracts/test/TestNFTOrderPresigner.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;
diff --git a/contracts/zero-ex/contracts/test/TestNativeOrdersFeature.sol b/contracts/zero-ex/contracts/test/TestNativeOrdersFeature.sol
index 06f6c8982f..821d758d3a 100644
--- a/contracts/zero-ex/contracts/test/TestNativeOrdersFeature.sol
+++ b/contracts/zero-ex/contracts/test/TestNativeOrdersFeature.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 
diff --git a/contracts/zero-ex/contracts/test/TestNoEthRecipient.sol b/contracts/zero-ex/contracts/test/TestNoEthRecipient.sol
index b510890b98..c21c41ec48 100644
--- a/contracts/zero-ex/contracts/test/TestNoEthRecipient.sol
+++ b/contracts/zero-ex/contracts/test/TestNoEthRecipient.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 
 contract TestNoEthRecipient {}
diff --git a/contracts/zero-ex/contracts/test/TestOrderSignerRegistryWithContractWallet.sol b/contracts/zero-ex/contracts/test/TestOrderSignerRegistryWithContractWallet.sol
index f52b7dad7d..b00fddaa14 100644
--- a/contracts/zero-ex/contracts/test/TestOrderSignerRegistryWithContractWallet.sol
+++ b/contracts/zero-ex/contracts/test/TestOrderSignerRegistryWithContractWallet.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;
diff --git a/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerSuicidal.sol b/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerSuicidal.sol
index f3ae3e7795..0b605b1fee 100644
--- a/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerSuicidal.sol
+++ b/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerSuicidal.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;
diff --git a/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerTransformer.sol b/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerTransformer.sol
index f5455b4600..a119560ab2 100644
--- a/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerTransformer.sol
+++ b/contracts/zero-ex/contracts/test/TestPermissionlessTransformerDeployerTransformer.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;
diff --git a/contracts/zero-ex/contracts/test/TestPropertyValidator.sol b/contracts/zero-ex/contracts/test/TestPropertyValidator.sol
index 9aeff02058..800d90c9e9 100644
--- a/contracts/zero-ex/contracts/test/TestPropertyValidator.sol
+++ b/contracts/zero-ex/contracts/test/TestPropertyValidator.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;
diff --git a/contracts/zero-ex/contracts/test/TestRfqOriginRegistration.sol b/contracts/zero-ex/contracts/test/TestRfqOriginRegistration.sol
index 739b1e219f..a6ec3bc53c 100644
--- a/contracts/zero-ex/contracts/test/TestRfqOriginRegistration.sol
+++ b/contracts/zero-ex/contracts/test/TestRfqOriginRegistration.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;
diff --git a/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl1.sol b/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl1.sol
index bfea8eaa05..b3e96a3f46 100644
--- a/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl1.sol
+++ b/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl1.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;
diff --git a/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl2.sol b/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl2.sol
index 4e6644f52c..f4418b8231 100644
--- a/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl2.sol
+++ b/contracts/zero-ex/contracts/test/TestSimpleFunctionRegistryFeatureImpl2.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;
diff --git a/contracts/zero-ex/contracts/test/TestStaking.sol b/contracts/zero-ex/contracts/test/TestStaking.sol
index 0df32bac38..e7242c6680 100644
--- a/contracts/zero-ex/contracts/test/TestStaking.sol
+++ b/contracts/zero-ex/contracts/test/TestStaking.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;
diff --git a/contracts/zero-ex/contracts/test/TestTransformERC20.sol b/contracts/zero-ex/contracts/test/TestTransformERC20.sol
index 4408a4e6ac..078333ceed 100644
--- a/contracts/zero-ex/contracts/test/TestTransformERC20.sol
+++ b/contracts/zero-ex/contracts/test/TestTransformERC20.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;
diff --git a/contracts/zero-ex/contracts/test/TestTransformerBase.sol b/contracts/zero-ex/contracts/test/TestTransformerBase.sol
index de12f4d339..3066c98b24 100644
--- a/contracts/zero-ex/contracts/test/TestTransformerBase.sol
+++ b/contracts/zero-ex/contracts/test/TestTransformerBase.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;
diff --git a/contracts/zero-ex/contracts/test/TestTransformerDeployerTransformer.sol b/contracts/zero-ex/contracts/test/TestTransformerDeployerTransformer.sol
index 5440c5e4de..8155cee7c1 100644
--- a/contracts/zero-ex/contracts/test/TestTransformerDeployerTransformer.sol
+++ b/contracts/zero-ex/contracts/test/TestTransformerDeployerTransformer.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;
diff --git a/contracts/zero-ex/contracts/test/TestTransformerHost.sol b/contracts/zero-ex/contracts/test/TestTransformerHost.sol
index 676c896c33..e1c93ed2e5 100644
--- a/contracts/zero-ex/contracts/test/TestTransformerHost.sol
+++ b/contracts/zero-ex/contracts/test/TestTransformerHost.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;
diff --git a/contracts/zero-ex/contracts/test/TestUniswapV3Feature.sol b/contracts/zero-ex/contracts/test/TestUniswapV3Feature.sol
index 870c5395f1..a32d26eb8b 100644
--- a/contracts/zero-ex/contracts/test/TestUniswapV3Feature.sol
+++ b/contracts/zero-ex/contracts/test/TestUniswapV3Feature.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 import "../src/features/UniswapV3Feature.sol";
diff --git a/contracts/zero-ex/contracts/test/TestWethTransformerHost.sol b/contracts/zero-ex/contracts/test/TestWethTransformerHost.sol
index 9f1e21266a..aece8c6b61 100644
--- a/contracts/zero-ex/contracts/test/TestWethTransformerHost.sol
+++ b/contracts/zero-ex/contracts/test/TestWethTransformerHost.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;
diff --git a/contracts/zero-ex/contracts/test/integration/TestCurve.sol b/contracts/zero-ex/contracts/test/integration/TestCurve.sol
index 7671e66535..a3fe2a141d 100644
--- a/contracts/zero-ex/contracts/test/integration/TestCurve.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestCurve.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;
diff --git a/contracts/zero-ex/contracts/test/integration/TestLiquidityProvider.sol b/contracts/zero-ex/contracts/test/integration/TestLiquidityProvider.sol
index 8c1dc6b972..1d459c0e3a 100644
--- a/contracts/zero-ex/contracts/test/integration/TestLiquidityProvider.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestLiquidityProvider.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;
diff --git a/contracts/zero-ex/contracts/test/integration/TestMooniswap.sol b/contracts/zero-ex/contracts/test/integration/TestMooniswap.sol
index 900b345ac6..2f11297bbc 100644
--- a/contracts/zero-ex/contracts/test/integration/TestMooniswap.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestMooniswap.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;
diff --git a/contracts/zero-ex/contracts/test/integration/TestUniswapV2Factory.sol b/contracts/zero-ex/contracts/test/integration/TestUniswapV2Factory.sol
index 3c67d226cf..27d7c78094 100644
--- a/contracts/zero-ex/contracts/test/integration/TestUniswapV2Factory.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestUniswapV2Factory.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
diff --git a/contracts/zero-ex/contracts/test/integration/TestUniswapV2Pool.sol b/contracts/zero-ex/contracts/test/integration/TestUniswapV2Pool.sol
index 00d400d687..cb0761d9f6 100644
--- a/contracts/zero-ex/contracts/test/integration/TestUniswapV2Pool.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestUniswapV2Pool.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
diff --git a/contracts/zero-ex/contracts/test/integration/TestUniswapV3Factory.sol b/contracts/zero-ex/contracts/test/integration/TestUniswapV3Factory.sol
index 07e8726445..89d604f46d 100644
--- a/contracts/zero-ex/contracts/test/integration/TestUniswapV3Factory.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestUniswapV3Factory.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
diff --git a/contracts/zero-ex/contracts/test/integration/TestUniswapV3Pool.sol b/contracts/zero-ex/contracts/test/integration/TestUniswapV3Pool.sol
index 8b75f21b19..411c2a7a28 100644
--- a/contracts/zero-ex/contracts/test/integration/TestUniswapV3Pool.sol
+++ b/contracts/zero-ex/contracts/test/integration/TestUniswapV3Pool.sol
@@ -1,4 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
+/*
+  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;
 pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
diff --git a/contracts/zero-ex/contracts/test/tokens/TestMintableERC20Token.sol b/contracts/zero-ex/contracts/test/tokens/TestMintableERC20Token.sol
index 63e7917cdf..327d280264 100644
--- a/contracts/zero-ex/contracts/test/tokens/TestMintableERC20Token.sol
+++ b/contracts/zero-ex/contracts/test/tokens/TestMintableERC20Token.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;
diff --git a/contracts/zero-ex/contracts/test/tokens/TestMintableERC721Token.sol b/contracts/zero-ex/contracts/test/tokens/TestMintableERC721Token.sol
index c0c0a9b3de..ea0372f28b 100644
--- a/contracts/zero-ex/contracts/test/tokens/TestMintableERC721Token.sol
+++ b/contracts/zero-ex/contracts/test/tokens/TestMintableERC721Token.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;
diff --git a/contracts/zero-ex/contracts/test/tokens/TestTokenSpenderERC20Token.sol b/contracts/zero-ex/contracts/test/tokens/TestTokenSpenderERC20Token.sol
index ee3879aaf6..e6067e264a 100644
--- a/contracts/zero-ex/contracts/test/tokens/TestTokenSpenderERC20Token.sol
+++ b/contracts/zero-ex/contracts/test/tokens/TestTokenSpenderERC20Token.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;
diff --git a/contracts/zero-ex/contracts/test/tokens/TestWeth.sol b/contracts/zero-ex/contracts/test/tokens/TestWeth.sol
index 1afdcd1dda..32b1e80fb7 100644
--- a/contracts/zero-ex/contracts/test/tokens/TestWeth.sol
+++ b/contracts/zero-ex/contracts/test/tokens/TestWeth.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;
diff --git a/contracts/zero-ex/foundry.toml b/contracts/zero-ex/foundry.toml
index ddf0bbeeba..eebb991271 100644
--- a/contracts/zero-ex/foundry.toml
+++ b/contracts/zero-ex/foundry.toml
@@ -3,5 +3,23 @@ src = 'contracts/src'
 out = 'foundry-artifacts'
 test = 'tests'
 libs = ["contracts/deps/", "../utils/contracts/src/"]
-remappings = ['@0x/contracts-utils/=../utils/', '@0x/contracts-erc20/=../erc20/', 'src/=./contracts/src']
+remappings = [
+    'forge-std/=contracts/deps/forge-std/src/',
+    'ds-test/=contracts/deps/forge-std/lib/ds-test/src/',
+    '@0x/contracts-utils/=../utils/',
+    '@0x/contracts-erc20/=../erc20/',
+    'src/=./contracts/src',
+    'samplers/=contracts/test/samplers',
+    'utils/=./tests/utils',
+]
 optimizer_runs = 1000000
+fs_permissions = [{ access = "read", path = "./" }]
+
+[rpc_endpoints]
+arbitrum = "${ARBITRUM_RPC_URL}"
+avalanche = "${AVALANCHE_RPC_URL}"
+bsc = "${BSC_RPC_URL}"
+fantom = "${FANTOM_RPC_URL}"
+mainnet = "${MAINNET_RPC_URL}"
+optimism = "${OPTIMISM_RPC_URL}"
+polygon = "${POLYGON_RPC_URL}"
diff --git a/contracts/zero-ex/package.json b/contracts/zero-ex/package.json
index 624c4c2177..110dc13478 100644
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -15,6 +15,7 @@
         "build:ts": "tsc -b",
         "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
         "test": "yarn run_mocha",
+        "test:integration": "forge test -vvv",
         "rebuild_and_test": "run-s build test",
         "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
         "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
diff --git a/contracts/zero-ex/tests/BaseTest.sol b/contracts/zero-ex/tests/BaseTest.sol
index 30bf48d3a8..7165e2a93a 100644
--- a/contracts/zero-ex/tests/BaseTest.sol
+++ b/contracts/zero-ex/tests/BaseTest.sol
@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
   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;
diff --git a/contracts/zero-ex/tests/FlashWalletTest.t.sol b/contracts/zero-ex/tests/FlashWalletTest.t.sol
index 219431076e..c3e98a93a8 100644
--- a/contracts/zero-ex/tests/FlashWalletTest.t.sol
+++ b/contracts/zero-ex/tests/FlashWalletTest.t.sol
@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
   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;
diff --git a/contracts/zero-ex/tests/ForkUtils.t.sol b/contracts/zero-ex/tests/ForkUtils.t.sol
new file mode 100644
index 0000000000..1464a2e398
--- /dev/null
+++ b/contracts/zero-ex/tests/ForkUtils.t.sol
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+
+pragma experimental ABIEncoderV2;
+
+import "utils/ForkUtils.sol";
+import "utils/TestUtils.sol";
+import "src/IZeroEx.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/transformers/bridges/EthereumBridgeAdapter.sol";
+import "src/transformers/bridges/PolygonBridgeAdapter.sol";
+import "src/transformers/bridges/ArbitrumBridgeAdapter.sol";
+import "src/transformers/bridges/OptimismBridgeAdapter.sol";
+import "src/transformers/bridges/AvalancheBridgeAdapter.sol";
+import "src/transformers/bridges/FantomBridgeAdapter.sol";
+import "src/transformers/bridges/CeloBridgeAdapter.sol";
+import "src/features/OtcOrdersFeature.sol";
+
+contract ForkUtilsTest is Test, ForkUtils, TestUtils {
+    /*//////////////////////////////////////////////////////////////
+                                 Rpc Setup
+    //////////////////////////////////////////////////////////////*/
+    function setUp() public {
+        _setup();
+    }
+
+    function test_transformERC20Forked() public {}
+
+    function logAddresses(string memory chainName, string memory chainId) public {
+        bytes memory details = json.parseRaw(chainId);
+        addresses = abi.decode(details, (ContractAddresses));
+    }
+}
diff --git a/contracts/zero-ex/tests/WrapEth.sol b/contracts/zero-ex/tests/WrapEth.sol
new file mode 100644
index 0000000000..6ec3fc8919
--- /dev/null
+++ b/contracts/zero-ex/tests/WrapEth.sol
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+pragma experimental ABIEncoderV2;
+
+import "./utils/ForkUtils.sol";
+import "./utils/TestUtils.sol";
+import "./utils/DeployZeroEx.sol";
+import "forge-std/Test.sol";
+import "src/IZeroEx.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/transformers/bridges/EthereumBridgeAdapter.sol";
+import "src/IZeroEx.sol";
+
+contract WrapEth is Test, ForkUtils, TestUtils {
+    DeployZeroEx.ZeroExDeployed zeroExDeployed;
+
+    function setUp() public {
+        zeroExDeployed = new DeployZeroEx().deployZeroEx();
+        vm.deal(address(this), 1e19);
+    }
+
+    function test_transformERC20() public {
+        emit log_string("-----Preparing ETH->WETH transformation through TransformERC20()-----");
+        emit log_string("   --Building Up Transformations--");
+        ITransformERC20Feature.Transformation[] memory transformations = new ITransformERC20Feature.Transformation[](1);
+
+        emit log_named_address("    Finding TransformerDeployer nonce @", address(zeroExDeployed.transformerDeployer));
+        emit log_named_uint(
+            "       Deployer nonce",
+            _findTransformerNonce(
+                address(zeroExDeployed.transformers.wethTransformer),
+                address(zeroExDeployed.transformerDeployer)
+            )
+        );
+        transformations[0].deploymentNonce = _findTransformerNonce(
+            address(zeroExDeployed.transformers.wethTransformer),
+            address(zeroExDeployed.transformerDeployer)
+        );
+        transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
+
+        emit log_string("   ---Calling TransformERC20()---");
+        uint256 balanceETHBefore = address(this).balance;
+        uint256 balanceWETHBefore = zeroExDeployed.weth.balanceOf(address(this));
+        zeroExDeployed.zeroEx.transformERC20{value: 1e18}(
+            // input token
+            IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
+            // output token
+            IERC20TokenV06(address(zeroExDeployed.weth)),
+            // input token amount
+            1e18,
+            // min output token amount
+            1e18,
+            // list of transform
+            transformations
+        );
+        assert(zeroExDeployed.weth.balanceOf(address(this)) == 1e18);
+        emit log_string("       Successful Transformation Complete");
+        emit log_named_uint("           ETH BALANCE BEFORE:", balanceETHBefore);
+        emit log_named_uint("           ETH BALANCE AFTER:", address(this).balance);
+        emit log_named_uint("           WETH BALANCE BEFORE:", balanceWETHBefore);
+        emit log_named_uint("           WETH BALANCE AFTER:", zeroExDeployed.weth.balanceOf(address(this)));
+    }
+}
diff --git a/contracts/zero-ex/tests/ZeroExTest.t.sol b/contracts/zero-ex/tests/ZeroExTest.t.sol
index 61a05f2de5..318ab02148 100644
--- a/contracts/zero-ex/tests/ZeroExTest.t.sol
+++ b/contracts/zero-ex/tests/ZeroExTest.t.sol
@@ -1,20 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-
   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;
diff --git a/contracts/zero-ex/tests/addresses/Addresses.json b/contracts/zero-ex/tests/addresses/Addresses.json
new file mode 100644
index 0000000000..e335d2f847
--- /dev/null
+++ b/contracts/zero-ex/tests/addresses/Addresses.json
@@ -0,0 +1,149 @@
+{
+    "1": {
+        "zrxToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
+        "etherToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+        "zeroExGovernor": "0x7d3455421bbc5ed534a83c88fd80387dc8271392",
+        "zrxVault": "0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf",
+        "staking": "0x2a17c35ff147b32f13f19f2e311446eeb02503f3",
+        "stakingProxy": "0xa26e80e7dea86279c6d778d702cc413e6cffa777",
+        "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
+        "erc20BridgeSampler": "0xd8c38704c9937ea3312de29f824b4ad3450a5e61",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb",
+        "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18",
+        "exchangeProxyLiquidityProviderSandbox": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a",
+        "zrxTreasury": "0x0bb1810061c2f5b2088054ee184e6c79e1591101",
+        "wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
+        "payTakerTransformer": "0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e",
+        "affiliateFeeTransformer": "0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f",
+        "fillQuoteTransformer": "0xd75a9019a2a1782ea670e4f4a55f04b43514ed53",
+        "positiveSlippageFeeTransformer": "0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd"
+    },
+    "56": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0xccc9769c1a58766e79423a34b2cc5052d65c1983",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0xde7b2747624a647600fdb349184d0448ab954929",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f",
+        "payTakerTransformer": "0x4f5e8ca2cadecd4a467ae441e4b03de4278a4574",
+        "affiliateFeeTransformer": "0x1be34ab9b2acb5c4ddd89454bdce637967e65230",
+        "fillQuoteTransformer": "0xbd7fd6e116fc8589bb658fba3a2cc6273050bcf2",
+        "positiveSlippageFeeTransformer": "0x7f5c79ad1788573b1145f4651a248523c54f5d1f"
+    },
+    "137": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x4d3e56c56a55d23fc7aa9a9ffad61631cf7d1ae6",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0xe6d9207df11c55bce2f7a189ae95e3222d5484d3",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x4dd97080adf36103bd3db822f9d3c0e44890fd69",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "wethTransformer": "0xe309d011cc6f189a3e8dcba85922715a019fed38",
+        "payTakerTransformer": "0x5ba7b9be86cda01cfbf56e0fb97184783be9dda1",
+        "affiliateFeeTransformer": "0xbed27284b42e5684e987169cf1da09c5d6c49fa8",
+        "fillQuoteTransformer": "0x01c082e47c8dc6dedd01e3fcb07bfd3eb72e044d",
+        "positiveSlippageFeeTransformer": "0x4cd8f1c0df4d40fcc1e073845d5f6f4ed5cc8dab"
+    },
+    "43114": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x8953c63d0858d286cc407cd6f8e26b9cbd02a511",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c",
+        "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3",
+        "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c",
+        "fillQuoteTransformer": "0xcee9118bc14e1fe740c54c754b901629b322ee4f",
+        "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857"
+    },
+    "250": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0xf760c5b88d970d6f97e64e264dac5a3767dafd74",
+        "exchangeProxy": "0xdef189deaef76e379df891899eb5a00a94cbc250",
+        "exchangeProxyTransformerDeployer": "0x47f01db18a38261e4cb153bae6db7d3743acb33c",
+        "exchangeProxyFlashWallet": "0xb4d961671cadfed687e040b076eee29840c142e5",
+        "exchangeProxyLiquidityProviderSandbox": "0xca64d4225804f2ae069760cb5ff2f1d8bac1c2f9",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703",
+        "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2",
+        "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88",
+        "fillQuoteTransformer": "0xe40f81ef6e9c95ba04c659b8d032eab73152aafd",
+        "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600"
+    },
+    "10": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x4200000000000000000000000000000000000006",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x6d506b2847df0c6f04d2628da1adaf4d8fb2e81b",
+        "exchangeProxy": "0xdef1abe32c034e558cdd535791643c58a13acc10",
+        "exchangeProxyTransformerDeployer": "0x3a539ed6bd42de8fbaf3899fb490c792e153d647",
+        "exchangeProxyFlashWallet": "0xa3128d9b7cca7d5af29780a56abeec12b05a6740",
+        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
+        "payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11",
+        "affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553",
+        "fillQuoteTransformer": "0x845c75a791cceb1a451f4ca5778c011226dda95c",
+        "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
+    },
+    "42161": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x29f80c1f685e19ae1807063eda432f431ac623d0",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
+        "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
+        "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
+        "fillQuoteTransformer": "0x466b00a77662245c2cc7b093a7102a687afc16f3",
+        "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
+    }
+}
diff --git a/contracts/zero-ex/tests/addresses/ContractAddresses.json b/contracts/zero-ex/tests/addresses/ContractAddresses.json
new file mode 100644
index 0000000000..33d991f067
--- /dev/null
+++ b/contracts/zero-ex/tests/addresses/ContractAddresses.json
@@ -0,0 +1,163 @@
+{
+    "1": {
+        "zrxToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
+        "etherToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+        "zeroExGovernor": "0x7d3455421bbc5ed534a83c88fd80387dc8271392",
+        "zrxVault": "0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf",
+        "staking": "0x2a17c35ff147b32f13f19f2e311446eeb02503f3",
+        "stakingProxy": "0xa26e80e7dea86279c6d778d702cc413e6cffa777",
+        "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
+        "erc20BridgeSampler": "0xd8c38704c9937ea3312de29f824b4ad3450a5e61",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb",
+        "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18",
+        "exchangeProxyLiquidityProviderSandbox": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a",
+        "zrxTreasury": "0x0bb1810061c2f5b2088054ee184e6c79e1591101",
+        "transformers": {
+            "wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
+            "payTakerTransformer": "0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e",
+            "affiliateFeeTransformer": "0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f",
+            "fillQuoteTransformer": "0xd75a9019a2a1782ea670e4f4a55f04b43514ed53",
+            "positiveSlippageFeeTransformer": "0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd"
+        }
+    },
+    "56": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0xccc9769c1a58766e79423a34b2cc5052d65c1983",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0xde7b2747624a647600fdb349184d0448ab954929",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f",
+            "payTakerTransformer": "0x4f5e8ca2cadecd4a467ae441e4b03de4278a4574",
+            "affiliateFeeTransformer": "0x1be34ab9b2acb5c4ddd89454bdce637967e65230",
+            "fillQuoteTransformer": "0xbd7fd6e116fc8589bb658fba3a2cc6273050bcf2",
+            "positiveSlippageFeeTransformer": "0x7f5c79ad1788573b1145f4651a248523c54f5d1f"
+        }
+    },
+    "137": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x4d3e56c56a55d23fc7aa9a9ffad61631cf7d1ae6",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0xe6d9207df11c55bce2f7a189ae95e3222d5484d3",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x4dd97080adf36103bd3db822f9d3c0e44890fd69",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0xe309d011cc6f189a3e8dcba85922715a019fed38",
+            "payTakerTransformer": "0x5ba7b9be86cda01cfbf56e0fb97184783be9dda1",
+            "affiliateFeeTransformer": "0xbed27284b42e5684e987169cf1da09c5d6c49fa8",
+            "fillQuoteTransformer": "0x01c082e47c8dc6dedd01e3fcb07bfd3eb72e044d",
+            "positiveSlippageFeeTransformer": "0x4cd8f1c0df4d40fcc1e073845d5f6f4ed5cc8dab"
+        }
+    },
+    "43114": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x8953c63d0858d286cc407cd6f8e26b9cbd02a511",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c",
+            "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3",
+            "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c",
+            "fillQuoteTransformer": "0xcee9118bc14e1fe740c54c754b901629b322ee4f",
+            "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857"
+        }
+    },
+    "250": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0xf760c5b88d970d6f97e64e264dac5a3767dafd74",
+        "exchangeProxy": "0xdef189deaef76e379df891899eb5a00a94cbc250",
+        "exchangeProxyTransformerDeployer": "0x47f01db18a38261e4cb153bae6db7d3743acb33c",
+        "exchangeProxyFlashWallet": "0xb4d961671cadfed687e040b076eee29840c142e5",
+        "exchangeProxyLiquidityProviderSandbox": "0xca64d4225804f2ae069760cb5ff2f1d8bac1c2f9",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703",
+            "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2",
+            "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88",
+            "fillQuoteTransformer": "0xe40f81ef6e9c95ba04c659b8d032eab73152aafd",
+            "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600"
+        }
+    },
+    "10": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x4200000000000000000000000000000000000006",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x6d506b2847df0c6f04d2628da1adaf4d8fb2e81b",
+        "exchangeProxy": "0xdef1abe32c034e558cdd535791643c58a13acc10",
+        "exchangeProxyTransformerDeployer": "0x3a539ed6bd42de8fbaf3899fb490c792e153d647",
+        "exchangeProxyFlashWallet": "0xa3128d9b7cca7d5af29780a56abeec12b05a6740",
+        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
+            "payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11",
+            "affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553",
+            "fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
+            "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
+        }
+    },
+    "42161": {
+        "zrxToken": "0x0000000000000000000000000000000000000000",
+        "etherToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "zrxVault": "0x0000000000000000000000000000000000000000",
+        "staking": "0x0000000000000000000000000000000000000000",
+        "stakingProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
+        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x29f80c1f685e19ae1807063eda432f431ac623d0",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
+            "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
+            "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
+            "fillQuoteTransformer": "0x542c7dfc7959d8d03c5b738478213885ab3f214e",
+            "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
+        }
+    }
+}
diff --git a/contracts/zero-ex/tests/addresses/SourceAddresses.json b/contracts/zero-ex/tests/addresses/SourceAddresses.json
new file mode 100644
index 0000000000..e0ad8e0965
--- /dev/null
+++ b/contracts/zero-ex/tests/addresses/SourceAddresses.json
@@ -0,0 +1,30 @@
+{
+    "1": {
+        "UniswapV2Router": "0xf164fc0ec4e93095b804a4795bbe1e041497b92a",
+        "UniswapV3Router": "0x0000000000000000000000000000000000000000"
+    },
+    "56": {
+        "UniswapV2Router": "0x10ed43c718714eb63d5aa57b78b54704e256024e",
+        "UniswapV3Router": "0x0000000000000000000000000000000000000000"
+    },
+    "137": {
+        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+        "UniswapV3Router": "0x0000000000000000000000000000000000000000"
+    },
+    "43114": {
+        "UniswapV2Router": "0x9Ad6C38BE94206cA50bb0d90783181662f0Cfa10",
+        "UniswapV3Router": "0x0000000000000000000000000000000000000000"
+    },
+    "250": {
+        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+        "UniswapV3Router": "0x0000000000000000000000000000000000000000"
+    },
+    "10": {
+        "UniswapV2Router": "0x0000000000000000000000000000000000000000",
+        "UniswapV3Router": "0x61ffe014ba17989e743c5f6cb21bf9697530b21e"
+    },
+    "42161": {
+        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+        "UniswapV3Router": "0x0000000000000000000000000000000000000000"
+    }
+}
diff --git a/contracts/zero-ex/tests/addresses/TokenAddresses.json b/contracts/zero-ex/tests/addresses/TokenAddresses.json
new file mode 100644
index 0000000000..0a07fe3eaf
--- /dev/null
+++ b/contracts/zero-ex/tests/addresses/TokenAddresses.json
@@ -0,0 +1,44 @@
+{
+    "1": {
+        "WrappedNativeToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+        "DAI": "0x6b175474e89094c44da98b954eedeac495271d0f",
+        "USDC": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+        "USDT": "0xdac17f958d2ee523a2206206994597c13d831ec7"
+    },
+    "56": {
+        "WrappedNativeToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+        "DAI": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+        "USDC": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+        "USDT": "0x55d398326f99059ff775485246999027b3197955"
+    },
+    "137": {
+        "WrappedNativeToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
+        "DAI": "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
+        "USDC": "0x2791bca1f2de4661ed88a30c99a7a9449aa84174",
+        "USDT": "0xc2132d05d31c914a87c6611c10748aeb04b58e8f"
+    },
+    "43114": {
+        "WrappedNativeToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
+        "DAI": "0xd586e7f844cea2f87f50152665bcbc2c279d8d70",
+        "USDC": "0xa7d7079b0fead91f3e65f86e8915cb59c1a4c664",
+        "USDT": "0xc7198437980c041c805A1EDcbA50c1Ce5db95118"
+    },
+    "250": {
+        "WrappedNativeToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
+        "DAI": "0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e",
+        "USDC": "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
+        "USDT": "0x049d68029688eabf473097a2fc38ef61633a3c7a"
+    },
+    "10": {
+        "WrappedNativeToken": "0x4200000000000000000000000000000000000006",
+        "DAI": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
+        "USDC": "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
+        "USDT": "0x94b008aa00579c1307b0ef2c499ad98a8ce58e58"
+    },
+    "42161": {
+        "WrappedNativeToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+        "DAI": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
+        "USDC": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
+        "USDT": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9"
+    }
+}
diff --git a/contracts/zero-ex/tests/forked/RfqtV2Test.t.sol b/contracts/zero-ex/tests/forked/RfqtV2Test.t.sol
new file mode 100644
index 0000000000..4bdd02dad1
--- /dev/null
+++ b/contracts/zero-ex/tests/forked/RfqtV2Test.t.sol
@@ -0,0 +1,164 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+
+pragma experimental ABIEncoderV2;
+
+import "../utils/ForkUtils.sol";
+import "../utils/TestUtils.sol";
+import "src/IZeroEx.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/features/OtcOrdersFeature.sol";
+
+contract RfqtV2Test is Test, ForkUtils, TestUtils {
+    function setUp() public {
+        _setup();
+    }
+
+    function test_swapEthForUSDTThroughFqtOtcs() public {
+        log_string("SwapEthForUSDTThroughFqtOtc");
+        /* */
+        for (uint256 i = 0; i < 1; i++) {
+            //skip fantom/avax failing test
+            if (i == 3 || i == 4) {
+                continue;
+            }
+            vm.selectFork(forkIds[chains[i]]);
+            log_named_string("  Selecting Fork On", chains[i]);
+            vm.deal(address(this), 1e18);
+            labelAddresses(
+                chains[i],
+                indexChainsByChain[chains[i]],
+                getTokens(i),
+                getContractAddresses(i),
+                getLiquiditySourceAddresses(i)
+            );
+            swapWithOtcOrder(getTokens(i), getContractAddresses(i), getLiquiditySourceAddresses(i));
+        }
+    }
+
+    /* solhint-disable function-max-lines */
+    function swapWithOtcOrder(
+        TokenAddresses memory tokens,
+        ContractAddresses memory addresses,
+        LiquiditySources memory sources
+    ) public onlyForked {
+        IZERO_EX = IZeroEx(addresses.exchangeProxy);
+        address USDC = address(tokens.USDC);
+        // Create our list of transformations, let's do WethTransformer and FillQuoteTransformer
+        ITransformERC20Feature.Transformation[] memory transformations = new ITransformERC20Feature.Transformation[](2);
+
+        /*//////////////////////////////////////////////////////////////
+                                WethTransformer
+        //////////////////////////////////////////////////////////////*/
+
+        // Use our cheeky search helper to find the nonce rather than hardcode it
+        transformations[0].deploymentNonce = _findTransformerNonce(
+            address(addresses.transformers.wethTransformer),
+            address(addresses.exchangeProxyTransformerDeployer)
+        );
+        emit log_named_uint("           WethTransformer nonce", transformations[0].deploymentNonce);
+        createNewFQT(tokens.WrappedNativeToken, addresses.exchangeProxy, addresses.exchangeProxyTransformerDeployer);
+        // Set the first transformation to transform ETH into WETH
+        transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
+
+        /*//////////////////////////////////////////////////////////////
+                                FillQuoteTransformer
+        //////////////////////////////////////////////////////////////*/
+
+        transformations[1].deploymentNonce = _findTransformerNonce(
+            address(fillQuoteTransformer),
+            address(addresses.exchangeProxyTransformerDeployer)
+        );
+        log_named_uint("           FillQuoteTransformer nonce", transformations[1].deploymentNonce);
+        // Set up the FillQuoteTransformer data
+        FillQuoteTransformer.TransformData memory fqtData;
+        fqtData.side = FillQuoteTransformer.Side.Sell;
+        fqtData.sellToken = IERC20TokenV06(address(tokens.WrappedNativeToken));
+        fqtData.buyToken = tokens.USDC;
+        // the FQT has a sequence, e.g first RFQ then Limit then Bridge
+        // since solidity doesn't support arrays of different types, this is one simple solution
+        // We use a Bridge order type here as we will fill on UniswapV2
+        fqtData.fillSequence = new FillQuoteTransformer.OrderType[](1);
+        fqtData.fillSequence[0] = FillQuoteTransformer.OrderType.Otc;
+        // The amount to fill
+        fqtData.fillAmount = 1e18;
+
+        // Now let's set up an OTC fill
+        fqtData.otcOrders = new FillQuoteTransformer.OtcOrderInfo[](1);
+        LibNativeOrder.OtcOrder memory order;
+        FillQuoteTransformer.OtcOrderInfo memory orderInfo;
+
+        order.makerToken = fqtData.buyToken;
+        order.takerToken = fqtData.sellToken;
+        order.makerAmount = 1e18;
+        order.takerAmount = 1e18;
+        uint privateKey;
+        (order.maker, privateKey) = getSigner();
+        deal(address(order.makerToken), order.maker, 1e20);
+        vm.prank(order.maker);
+        IERC20TokenV06(tokens.USDC).approve(address(addresses.exchangeProxy), 1e20);
+        vm.prank(order.maker);
+
+        order.taker = address(0);
+        order.txOrigin = address(tx.origin);
+        order.expiryAndNonce = encodeExpiryAndNonce(order.maker);
+        orderInfo.order = order;
+
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, IZERO_EX.getOtcOrderHash(order));
+        // How much we want to fill on this order, which can be different to the total
+        // e.g 50/50 split this would be half
+        order.takerAmount = 1e18;
+        // Set this low as the price of ETH/USDC can change
+        order.makerAmount = 1e18;
+
+        orderInfo.signature.signatureType = LibSignature.SignatureType.EIP712;
+        orderInfo.signature.v = v;
+        orderInfo.signature.r = r;
+        orderInfo.signature.s = s;
+
+        orderInfo.maxTakerTokenFillAmount = 1e18;
+
+        fqtData.otcOrders[0] = orderInfo;
+        transformations[1].data = abi.encode(fqtData);
+        log_string("        Successful fill, makerTokens bought");
+        IZERO_EX.transformERC20{value: 1e18}(
+            // input token
+            IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
+            // output token
+            tokens.USDC,
+            // input token amount
+            order.takerAmount,
+            // min output token amount
+            order.makerAmount,
+            // list of transform
+            transformations
+        );
+        assert(tokens.USDC.balanceOf(address(this)) > 0);
+    }
+
+    /* solhint-enable function-max-lines */
+    function encodeExpiryAndNonce(address maker) public returns (uint256) {
+        uint256 expiry = (block.timestamp + 120) << 192;
+        uint256 bucket = 0 << 128;
+        uint256 nonce = vm.getNonce(maker);
+        return expiry | bucket | nonce;
+    }
+}
diff --git a/contracts/zero-ex/tests/forked/SwapEthForERC20Test.t.sol b/contracts/zero-ex/tests/forked/SwapEthForERC20Test.t.sol
new file mode 100644
index 0000000000..bc210a27ce
--- /dev/null
+++ b/contracts/zero-ex/tests/forked/SwapEthForERC20Test.t.sol
@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+
+pragma experimental ABIEncoderV2;
+
+import "../utils/ForkUtils.sol";
+import "../utils/TestUtils.sol";
+import "src/IZeroEx.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/features/OtcOrdersFeature.sol";
+
+contract SwapEthForERC20Test is Test, ForkUtils, TestUtils {
+    function setUp() public {
+        //get out addresses.json file that defines contract addresses for each chain we are currently deployed on
+        _setup();
+    }
+
+    function test_swapEthForERC20OnUniswap() public {
+        log_string("SwapEthForERC20OnUniswap");
+        for (uint256 i = 0; i < chains.length; i++) {
+            //skip fantom/avax failing test
+            if (i == 3 || i == 4) {
+                continue;
+            }
+            vm.selectFork(forkIds[chains[i]]);
+            log_named_string("  Selecting Fork On", chains[i]);
+            labelAddresses(
+                chains[i],
+                indexChainsByChain[chains[i]],
+                getTokens(i),
+                getContractAddresses(i),
+                getLiquiditySourceAddresses(i)
+            );
+            swapOnUniswap(getTokens(i), getContractAddresses(i), getLiquiditySourceAddresses(i));
+        }
+    }
+
+    /* solhint-disable function-max-lines */
+    function swapOnUniswap(
+        TokenAddresses memory tokens,
+        ContractAddresses memory addresses,
+        LiquiditySources memory sources
+    ) public onlyForked {
+        if (sources.UniswapV2Router != address(0)) {
+            // Create our list of transformations, let's do WethTransformer and FillQuoteTransformer
+            ITransformERC20Feature.Transformation[]
+                memory transformations = new ITransformERC20Feature.Transformation[](2);
+
+            /*//////////////////////////////////////////////////////////////
+                                    WethTransformer
+            //////////////////////////////////////////////////////////////*/
+
+            // Use our cheeky search helper to find the nonce rather than hardcode it
+            transformations[0].deploymentNonce = _findTransformerNonce(
+                address(addresses.transformers.wethTransformer),
+                address(addresses.exchangeProxyTransformerDeployer)
+            );
+            emit log_named_uint("           WethTransformer nonce", transformations[0].deploymentNonce);
+            createNewFQT(
+                tokens.WrappedNativeToken,
+                addresses.exchangeProxy,
+                addresses.exchangeProxyTransformerDeployer
+            );
+            // Set the first transformation to transform ETH into WETH
+            transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
+
+            /*//////////////////////////////////////////////////////////////
+                                    FillQuoteTransformer
+            //////////////////////////////////////////////////////////////*/
+
+            transformations[1].deploymentNonce = _findTransformerNonce(
+                address(fillQuoteTransformer),
+                address(addresses.exchangeProxyTransformerDeployer)
+            );
+            emit log_named_uint("           FillQuoteTransformer nonce", transformations[1].deploymentNonce);
+            // Set up the FillQuoteTransformer data
+            FillQuoteTransformer.TransformData memory fqtData;
+            fqtData.side = FillQuoteTransformer.Side.Sell;
+            fqtData.sellToken = IERC20TokenV06(address(tokens.WrappedNativeToken));
+            fqtData.buyToken = IERC20TokenV06(address(tokens.USDT));
+            // the FQT has a sequence, e.g first RFQ then Limit then Bridge
+            // since solidity doesn't support arrays of different types, this is one simple solution
+            // We use a Bridge order type here as we will fill on UniswapV2
+            fqtData.fillSequence = new FillQuoteTransformer.OrderType[](1);
+            fqtData.fillSequence[0] = FillQuoteTransformer.OrderType.Bridge;
+            // The amount to fill
+            fqtData.fillAmount = 1e18;
+
+            /*//////////////////////////////////////////////////////////////
+                                    Sampling
+            //////////////////////////////////////////////////////////////*/
+
+            uint256 amountOut = sampleLiquiditySource(
+                fqtData.fillAmount,
+                address(fqtData.sellToken),
+                address(fqtData.buyToken),
+                sources.UniswapV2Router
+            );
+
+            /*//////////////////////////////////////////////////////////////
+                                    BridgeAdapter
+            //////////////////////////////////////////////////////////////*/
+            // Now let's set up a UniswapV2 fill
+            fqtData.bridgeOrders = new IBridgeAdapter.BridgeOrder[](1);
+            IBridgeAdapter.BridgeOrder memory order;
+            // The ID is shifted so we can concat <PROTOCOL><NAME>
+            // e.g <UniswapV2Protocol><UniswapV2>
+            // or  <UniswapV2Protocol><SushiSwap> for forks
+            order.source = bytes32(uint256(BridgeProtocols.UNISWAPV2) << 128);
+            // How much we want to fill on this order, which can be different to the total
+            // e.g 50/50 split this would be half
+            order.takerTokenAmount = 1e18;
+            // Set this low as the price of ETH/USDT can change
+            order.makerTokenAmount = amountOut;
+            // The data needed specifically for the source to fill,
+            // e.g for UniswapV2 it is the router contract and a path. See MixinUniswapV2
+            address[] memory uniPath = new address[](2);
+            uniPath[0] = address(tokens.WrappedNativeToken);
+            uniPath[1] = address(tokens.USDT);
+            order.bridgeData = abi.encode(address(sources.UniswapV2Router), uniPath);
+            fqtData.bridgeOrders[0] = order;
+            // Now encode the FQT data into the transformation
+            transformations[1].data = abi.encode(fqtData);
+
+            vm.deal(address(this), 1e18);
+            uint256 balanceETHBefore = address(this).balance;
+            uint256 balanceERC20Before = IERC20TokenV06(tokens.USDT).balanceOf(address(this));
+
+            IZeroEx(payable(addresses.exchangeProxy)).transformERC20{value: 1e18}(
+                // input token
+                IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
+                // output token
+                IERC20TokenV06(address(tokens.USDT)),
+                // input token amount
+                1e18,
+                // min output token amount
+                order.makerTokenAmount,
+                // list of transform
+                transformations
+            );
+
+            log_named_uint("        NativeAsset balance before", balanceETHBefore);
+            log_named_uint("        ERC-20 balance before", balanceERC20Before);
+            log_named_uint("        NativeAsset balance after", balanceETHBefore - address(this).balance);
+            log_named_uint(
+                "        ERC-20 balance after",
+                IERC20TokenV06(tokens.USDT).balanceOf(address(this)) - balanceERC20Before
+            );
+            assert(IERC20TokenV06(tokens.USDT).balanceOf(address(this)) > 0);
+        } else {
+            emit log_string("Liquidity Source Not available on this chain");
+        }
+    }
+
+    /* solhint-enable function-max-lines */
+
+    /*//////////////////////////////////////////////////////////////
+                            Sampler Dispatch
+    //////////////////////////////////////////////////////////////*/
+    // get a real quote from uniswap
+    function sampleLiquiditySource(
+        uint256 amount,
+        address takerToken,
+        address makerToken,
+        address router
+    ) public returns (uint256 makerTokenAmounts) {
+        address[] memory path = new address[](2);
+        path[0] = address(takerToken);
+        path[1] = address(makerToken);
+        uint256[] memory amounts = new uint256[](1);
+        amounts[0] = amount;
+        uint256 out = sampleSellsFromUniswapV2(router, path, amounts)[0];
+
+        log_string("       Sampling Uniswap for tokens");
+        log_named_address("        ", takerToken);
+        log_string("           -> ");
+        log_named_address("        ", makerToken);
+        return out;
+    }
+}
diff --git a/contracts/zero-ex/tests/forked/WrapEthTest.t.sol b/contracts/zero-ex/tests/forked/WrapEthTest.t.sol
new file mode 100644
index 0000000000..84437c41c4
--- /dev/null
+++ b/contracts/zero-ex/tests/forked/WrapEthTest.t.sol
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+
+pragma experimental ABIEncoderV2;
+
+import "../utils/ForkUtils.sol";
+import "../utils/TestUtils.sol";
+import "src/IZeroEx.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/transformers/bridges/EthereumBridgeAdapter.sol";
+import "src/transformers/bridges/PolygonBridgeAdapter.sol";
+import "src/transformers/bridges/ArbitrumBridgeAdapter.sol";
+import "src/transformers/bridges/OptimismBridgeAdapter.sol";
+import "src/transformers/bridges/AvalancheBridgeAdapter.sol";
+import "src/transformers/bridges/FantomBridgeAdapter.sol";
+import "src/transformers/bridges/CeloBridgeAdapter.sol";
+import "src/features/OtcOrdersFeature.sol";
+
+contract WrapEthTest is Test, ForkUtils, TestUtils {
+    /*//////////////////////////////////////////////////////////////
+                                 Rpc Setup
+    //////////////////////////////////////////////////////////////*/
+    function setUp() public {
+        _setup();
+    }
+
+    function test_transformERC20Forked() public {
+        log_string("TransformERC20Tests");
+        for (uint256 i = 0; i < chains.length; i++) {
+            vm.selectFork(forkIds[chains[i]]);
+            log_named_string("  Selecting Fork On", chains[i]);
+            _wrapNativeToken(chains[i], indexChainsByChain[chains[i]]);
+        }
+    }
+
+    function logAddresses(string memory chainName, string memory chainId) public {
+        bytes memory details = json.parseRaw(chainId);
+        addresses = abi.decode(details, (ContractAddresses));
+    }
+
+    function _wrapNativeToken(string memory chainName, string memory chainId) public onlyForked {
+        bytes memory details = json.parseRaw(chainId);
+        addresses = abi.decode(details, (ContractAddresses));
+
+        vm.deal(address(this), 1e19);
+
+        emit log_string("-----Preparing ETH->WETH transformation through TransformERC20()-----");
+        emit log_string("   --Building Up Transformations--");
+        ITransformERC20Feature.Transformation[] memory transformations = new ITransformERC20Feature.Transformation[](1);
+
+        emit log_named_address(
+            "    Finding TransformerDeployer nonce @",
+            address(addresses.exchangeProxyTransformerDeployer)
+        );
+        emit log_named_uint(
+            "       Deployer nonce",
+            _findTransformerNonce(
+                address(addresses.transformers.wethTransformer),
+                address(addresses.exchangeProxyTransformerDeployer)
+            )
+        );
+        transformations[0].deploymentNonce = _findTransformerNonce(
+            address(addresses.transformers.wethTransformer),
+            address(addresses.exchangeProxyTransformerDeployer)
+        );
+        transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
+
+        emit log_string("   ---Calling TransformERC20()---");
+        uint256 balanceETHBefore = address(this).balance;
+        uint256 balanceWETHBefore = IERC20TokenV06(addresses.etherToken).balanceOf(address(this));
+
+        IZeroEx(payable(addresses.exchangeProxy)).transformERC20{value: 1e18}(
+            // input token
+            IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
+            // output token
+            IERC20TokenV06(address(addresses.etherToken)),
+            // input token amount
+            1e18,
+            // min output token amount
+            1e18,
+            // list of transform
+            transformations
+        );
+        log_named_uint("        NativeAsset balance before", balanceETHBefore);
+        log_named_uint("        ERC-20 balance before", balanceWETHBefore);
+        log_named_uint("        NativeAsset balance after", balanceETHBefore - address(this).balance);
+        log_named_uint(
+            "        ERC-20 balance after",
+            IERC20TokenV06(addresses.etherToken).balanceOf(address(this)) - balanceWETHBefore
+        );
+    }
+}
diff --git a/contracts/zero-ex/tests/mocks/TestCallTarget.sol b/contracts/zero-ex/tests/mocks/TestCallTarget.sol
index 9b5e249de1..4f8b2d9521 100644
--- a/contracts/zero-ex/tests/mocks/TestCallTarget.sol
+++ b/contracts/zero-ex/tests/mocks/TestCallTarget.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;
diff --git a/contracts/zero-ex/tests/mocks/TestZeroExFeature.sol b/contracts/zero-ex/tests/mocks/TestZeroExFeature.sol
index 342a793db7..93b9ecc733 100644
--- a/contracts/zero-ex/tests/mocks/TestZeroExFeature.sol
+++ b/contracts/zero-ex/tests/mocks/TestZeroExFeature.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;
diff --git a/contracts/zero-ex/tests/utils/DeployZeroEx.sol b/contracts/zero-ex/tests/utils/DeployZeroEx.sol
new file mode 100644
index 0000000000..a7e04b33cb
--- /dev/null
+++ b/contracts/zero-ex/tests/utils/DeployZeroEx.sol
@@ -0,0 +1,299 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+pragma experimental ABIEncoderV2;
+
+import "forge-std/Test.sol";
+
+import "src/IZeroEx.sol";
+import "src/ZeroEx.sol";
+import "src/migrations/InitialMigration.sol";
+import "src/features/OwnableFeature.sol";
+import "src/features/SimpleFunctionRegistryFeature.sol";
+import "src/features/NativeOrdersFeature.sol";
+import "src/features/BatchFillNativeOrdersFeature.sol";
+import "src/features/FundRecoveryFeature.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/features/OtcOrdersFeature.sol";
+import "src/features/MetaTransactionsFeature.sol";
+import "src/features/nft_orders/ERC1155OrdersFeature.sol";
+import "src/features/nft_orders/ERC721OrdersFeature.sol";
+import "src/features/UniswapFeature.sol";
+import "src/features/multiplex/MultiplexFeature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/external/FeeCollectorController.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/PayTakerTransformer.sol";
+import "src/transformers/AffiliateFeeTransformer.sol";
+import "src/transformers/PositiveSlippageFeeTransformer.sol";
+import "src/transformers/bridges/IBridgeAdapter.sol";
+import "src/transformers/bridges/EthereumBridgeAdapter.sol";
+
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/WETH9V06.sol";
+
+contract DeployZeroEx is Test {
+    ZeroEx public ZERO_EX = ZeroEx(0xDef1C0ded9bec7F1a1670819833240f027b25EfF);
+    IZeroEx public IZERO_EX = IZeroEx(address(ZERO_EX));
+    address VANITY_DEPLOYER_ADDRESS = 0xe750ad66DE350F8110E305fb78Ec6A9f594445E3;
+    /* solhint-disable max-line-length */
+    bytes deployerBytecode =
+        hex"608060405234801561001057600080fd5b506040516103da3803806103da83398101604081905261002f91610077565b8060405161003c9061006a565b610046919061011f565b604051809103906000f080158015610062573d6000803e3d6000fd5b505050610198565b6101f5806101e583390190565b600060208284031215610088578081fd5b81516001600160401b038082111561009e578283fd5b818401915084601f8301126100b1578283fd5b8151818111156100c3576100c3610182565b604051601f8201601f19908116603f011681019083821181831017156100eb576100eb610182565b81604052828152876020848701011115610103578586fd5b610114836020830160208801610152565b979650505050505050565b600060208252825180602084015261013e816040850160208701610152565b601f01601f19169190910160400192915050565b60005b8381101561016d578181015183820152602001610155565b8381111561017c576000848401525b50505050565b634e487b7160e01b600052604160045260246000fd5b603f806101a66000396000f3fe6080604052600080fdfea26469706673582212201bd8b1a777b100d67435ca4bb0b2fdccb13a2c2dde019b227bb553ff9a95bd4464736f6c63430008020033608060405234801561001057600080fd5b506040516101f53803806101f583398101604081905261002f916100c9565b60008151602083016000f090506001600160a01b0381166100865760405162461bcd60e51b815260206004820152600d60248201526c1111541313d657d19052531151609a1b604482015260640160405180910390fd5b6040516001600160a01b03821681527ff40fcec21964ffb566044d083b4073f29f7f7929110ea19e1b3ebe375d89055e9060200160405180910390a150506101a8565b600060208083850312156100db578182fd5b82516001600160401b03808211156100f1578384fd5b818501915085601f830112610104578384fd5b81518181111561011657610116610192565b604051601f8201601f19908116603f0116810190838211818310171561013e5761013e610192565b816040528281528886848701011115610155578687fd5b8693505b828410156101765784840186015181850187015292850192610159565b8284111561018657868684830101525b98975050505050505050565b634e487b7160e01b600052604160045260246000fd5b603f806101b66000396000f3fe6080604052600080fdfea2646970667358221220fbca036a163ed7f008cefa7c834d98d25109a456a051d41d9c89d55d7185d12b64736f6c63430008020033";
+    /* solhint-enable max-line-length */
+    address[] transformerSigners = [address(this)];
+
+    bool isDeployed = false;
+
+    struct Features {
+        NativeOrdersFeature nativeOrdersFeature;
+        BatchFillNativeOrdersFeature batchFillNativeOrdersFeature;
+        OtcOrdersFeature otcOrdersFeature;
+        UniswapFeature uniswapFeature;
+        FundRecoveryFeature fundRecoveryFeature;
+        TransformERC20Feature transformERC20Feature;
+        MetaTransactionsFeature metaTransactionsFeature;
+        ERC1155OrdersFeature erc1155OrdersFeature;
+        ERC721OrdersFeature erc721OrdersFeature;
+        MultiplexFeature multiplexFeature;
+    }
+
+    struct Transformers {
+        FillQuoteTransformer fillQuoteTransformer;
+        WethTransformer wethTransformer;
+        AffiliateFeeTransformer affiliateFeeTransformer;
+        PayTakerTransformer payTakerTransformer;
+    }
+
+    struct ZeroExDeployed {
+        IZeroEx zeroEx;
+        TransformerDeployer transformerDeployer;
+        FeeCollectorController feeCollectorController;
+        IStaking staking; // address(0)
+        Features features;
+        Transformers transformers;
+        IEtherTokenV06 weth;
+    }
+
+    ZeroExDeployed ZERO_EX_DEPLOYED;
+
+    function getDeployedZeroEx() public returns (ZeroExDeployed memory) {
+        if (!isDeployed) {
+            deployZeroEx();
+        }
+        return ZERO_EX_DEPLOYED;
+    }
+
+    function logDeployedZeroEx() public {
+        emit log_string("--- Deployed ZeroEx ---");
+        emit log_named_address("ZeroEx", address(ZERO_EX));
+        emit log_named_address("TransformerDeployer", address(ZERO_EX_DEPLOYED.transformerDeployer));
+        emit log_named_address("FeeCollectorController", address(ZERO_EX_DEPLOYED.feeCollectorController));
+        emit log_named_address("Staking", address(ZERO_EX_DEPLOYED.staking));
+
+        emit log_string("----- Features -----");
+        emit log_named_address("NativeOrdersFeature", address(ZERO_EX_DEPLOYED.features.nativeOrdersFeature));
+        emit log_named_address(
+            "BatchFillNativeOrdersFeature",
+            address(ZERO_EX_DEPLOYED.features.batchFillNativeOrdersFeature)
+        );
+        emit log_named_address("OtcOrdersFeature", address(ZERO_EX_DEPLOYED.features.otcOrdersFeature));
+        emit log_named_address("UniswapFeature", address(ZERO_EX_DEPLOYED.features.uniswapFeature));
+        emit log_named_address("FundRecoveryFeature", address(ZERO_EX_DEPLOYED.features.fundRecoveryFeature));
+        emit log_named_address("MetaTransactionsFeature", address(ZERO_EX_DEPLOYED.features.metaTransactionsFeature));
+        emit log_named_address("ERC1155OrdersFeature", address(ZERO_EX_DEPLOYED.features.erc1155OrdersFeature));
+        emit log_named_address("ERC721OrdersFeature", address(ZERO_EX_DEPLOYED.features.erc721OrdersFeature));
+        emit log_named_address("TransformERC20Feature", address(ZERO_EX_DEPLOYED.features.transformERC20Feature));
+        emit log_named_address("MultiplexFeature", address(ZERO_EX_DEPLOYED.features.multiplexFeature));
+
+        emit log_string("----- Transformers -----");
+        emit log_named_address("FillQuoteTransformer", address(ZERO_EX_DEPLOYED.transformers.fillQuoteTransformer));
+        emit log_named_address("WethTransformer", address(ZERO_EX_DEPLOYED.transformers.wethTransformer));
+        emit log_named_address(
+            "AffiliateFeeTransformer",
+            address(ZERO_EX_DEPLOYED.transformers.affiliateFeeTransformer)
+        );
+        emit log_named_address("PayTakerTransformer", address(ZERO_EX_DEPLOYED.transformers.payTakerTransformer));
+
+        emit log_string("----- Other -----");
+        emit log_named_address("WETH", address(ZERO_EX_DEPLOYED.weth));
+    }
+
+    function deployZeroEx() public returns (ZeroExDeployed memory) {
+        if (isDeployed) {
+            return ZERO_EX_DEPLOYED;
+        }
+
+        ZERO_EX_DEPLOYED.weth = IEtherTokenV06(address(new WETH9V06()));
+        InitialMigration initialMigration = new InitialMigration(address(this));
+        // Append the required ZeroEx constructor arguments (address bootstrapper)
+        bytes memory zeroExDeploycode = abi.encodePacked(type(ZeroEx).creationCode, abi.encode(initialMigration));
+        // Append the required deployer code constructor arguments (bytes initCode)
+        bytes memory deployerDeploycode = abi.encodePacked(deployerBytecode, abi.encode(zeroExDeploycode));
+        // HERE BE DRAGONS, feel free to ignore this for now
+        // We want to deploy the ZeroEx contract, at 0xDef1C0ded9bec7F1a1670819833240f027b25EfF
+
+        // We use a special mechanism to deploy the ZeroEx contract.
+        // Must occur from this address as the first transaction
+        // The address is technically emitted in an event, but we know we did it correctly
+        //│   │   ├─  emit topic 0: 0xf40fcec21964ffb566044d083b4073f29f7f7929110ea19e1b3ebe375d89055e
+        //│   │   │           data: 0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff
+        hoax(VANITY_DEPLOYER_ADDRESS);
+        assembly {
+            pop(create(0, add(deployerDeploycode, 0x20), mload(deployerDeploycode)))
+        }
+        // Staking = address(0);
+        ZERO_EX_DEPLOYED.staking = IStaking(address(0));
+        ZERO_EX_DEPLOYED.transformerDeployer = new TransformerDeployer(transformerSigners);
+        ZERO_EX_DEPLOYED.feeCollectorController = new FeeCollectorController(
+            IEtherTokenV06(ZERO_EX_DEPLOYED.weth),
+            IStaking(ZERO_EX_DEPLOYED.staking)
+        );
+
+        // Features
+        ZERO_EX_DEPLOYED.features.transformERC20Feature = new TransformERC20Feature();
+        ZERO_EX_DEPLOYED.features.nativeOrdersFeature = new NativeOrdersFeature(
+            address(ZERO_EX), // EP address
+            ZERO_EX_DEPLOYED.weth,
+            ZERO_EX_DEPLOYED.staking,
+            ZERO_EX_DEPLOYED.feeCollectorController, // feeCollectorController address
+            uint32(0) // protocolFeeMultiplier
+        );
+        ZERO_EX_DEPLOYED.features.batchFillNativeOrdersFeature = new BatchFillNativeOrdersFeature(address(ZERO_EX));
+        ZERO_EX_DEPLOYED.features.otcOrdersFeature = new OtcOrdersFeature(address(ZERO_EX), ZERO_EX_DEPLOYED.weth);
+        ZERO_EX_DEPLOYED.features.uniswapFeature = new UniswapFeature(ZERO_EX_DEPLOYED.weth);
+        ZERO_EX_DEPLOYED.features.fundRecoveryFeature = new FundRecoveryFeature();
+        ZERO_EX_DEPLOYED.features.metaTransactionsFeature = new MetaTransactionsFeature(address(ZERO_EX));
+        ZERO_EX_DEPLOYED.features.erc1155OrdersFeature = new ERC1155OrdersFeature(
+            address(ZERO_EX),
+            ZERO_EX_DEPLOYED.weth
+        );
+        ZERO_EX_DEPLOYED.features.erc721OrdersFeature = new ERC721OrdersFeature(
+            address(ZERO_EX),
+            ZERO_EX_DEPLOYED.weth
+        );
+        ZERO_EX_DEPLOYED.features.multiplexFeature = new MultiplexFeature(
+            address(ZERO_EX),
+            ZERO_EX_DEPLOYED.weth,
+            ILiquidityProviderSandbox(address(0)),
+            address(0), // uniswapFactory
+            address(0), // sushiswapFactory
+            bytes32(0), // uniswapPairInitCodeHash
+            bytes32(0) // sushiswapPairInitCodeHash
+        );
+
+        initialMigration.initializeZeroEx(
+            payable(address(this)),
+            ZERO_EX,
+            InitialMigration.BootstrapFeatures({
+                registry: new SimpleFunctionRegistryFeature(),
+                ownable: new OwnableFeature()
+            })
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.batchFillNativeOrdersFeature),
+            abi.encodeWithSelector(BatchFillNativeOrdersFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.transformERC20Feature),
+            abi.encodeWithSelector(
+                TransformERC20Feature.migrate.selector,
+                address(ZERO_EX_DEPLOYED.transformerDeployer)
+            ),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.nativeOrdersFeature),
+            abi.encodeWithSelector(NativeOrdersFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.otcOrdersFeature),
+            abi.encodeWithSelector(OtcOrdersFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.uniswapFeature),
+            abi.encodeWithSelector(UniswapFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.fundRecoveryFeature),
+            abi.encodeWithSelector(FundRecoveryFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.metaTransactionsFeature),
+            abi.encodeWithSelector(MetaTransactionsFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.erc1155OrdersFeature),
+            abi.encodeWithSelector(ERC1155OrdersFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.erc721OrdersFeature),
+            abi.encodeWithSelector(ERC721OrdersFeature.migrate.selector),
+            address(this)
+        );
+        IZERO_EX.migrate(
+            address(ZERO_EX_DEPLOYED.features.multiplexFeature),
+            abi.encodeWithSelector(MultiplexFeature.migrate.selector),
+            address(this)
+        );
+
+        // Transformers
+        ZERO_EX_DEPLOYED.transformers.wethTransformer = WethTransformer(
+            ZERO_EX_DEPLOYED.transformerDeployer.deploy(
+                abi.encodePacked(
+                    // Deploy the WethTransformer code
+                    type(WethTransformer).creationCode,
+                    // WethTransformer takes WETH address as a constructor argument
+                    abi.encode(address(ZERO_EX_DEPLOYED.weth))
+                )
+            )
+        );
+
+        // Deploy the FQT, NOTE: No bridge adapter in tests
+        ZERO_EX_DEPLOYED.transformers.fillQuoteTransformer = FillQuoteTransformer(
+            ZERO_EX_DEPLOYED.transformerDeployer.deploy(
+                abi.encodePacked(
+                    // Deploy the FQT code
+                    type(FillQuoteTransformer).creationCode,
+                    // FQT takes a BridgeAdapter and ZeroEx
+                    abi.encode(
+                        address(0), // Note: No BridgeAdapter in tests
+                        INativeOrdersFeature(address(ZERO_EX))
+                    )
+                )
+            )
+        );
+
+        ZERO_EX_DEPLOYED.transformers.affiliateFeeTransformer = AffiliateFeeTransformer(
+            ZERO_EX_DEPLOYED.transformerDeployer.deploy(type(AffiliateFeeTransformer).creationCode)
+        );
+
+        ZERO_EX_DEPLOYED.transformers.payTakerTransformer = PayTakerTransformer(
+            ZERO_EX_DEPLOYED.transformerDeployer.deploy(type(PayTakerTransformer).creationCode)
+        );
+
+        ZERO_EX_DEPLOYED.zeroEx = IZERO_EX;
+        isDeployed = true;
+        logDeployedZeroEx();
+        return ZERO_EX_DEPLOYED;
+    }
+}
diff --git a/contracts/zero-ex/tests/utils/ForkUtils.sol b/contracts/zero-ex/tests/utils/ForkUtils.sol
new file mode 100644
index 0000000000..70ee39eb4d
--- /dev/null
+++ b/contracts/zero-ex/tests/utils/ForkUtils.sol
@@ -0,0 +1,727 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+pragma experimental ABIEncoderV2;
+
+import "forge-std/Test.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/transformers/bridges/EthereumBridgeAdapter.sol";
+import "src/transformers/bridges/PolygonBridgeAdapter.sol";
+import "src/transformers/bridges/BSCBridgeAdapter.sol";
+import "src/transformers/bridges/ArbitrumBridgeAdapter.sol";
+import "src/transformers/bridges/OptimismBridgeAdapter.sol";
+import "src/transformers/bridges/AvalancheBridgeAdapter.sol";
+import "src/transformers/bridges/FantomBridgeAdapter.sol";
+import "src/transformers/bridges/CeloBridgeAdapter.sol";
+import "src/IZeroEx.sol";
+
+//contract-addresses/addresses.json interfaces
+struct Transformers {
+    address affiliateFeeTransformer;
+    address fillQuoteTransformer;
+    address payTakerTransformer;
+    address positiveSlippageFeeTransformer;
+    address wethTransformer;
+}
+struct ContractAddresses {
+    address erc20BridgeProxy;
+    address erc20BridgeSampler;
+    address etherToken;
+    address payable exchangeProxy;
+    address exchangeProxyFlashWallet;
+    address exchangeProxyGovernor;
+    address exchangeProxyLiquidityProviderSandbox;
+    address exchangeProxyTransformerDeployer;
+    address staking;
+    address stakingProxy;
+    Transformers transformers;
+    address zeroExGovernor;
+    address zrxToken;
+    address zrxTreasury;
+    address zrxVault;
+}
+//need to be alphebetized in solidity but not in addresses.json
+struct Addresses {
+    address affiliateFeeTransformer;
+    address erc20BridgeProxy;
+    address erc20BridgeSampler;
+    address etherToken;
+    address payable exchangeProxy;
+    address exchangeProxyFlashWallet;
+    address exchangeProxyGovernor;
+    address exchangeProxyLiquidityProviderSandbox;
+    address exchangeProxyTransformerDeployer;
+    address fillQuoteTransformer;
+    address payTakerTransformer;
+    address positiveSlippageFeeTransformer;
+    address staking;
+    address stakingProxy;
+    address wethTransformer;
+    address zeroExGovernor;
+    address zrxToken;
+    address zrxTreasury;
+    address zrxVault;
+}
+
+struct TokenAddresses {
+    IERC20TokenV06 DAI;
+    IERC20TokenV06 USDC;
+    IERC20TokenV06 USDT;
+    IEtherTokenV06 WrappedNativeToken;
+}
+
+struct LiquiditySources {
+    address UniswapV2Router;
+    address UniswapV3Router;
+}
+
+interface IFQT {
+    function bridgeAdapter() external returns (address);
+}
+
+interface IUniswapV2Router01 {
+    function getAmountsOut(uint256 amountIn, address[] calldata path) external view returns (uint256[] memory amounts);
+
+    function getAmountsIn(uint256 amountOut, address[] calldata path) external view returns (uint256[] memory amounts);
+}
+
+interface IUniswapV3QuoterV2 {
+    function factory() external view returns (IUniswapV3Factory factory);
+
+    // @notice Returns the amount out received for a given exact input swap without executing the swap
+    // @param path The path of the swap, i.e. each token pair and the pool fee
+    // @param amountIn The amount of the first token to swap
+    // @return amountOut The amount of the last token that would be received
+    // @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
+    // @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
+    // @return gasEstimate The estimate of the gas that the swap consumes
+    function quoteExactInput(
+        bytes memory path,
+        uint256 amountIn
+    )
+        external
+        returns (
+            uint256 amountOut,
+            uint160[] memory sqrtPriceX96AfterList,
+            uint32[] memory initializedTicksCrossedList,
+            uint256 gasEstimate
+        );
+
+    // @notice Returns the amount in required for a given exact output swap without executing the swap
+    // @param path The path of the swap, i.e. each token pair and the pool fee. Path must be provided in reverse order
+    // @param amountOut The amount of the last token to receive
+    // @return amountIn The amount of first token required to be paid
+    // @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
+    // @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
+    // @return gasEstimate The estimate of the gas that the swap consumes
+    function quoteExactOutput(
+        bytes memory path,
+        uint256 amountOut
+    )
+        external
+        returns (
+            uint256 amountIn,
+            uint160[] memory sqrtPriceX96AfterList,
+            uint32[] memory initializedTicksCrossedList,
+            uint256 gasEstimate
+        );
+}
+
+interface IUniswapV3Factory {
+    function getPool(IERC20TokenV06 a, IERC20TokenV06 b, uint24 fee) external view returns (IUniswapV3Pool pool);
+}
+
+interface IUniswapV3Pool {
+    function token0() external view returns (IERC20TokenV06);
+
+    function token1() external view returns (IERC20TokenV06);
+
+    function fee() external view returns (uint24);
+}
+
+contract ForkUtils is Test {
+    using stdJson for string;
+
+    string json;
+
+    //forked providers for each chain
+    mapping(string => uint256) public forkIds;
+
+    IZeroEx IZERO_EX;
+
+    IBridgeAdapter bridgeAdapter;
+    FillQuoteTransformer fillQuoteTransformer;
+
+    TokenAddresses tokens;
+    Transformers transformers;
+    ContractAddresses addresses;
+    LiquiditySources sources;
+
+    uint256 forkBlock = 15_000_000;
+
+    string[] chains = ["mainnet", "bsc", "polygon", "avalanche", "fantom", "optimism", "arbitrum"];
+    string[] indexChainIds = [".1", ".56", ".137", ".43114", ".250", ".10", ".42161"];
+    string[] chainIds = ["1", "56", "137", "43114", "250", "10", "42161"];
+    uint256[] chainId = [1, 56, 137, 43114, 250, 10, 42161];
+
+    //special fork block number for fantom since it produces blocks faster and more frequently
+    uint256[] blockNumber = [forkBlock, forkBlock, 33447149, forkBlock, 32000000, forkBlock, forkBlock];
+
+    string addressesJson;
+    string tokensJson;
+    string sourcesJson;
+
+    //utility mapping to get chainId by name
+    mapping(string => string) public chainsByChainId;
+    //utility mapping to get indexingChainId by Chain
+    mapping(string => string) public indexChainsByChain;
+
+    function createForks() public returns (uint256[] memory) {
+        for (uint256 i = 0; i < chains.length; i++) {
+            forkIds[chains[i]] = vm.createFork(vm.rpcUrl(chains[i]), blockNumber[i]);
+        }
+    }
+
+    //gets a dummy signer to be used for an OTC order
+    function getSigner() public returns (address, uint) {
+        string memory mnemonic = "test test test test test test test test test test test junk";
+        uint256 privateKey = vm.deriveKey(mnemonic, 0);
+
+        vm.label(vm.addr(privateKey), "zeroEx/MarketMaker");
+        return (vm.addr(privateKey), privateKey);
+    }
+
+    //read the uniswapV2 router addresses from file
+    function readLiquiditySourceAddresses() internal returns (string memory) {
+        string memory root = vm.projectRoot();
+        string memory path = string(abi.encodePacked(root, "/", "tests/addresses/SourceAddresses.json"));
+        sourcesJson = vm.readFile(path);
+        return vm.readFile(path);
+    }
+
+    //retrieve the uniswapV2 router addresses
+    function getLiquiditySourceAddresses(uint index) public returns (LiquiditySources memory sources) {
+        readLiquiditySourceAddresses();
+        bytes memory liquiditySources = sourcesJson.parseRaw(indexChainIds[index]);
+        return abi.decode(liquiditySources, (LiquiditySources));
+    }
+
+    function readAddresses() internal returns (string memory) {
+        string memory root = vm.projectRoot();
+        string memory path = string(abi.encodePacked(root, "/", "tests/addresses/ContractAddresses.json"));
+        addressesJson = vm.readFile(path);
+        return vm.readFile(path);
+    }
+
+    //retrieve the 0x Protocol contract addresses from addresses.json
+    function getContractAddresses(uint index) public returns (ContractAddresses memory addresses) {
+        readAddresses();
+        bytes memory contractAddresses = addressesJson.parseRaw(indexChainIds[index]);
+        return abi.decode(contractAddresses, (ContractAddresses));
+    }
+
+    function readTokens() internal returns (string memory) {
+        string memory root = vm.projectRoot();
+        string memory path = string(abi.encodePacked(root, "/", "tests/addresses/TokenAddresses.json"));
+        tokensJson = vm.readFile(path);
+        return vm.readFile(path);
+    }
+
+    //retrieve our tokenList from TokenAddresses.json
+    function getTokens(uint index) public returns (TokenAddresses memory addresses) {
+        readTokens();
+        bytes memory chainTokens = tokensJson.parseRaw(indexChainIds[index]);
+        return abi.decode(chainTokens, (TokenAddresses));
+    }
+
+    //creates the appropriate bridge adapter based on what chain the tests are currently executing on.
+    function createBridgeAdapter(IEtherTokenV06 weth) public returns (IBridgeAdapter bridgeAdapter) {
+        uint chainId;
+
+        assembly {
+            chainId := chainid()
+        }
+        if (chainId == 1) {
+            return IBridgeAdapter(new EthereumBridgeAdapter(weth));
+        } else if (chainId == 56) {
+            return IBridgeAdapter(new BSCBridgeAdapter(weth));
+        } else if (chainId == 137) {
+            return IBridgeAdapter(new PolygonBridgeAdapter(weth));
+        } else if (chainId == 43114) {
+            return IBridgeAdapter(new AvalancheBridgeAdapter(weth));
+        } else if (chainId == 250) {
+            return IBridgeAdapter(new FantomBridgeAdapter(weth));
+        } else if (chainId == 10) {
+            return IBridgeAdapter(new OptimismBridgeAdapter(weth));
+        } else if (chainId == 42161) {
+            return IBridgeAdapter(new ArbitrumBridgeAdapter(weth));
+        } else {
+            //ERROR: chainId not mapped
+            revert("ChainId not supported");
+        }
+    }
+
+    //label the addresses that are read from the various .json files
+    function labelAddresses(
+        string memory chainName,
+        string memory chainId,
+        TokenAddresses memory tokens,
+        ContractAddresses memory addresses,
+        LiquiditySources memory sources
+    ) public {
+        log_named_string("   Using contract addresses on chain", chainName);
+        vm.label(addresses.transformers.affiliateFeeTransformer, "zeroEx/affiliateFeeTransformer");
+        vm.label(addresses.erc20BridgeProxy, "zeroEx/erc20BridgeProxy");
+        vm.label(addresses.erc20BridgeSampler, "zeroEx/erc20BridgeSampler");
+        vm.label(addresses.etherToken, "zeroEx/etherToken");
+        vm.label(addresses.exchangeProxy, "zeroEx/exchangeProxy");
+        vm.label(addresses.exchangeProxyFlashWallet, "zeroEx/exchangeProxyFlashWallet");
+        vm.label(addresses.exchangeProxyGovernor, "zeroEx/exchangeProxyGovernor");
+        vm.label(addresses.exchangeProxyLiquidityProviderSandbox, "zeroEx/exchangeProxyLiquidityProviderSandbox");
+        vm.label(addresses.exchangeProxyTransformerDeployer, "zeroEx/exchangeProxyTransformerDeployer");
+        vm.label(addresses.transformers.fillQuoteTransformer, "zeroEx/fillQuoteTransformer");
+        vm.label(addresses.transformers.payTakerTransformer, "zeroEx/payTakerTransformer");
+        vm.label(addresses.transformers.positiveSlippageFeeTransformer, "zeroEx/positiveSlippageFeeTransformer");
+        vm.label(addresses.staking, "zeroEx/staking");
+        vm.label(addresses.stakingProxy, "zeroEx/stakingProxy");
+        vm.label(addresses.transformers.wethTransformer, "zeroEx/wethTransformer");
+        vm.label(addresses.zeroExGovernor, "zeroEx/zeroExGovernor");
+        vm.label(addresses.zrxToken, "zeroEx/zrxToken");
+        vm.label(addresses.zrxTreasury, "zeroEx/zrxTreasury");
+        vm.label(addresses.zrxVault, "zeroEx/zrxVault");
+        vm.label(address(tokens.WrappedNativeToken), "WrappedNativeToken");
+        vm.label(address(tokens.USDT), "USDT");
+        vm.label(address(tokens.USDC), "USDC");
+        vm.label(address(tokens.DAI), "DAI");
+        vm.label(address(sources.UniswapV2Router), "UniswapRouter");
+    }
+
+    //deploy a new FillQuoteTransformer
+    //executes in the context of the transformerDeployer
+    function createNewFQT(
+        IEtherTokenV06 wrappedNativeToken,
+        address payable exchangeProxy,
+        address transformerDeployer
+    ) public {
+        vm.startPrank(transformerDeployer);
+        // deploy a new instance of the bridge adapter from the transformerDeployer
+        bridgeAdapter = createBridgeAdapter(IEtherTokenV06(wrappedNativeToken));
+        // deploy a new instance of the fill quote transformer from the transformerDeployer
+        fillQuoteTransformer = new FillQuoteTransformer(IBridgeAdapter(bridgeAdapter), IZeroEx(exchangeProxy));
+        vm.label(address(fillQuoteTransformer), "zeroEx/FillQuoteTransformer");
+        vm.stopPrank();
+    }
+
+    //utility function to be called in the `setUp()` function of a test
+    //creates a fork and retrieves the correct addresses based on chainId
+    function _setup() public {
+        //get our addresses.json file that defines contract addresses for each chain we are currently deployed on
+        string memory root = vm.projectRoot();
+        string memory path = string(abi.encodePacked(root, "/", "tests/addresses/ContractAddresses.json"));
+        json = vm.readFile(path);
+        createForks();
+
+        for (uint256 i = 0; i < chains.length; i++) {
+            chainsByChainId[chains[i]] = chainIds[i];
+            indexChainsByChain[chains[i]] = indexChainIds[i];
+            bytes memory details = json.parseRaw(indexChainIds[i]);
+            addresses = abi.decode(details, (ContractAddresses));
+        }
+    }
+
+    /// @dev Sample sell quotes from UniswapV2.
+    /// @param router Router to look up tokens and amounts
+    /// @param path Token route. Should be takerToken -> makerToken.
+    /// @param takerTokenAmounts Taker token sell amount for each sample.
+    /// @return makerTokenAmounts Taker amounts sold at each maker token
+    ///         amount.
+    function sampleSellsFromUniswapV2(
+        address router,
+        address[] memory path,
+        uint256[] memory takerTokenAmounts
+    ) public view returns (uint256[] memory makerTokenAmounts) {
+        uint256 numSamples = takerTokenAmounts.length;
+        makerTokenAmounts = new uint256[](numSamples);
+        for (uint256 i = 0; i < numSamples; i++) {
+            try IUniswapV2Router01(router).getAmountsOut(takerTokenAmounts[i], path) returns (
+                uint256[] memory amounts
+            ) {
+                makerTokenAmounts[i] = amounts[path.length - 1];
+                // Break early if there are 0 amounts
+                if (makerTokenAmounts[i] == 0) {
+                    break;
+                }
+            } catch (bytes memory) {
+                // Swallow failures, leaving all results as zero.
+                break;
+            }
+        }
+    }
+
+    /// @dev Sample buy quotes from UniswapV2.
+    /// @param router Router to look up tokens and amounts
+    /// @param path Token route. Should be takerToken -> makerToken.
+    /// @param makerTokenAmounts Maker token buy amount for each sample.
+    /// @return takerTokenAmounts Taker amounts sold at each maker token
+    ///         amount.
+    function sampleBuysFromUniswapV2(
+        address router,
+        address[] memory path,
+        uint256[] memory makerTokenAmounts
+    ) public view returns (uint256[] memory takerTokenAmounts) {
+        uint256 numSamples = makerTokenAmounts.length;
+        takerTokenAmounts = new uint256[](numSamples);
+        for (uint256 i = 0; i < numSamples; i++) {
+            try IUniswapV2Router01(router).getAmountsIn(makerTokenAmounts[i], path) returns (uint256[] memory amounts) {
+                takerTokenAmounts[i] = amounts[0];
+                // Break early if there are 0 amounts
+                if (takerTokenAmounts[i] == 0) {
+                    break;
+                }
+            } catch (bytes memory) {
+                // Swallow failures, leaving all results as zero.
+                break;
+            }
+        }
+    }
+
+    /// @dev Sample sell quotes from UniswapV3.
+    /// @param quoter UniswapV3 Quoter contract.
+    /// @param path Token route. Should be takerToken -> makerToken (at most two hops).
+    /// @param takerTokenAmounts Taker token sell amount for each sample.
+    /// @return uniswapPaths The encoded uniswap path for each sample.
+    /// @return uniswapGasUsed Estimated amount of gas used
+    /// @return makerTokenAmounts Maker amounts bought at each taker token amount.
+    function sampleSellsFromUniswapV3(
+        IUniswapV3QuoterV2 quoter,
+        IERC20TokenV06[] memory path,
+        uint256[] memory takerTokenAmounts
+    )
+        public
+        returns (bytes[] memory uniswapPaths, uint256[] memory uniswapGasUsed, uint256[] memory makerTokenAmounts)
+    {
+        IUniswapV3Pool[][] memory poolPaths = _getPoolPaths(
+            quoter,
+            path,
+            takerTokenAmounts[takerTokenAmounts.length - 1]
+        );
+
+        makerTokenAmounts = new uint256[](takerTokenAmounts.length);
+        uniswapPaths = new bytes[](takerTokenAmounts.length);
+        uniswapGasUsed = new uint256[](takerTokenAmounts.length);
+
+        for (uint256 i = 0; i < takerTokenAmounts.length; ++i) {
+            // Pick the best result from the pool paths.
+            uint256 topBuyAmount = 0;
+            for (uint256 j = 0; j < poolPaths.length; ++j) {
+                if (!isValidPoolPath(poolPaths[j])) {
+                    continue;
+                }
+
+                bytes memory uniswapPath = _toUniswapPath(path, poolPaths[j]);
+                try quoter.quoteExactInput(uniswapPath, takerTokenAmounts[i]) returns (
+                    uint256 buyAmount,
+                    uint160[] memory /* sqrtPriceX96AfterList */,
+                    uint32[] memory /* initializedTicksCrossedList */,
+                    uint256 gasUsed
+                ) {
+                    if (topBuyAmount <= buyAmount) {
+                        topBuyAmount = buyAmount;
+                        uniswapPaths[i] = uniswapPath;
+                        uniswapGasUsed[i] = gasUsed;
+                    }
+                } catch {}
+            }
+            // Break early if we can't complete the sells.
+            if (topBuyAmount == 0) {
+                // HACK(kimpers): To avoid too many local variables, paths and gas used is set directly in the loop
+                // then reset if no valid valid quote was found
+                uniswapPaths[i] = "";
+                uniswapGasUsed[i] = 0;
+                break;
+            }
+            makerTokenAmounts[i] = topBuyAmount;
+        }
+    }
+
+    /// @dev Sample buy quotes from UniswapV3.
+    /// @param quoter UniswapV3 Quoter contract.
+    /// @param path Token route. Should be takerToken -> makerToken (at most two hops).
+    /// @param makerTokenAmounts Maker token buy amount for each sample.
+    /// @return uniswapPaths The encoded uniswap path for each sample.
+    /// @return uniswapGasUsed Estimated amount of gas used
+    /// @return takerTokenAmounts Taker amounts sold at each maker token amount.
+    function sampleBuysFromUniswapV3(
+        IUniswapV3QuoterV2 quoter,
+        IERC20TokenV06[] memory path,
+        uint256[] memory makerTokenAmounts
+    )
+        public
+        returns (bytes[] memory uniswapPaths, uint256[] memory uniswapGasUsed, uint256[] memory takerTokenAmounts)
+    {
+        IERC20TokenV06[] memory reversedPath = _reverseTokenPath(path);
+        IUniswapV3Pool[][] memory poolPaths = _getPoolPaths(
+            quoter,
+            reversedPath,
+            makerTokenAmounts[makerTokenAmounts.length - 1]
+        );
+
+        takerTokenAmounts = new uint256[](makerTokenAmounts.length);
+        uniswapPaths = new bytes[](makerTokenAmounts.length);
+        uniswapGasUsed = new uint256[](makerTokenAmounts.length);
+
+        for (uint256 i = 0; i < makerTokenAmounts.length; ++i) {
+            // Pick the best result from the pool paths.
+            uint256 topSellAmount = 0;
+            for (uint256 j = 0; j < poolPaths.length; ++j) {
+                if (!isValidPoolPath(poolPaths[j])) {
+                    continue;
+                }
+
+                // quoter requires path to be reversed for buys.
+                bytes memory uniswapPath = _toUniswapPath(reversedPath, poolPaths[j]);
+                try quoter.quoteExactOutput(uniswapPath, makerTokenAmounts[i]) returns (
+                    uint256 sellAmount,
+                    uint160[] memory /* sqrtPriceX96AfterList */,
+                    uint32[] memory /* initializedTicksCrossedList */,
+                    uint256 gasUsed
+                ) {
+                    if (topSellAmount == 0 || topSellAmount >= sellAmount) {
+                        topSellAmount = sellAmount;
+                        // But the output path should still be encoded for sells.
+                        uniswapPaths[i] = _toUniswapPath(path, _reversePoolPath(poolPaths[j]));
+                        uniswapGasUsed[i] = gasUsed;
+                    }
+                } catch {}
+            }
+            // Break early if we can't complete the buys.
+            if (topSellAmount == 0) {
+                // HACK(kimpers): To avoid too many local variables, paths and gas used is set directly in the loop
+                // then reset if no valid valid quote was found
+                uniswapPaths[i] = "";
+                uniswapGasUsed[i] = 0;
+                break;
+            }
+            takerTokenAmounts[i] = topSellAmount;
+        }
+    }
+
+    function _getPoolPaths(
+        IUniswapV3QuoterV2 quoter,
+        IERC20TokenV06[] memory path,
+        uint256 inputAmount
+    ) private returns (IUniswapV3Pool[][] memory poolPaths) {
+        if (path.length == 2) {
+            return _getPoolPathSingleHop(quoter, path, inputAmount);
+        }
+        if (path.length == 3) {
+            return _getPoolPathTwoHop(quoter, path, inputAmount);
+        }
+        revert("UniswapV3Sampler/unsupported token path length");
+    }
+
+    function _getPoolPathSingleHop(
+        IUniswapV3QuoterV2 quoter,
+        IERC20TokenV06[] memory path,
+        uint256 inputAmount
+    ) public returns (IUniswapV3Pool[][] memory poolPaths) {
+        poolPaths = new IUniswapV3Pool[][](2);
+        (IUniswapV3Pool[2] memory topPools, ) = _getTopTwoPools(
+            quoter,
+            quoter.factory(),
+            path[0],
+            path[1],
+            inputAmount
+        );
+
+        uint256 pathCount = 0;
+        for (uint256 i = 0; i < 2; i++) {
+            IUniswapV3Pool topPool = topPools[i];
+            poolPaths[pathCount] = new IUniswapV3Pool[](1);
+            poolPaths[pathCount][0] = topPool;
+            pathCount++;
+        }
+    }
+
+    function _getPoolPathTwoHop(
+        IUniswapV3QuoterV2 quoter,
+        IERC20TokenV06[] memory path,
+        uint256 inputAmount
+    ) private returns (IUniswapV3Pool[][] memory poolPaths) {
+        IUniswapV3Factory factory = quoter.factory();
+        poolPaths = new IUniswapV3Pool[][](4);
+        (IUniswapV3Pool[2] memory firstHopTopPools, uint256[2] memory firstHopAmounts) = _getTopTwoPools(
+            quoter,
+            factory,
+            path[0],
+            path[1],
+            inputAmount
+        );
+        (IUniswapV3Pool[2] memory secondHopTopPools, ) = _getTopTwoPools(
+            quoter,
+            factory,
+            path[1],
+            path[2],
+            firstHopAmounts[0]
+        );
+
+        uint256 pathCount = 0;
+        for (uint256 i = 0; i < 2; i++) {
+            for (uint256 j = 0; j < 2; j++) {
+                poolPaths[pathCount] = new IUniswapV3Pool[](2);
+                IUniswapV3Pool[] memory currentPath = poolPaths[pathCount];
+                currentPath[0] = firstHopTopPools[i];
+                currentPath[1] = secondHopTopPools[j];
+                pathCount++;
+            }
+        }
+    }
+
+    /// @dev Returns top 0-2 pools and corresponding output amounts based on swaping `inputAmount`.
+    /// Addresses in `topPools` can be zero addresses when there are pool isn't available.
+    function _getTopTwoPools(
+        IUniswapV3QuoterV2 quoter,
+        IUniswapV3Factory factory,
+        IERC20TokenV06 inputToken,
+        IERC20TokenV06 outputToken,
+        uint256 inputAmount
+    ) private returns (IUniswapV3Pool[2] memory topPools, uint256[2] memory outputAmounts) {
+        IERC20TokenV06[] memory path = new IERC20TokenV06[](2);
+        path[0] = inputToken;
+        path[1] = outputToken;
+
+        uint24[4] memory validPoolFees = [uint24(0.0001e6), uint24(0.0005e6), uint24(0.003e6), uint24(0.01e6)];
+        for (uint256 i = 0; i < validPoolFees.length; ++i) {
+            IUniswapV3Pool pool = factory.getPool(inputToken, outputToken, validPoolFees[i]);
+            if (!_isValidPool(pool)) {
+                continue;
+            }
+
+            IUniswapV3Pool[] memory poolPath = new IUniswapV3Pool[](1);
+            poolPath[0] = pool;
+            bytes memory uniswapPath = _toUniswapPath(path, poolPath);
+            try quoter.quoteExactInput(uniswapPath, inputAmount) returns (
+                uint256 outputAmount,
+                uint160[] memory /* sqrtPriceX96AfterList */,
+                uint32[] memory /* initializedTicksCrossedList */,
+                uint256 /* gasUsed */
+            ) {
+                // Keeping track of the top 2 pools.
+                if (outputAmount > outputAmounts[0]) {
+                    outputAmounts[1] = outputAmounts[0];
+                    topPools[1] = topPools[0];
+                    outputAmounts[0] = outputAmount;
+                    topPools[0] = pool;
+                } else if (outputAmount > outputAmounts[1]) {
+                    outputAmounts[1] = outputAmount;
+                    topPools[1] = pool;
+                }
+            } catch {}
+        }
+    }
+
+    function _reverseTokenPath(
+        IERC20TokenV06[] memory tokenPath
+    ) private pure returns (IERC20TokenV06[] memory reversed) {
+        reversed = new IERC20TokenV06[](tokenPath.length);
+        for (uint256 i = 0; i < tokenPath.length; ++i) {
+            reversed[i] = tokenPath[tokenPath.length - i - 1];
+        }
+    }
+
+    function _reversePoolPath(
+        IUniswapV3Pool[] memory poolPath
+    ) private pure returns (IUniswapV3Pool[] memory reversed) {
+        reversed = new IUniswapV3Pool[](poolPath.length);
+        for (uint256 i = 0; i < poolPath.length; ++i) {
+            reversed[i] = poolPath[poolPath.length - i - 1];
+        }
+    }
+
+    function _isValidPool(IUniswapV3Pool pool) private view returns (bool isValid) {
+        // Check if it has been deployed.
+        {
+            uint256 codeSize;
+            assembly {
+                codeSize := extcodesize(pool)
+            }
+            if (codeSize == 0) {
+                return false;
+            }
+        }
+        // Must have a balance of both tokens.
+        if (pool.token0().balanceOf(address(pool)) == 0) {
+            return false;
+        }
+        if (pool.token1().balanceOf(address(pool)) == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    function isValidPoolPath(IUniswapV3Pool[] memory poolPaths) private pure returns (bool) {
+        for (uint256 i = 0; i < poolPaths.length; i++) {
+            if (address(poolPaths[i]) == address(0)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function _toUniswapPath(
+        IERC20TokenV06[] memory tokenPath,
+        IUniswapV3Pool[] memory poolPath
+    ) private view returns (bytes memory uniswapPath) {
+        require(
+            tokenPath.length >= 2 && tokenPath.length == poolPath.length + 1,
+            "UniswapV3Sampler/invalid path lengths"
+        );
+        // Uniswap paths are tightly packed as:
+        // [token0, token0token1PairFee, token1, token1Token2PairFee, token2, ...]
+        uniswapPath = new bytes(tokenPath.length * 20 + poolPath.length * 3);
+        uint256 o;
+        assembly {
+            o := add(uniswapPath, 32)
+        }
+        for (uint256 i = 0; i < tokenPath.length; ++i) {
+            if (i > 0) {
+                uint24 poolFee = poolPath[i - 1].fee();
+                assembly {
+                    mstore(o, shl(232, poolFee))
+                    o := add(o, 3)
+                }
+            }
+            IERC20TokenV06 token = tokenPath[i];
+            assembly {
+                mstore(o, shl(96, token))
+                o := add(o, 20)
+            }
+        }
+    }
+
+    modifier onlyForked() {
+        if (block.number >= 15000000) {
+            _;
+        } else {
+            revert("Requires fork mode");
+        }
+    }
+}
diff --git a/contracts/zero-ex/tests/utils/SwapEthForERC20Test.t.sol b/contracts/zero-ex/tests/utils/SwapEthForERC20Test.t.sol
new file mode 100644
index 0000000000..751cd722b0
--- /dev/null
+++ b/contracts/zero-ex/tests/utils/SwapEthForERC20Test.t.sol
@@ -0,0 +1,195 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+
+pragma experimental ABIEncoderV2;
+
+import "../utils/ForkUtils.sol";
+import "../utils/TestUtils.sol";
+import "src/IZeroEx.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "src/features/TransformERC20Feature.sol";
+import "src/external/TransformerDeployer.sol";
+import "src/transformers/WethTransformer.sol";
+import "src/transformers/FillQuoteTransformer.sol";
+import "src/transformers/bridges/BridgeProtocols.sol";
+import "src/features/OtcOrdersFeature.sol";
+
+contract SwapEthForERC20Test is Test, ForkUtils, TestUtils {
+    function setUp() public {
+        //get out addresses.json file that defines contract addresses for each chain we are currently deployed on
+        _setup();
+    }
+
+    function test_swapEthForERC20OnUniswap() public {
+        log_string("SwapEthForERC20OnUniswap");
+        for (uint256 i = 0; i < chains.length; i++) {
+            //skip fantom/avax failing test
+            if (i == 3 || i == 4) {
+                continue;
+            }
+            vm.selectFork(forkIds[chains[i]]);
+            log_named_string("  Selecting Fork On", chains[i]);
+            labelAddresses(
+                chains[i],
+                indexChainsByChain[chains[i]],
+                getTokens(i),
+                getContractAddresses(i),
+                getLiquiditySourceAddresses(i)
+            );
+            swapOnUniswap(getTokens(i), getContractAddresses(i), getLiquiditySourceAddresses(i));
+        }
+    }
+
+    /* solhint-disable function-max-lines */
+    function swapOnUniswap(
+        TokenAddresses memory tokens,
+        ContractAddresses memory addresses,
+        LiquiditySources memory sources
+    ) public onlyForked {
+        if (sources.UniswapV2Router != address(0)) {
+            // Create our list of transformations, let's do WethTransformer and FillQuoteTransformer
+            ITransformERC20Feature.Transformation[]
+                memory transformations = new ITransformERC20Feature.Transformation[](2);
+
+            /*//////////////////////////////////////////////////////////////
+                                    WethTransformer
+            //////////////////////////////////////////////////////////////*/
+
+            // Use our cheeky search helper to find the nonce rather than hardcode it
+            transformations[0].deploymentNonce = _findTransformerNonce(
+                address(addresses.transformers.wethTransformer),
+                address(addresses.exchangeProxyTransformerDeployer)
+            );
+            emit log_named_uint("           WethTransformer nonce", transformations[0].deploymentNonce);
+            createNewFQT(
+                tokens.WrappedNativeToken,
+                addresses.exchangeProxy,
+                addresses.exchangeProxyTransformerDeployer
+            );
+            // Set the first transformation to transform ETH into WETH
+            transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
+
+            /*//////////////////////////////////////////////////////////////
+                                    FillQuoteTransformer
+            //////////////////////////////////////////////////////////////*/
+
+            transformations[1].deploymentNonce = _findTransformerNonce(
+                address(fillQuoteTransformer),
+                address(addresses.exchangeProxyTransformerDeployer)
+            );
+            emit log_named_uint("           FillQuoteTransformer nonce", transformations[1].deploymentNonce);
+            // Set up the FillQuoteTransformer data
+            FillQuoteTransformer.TransformData memory fqtData;
+            fqtData.side = FillQuoteTransformer.Side.Sell;
+            fqtData.sellToken = IERC20TokenV06(address(tokens.WrappedNativeToken));
+            fqtData.buyToken = IERC20TokenV06(address(tokens.USDT));
+            // the FQT has a sequence, e.g first RFQ then Limit then Bridge
+            // since solidity doesn't support arrays of different types, this is one simple solution
+            // We use a Bridge order type here as we will fill on UniswapV2
+            fqtData.fillSequence = new FillQuoteTransformer.OrderType[](1);
+            fqtData.fillSequence[0] = FillQuoteTransformer.OrderType.Bridge;
+            // The amount to fill
+            fqtData.fillAmount = 1e18;
+
+            /*//////////////////////////////////////////////////////////////
+                                    Sampling
+            //////////////////////////////////////////////////////////////*/
+
+            uint256 amountOut = sampleLiquiditySource(
+                fqtData.fillAmount,
+                address(fqtData.sellToken),
+                address(fqtData.buyToken),
+                sources.UniswapV2Router
+            );
+
+            /*//////////////////////////////////////////////////////////////
+                                    BridgeAdapter
+            //////////////////////////////////////////////////////////////*/
+            // Now let's set up a UniswapV2 fill
+            fqtData.bridgeOrders = new IBridgeAdapter.BridgeOrder[](1);
+            IBridgeAdapter.BridgeOrder memory order;
+            // The ID is shifted so we can concat <PROTOCOL><NAME>
+            // e.g <UniswapV2Protocol><UniswapV2>
+            // or  <UniswapV2Protocol><SushiSwap> for forks
+            order.source = bytes32(uint256(BridgeProtocols.UNISWAPV2) << 128);
+            // How much we want to fill on this order, which can be different to the total
+            // e.g 50/50 split this would be half
+            order.takerTokenAmount = 1e18;
+            // Set this low as the price of ETH/USDT can change
+            order.makerTokenAmount = amountOut;
+            // The data needed specifically for the source to fill,
+            // e.g for UniswapV2 it is the router contract and a path. See MixinUniswapV2
+            address[] memory uniPath = new address[](2);
+            uniPath[0] = address(tokens.WrappedNativeToken);
+            uniPath[1] = address(tokens.USDT);
+            order.bridgeData = abi.encode(address(sources.UniswapV2Router), uniPath);
+            fqtData.bridgeOrders[0] = order;
+            // Now encode the FQT data into the transformation
+            transformations[1].data = abi.encode(fqtData);
+
+            vm.deal(address(this), 1e18);
+            uint256 balanceETHBefore = address(this).balance;
+            uint256 balanceERC20Before = IERC20TokenV06(tokens.USDT).balanceOf(address(this));
+
+            IZeroEx(payable(addresses.exchangeProxy)).transformERC20{value: 1e18}(
+                // input token
+                IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
+                // output token
+                IERC20TokenV06(address(tokens.USDT)),
+                // input token amount
+                1e18,
+                // min output token amount
+                order.makerTokenAmount,
+                // list of transform
+                transformations
+            );
+
+            log_named_uint("        NativeAsset balance before", balanceETHBefore);
+            log_named_uint("        ERC-20 balance before", balanceERC20Before);
+            log_named_uint("        NativeAsset balance after", balanceETHBefore - address(this).balance);
+            log_named_uint(
+                "        ERC-20 balance after",
+                IERC20TokenV06(tokens.USDT).balanceOf(address(this)) - balanceERC20Before
+            );
+            assert(IERC20TokenV06(tokens.USDT).balanceOf(address(this)) > 0);
+        } else {
+            emit log_string("Liquidity Source not available on this chain");
+        }
+    }
+
+    /* solhint-enable function-max-lines */
+
+    // get a real quote from uniswap
+    function sampleLiquiditySource(
+        uint256 amount,
+        address takerToken,
+        address makerToken,
+        address router
+    ) public returns (uint256 makerTokenAmounts) {
+        address[] memory path = new address[](2);
+        path[0] = address(takerToken);
+        path[1] = address(makerToken);
+        uint256[] memory amounts = new uint256[](1);
+        amounts[0] = amount;
+        uint256 out = sampleSellsFromUniswapV2(router, path, amounts)[0];
+
+        log_string("       Sampling Uniswap for tokens");
+        log_named_address("        ", takerToken);
+        log_string("           -> ");
+        log_named_address("        ", makerToken);
+        return out;
+    }
+}
diff --git a/contracts/zero-ex/tests/utils/TestUtils.sol b/contracts/zero-ex/tests/utils/TestUtils.sol
new file mode 100644
index 0000000000..b4e3ab858e
--- /dev/null
+++ b/contracts/zero-ex/tests/utils/TestUtils.sol
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+  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;
+pragma experimental ABIEncoderV2;
+
+import "forge-std/Test.sol";
+
+import "src/transformers/LibERC20Transformer.sol";
+
+contract TestUtils is Test {
+    function _findTransformerNonce(address transformer, address deployer) internal pure returns (uint32) {
+        address current;
+        for (uint32 i = 0; i < 1024; i++) {
+            current = LibERC20Transformer.getDeployedAddress(deployer, i);
+            if (current == transformer) {
+                return i;
+            }
+        }
+    }
+}
diff --git a/package.json b/package.json
index 4af2d93aff..03b95a0d52 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
         "test:all": "wsrun --fast-exit --serial --exclude-missing -p $PKG -c test",
         "test:contracts": "wsrun --serial -p $(echo ${npm_package_config_contractsPackages} ${npm_package_config_ignoreTestsForPackages} | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ') --fast-exit --exclude-missing -c test",
         "test:contracts:all": "wsrun --serial -p ${npm_package_config_contractsPackages} --fast-exit --exclude-missing -c test",
-        "test:links": "yarn check-md",
+        "test:links": "yarn check-md --ignore **/contracts/zero-ex/contracts/deps/forge-std/README.md,**/node_modules",
         "generate_doc": "node ./node_modules/@0x/monorepo-scripts/lib/doc_generate.js --config ./doc-gen-config.json",
         "upload_md_docs": "aws s3 rm --recursive s3://docs-markdown; wsrun --exclude-missing -c s3:sync_md_docs",
         "diff_md_docs:ci": "wsrun --exclude-missing -c diff_docs",