remove old code from multiplex foundry tests

install deps and test and add the --root option

.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

.github/autolabeler.yml

@@ -1,2 +1,6 @@
-documentation: ['docs']
-liquidity integrations: ['contracts/zero-ex/contracts/src/transformers']
+python: ['python-packages']
+contracts: ['contracts']
+@0x/contract-addresses: ['packages/contract-addresses']
+@0x/order-utils: ['packages/order-utils']
+@0x/contract-artifacts: ['packages/contract-artifacts']
+@0x/contract-wrappers: ['packages/contract-wrappers']

.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: monthly
-    target-branch: "development"

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+    - pinned
+    - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+    This issue has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs. Thank you
+    for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+    This issue has been automatically closed because no activity occured in 7 days after being marked as stale. If it's still relevant - feel free to reopen. Thank you
+    for your contributions.

.github/workflows/ci.yml

@@ -1,108 +0,0 @@
-name: Continuous Integration
-on:
-  push:
-    branches:
-      - main
-      - development
-  pull_request:
-
-jobs:
-  build:
-    name: Build and test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "16"
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Build solution
-        run: yarn build
-
-      - name: Lint typescript
-        run: yarn lint:ts
-
-      - name: Lint solidity
-        run: yarn lint:contracts
-
-      - name: Run prettier
-        run: yarn prettier:ci
-
-      - name: Check dependent packages have consistent versions
-        run: yarn deps_versions:ci
-
-      - name: Check diff in docs
-        run: yarn diff_md_docs:ci
-
-      - name: Check for broken links in markdown files
-        run: yarn test:links
-
-      - name: Test doc generation
-        run: yarn test:generate_docs:ci
-
-      - name: Test @0x/contracts-*
-        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:ci
-
-      - name: Test local @0x/contracts-*
-        run: |
-                yarn wsrun \
-                  -p @0x/contracts-test-utils \
-                  -p @0x/contract-addresses \
-                  -p @0x/contract-artifacts \
-                  -p @0x/contract-wrappers-test \
-                  -p @0x/order-utils \
-                  -m --serial -c test:ci
-
-      - name: Add foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Run Forge build
-        working-directory: contracts/zero-ex
-        run: |
-          forge --version
-          forge build --sizes
-
-      - 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
-
-      - name: Run Forge coverage
-        working-directory: contracts/zero-ex
-        run: |
-          forge coverage --report lcov
-
-      - name: Upload the coverage report to Coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          base-path: ./contracts/zero-ex/
-          path-to-lcov: ./contracts/zero-ex/lcov.info

.github/workflows/stale.yml

@@ -1,40 +0,0 @@
-name: "Close stale issues and PRs"
-on:
-  schedule:
-    - cron: "0 8 * * 1-5" # This is in UTC.
-  # Do a dry-run (debug-only: true) whenever this workflow itself is changed.
-  pull_request:
-    paths:
-      - .github/workflows/stale.yml
-    types:
-      - opened
-      - synchronize
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v7
-        with:
-          ascending: true # Spend API operations budget on older, more-likely-to-get-closed issues first
-          close-issue-message: "" # Leave no comment when closing
-          close-pr-message: "" # Leave no comment when closing
-          days-before-issue-stale: 30
-          days-before-pr-stale: 30
-          days-before-close: 14
-          debug-only: ${{ github.event_name == 'pull_request' }} # Dry-run when true.
-          exempt-issue-labels: bug,enhancement,feature,question
-          # No actual changes get made in debug-only mode, so we can raise the operations ceiling.
-          operations-per-run: ${{ github.event_name == 'pull_request' && 100 || 30}}
-          stale-issue-label: stale
-          stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-          stale-pr-label: stale
-          stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-          # Time immemorial when in debug-only mode (ie. on pull requests).
-          # `STALEBOT_START_DATE` otherwise.
-          # You can use this as a killswitch by setting `STALEBOT_START_DATE` in the far future.
-          start-date: ${{ github.event_name == 'pull_request' && '1970-01-01T00:00:00Z' || secrets.STALEBOT_START_DATE }} # ISO 8601 or RFC 2822

.gitignore

@@ -15,6 +15,9 @@ pids
 *.db
 *.sqlite
 
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
 # Coverage directory used by tools like istanbul
 coverage
 
@@ -77,22 +80,104 @@ TODO.md
 .idea
 
 # generated contract artifacts/
-generated-artifacts/
+contracts/broker/generated-artifacts/
+contracts/broker/test/generated-artifacts/
+contracts/erc20-bridge-sampler/generated-artifacts/
+contracts/erc20-bridge-sampler/test/generated-artifacts/
+contracts/integrations/generated-artifacts/
+contracts/integrations/test/generated-artifacts/
+contracts/staking/generated-artifacts/
+contracts/staking/test/generated-artifacts/
+contracts/coordinator/generated-artifacts/
+contracts/coordinator/test/generated-artifacts/
+contracts/exchange/generated-artifacts/
+contracts/exchange/test/generated-artifacts/
+contracts/asset-proxy/generated-artifacts/
+contracts/asset-proxy/test/generated-artifacts/
+contracts/multisig/generated-artifacts/
+contracts/multisig/test/generated-artifacts/
+contracts/utils/generated-artifacts/
+contracts/utils/test/generated-artifacts/
+contracts/exchange-libs/generated-artifacts/
+contracts/exchange-libs/test/generated-artifacts/
+contracts/erc20/generated-artifacts/
+contracts/erc20/test/generated-artifacts/
+contracts/erc721/generated-artifacts/
+contracts/erc721/test/generated-artifacts/
+contracts/erc1155/generated-artifacts/
+contracts/erc1155/test/generated-artifacts/
+contracts/extensions/generated-artifacts/
+contracts/extensions/test/generated-artifacts/
+contracts/exchange-forwarder/generated-artifacts/
+contracts/exchange-forwarder/test/generated-artifacts/
+contracts/dev-utils/generated-artifacts/
+contracts/dev-utils/test/generated-artifacts/
+contracts/zero-ex/generated-artifacts/
+contracts/zero-ex/test/generated-artifacts/
+contracts/treasury/generated-artifacts/
+contracts/treasury/test/generated-artifacts/
+
+# generated truffle contract artifacts/
+contracts/broker/build/
+contracts/erc20-bridge-sampler/build/
+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/extensions/build/
+contracts/exchange-forwarder/build/
+contracts/dev-utils/build/
 
 # generated contract wrappers
-generated-wrappers/
-
-# forge std-lib
-contracts/zero-ex/contracts/deps/forge-std
+contracts/broker/generated-wrappers/
+contracts/broker/test/generated-wrappers/
+packages/python-contract-wrappers/generated/
+contracts/erc20-bridge-sampler/generated-wrappers/
+contracts/erc20-bridge-sampler/test/generated-wrappers/
+contracts/integrations/generated-wrappers/
+contracts/integrations/test/generated-wrappers/
+contracts/staking/generated-wrappers/
+contracts/staking/test/generated-wrappers/
+contracts/coordinator/generated-wrappers/
+contracts/coordinator/test/generated-wrappers/
+contracts/exchange/generated-wrappers/
+contracts/exchange/test/generated-wrappers/
+contracts/asset-proxy/generated-wrappers/
+contracts/asset-proxy/test/generated-wrappers/
+contracts/multisig/generated-wrappers/
+contracts/multisig/test/generated-wrappers/
+contracts/utils/generated-wrappers/
+contracts/utils/test/generated-wrappers/
+contracts/exchange-libs/generated-wrappers/
+contracts/exchange-libs/test/generated-wrappers/
+contracts/erc20/generated-wrappers/
+contracts/erc20/test/generated-wrappers/
+contracts/erc721/generated-wrappers/
+contracts/erc721/test/generated-wrappers/
+contracts/erc1155/generated-wrappers/
+contracts/erc1155/test/generated-wrappers/
+contracts/extensions/generated-wrappers/
+contracts/extensions/test/generated-wrappers/
+contracts/exchange-forwarder/generated-wrappers/
+contracts/exchange-forwarder/test/generated-wrappers/
+contracts/dev-utils/generated-wrappers/
+contracts/dev-utils/test/generated-wrappers/
+contracts/zero-ex/generated-wrappers/
+contracts/zero-ex/test/generated-wrappers/
+contracts/treasury/generated-wrappers/
+contracts/treasury/test/generated-wrappers/
 
 # foundry artifacts
-foundry-artifacts/
+contracts/zero-ex/foundry-artifacts/
 
-# foundry cache
-cache/
-
-#foundry output artifacts
-out/
+# foundry cache 
+contracts/zero-ex/foundry-cache/
 
 # typechain wrappers
 contracts/zero-ex/typechain-wrappers/

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged --no-stash

.prettierignore

@@ -1,10 +1,91 @@
 lib
-deps
 .nyc_output
-generated-artifacts/
-generated-wrappers/
-foundry-artifacts/
-out/
-cache/
+/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/
 package.json
-packages
+packages/*/docs
+docs/

.solhint.json

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

.solhintignore

@@ -1,9 +1 @@
 contracts/erc20/contracts/src/ZRXToken.sol
-node_modules/
-lib
-deps
-generated-artifacts/
-generated-wrappers/
-foundry-artifacts/
-out/
-cache/

CODEOWNERS

@@ -8,7 +8,7 @@
 
 # Dev tools & setup
 
-.github/ @dekz
+.circleci/ @dekz
 packages/contract-addresses/ @dekz @dextracker @kyu-c
 packages/contract-artifacts/ @dekz
 packages/protocol-utils/ @dekz

CONTRIBUTING.md

@@ -89,3 +89,15 @@ A few of our coding conventions are not yet enforced by the linter/auto-formatte
 1.  If you _must_ cast a variable to any - try to type it back as fast as possible. (e.g., `const cw = ((zeroEx as any)._contractWrappers as ContractWrappers);`). This ensures subsequent code is type-safe.
 1.  Our enum conventions coincide with the recommended TypeScript conventions, using capitalized keys, and all-caps snake-case values. Eg `GetStats = 'GET_STATS'`
 1.  All public, exported methods/functions/classes must have associated Javadoc-style comments.
+
+### Fix `submit-coverage` CI failure
+
+If you simply fork the repo and then create a PR from it, your PR will fail the `submit-coverage` check on CI. This is because the 0x CircleCI configuration sets the `COVERALLS_REPO_TOKEN` environment variable to the token for `0xProject/0x-tools`, but when running the check against your fork the token needs to match your repo's name `your-username/0x-tools`.
+
+To facilitate this check, after creating your fork, but before creating the branch for your PR, do the following:
+
+1.  Log in to [coveralls.io](https://coveralls.io/), go to `Add Repos`, and enable your fork. Then go to the settings for that repo, and copy the `Repo Token` identifier.
+2.  Log in to [CircleCI](https://circleci.com/login), go to `Add Projects`, click the `Set Up Project` button corresponding to your fork, and then click `Start Building`. (Aside from step 3 below, no actual set up is needed, since it will use the `.circleci/config.yml` file in 0x-tools, so you can ignore all of the instruction/explanation given on the page with the `Start Building` button.)
+3.  In CircleCI, configure your project to add an environment variable, with name `COVERALLS_REPO_TOKEN`, and for the value paste in the `Repo Token` you copied in step 1.
+
+Now, when you push to your branch, CircleCI will automatically run all of the checks in your own instance, and the coverage check will work since it has the proper `Repo Token`, and the PR will magically refer to your own checks rather than running them in the 0x CircleCI instance.

ISSUE_TEMPLATE.md

@@ -2,13 +2,15 @@
 
 <!--- Before submitting please check to see if this issue was already reported -->
 
+<!--- Prefix your issue title with the package name it relates to (e.g., `0x.js: ` or `general:`) -->
+
 ## Expected Behavior
 
 <!--- If you're describing a bug, tell us what should happen -->
 
 <!--- If you're suggesting a package change/improvement, tell us how it should work -->
 
-<!--- If you're suggesting a contract or protocol change/improvement, visit our ZEIPs repo https://github.com/0xProject/ZEIPs -->
+<!--- If you're suggesting a contract or protocol change/improvement, visit our ZEIPs repo -->
 
 ## Current Behavior
 
@@ -48,8 +50,8 @@
 | ------: | :------ |
 
 <!-- For example:
-|    `protocol-utils` | 2.0.4   |
-| `Exchange Contract` | v3      |
+|             `0x.js` | 2.0.4   |
+| `Exchange Contract` | v2      |
 -->
 
 | Network |
@@ -58,6 +60,6 @@
 
 <!-- For example:
 | mainnet |
-| goerli |
-| development |
+| kovan |
+| testrpc |
 -->

README.md

@@ -8,7 +8,8 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 [website-url]: https://0x.org
 
-[![Coverage Status](https://coveralls.io/repos/github/0xProject/protocol/badge.svg?branch=development)](https://coveralls.io/github/0xProject/protocol?branch=development)
+[![CircleCI](https://circleci.com/gh/0xProject/protocol.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/protocool)
+[![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
 [![Discord](https://img.shields.io/badge/chat-discord.chat-yellow.svg?style=flat)](https://discordapp.com/invite/d3FTX3M)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
@@ -53,7 +54,7 @@ You can include those by prepending the `@0x/typescript-typings` package to your
 
 We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-#### Read our [contribution guidelines](.github/CONTRIBUTING.md).
+#### Read our [contribution guidelines](./CONTRIBUTING.md).
 
 ### Install dependencies
 

contracts/erc20/CHANGELOG.json

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

contracts/erc20/CHANGELOG.md

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

contracts/erc20/README.md

@@ -20,7 +20,7 @@ We strongly recommend that the community help us make improvements and determine
 
 For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
 
-Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

contracts/erc20/contracts/src/v08/IERC20TokenV08.sol

@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8.0;
-
-interface IERC20TokenV08 {
-    event Transfer(address indexed from, address indexed to, uint256 value);
-
-    event Approval(address indexed owner, address indexed spender, uint256 value);
-
-    /// @dev send `value` token to `to` from `msg.sender`
-    /// @param to The address of the recipient
-    /// @param value The amount of token to be transferred
-    /// @return True if transfer was successful
-    function transfer(address to, uint256 value) external returns (bool);
-
-    /// @dev send `value` token to `to` from `from` on the condition it is approved by `from`
-    /// @param from The address of the sender
-    /// @param to The address of the recipient
-    /// @param value The amount of token to be transferred
-    /// @return True if transfer was successful
-    function transferFrom(address from, address to, uint256 value) external returns (bool);
-
-    /// @dev `msg.sender` approves `spender` to spend `value` tokens
-    /// @param spender The address of the account able to transfer the tokens
-    /// @param value The amount of wei to be approved for transfer
-    /// @return Always true if the call has enough gas to complete execution
-    function approve(address spender, uint256 value) external returns (bool);
-
-    /// @dev Query total supply of token
-    /// @return Total supply of token
-    function totalSupply() external view returns (uint256);
-
-    /// @dev Get the balance of `owner`.
-    /// @param owner The address from which the balance will be retrieved
-    /// @return Balance of owner
-    function balanceOf(address owner) external view returns (uint256);
-
-    /// @dev Get the allowance for `spender` to spend from `owner`.
-    /// @param owner The address of the account owning tokens
-    /// @param spender The address of the account able to transfer the tokens
-    /// @return Amount of remaining tokens allowed to spent
-    function allowance(address owner, address spender) external view returns (uint256);
-
-    /// @dev Get the number of decimals this token has.
-    function decimals() external view returns (uint8);
-}

contracts/erc20/contracts/src/v08/IEtherTokenV08.sol

@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8.0;
-
-import "./IERC20TokenV08.sol";
-
-interface IEtherTokenV08 is IERC20TokenV08 {
-    /// @dev Wrap ether.
-    function deposit() external payable;
-
-    /// @dev Unwrap ether.
-    function withdraw(uint256 amount) external;
-}

contracts/erc20/contracts/src/v08/LibERC20TokenV08.sol

@@ -1,146 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8.0;
-
-import "@0x/contracts-utils/contracts/src/v08/errors/LibRichErrorsV08.sol";
-import "@0x/contracts-utils/contracts/src/v08/LibBytesV08.sol";
-import "./IERC20TokenV08.sol";
-
-library LibERC20TokenV08 {
-    bytes private constant DECIMALS_CALL_DATA = hex"313ce567";
-
-    /// @dev Calls `IERC20TokenV08(token).approve()`.
-    ///      Reverts if the return data is invalid or the call reverts.
-    /// @param token The address of the token contract.
-    /// @param spender The address that receives an allowance.
-    /// @param allowance The allowance to set.
-    function compatApprove(IERC20TokenV08 token, address spender, uint256 allowance) internal {
-        bytes memory callData = abi.encodeCall(token.approve, (spender, allowance));
-        _callWithOptionalBooleanResult(address(token), callData);
-    }
-
-    /// @dev Calls `IERC20TokenV08(token).approve()` and sets the allowance to the
-    ///      maximum if the current approval is not already >= an amount.
-    ///      Reverts if the return data is invalid or the call reverts.
-    /// @param token The address of the token contract.
-    /// @param spender The address that receives an allowance.
-    /// @param amount The minimum allowance needed.
-    function approveIfBelow(IERC20TokenV08 token, address spender, uint256 amount) internal {
-        if (token.allowance(address(this), spender) < amount) {
-            compatApprove(token, spender, type(uint256).max);
-        }
-    }
-
-    /// @dev Calls `IERC20TokenV08(token).transfer()`.
-    ///      Reverts if the return data is invalid or the call reverts.
-    /// @param token The address of the token contract.
-    /// @param to The address that receives the tokens
-    /// @param amount Number of tokens to transfer.
-    function compatTransfer(IERC20TokenV08 token, address to, uint256 amount) internal {
-        bytes memory callData = abi.encodeCall(token.transfer, (to, amount));
-        _callWithOptionalBooleanResult(address(token), callData);
-    }
-
-    /// @dev Calls `IERC20TokenV08(token).transferFrom()`.
-    ///      Reverts if the return data is invalid or the call reverts.
-    /// @param token The address of the token contract.
-    /// @param from The owner of the tokens.
-    /// @param to The address that receives the tokens
-    /// @param amount Number of tokens to transfer.
-    function compatTransferFrom(IERC20TokenV08 token, address from, address to, uint256 amount) internal {
-        bytes memory callData = abi.encodeCall(token.transferFrom, (from, to, amount));
-        _callWithOptionalBooleanResult(address(token), callData);
-    }
-
-    /// @dev Retrieves the number of decimals for a token.
-    ///      Returns `18` if the call reverts.
-    /// @param token The address of the token contract.
-    /// @return tokenDecimals The number of decimals places for the token.
-    function compatDecimals(IERC20TokenV08 token) internal view returns (uint8 tokenDecimals) {
-        tokenDecimals = 18;
-        (bool didSucceed, bytes memory resultData) = address(token).staticcall(DECIMALS_CALL_DATA);
-        if (didSucceed && resultData.length >= 32) {
-            tokenDecimals = abi.decode(resultData, (uint8));
-        }
-    }
-
-    /// @dev Retrieves the allowance for a token, owner, and spender.
-    ///      Returns `0` if the call reverts.
-    /// @param token The address of the token contract.
-    /// @param owner The owner of the tokens.
-    /// @param spender The address the spender.
-    /// @return allowance_ The allowance for a token, owner, and spender.
-    function compatAllowance(
-        IERC20TokenV08 token,
-        address owner,
-        address spender
-    ) internal view returns (uint256 allowance_) {
-        (bool didSucceed, bytes memory resultData) = address(token).staticcall(
-            abi.encodeCall(token.allowance, (owner, spender))
-        );
-        if (didSucceed && resultData.length >= 32) {
-            allowance_ = abi.decode(resultData, (uint256));
-        }
-    }
-
-    /// @dev Retrieves the balance for a token owner.
-    ///      Returns `0` if the call reverts.
-    /// @param token The address of the token contract.
-    /// @param owner The owner of the tokens.
-    /// @return balance The token balance of an owner.
-    function compatBalanceOf(IERC20TokenV08 token, address owner) internal view returns (uint256 balance) {
-        (bool didSucceed, bytes memory resultData) = address(token).staticcall(
-            abi.encodeCall(token.balanceOf, (owner))
-        );
-        if (didSucceed && resultData.length >= 32) {
-            balance = abi.decode(resultData, (uint256));
-        }
-    }
-
-    /// @dev Executes a call on address `target` with calldata `callData`
-    ///      and asserts that either nothing was returned or a single boolean
-    ///      was returned equal to `true`.
-    /// @param target The call target.
-    /// @param callData The abi-encoded call data.
-    function _callWithOptionalBooleanResult(address target, bytes memory callData) private {
-        (bool didSucceed, bytes memory resultData) = target.call(callData);
-        // Revert if the call reverted.
-        if (!didSucceed) {
-            LibRichErrorsV08.rrevert(resultData);
-        }
-        // If we get back 0 returndata, this may be a non-standard ERC-20 that
-        // does not return a boolean. Check that it at least contains code.
-        if (resultData.length == 0) {
-            require(target.code.length > 0, "invalid token address, contains no code");
-            return;
-        }
-        // If we get back at least 32 bytes, we know the target address
-        // contains code, and we assume it is a token that returned a boolean
-        // success value, which must be true.
-        if (resultData.length >= 32) {
-            if (!abi.decode(resultData, (bool))) {
-                LibRichErrorsV08.rrevert(resultData);
-            }
-        }
-        // If 0 < returndatasize < 32, the target is a contract, but not a
-        // valid token.
-        LibRichErrorsV08.rrevert(resultData);
-    }
-}

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.57",
+    "version": "3.3.54",
     "engines": {
         "node": ">=6.12"
     },
@@ -15,6 +15,7 @@
         "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
+        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
         "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
@@ -24,7 +25,11 @@
         "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
         "lint": "eslint src test",
         "fix": "eslint --fix src test",
-        "test:ci": "yarn test",
+        "coverage:report:text": "istanbul report text",
+        "coverage:report:html": "istanbul report html && open coverage/index.html",
+        "profiler:report:html": "istanbul report html && open coverage/index.html",
+        "coverage:report:lcov": "istanbul report lcov",
+        "test:circleci": "yarn test",
         "contracts:gen": "contracts-gen generate",
         "contracts:copy": "contracts-gen copy",
         "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
@@ -32,7 +37,7 @@
     },
     "config": {
         "publicInterfaceContracts": "DummyERC20Token,ERC20Token,WETH9,ZRXToken,DummyNoReturnERC20Token,DummyMultipleReturnERC20Token",
-        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IERC20TokenV08|IEtherToken|IEtherTokenV06|IEtherTokenV08|LibERC20Token|LibERC20TokenV06|LibERC20TokenV08|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|WETH9V06|ZRXToken).json",
+        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IEtherToken|IEtherTokenV06|LibERC20Token|LibERC20TokenV06|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|WETH9V06|ZRXToken).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -47,8 +52,8 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.47",
-        "@0x/contracts-utils": "^4.8.38",
+        "@0x/contracts-test-utils": "^5.4.44",
+        "@0x/contracts-utils": "^4.8.35",
         "@0x/dev-utils": "^5.0.0",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",

contracts/erc20/test/artifacts.ts

@@ -11,13 +11,10 @@ import * as DummyNoReturnERC20Token from '../test/generated-artifacts/DummyNoRet
 import * as ERC20Token from '../test/generated-artifacts/ERC20Token.json';
 import * as IERC20Token from '../test/generated-artifacts/IERC20Token.json';
 import * as IERC20TokenV06 from '../test/generated-artifacts/IERC20TokenV06.json';
-import * as IERC20TokenV08 from '../test/generated-artifacts/IERC20TokenV08.json';
 import * as IEtherToken from '../test/generated-artifacts/IEtherToken.json';
 import * as IEtherTokenV06 from '../test/generated-artifacts/IEtherTokenV06.json';
-import * as IEtherTokenV08 from '../test/generated-artifacts/IEtherTokenV08.json';
 import * as LibERC20Token from '../test/generated-artifacts/LibERC20Token.json';
 import * as LibERC20TokenV06 from '../test/generated-artifacts/LibERC20TokenV06.json';
-import * as LibERC20TokenV08 from '../test/generated-artifacts/LibERC20TokenV08.json';
 import * as MintableERC20Token from '../test/generated-artifacts/MintableERC20Token.json';
 import * as TestLibERC20Token from '../test/generated-artifacts/TestLibERC20Token.json';
 import * as TestLibERC20TokenTarget from '../test/generated-artifacts/TestLibERC20TokenTarget.json';
@@ -39,9 +36,6 @@ export const artifacts = {
     IEtherTokenV06: IEtherTokenV06 as ContractArtifact,
     LibERC20TokenV06: LibERC20TokenV06 as ContractArtifact,
     WETH9V06: WETH9V06 as ContractArtifact,
-    IERC20TokenV08: IERC20TokenV08 as ContractArtifact,
-    IEtherTokenV08: IEtherTokenV08 as ContractArtifact,
-    LibERC20TokenV08: LibERC20TokenV08 as ContractArtifact,
     DummyERC20Token: DummyERC20Token as ContractArtifact,
     DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
     DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,

contracts/erc20/test/global_hooks.ts

@@ -0,0 +1,19 @@
+import { env, EnvVars } from '@0x/dev-utils';
+
+import { coverage, profiler, provider } from '@0x/contracts-test-utils';
+import { providerUtils } from '@0x/utils';
+
+before('start web3 provider', () => {
+    providerUtils.startProviderEngine(provider);
+});
+after('generate coverage report', async () => {
+    if (env.parseBoolean(EnvVars.SolidityCoverage)) {
+        const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+        await coverageSubprovider.writeCoverageAsync();
+    }
+    if (env.parseBoolean(EnvVars.SolidityProfiler)) {
+        const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+        await profilerSubprovider.writeProfilerOutputAsync();
+    }
+    provider.stop();
+});

contracts/erc20/test/wrappers.ts

@@ -9,13 +9,10 @@ export * from '../test/generated-wrappers/dummy_no_return_erc20_token';
 export * from '../test/generated-wrappers/erc20_token';
 export * from '../test/generated-wrappers/i_erc20_token';
 export * from '../test/generated-wrappers/i_erc20_token_v06';
-export * from '../test/generated-wrappers/i_erc20_token_v08';
 export * from '../test/generated-wrappers/i_ether_token';
 export * from '../test/generated-wrappers/i_ether_token_v06';
-export * from '../test/generated-wrappers/i_ether_token_v08';
 export * from '../test/generated-wrappers/lib_erc20_token';
 export * from '../test/generated-wrappers/lib_erc20_token_v06';
-export * from '../test/generated-wrappers/lib_erc20_token_v08';
 export * from '../test/generated-wrappers/mintable_erc20_token';
 export * from '../test/generated-wrappers/test_lib_erc20_token';
 export * from '../test/generated-wrappers/test_lib_erc20_token_target';

contracts/erc20/truffle-config.js

@@ -0,0 +1,96 @@
+/**
+ * Use this file to configure your truffle project. It's seeded with some
+ * common settings for different networks and features like migrations,
+ * compilation and testing. Uncomment the ones you need or modify
+ * them to suit your project as necessary.
+ *
+ * More information about configuration can be found at:
+ *
+ * truffleframework.com/docs/advanced/configuration
+ *
+ * To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
+ * to sign your transactions before they're sent to a remote public node. Infura accounts
+ * are available for free at: infura.io/register.
+ *
+ * You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
+ * public/private key pairs. If you're publishing your code to GitHub make sure you load this
+ * phrase from a file you've .gitignored so it doesn't accidentally become public.
+ *
+ */
+
+// const HDWalletProvider = require('truffle-hdwallet-provider');
+// const infuraKey = "fj4jll3k.....";
+//
+// const fs = require('fs');
+// const mnemonic = fs.readFileSync(".secret").toString().trim();
+
+module.exports = {
+    /**
+     * Networks define how you connect to your ethereum client and let you set the
+     * defaults web3 uses to send transactions. If you don't specify one truffle
+     * will spin up a development blockchain for you on port 9545 when you
+     * run `develop` or `test`. You can ask a truffle command to use a specific
+     * network from the command line, e.g
+     *
+     * $ truffle test --network <network-name>
+     */
+
+    networks: {
+        // Useful for testing. The `development` name is special - truffle uses it by default
+        // if it's defined here and no other network is specified at the command line.
+        // You should run a client (like ganache-cli, geth or parity) in a separate terminal
+        // tab if you use this network and you must also set the `host`, `port` and `network_id`
+        // options below to some value.
+        //
+        // development: {
+        //  host: "127.0.0.1",     // Localhost (default: none)
+        //  port: 8545,            // Standard Ethereum port (default: none)
+        //  network_id: "*",       // Any network (default: none)
+        // },
+        // Another network with more advanced options...
+        // advanced: {
+        // port: 8777,             // Custom port
+        // network_id: 1342,       // Custom network
+        // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
+        // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
+        // from: <address>,        // Account to send txs from (default: accounts[0])
+        // websockets: true        // Enable EventEmitter interface for web3 (default: false)
+        // },
+        // Useful for deploying to a public network.
+        // NB: It's important to wrap the provider as a function.
+        // ropsten: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+        // network_id: 3,       // Ropsten's id
+        // gas: 5500000,        // Ropsten has a lower block limit than mainnet
+        // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
+        // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
+        // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
+        // },
+        // Useful for private networks
+        // private: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
+        // network_id: 2111,   // This network is yours, in the cloud.
+        // production: true    // Treats this network as if it was a public net. (default: false)
+        // }
+    },
+
+    // Set default mocha options here, use special reporters etc.
+    mocha: {
+        // timeout: 100000
+    },
+
+    // Configure your compilers
+    compilers: {
+        solc: {
+            version: '0.5.9',
+            settings: {
+                evmVersion: 'constantinople',
+                optimizer: {
+                    enabled: true,
+                    runs: 1000000,
+                    details: { yul: true, deduplicate: true, cse: true, constantOptimizer: true },
+                },
+            },
+        },
+    },
+};

contracts/erc20/tsconfig.json

@@ -15,13 +15,10 @@
         "test/generated-artifacts/ERC20Token.json",
         "test/generated-artifacts/IERC20Token.json",
         "test/generated-artifacts/IERC20TokenV06.json",
-        "test/generated-artifacts/IERC20TokenV08.json",
         "test/generated-artifacts/IEtherToken.json",
         "test/generated-artifacts/IEtherTokenV06.json",
-        "test/generated-artifacts/IEtherTokenV08.json",
         "test/generated-artifacts/LibERC20Token.json",
         "test/generated-artifacts/LibERC20TokenV06.json",
-        "test/generated-artifacts/LibERC20TokenV08.json",
         "test/generated-artifacts/MintableERC20Token.json",
         "test/generated-artifacts/TestLibERC20Token.json",
         "test/generated-artifacts/TestLibERC20TokenTarget.json",

contracts/test-utils/CHANGELOG.json

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

contracts/test-utils/CHANGELOG.md

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

contracts/test-utils/README.md

@@ -24,7 +24,7 @@ import {
 
 We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.47",
+    "version": "5.4.44",
     "engines": {
         "node": ">=6.12"
     },
@@ -13,11 +13,16 @@
         "build": "tsc -b",
         "build:ci": "yarn build",
         "test": "yarn run_mocha",
+        "test:coverage": "run-s build run_mocha coverage:report:text coverage:report:lcov",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
         "clean": "shx rm -rf lib",
         "lint": "eslint src test",
         "fix": "eslint --fix src test",
-        "test:ci": "yarn test"
+        "coverage:report:text": "istanbul report text",
+        "coverage:report:html": "istanbul report html && open coverage/index.html",
+        "profiler:report:html": "istanbul report html && open coverage/index.html",
+        "coverage:report:lcov": "istanbul report lcov",
+        "test:circleci": "yarn test"
     },
     "repository": {
         "type": "git",
@@ -41,10 +46,11 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.0.3",
+        "@0x/contract-addresses": "^8.0.0",
         "@0x/dev-utils": "^5.0.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",
+        "@0x/sol-coverage": "^4.0.46",
         "@0x/sol-profiler": "^4.1.36",
         "@0x/sol-trace": "^3.0.46",
         "@0x/subproviders": "^7.0.0",

contracts/test-utils/src/coverage.ts

@@ -0,0 +1,26 @@
+import { devConstants } from '@0x/dev-utils';
+import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-coverage';
+let coverageSubprovider: CoverageSubprovider;
+
+export const coverage = {
+    getCoverageSubproviderSingleton(): CoverageSubprovider {
+        if (coverageSubprovider === undefined) {
+            coverageSubprovider = coverage._getCoverageSubprovider();
+        }
+        return coverageSubprovider;
+    },
+    _getCoverageSubprovider(): CoverageSubprovider {
+        const defaultFromAddress = devConstants.TESTRPC_FIRST_ADDRESS;
+        const solCompilerArtifactAdapter = new SolCompilerArtifactAdapter();
+        const coverageSubproviderConfig = {
+            isVerbose: true,
+            ignoreFilesGlobs: ['**/node_modules/**', '**/interfaces/**', '**/test/**'],
+        };
+        const subprovider = new CoverageSubprovider(
+            solCompilerArtifactAdapter,
+            defaultFromAddress,
+            coverageSubproviderConfig,
+        );
+        return subprovider;
+    },
+};

contracts/test-utils/src/global_hooks.ts

@@ -0,0 +1,15 @@
+import { env, EnvVars } from '@0x/dev-utils';
+
+import { coverage } from './coverage';
+import { profiler } from './profiler';
+
+after('generate coverage report', async () => {
+    if (env.parseBoolean(EnvVars.SolidityCoverage)) {
+        const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+        await coverageSubprovider.writeCoverageAsync();
+    }
+    if (env.parseBoolean(EnvVars.SolidityProfiler)) {
+        const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+        await profilerSubprovider.writeProfilerOutputAsync();
+    }
+});

contracts/test-utils/src/index.ts

@@ -20,6 +20,7 @@ export { signingUtils } from './signing_utils';
 export { orderUtils } from './order_utils';
 export { typeEncodingUtils } from './type_encoding_utils';
 export { profiler } from './profiler';
+export { coverage } from './coverage';
 export { Web3ProviderEngine } from '@0x/subproviders';
 export { randomAddress } from './address_utils';
 export { OrderFactory } from './order_factory';

contracts/test-utils/src/web3_wrapper.ts

@@ -5,6 +5,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
 import { constants } from './constants';
+import { coverage } from './coverage';
 import { profiler } from './profiler';
 import { revertTrace } from './revert_trace';
 
@@ -38,7 +39,11 @@ const enabledSubproviderCount = _.filter(
     _.identity.bind(_),
 ).length;
 if (enabledSubproviderCount > 1) {
-    throw new Error(`Only one of profiler or revert trace subproviders can be enabled at a time`);
+    throw new Error(`Only one of coverage, profiler, or revert trace subproviders can be enabled at a time`);
+}
+if (isCoverageEnabled) {
+    const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+    prependSubprovider(provider, coverageSubprovider);
 }
 if (isProfilerEnabled) {
     const profilerSubprovider = profiler.getProfilerSubproviderSingleton();

contracts/treasury/CHANGELOG.json

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

contracts/treasury/CHANGELOG.md

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

contracts/treasury/README.md

@@ -16,7 +16,7 @@ We strongly recommend that the community help us make improvements and determine
 
 For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
 
-Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.40",
+    "version": "1.4.37",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
         "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
         "lint": "eslint src test",
         "fix": "eslint --fix src test",
-        "test:ci": "yarn test",
+        "test:circleci": "yarn test",
         "contracts:gen": "contracts-gen generate",
         "contracts:copy": "contracts-gen copy",
         "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
@@ -46,12 +46,12 @@
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^8.0.3",
+        "@0x/contract-addresses": "^8.0.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.57",
+        "@0x/contracts-erc20": "^3.3.54",
         "@0x/contracts-gen": "^2.0.48",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.47",
+        "@0x/contracts-test-utils": "^5.4.44",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
         "@types/isomorphic-fetch": "^0.0.35",
@@ -73,7 +73,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.17.6",
+        "@0x/protocol-utils": "^11.17.3",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

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

contracts/utils/CHANGELOG.md

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

contracts/utils/README.md

@@ -16,7 +16,7 @@ We strongly recommend that the community help us make improvements and determine
 
 For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
 
-Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

contracts/utils/contracts/src/v08/AuthorizableV08.sol

@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-import "./interfaces/IAuthorizableV08.sol";
-import "./errors/LibRichErrorsV08.sol";
-import "./errors/LibAuthorizableRichErrorsV08.sol";
-import "./OwnableV08.sol";
-
-contract AuthorizableV08 is OwnableV08, IAuthorizableV08 {
-    /// @dev Only authorized addresses can invoke functions with this modifier.
-    modifier onlyAuthorized() {
-        _assertSenderIsAuthorized();
-        _;
-    }
-
-    // @dev Whether an address is authorized to call privileged functions.
-    // @param 0 Address to query.
-    // @return 0 Whether the address is authorized.
-    mapping(address => bool) public override authorized;
-    // @dev Whether an address is authorized to call privileged functions.
-    // @param 0 Index of authorized address.
-    // @return 0 Authorized address.
-    address[] public override authorities;
-
-    /// @dev Initializes the `owner` address.
-    constructor() OwnableV08() {}
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target) external override onlyOwner {
-        _addAuthorizedAddress(target);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target) external override onlyOwner {
-        if (!authorized[target]) {
-            LibRichErrorsV08.rrevert(LibAuthorizableRichErrorsV08.TargetNotAuthorizedError(target));
-        }
-        for (uint256 i = 0; i < authorities.length; i++) {
-            if (authorities[i] == target) {
-                _removeAuthorizedAddressAtIndex(target, i);
-                break;
-            }
-        }
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function removeAuthorizedAddressAtIndex(address target, uint256 index) external override onlyOwner {
-        _removeAuthorizedAddressAtIndex(target, index);
-    }
-
-    /// @dev Gets all authorized addresses.
-    /// @return Array of authorized addresses.
-    function getAuthorizedAddresses() external view override returns (address[] memory) {
-        return authorities;
-    }
-
-    /// @dev Reverts if msg.sender is not authorized.
-    function _assertSenderIsAuthorized() internal view {
-        if (!authorized[msg.sender]) {
-            LibRichErrorsV08.rrevert(LibAuthorizableRichErrorsV08.SenderNotAuthorizedError(msg.sender));
-        }
-    }
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function _addAuthorizedAddress(address target) internal {
-        // Ensure that the target is not the zero address.
-        if (target == address(0)) {
-            LibRichErrorsV08.rrevert(LibAuthorizableRichErrorsV08.ZeroCantBeAuthorizedError());
-        }
-
-        // Ensure that the target is not already authorized.
-        if (authorized[target]) {
-            LibRichErrorsV08.rrevert(LibAuthorizableRichErrorsV08.TargetAlreadyAuthorizedError(target));
-        }
-
-        authorized[target] = true;
-        authorities.push(target);
-        emit AuthorizedAddressAdded(target, msg.sender);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function _removeAuthorizedAddressAtIndex(address target, uint256 index) internal {
-        if (!authorized[target]) {
-            LibRichErrorsV08.rrevert(LibAuthorizableRichErrorsV08.TargetNotAuthorizedError(target));
-        }
-        if (index >= authorities.length) {
-            LibRichErrorsV08.rrevert(LibAuthorizableRichErrorsV08.IndexOutOfBoundsError(index, authorities.length));
-        }
-        if (authorities[index] != target) {
-            LibRichErrorsV08.rrevert(
-                LibAuthorizableRichErrorsV08.AuthorizedAddressMismatchError(authorities[index], target)
-            );
-        }
-
-        delete authorized[target];
-        authorities[index] = authorities[authorities.length - 1];
-        authorities.pop();
-        emit AuthorizedAddressRemoved(target, msg.sender);
-    }
-}

contracts/utils/contracts/src/v08/LibBytesV08.sol

@@ -1,434 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-import "./errors/LibBytesRichErrorsV08.sol";
-import "./errors/LibRichErrorsV08.sol";
-
-library LibBytesV08 {
-    using LibBytesV08 for bytes;
-
-    /// @dev Gets the memory address for a byte array.
-    /// @param input Byte array to lookup.
-    /// @return memoryAddress Memory address of byte array. This
-    ///         points to the header of the byte array which contains
-    ///         the length.
-    function rawAddress(bytes memory input) internal pure returns (uint256 memoryAddress) {
-        assembly ("memory-safe") {
-            memoryAddress := input
-        }
-        return memoryAddress;
-    }
-
-    /// @dev Gets the memory address for the contents of a byte array.
-    /// @param input Byte array to lookup.
-    /// @return memoryAddress Memory address of the contents of the byte array.
-    function contentAddress(bytes memory input) internal pure returns (uint256 memoryAddress) {
-        assembly ("memory-safe") {
-            memoryAddress := add(input, 32)
-        }
-        return memoryAddress;
-    }
-
-    /// @dev Copies `length` bytes from memory location `source` to `dest`.
-    /// @param dest memory address to copy bytes to.
-    /// @param source memory address to copy bytes from.
-    /// @param length number of bytes to copy.
-    function memCopy(uint256 dest, uint256 source, uint256 length) internal pure {
-        if (length < 32) {
-            // Handle a partial word by reading destination and masking
-            // off the bits we are interested in.
-            // This correctly handles overlap, zero lengths and source == dest
-            assembly {
-                let mask := sub(exp(256, sub(32, length)), 1)
-                let s := and(mload(source), not(mask))
-                let d := and(mload(dest), mask)
-                mstore(dest, or(s, d))
-            }
-        } else {
-            // Skip the O(length) loop when source == dest.
-            if (source == dest) {
-                return;
-            }
-
-            // For large copies we copy whole words at a time. The final
-            // word is aligned to the end of the range (instead of after the
-            // previous) to handle partial words. So a copy will look like this:
-            //
-            //  ####
-            //      ####
-            //          ####
-            //            ####
-            //
-            // We handle overlap in the source and destination range by
-            // changing the copying direction. This prevents us from
-            // overwriting parts of source that we still need to copy.
-            //
-            // This correctly handles source == dest
-            //
-            if (source > dest) {
-                assembly {
-                    // We subtract 32 from `sEnd` and `dEnd` because it
-                    // is easier to compare with in the loop, and these
-                    // are also the addresses we need for copying the
-                    // last bytes.
-                    length := sub(length, 32)
-                    let sEnd := add(source, length)
-                    let dEnd := add(dest, length)
-
-                    // Remember the last 32 bytes of source
-                    // This needs to be done here and not after the loop
-                    // because we may have overwritten the last bytes in
-                    // source already due to overlap.
-                    let last := mload(sEnd)
-
-                    // Copy whole words front to back
-                    // Note: the first check is always true,
-                    // this could have been a do-while loop.
-                    for {
-
-                    } lt(source, sEnd) {
-
-                    } {
-                        mstore(dest, mload(source))
-                        source := add(source, 32)
-                        dest := add(dest, 32)
-                    }
-
-                    // Write the last 32 bytes
-                    mstore(dEnd, last)
-                }
-            } else {
-                assembly {
-                    // We subtract 32 from `sEnd` and `dEnd` because those
-                    // are the starting points when copying a word at the end.
-                    length := sub(length, 32)
-                    let sEnd := add(source, length)
-                    let dEnd := add(dest, length)
-
-                    // Remember the first 32 bytes of source
-                    // This needs to be done here and not after the loop
-                    // because we may have overwritten the first bytes in
-                    // source already due to overlap.
-                    let first := mload(source)
-
-                    // Copy whole words back to front
-                    // We use a signed comparisson here to allow dEnd to become
-                    // negative (happens when source and dest < 32). Valid
-                    // addresses in local memory will never be larger than
-                    // 2**255, so they can be safely re-interpreted as signed.
-                    // Note: the first check is always true,
-                    // this could have been a do-while loop.
-                    for {
-
-                    } slt(dest, dEnd) {
-
-                    } {
-                        mstore(dEnd, mload(sEnd))
-                        sEnd := sub(sEnd, 32)
-                        dEnd := sub(dEnd, 32)
-                    }
-
-                    // Write the first 32 bytes
-                    mstore(dest, first)
-                }
-            }
-        }
-    }
-
-    /// @dev Returns a slices from a byte array.
-    /// @param b The byte array to take a slice from.
-    /// @param from The starting index for the slice (inclusive).
-    /// @param to The final index for the slice (exclusive).
-    /// @return result The slice containing bytes at indices [from, to)
-    function slice(bytes memory b, uint256 from, uint256 to) internal pure returns (bytes memory result) {
-        // Ensure that the from and to positions are valid positions for a slice within
-        // the byte array that is being used.
-        if (from > to) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.FromLessThanOrEqualsToRequired,
-                    from,
-                    to
-                )
-            );
-        }
-        if (to > b.length) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.ToLessThanOrEqualsLengthRequired,
-                    to,
-                    b.length
-                )
-            );
-        }
-
-        // Create a new bytes structure and copy contents
-        result = new bytes(to - from);
-        memCopy(result.contentAddress(), b.contentAddress() + from, result.length);
-        return result;
-    }
-
-    /// @dev Returns a slice from a byte array without preserving the input.
-    ///      When `from == 0`, the original array will match the slice.
-    ///      In other cases its state will be corrupted.
-    /// @param b The byte array to take a slice from. Will be destroyed in the process.
-    /// @param from The starting index for the slice (inclusive).
-    /// @param to The final index for the slice (exclusive).
-    /// @return result The slice containing bytes at indices [from, to)
-    function sliceDestructive(bytes memory b, uint256 from, uint256 to) internal pure returns (bytes memory result) {
-        // Ensure that the from and to positions are valid positions for a slice within
-        // the byte array that is being used.
-        if (from > to) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.FromLessThanOrEqualsToRequired,
-                    from,
-                    to
-                )
-            );
-        }
-        if (to > b.length) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.ToLessThanOrEqualsLengthRequired,
-                    to,
-                    b.length
-                )
-            );
-        }
-
-        // Create a new bytes structure around [from, to) in-place.
-        assembly {
-            result := add(b, from)
-            mstore(result, sub(to, from))
-        }
-        return result;
-    }
-
-    /// @dev Pops the last byte off of a byte array by modifying its length.
-    /// @param b Byte array that will be modified.
-    /// @return result The byte that was popped off.
-    function popLastByte(bytes memory b) internal pure returns (bytes1 result) {
-        if (b.length == 0) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.LengthGreaterThanZeroRequired,
-                    b.length,
-                    0
-                )
-            );
-        }
-
-        // Store last byte.
-        result = b[b.length - 1];
-
-        assembly ("memory-safe") {
-            // Decrement length of byte array.
-            let newLen := sub(mload(b), 1)
-            mstore(b, newLen)
-        }
-        return result;
-    }
-
-    /// @dev Tests equality of two byte arrays.
-    /// @param lhs First byte array to compare.
-    /// @param rhs Second byte array to compare.
-    /// @return equal True if arrays are the same. False otherwise.
-    function equals(bytes memory lhs, bytes memory rhs) internal pure returns (bool equal) {
-        // Keccak gas cost is 30 + numWords * 6. This is a cheap way to compare.
-        return keccak256(lhs) == keccak256(rhs);
-    }
-
-    /// @dev Reads an address from a position in a byte array.
-    /// @param b Byte array containing an address.
-    /// @param index Index in byte array of address.
-    /// @return result address from byte array.
-    function readAddress(bytes memory b, uint256 index) internal pure returns (address result) {
-        if (b.length < index + 20) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.LengthGreaterThanOrEqualsTwentyRequired,
-                    b.length,
-                    index + 20 // 20 is length of address
-                )
-            );
-        }
-
-        // Add offset to index:
-        // 1. Arrays are prefixed by 32-byte length parameter (add 32 to index)
-        // 2. Account for size difference between address length and 32-byte storage word (subtract 12 from index)
-        index += 20;
-
-        // Read address from array memory
-        assembly ("memory-safe") {
-            // 1. Add index to address of bytes array
-            // 2. Load 32-byte word from memory
-            result := mload(add(b, index))
-        }
-        return result;
-    }
-
-    /// @dev Writes an address into a specific position in a byte array.
-    /// @param b Byte array to insert address into.
-    /// @param index Index in byte array of address.
-    /// @param input Address to put into byte array.
-    function writeAddress(bytes memory b, uint256 index, address input) internal pure {
-        if (b.length < index + 20) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.LengthGreaterThanOrEqualsTwentyRequired,
-                    b.length,
-                    index + 20 // 20 is length of address
-                )
-            );
-        }
-
-        // Add offset to index:
-        // 1. Arrays are prefixed by 32-byte length parameter (add 32 to index)
-        // 2. Account for size difference between address length and 32-byte storage word (subtract 12 from index)
-        index += 20;
-
-        // Store address into array memory
-        assembly ("memory-safe") {
-            // The address occupies 20 bytes and mstore stores 32 bytes.
-            // First fetch the 32-byte word where we'll be storing the address, then
-            // apply a mask so we have only the bytes in the word that the address will not occupy.
-            // Then combine these bytes with the address and store the 32 bytes back to memory with mstore.
-
-            // 1. Add index to address of bytes array
-            // 2. Load 32-byte word from memory
-            // 3. Apply 12-byte mask to obtain extra bytes occupying word of memory where we'll store the address
-            let neighbors := and(
-                mload(add(b, index)),
-                0xffffffffffffffffffffffff0000000000000000000000000000000000000000
-            )
-
-            // Make sure input address is clean.
-            // (Solidity does not guarantee this)
-            input := and(input, 0xffffffffffffffffffffffffffffffffffffffff)
-
-            // Store the neighbors and address into memory
-            mstore(add(b, index), xor(input, neighbors))
-        }
-    }
-
-    /// @dev Reads a bytes32 value from a position in a byte array.
-    /// @param b Byte array containing a bytes32 value.
-    /// @param index Index in byte array of bytes32 value.
-    /// @return result bytes32 value from byte array.
-    function readBytes32(bytes memory b, uint256 index) internal pure returns (bytes32 result) {
-        if (b.length < index + 32) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.LengthGreaterThanOrEqualsThirtyTwoRequired,
-                    b.length,
-                    index + 32
-                )
-            );
-        }
-
-        // Arrays are prefixed by a 256 bit length parameter
-        index += 32;
-
-        // Read the bytes32 from array memory
-        assembly ("memory-safe") {
-            result := mload(add(b, index))
-        }
-        return result;
-    }
-
-    /// @dev Writes a bytes32 into a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input bytes32 to put into byte array.
-    function writeBytes32(bytes memory b, uint256 index, bytes32 input) internal pure {
-        if (b.length < index + 32) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.LengthGreaterThanOrEqualsThirtyTwoRequired,
-                    b.length,
-                    index + 32
-                )
-            );
-        }
-
-        // Arrays are prefixed by a 256 bit length parameter
-        index += 32;
-
-        // Read the bytes32 from array memory
-        assembly ("memory-safe") {
-            mstore(add(b, index), input)
-        }
-    }
-
-    /// @dev Reads a uint256 value from a position in a byte array.
-    /// @param b Byte array containing a uint256 value.
-    /// @param index Index in byte array of uint256 value.
-    /// @return result uint256 value from byte array.
-    function readUint256(bytes memory b, uint256 index) internal pure returns (uint256 result) {
-        result = uint256(readBytes32(b, index));
-        return result;
-    }
-
-    /// @dev Writes a uint256 into a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input uint256 to put into byte array.
-    function writeUint256(bytes memory b, uint256 index, uint256 input) internal pure {
-        writeBytes32(b, index, bytes32(input));
-    }
-
-    /// @dev Reads an unpadded bytes4 value from a position in a byte array.
-    /// @param b Byte array containing a bytes4 value.
-    /// @param index Index in byte array of bytes4 value.
-    /// @return result bytes4 value from byte array.
-    function readBytes4(bytes memory b, uint256 index) internal pure returns (bytes4 result) {
-        if (b.length < index + 4) {
-            LibRichErrorsV08.rrevert(
-                LibBytesRichErrorsV08.InvalidByteOperationError(
-                    LibBytesRichErrorsV08.InvalidByteOperationErrorCodes.LengthGreaterThanOrEqualsFourRequired,
-                    b.length,
-                    index + 4
-                )
-            );
-        }
-
-        // Arrays are prefixed by a 32 byte length field
-        index += 32;
-
-        // Read the bytes4 from array memory
-        assembly ("memory-safe") {
-            result := mload(add(b, index))
-        }
-        return result;
-    }
-
-    /// @dev Writes a new length to a byte array.
-    ///      Decreasing length will lead to removing the corresponding lower order bytes from the byte array.
-    ///      Increasing length may lead to appending adjacent in-memory bytes to the end of the byte array.
-    /// @param b Bytes array to write new length to.
-    /// @param length New length of byte array.
-    function writeLength(bytes memory b, uint256 length) internal pure {
-        assembly {
-            mstore(b, length)
-        }
-    }
-}

contracts/utils/contracts/src/v08/LibMathV08.sol

@@ -1,201 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2019 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-import "./errors/LibRichErrorsV08.sol";
-import "./errors/LibMathRichErrorsV08.sol";
-import "./errors/LibSafeMathRichErrorsV08.sol";
-
-library LibMathV08 {
-    function max256(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a >= b ? a : b;
-    }
-
-    function min256(uint256 a, uint256 b) internal pure returns (uint256) {
-        return a < b ? a : b;
-    }
-
-    function max128(uint128 a, uint128 b) internal pure returns (uint128) {
-        return a >= b ? a : b;
-    }
-
-    function min128(uint128 a, uint128 b) internal pure returns (uint128) {
-        return a < b ? a : b;
-    }
-
-    function safeDowncastToUint128(uint256 a) internal pure returns (uint128) {
-        if (a > type(uint128).max) {
-            LibRichErrorsV08.rrevert(
-                LibSafeMathRichErrorsV08.Uint256DowncastError(
-                    LibSafeMathRichErrorsV08.DowncastErrorCodes.VALUE_TOO_LARGE_TO_DOWNCAST_TO_UINT128,
-                    a
-                )
-            );
-        }
-        return uint128(a);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return partialAmount Partial value of target rounded down.
-    function safeGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        if (isRoundingErrorFloor(numerator, denominator, target)) {
-            LibRichErrorsV08.rrevert(LibMathRichErrorsV08.RoundingError(numerator, denominator, target));
-        }
-
-        partialAmount = (numerator * target) / denominator;
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return partialAmount Partial value of target rounded up.
-    function safeGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        if (isRoundingErrorCeil(numerator, denominator, target)) {
-            LibRichErrorsV08.rrevert(LibMathRichErrorsV08.RoundingError(numerator, denominator, target));
-        }
-
-        // safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
-        //       ceil(a / b) = floor((a + b - 1) / b)
-        // To implement `ceil(a / b)` using safeDiv.
-        partialAmount = (numerator * target + (denominator - 1)) / denominator;
-
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return partialAmount Partial value of target rounded down.
-    function getPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        partialAmount = (numerator * target) / denominator;
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return partialAmount Partial value of target rounded up.
-    function getPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (uint256 partialAmount) {
-        // safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
-        //       ceil(a / b) = floor((a + b - 1) / b)
-        // To implement `ceil(a / b)` using safeDiv.
-        partialAmount = (numerator * target + (denominator - 1)) / denominator;
-
-        return partialAmount;
-    }
-
-    /// @dev Checks if rounding error >= 0.1% when rounding down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return isError Rounding error is present.
-    function isRoundingErrorFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (bool isError) {
-        if (denominator == 0) {
-            LibRichErrorsV08.rrevert(LibMathRichErrorsV08.DivisionByZeroError());
-        }
-
-        // The absolute rounding error is the difference between the rounded
-        // value and the ideal value. The relative rounding error is the
-        // absolute rounding error divided by the absolute value of the
-        // ideal value. This is undefined when the ideal value is zero.
-        //
-        // The ideal value is `numerator * target / denominator`.
-        // Let's call `numerator * target % denominator` the remainder.
-        // The absolute error is `remainder / denominator`.
-        //
-        // When the ideal value is zero, we require the absolute error to
-        // be zero. Fortunately, this is always the case. The ideal value is
-        // zero iff `numerator == 0` and/or `target == 0`. In this case the
-        // remainder and absolute error are also zero.
-        if (target == 0 || numerator == 0) {
-            return false;
-        }
-
-        // Otherwise, we want the relative rounding error to be strictly
-        // less than 0.1%.
-        // The relative error is `remainder / (numerator * target)`.
-        // We want the relative error less than 1 / 1000:
-        //        remainder / (numerator * denominator)  <  1 / 1000
-        // or equivalently:
-        //        1000 * remainder  <  numerator * target
-        // so we have a rounding error iff:
-        //        1000 * remainder  >=  numerator * target
-        uint256 remainder = mulmod(target, numerator, denominator);
-        isError = remainder * 1000 >= numerator * target;
-        return isError;
-    }
-
-    /// @dev Checks if rounding error >= 0.1% when rounding up.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return isError Rounding error is present.
-    function isRoundingErrorCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (bool isError) {
-        if (denominator == 0) {
-            LibRichErrorsV08.rrevert(LibMathRichErrorsV08.DivisionByZeroError());
-        }
-
-        // See the comments in `isRoundingError`.
-        if (target == 0 || numerator == 0) {
-            // When either is zero, the ideal value and rounded value are zero
-            // and there is no rounding error. (Although the relative error
-            // is undefined.)
-            return false;
-        }
-        // Compute remainder as before
-        uint256 remainder = mulmod(target, numerator, denominator);
-        remainder = denominator - (remainder % denominator);
-        isError = remainder * 1000 >= numerator * target;
-        return isError;
-    }
-}

contracts/utils/contracts/src/v08/OwnableV08.sol

@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2019 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-import "./interfaces/IOwnableV08.sol";
-import "./errors/LibRichErrorsV08.sol";
-import "./errors/LibOwnableRichErrorsV08.sol";
-
-contract OwnableV08 is IOwnableV08 {
-    /// @dev The owner of this contract.
-    /// @return 0 The owner address.
-    address public override owner;
-
-    constructor() {
-        owner = msg.sender;
-    }
-
-    modifier onlyOwner() {
-        _assertSenderIsOwner();
-        _;
-    }
-
-    /// @dev Change the owner of this contract.
-    /// @param newOwner New owner address.
-    function transferOwnership(address newOwner) public override onlyOwner {
-        if (newOwner == address(0)) {
-            LibRichErrorsV08.rrevert(LibOwnableRichErrorsV08.TransferOwnerToZeroError());
-        } else {
-            owner = newOwner;
-            emit OwnershipTransferred(msg.sender, newOwner);
-        }
-    }
-
-    function _assertSenderIsOwner() internal view {
-        if (msg.sender != owner) {
-            LibRichErrorsV08.rrevert(LibOwnableRichErrorsV08.OnlyOwnerError(msg.sender, owner));
-        }
-    }
-}

contracts/utils/contracts/src/v08/ReentrancyGuardV08.sol

@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-import "./errors/LibReentrancyGuardRichErrorsV08.sol";
-import "./errors/LibRichErrorsV08.sol";
-
-contract ReentrancyGuardV08 {
-    // Locked state of mutex.
-    bool private _locked = false;
-
-    /// @dev Functions with this modifer cannot be reentered. The mutex will be locked
-    ///      before function execution and unlocked after.
-    modifier nonReentrant() {
-        _lockMutexOrThrowIfAlreadyLocked();
-        _;
-        _unlockMutex();
-    }
-
-    function _lockMutexOrThrowIfAlreadyLocked() internal {
-        // Ensure mutex is unlocked.
-        if (_locked) {
-            LibRichErrorsV08.rrevert(LibReentrancyGuardRichErrorsV08.IllegalReentrancyError());
-        }
-        // Lock mutex.
-        _locked = true;
-    }
-
-    function _unlockMutex() internal {
-        // Unlock mutex.
-        _locked = false;
-    }
-}

contracts/utils/contracts/src/v08/errors/LibAuthorizableRichErrorsV08.sol

@@ -1,64 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-library LibAuthorizableRichErrorsV08 {
-    // bytes4(keccak256("AuthorizedAddressMismatchError(address,address)"))
-    bytes4 internal constant AUTHORIZED_ADDRESS_MISMATCH_ERROR_SELECTOR = 0x140a84db;
-
-    // bytes4(keccak256("IndexOutOfBoundsError(uint256,uint256)"))
-    bytes4 internal constant INDEX_OUT_OF_BOUNDS_ERROR_SELECTOR = 0xe9f83771;
-
-    // bytes4(keccak256("SenderNotAuthorizedError(address)"))
-    bytes4 internal constant SENDER_NOT_AUTHORIZED_ERROR_SELECTOR = 0xb65a25b9;
-
-    // bytes4(keccak256("TargetAlreadyAuthorizedError(address)"))
-    bytes4 internal constant TARGET_ALREADY_AUTHORIZED_ERROR_SELECTOR = 0xde16f1a0;
-
-    // bytes4(keccak256("TargetNotAuthorizedError(address)"))
-    bytes4 internal constant TARGET_NOT_AUTHORIZED_ERROR_SELECTOR = 0xeb5108a2;
-
-    // bytes4(keccak256("ZeroCantBeAuthorizedError()"))
-    bytes internal constant ZERO_CANT_BE_AUTHORIZED_ERROR_BYTES = hex"57654fe4";
-
-    function AuthorizedAddressMismatchError(address authorized, address target) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(AUTHORIZED_ADDRESS_MISMATCH_ERROR_SELECTOR, authorized, target);
-    }
-
-    function IndexOutOfBoundsError(uint256 index, uint256 length) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(INDEX_OUT_OF_BOUNDS_ERROR_SELECTOR, index, length);
-    }
-
-    function SenderNotAuthorizedError(address sender) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(SENDER_NOT_AUTHORIZED_ERROR_SELECTOR, sender);
-    }
-
-    function TargetAlreadyAuthorizedError(address target) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(TARGET_ALREADY_AUTHORIZED_ERROR_SELECTOR, target);
-    }
-
-    function TargetNotAuthorizedError(address target) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(TARGET_NOT_AUTHORIZED_ERROR_SELECTOR, target);
-    }
-
-    function ZeroCantBeAuthorizedError() internal pure returns (bytes memory) {
-        return ZERO_CANT_BE_AUTHORIZED_ERROR_BYTES;
-    }
-}

contracts/utils/contracts/src/v08/errors/LibBytesRichErrorsV08.sol

@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-library LibBytesRichErrorsV08 {
-    enum InvalidByteOperationErrorCodes {
-        FromLessThanOrEqualsToRequired,
-        ToLessThanOrEqualsLengthRequired,
-        LengthGreaterThanZeroRequired,
-        LengthGreaterThanOrEqualsFourRequired,
-        LengthGreaterThanOrEqualsTwentyRequired,
-        LengthGreaterThanOrEqualsThirtyTwoRequired,
-        LengthGreaterThanOrEqualsNestedBytesLengthRequired,
-        DestinationLengthGreaterThanOrEqualSourceLengthRequired
-    }
-
-    // bytes4(keccak256("InvalidByteOperationError(uint8,uint256,uint256)"))
-    bytes4 internal constant INVALID_BYTE_OPERATION_ERROR_SELECTOR = 0x28006595;
-
-    function InvalidByteOperationError(
-        InvalidByteOperationErrorCodes errorCode,
-        uint256 offset,
-        uint256 required
-    ) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(INVALID_BYTE_OPERATION_ERROR_SELECTOR, errorCode, offset, required);
-    }
-}

contracts/utils/contracts/src/v08/errors/LibMathRichErrorsV08.sol

@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-library LibMathRichErrorsV08 {
-    // bytes4(keccak256("DivisionByZeroError()"))
-    bytes internal constant DIVISION_BY_ZERO_ERROR = hex"a791837c";
-
-    // bytes4(keccak256("RoundingError(uint256,uint256,uint256)"))
-    bytes4 internal constant ROUNDING_ERROR_SELECTOR = 0x339f3de2;
-
-    function DivisionByZeroError() internal pure returns (bytes memory) {
-        return DIVISION_BY_ZERO_ERROR;
-    }
-
-    function RoundingError(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(ROUNDING_ERROR_SELECTOR, numerator, denominator, target);
-    }
-}

contracts/utils/contracts/src/v08/errors/LibOwnableRichErrorsV08.sol

@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity ^0.8;
-
-library LibOwnableRichErrorsV08 {
-    // bytes4(keccak256("OnlyOwnerError(address,address)"))
-    bytes4 internal constant ONLY_OWNER_ERROR_SELECTOR = 0x1de45ad1;
-
-    // bytes4(keccak256("TransferOwnerToZeroError()"))
-    bytes internal constant TRANSFER_OWNER_TO_ZERO_ERROR_BYTES = hex"e69edc3e";
-
-    function OnlyOwnerError(address sender, address owner) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(ONLY_OWNER_ERROR_SELECTOR, sender, owner);
-    }
-
-    function TransferOwnerToZeroError() internal pure returns (bytes memory) {
-        return TRANSFER_OWNER_TO_ZERO_ERROR_BYTES;
-    }
-}

contracts/utils/contracts/src/v08/errors/LibReentrancyGuardRichErrorsV08.sol

@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-library LibReentrancyGuardRichErrorsV08 {
-    // bytes4(keccak256("IllegalReentrancyError()"))
-    bytes internal constant ILLEGAL_REENTRANCY_ERROR_SELECTOR_BYTES = hex"0c3b823f";
-
-    function IllegalReentrancyError() internal pure returns (bytes memory) {
-        return ILLEGAL_REENTRANCY_ERROR_SELECTOR_BYTES;
-    }
-}

contracts/utils/contracts/src/v08/errors/LibRichErrorsV08.sol

@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-library LibRichErrorsV08 {
-    // bytes4(keccak256("Error(string)"))
-    bytes4 internal constant STANDARD_ERROR_SELECTOR = 0x08c379a0;
-
-    /// @dev ABI encode a standard, string revert error payload.
-    ///      This is the same payload that would be included by a `revert(string)`
-    ///      solidity statement. It has the function signature `Error(string)`.
-    /// @param message The error string.
-    /// @return The ABI encoded error.
-    function StandardError(string memory message) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(STANDARD_ERROR_SELECTOR, bytes(message));
-    }
-
-    /// @dev Reverts an encoded rich revert reason `errorData`.
-    /// @param errorData ABI encoded error data.
-    function rrevert(bytes memory errorData) internal pure {
-        assembly ("memory-safe") {
-            revert(add(errorData, 0x20), mload(errorData))
-        }
-    }
-}

contracts/utils/contracts/src/v08/errors/LibSafeMathRichErrorsV08.sol

@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-library LibSafeMathRichErrorsV08 {
-    // bytes4(keccak256("Uint256BinOpError(uint8,uint256,uint256)"))
-    bytes4 internal constant UINT256_BINOP_ERROR_SELECTOR = 0xe946c1bb;
-
-    // bytes4(keccak256("Uint256DowncastError(uint8,uint256)"))
-    bytes4 internal constant UINT256_DOWNCAST_ERROR_SELECTOR = 0xc996af7b;
-
-    enum BinOpErrorCodes {
-        ADDITION_OVERFLOW,
-        MULTIPLICATION_OVERFLOW,
-        SUBTRACTION_UNDERFLOW,
-        DIVISION_BY_ZERO
-    }
-
-    enum DowncastErrorCodes {
-        VALUE_TOO_LARGE_TO_DOWNCAST_TO_UINT32,
-        VALUE_TOO_LARGE_TO_DOWNCAST_TO_UINT64,
-        VALUE_TOO_LARGE_TO_DOWNCAST_TO_UINT96,
-        VALUE_TOO_LARGE_TO_DOWNCAST_TO_UINT128
-    }
-
-    function Uint256BinOpError(BinOpErrorCodes errorCode, uint256 a, uint256 b) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(UINT256_BINOP_ERROR_SELECTOR, errorCode, a, b);
-    }
-
-    function Uint256DowncastError(DowncastErrorCodes errorCode, uint256 a) internal pure returns (bytes memory) {
-        return abi.encodeWithSelector(UINT256_DOWNCAST_ERROR_SELECTOR, errorCode, a);
-    }
-}

contracts/utils/contracts/src/v08/interfaces/IAuthorizableV08.sol

@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-import "./IOwnableV08.sol";
-
-interface IAuthorizableV08 is IOwnableV08 {
-    // Event logged when a new address is authorized.
-    event AuthorizedAddressAdded(address indexed target, address indexed caller);
-
-    // Event logged when a currently authorized address is unauthorized.
-    event AuthorizedAddressRemoved(address indexed target, address indexed caller);
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target) external;
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target) external;
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function removeAuthorizedAddressAtIndex(address target, uint256 index) external;
-
-    /// @dev Gets all authorized addresses.
-    /// @return authorizedAddresses Array of authorized addresses.
-    function getAuthorizedAddresses() external view returns (address[] memory authorizedAddresses);
-
-    /// @dev Whether an adderss is authorized to call privileged functions.
-    /// @param addr Address to query.
-    /// @return isAuthorized Whether the address is authorized.
-    function authorized(address addr) external view returns (bool isAuthorized);
-
-    /// @dev All addresseses authorized to call privileged functions.
-    /// @param idx Index of authorized address.
-    /// @return addr Authorized address.
-    function authorities(uint256 idx) external view returns (address addr);
-}

contracts/utils/contracts/src/v08/interfaces/IOwnableV08.sol

@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.8;
-
-interface IOwnableV08 {
-    /// @dev Emitted by Ownable when ownership is transferred.
-    /// @param previousOwner The previous owner of the contract.
-    /// @param newOwner The new owner of the contract.
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
-
-    /// @dev Transfers ownership of the contract to a new address.
-    /// @param newOwner The address that will become the owner.
-    function transferOwnership(address newOwner) external;
-
-    /// @dev The owner of this contract.
-    /// @return ownerAddress The owner address.
-    function owner() external view returns (address ownerAddress);
-}

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.38",
+    "version": "4.8.35",
     "engines": {
         "node": ">=6.12"
     },
@@ -15,6 +15,7 @@
         "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
+        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
         "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
@@ -24,15 +25,19 @@
         "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
         "lint": "eslint src test",
         "fix": "eslint --fix src test",
+        "coverage:report:text": "istanbul report text",
+        "coverage:report:html": "istanbul report html && open coverage/index.html",
         "profiler:report:html": "istanbul report html && open coverage/index.html",
-        "test:ci": "yarn test",
+        "coverage:report:lcov": "istanbul report lcov",
+        "test:circleci": "yarn test",
         "contracts:gen": "contracts-gen generate",
-        "contracts:copy": "contracts-gen copy"
+        "contracts:copy": "contracts-gen copy",
+        "compile:truffle": "truffle compile"
     },
     "config": {
         "publicInterfaceContracts": "Authorizable,IAuthorizable,IOwnable,LibAddress,LibAddressArray,LibAddressArrayRichErrors,LibAuthorizableRichErrors,LibBytes,LibBytesRichErrors,LibEIP1271,LibEIP712,LibFractions,LibOwnableRichErrors,LibReentrancyGuardRichErrors,LibRichErrors,LibMath,LibMathRichErrors,LibSafeMath,LibSafeMathRichErrors,Ownable,ReentrancyGuard,Refundable",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(Authorizable|AuthorizableV06|AuthorizableV08|D18|DeploymentConstants|IAuthorizable|IAuthorizableV06|IAuthorizableV08|IOwnable|IOwnableV06|IOwnableV08|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibAuthorizableRichErrorsV06|LibAuthorizableRichErrorsV08|LibBytes|LibBytesRichErrors|LibBytesRichErrorsV06|LibBytesRichErrorsV08|LibBytesV06|LibBytesV08|LibEIP1271|LibEIP712|LibFractions|LibMath|LibMathRichErrors|LibMathRichErrorsV06|LibMathRichErrorsV08|LibMathV06|LibMathV08|LibOwnableRichErrors|LibOwnableRichErrorsV06|LibOwnableRichErrorsV08|LibReentrancyGuardRichErrors|LibReentrancyGuardRichErrorsV06|LibReentrancyGuardRichErrorsV08|LibRichErrors|LibRichErrorsV06|LibRichErrorsV08|LibSafeMath|LibSafeMathRichErrors|LibSafeMathRichErrorsV06|LibSafeMathRichErrorsV08|LibSafeMathV06|Ownable|OwnableV06|OwnableV08|ReentrancyGuard|ReentrancyGuardV06|ReentrancyGuardV08|Refundable|TestAuthorizable|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibMath|TestLibRichErrors|TestLibSafeMath|TestLogDecoding|TestLogDecodingDownstream|TestOwnable|TestReentrancyGuard|TestRefundable|TestRefundableReceiver).json"
+        "abis": "./test/generated-artifacts/@(Authorizable|AuthorizableV06|D18|DeploymentConstants|IAuthorizable|IAuthorizableV06|IOwnable|IOwnableV06|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibAuthorizableRichErrorsV06|LibBytes|LibBytesRichErrors|LibBytesRichErrorsV06|LibBytesV06|LibEIP1271|LibEIP712|LibFractions|LibMath|LibMathRichErrors|LibMathRichErrorsV06|LibMathV06|LibOwnableRichErrors|LibOwnableRichErrorsV06|LibReentrancyGuardRichErrors|LibReentrancyGuardRichErrorsV06|LibRichErrors|LibRichErrorsV06|LibSafeMath|LibSafeMathRichErrors|LibSafeMathRichErrorsV06|LibSafeMathV06|Ownable|OwnableV06|ReentrancyGuard|ReentrancyGuardV06|Refundable|TestAuthorizable|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibMath|TestLibRichErrors|TestLibSafeMath|TestLogDecoding|TestLogDecodingDownstream|TestOwnable|TestReentrancyGuard|TestRefundable|TestRefundableReceiver).json"
     },
     "repository": {
         "type": "git",
@@ -46,7 +51,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.47",
+        "@0x/contracts-test-utils": "^5.4.44",
         "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
@@ -70,6 +75,7 @@
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
+        "truffle": "^5.0.32",
         "typescript": "4.6.3"
     },
     "dependencies": {

contracts/utils/test/artifacts.ts

@@ -7,56 +7,42 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as Authorizable from '../test/generated-artifacts/Authorizable.json';
 import * as AuthorizableV06 from '../test/generated-artifacts/AuthorizableV06.json';
-import * as AuthorizableV08 from '../test/generated-artifacts/AuthorizableV08.json';
 import * as D18 from '../test/generated-artifacts/D18.json';
 import * as DeploymentConstants from '../test/generated-artifacts/DeploymentConstants.json';
 import * as IAuthorizable from '../test/generated-artifacts/IAuthorizable.json';
 import * as IAuthorizableV06 from '../test/generated-artifacts/IAuthorizableV06.json';
-import * as IAuthorizableV08 from '../test/generated-artifacts/IAuthorizableV08.json';
 import * as IOwnable from '../test/generated-artifacts/IOwnable.json';
 import * as IOwnableV06 from '../test/generated-artifacts/IOwnableV06.json';
-import * as IOwnableV08 from '../test/generated-artifacts/IOwnableV08.json';
 import * as LibAddress from '../test/generated-artifacts/LibAddress.json';
 import * as LibAddressArray from '../test/generated-artifacts/LibAddressArray.json';
 import * as LibAddressArrayRichErrors from '../test/generated-artifacts/LibAddressArrayRichErrors.json';
 import * as LibAuthorizableRichErrors from '../test/generated-artifacts/LibAuthorizableRichErrors.json';
 import * as LibAuthorizableRichErrorsV06 from '../test/generated-artifacts/LibAuthorizableRichErrorsV06.json';
-import * as LibAuthorizableRichErrorsV08 from '../test/generated-artifacts/LibAuthorizableRichErrorsV08.json';
 import * as LibBytes from '../test/generated-artifacts/LibBytes.json';
 import * as LibBytesRichErrors from '../test/generated-artifacts/LibBytesRichErrors.json';
 import * as LibBytesRichErrorsV06 from '../test/generated-artifacts/LibBytesRichErrorsV06.json';
-import * as LibBytesRichErrorsV08 from '../test/generated-artifacts/LibBytesRichErrorsV08.json';
 import * as LibBytesV06 from '../test/generated-artifacts/LibBytesV06.json';
-import * as LibBytesV08 from '../test/generated-artifacts/LibBytesV08.json';
 import * as LibEIP1271 from '../test/generated-artifacts/LibEIP1271.json';
 import * as LibEIP712 from '../test/generated-artifacts/LibEIP712.json';
 import * as LibFractions from '../test/generated-artifacts/LibFractions.json';
 import * as LibMath from '../test/generated-artifacts/LibMath.json';
 import * as LibMathRichErrors from '../test/generated-artifacts/LibMathRichErrors.json';
 import * as LibMathRichErrorsV06 from '../test/generated-artifacts/LibMathRichErrorsV06.json';
-import * as LibMathRichErrorsV08 from '../test/generated-artifacts/LibMathRichErrorsV08.json';
 import * as LibMathV06 from '../test/generated-artifacts/LibMathV06.json';
-import * as LibMathV08 from '../test/generated-artifacts/LibMathV08.json';
 import * as LibOwnableRichErrors from '../test/generated-artifacts/LibOwnableRichErrors.json';
 import * as LibOwnableRichErrorsV06 from '../test/generated-artifacts/LibOwnableRichErrorsV06.json';
-import * as LibOwnableRichErrorsV08 from '../test/generated-artifacts/LibOwnableRichErrorsV08.json';
 import * as LibReentrancyGuardRichErrors from '../test/generated-artifacts/LibReentrancyGuardRichErrors.json';
 import * as LibReentrancyGuardRichErrorsV06 from '../test/generated-artifacts/LibReentrancyGuardRichErrorsV06.json';
-import * as LibReentrancyGuardRichErrorsV08 from '../test/generated-artifacts/LibReentrancyGuardRichErrorsV08.json';
 import * as LibRichErrors from '../test/generated-artifacts/LibRichErrors.json';
 import * as LibRichErrorsV06 from '../test/generated-artifacts/LibRichErrorsV06.json';
-import * as LibRichErrorsV08 from '../test/generated-artifacts/LibRichErrorsV08.json';
 import * as LibSafeMath from '../test/generated-artifacts/LibSafeMath.json';
 import * as LibSafeMathRichErrors from '../test/generated-artifacts/LibSafeMathRichErrors.json';
 import * as LibSafeMathRichErrorsV06 from '../test/generated-artifacts/LibSafeMathRichErrorsV06.json';
-import * as LibSafeMathRichErrorsV08 from '../test/generated-artifacts/LibSafeMathRichErrorsV08.json';
 import * as LibSafeMathV06 from '../test/generated-artifacts/LibSafeMathV06.json';
 import * as Ownable from '../test/generated-artifacts/Ownable.json';
 import * as OwnableV06 from '../test/generated-artifacts/OwnableV06.json';
-import * as OwnableV08 from '../test/generated-artifacts/OwnableV08.json';
 import * as ReentrancyGuard from '../test/generated-artifacts/ReentrancyGuard.json';
 import * as ReentrancyGuardV06 from '../test/generated-artifacts/ReentrancyGuardV06.json';
-import * as ReentrancyGuardV08 from '../test/generated-artifacts/ReentrancyGuardV08.json';
 import * as Refundable from '../test/generated-artifacts/Refundable.json';
 import * as TestAuthorizable from '../test/generated-artifacts/TestAuthorizable.json';
 import * as TestLibAddress from '../test/generated-artifacts/TestLibAddress.json';
@@ -112,20 +98,6 @@ export const artifacts = {
     LibSafeMathRichErrorsV06: LibSafeMathRichErrorsV06 as ContractArtifact,
     IAuthorizableV06: IAuthorizableV06 as ContractArtifact,
     IOwnableV06: IOwnableV06 as ContractArtifact,
-    AuthorizableV08: AuthorizableV08 as ContractArtifact,
-    LibBytesV08: LibBytesV08 as ContractArtifact,
-    LibMathV08: LibMathV08 as ContractArtifact,
-    OwnableV08: OwnableV08 as ContractArtifact,
-    ReentrancyGuardV08: ReentrancyGuardV08 as ContractArtifact,
-    LibAuthorizableRichErrorsV08: LibAuthorizableRichErrorsV08 as ContractArtifact,
-    LibBytesRichErrorsV08: LibBytesRichErrorsV08 as ContractArtifact,
-    LibMathRichErrorsV08: LibMathRichErrorsV08 as ContractArtifact,
-    LibOwnableRichErrorsV08: LibOwnableRichErrorsV08 as ContractArtifact,
-    LibReentrancyGuardRichErrorsV08: LibReentrancyGuardRichErrorsV08 as ContractArtifact,
-    LibRichErrorsV08: LibRichErrorsV08 as ContractArtifact,
-    LibSafeMathRichErrorsV08: LibSafeMathRichErrorsV08 as ContractArtifact,
-    IAuthorizableV08: IAuthorizableV08 as ContractArtifact,
-    IOwnableV08: IOwnableV08 as ContractArtifact,
     TestAuthorizable: TestAuthorizable as ContractArtifact,
     TestLibAddress: TestLibAddress as ContractArtifact,
     TestLibAddressArray: TestLibAddressArray as ContractArtifact,

contracts/utils/test/global_hooks.ts

@@ -0,0 +1,19 @@
+import { env, EnvVars } from '@0x/dev-utils';
+
+import { coverage, profiler, provider } from '@0x/contracts-test-utils';
+import { providerUtils } from '@0x/utils';
+
+before('start web3 provider', () => {
+    providerUtils.startProviderEngine(provider);
+});
+after('generate coverage report', async () => {
+    if (env.parseBoolean(EnvVars.SolidityCoverage)) {
+        const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+        await coverageSubprovider.writeCoverageAsync();
+    }
+    if (env.parseBoolean(EnvVars.SolidityProfiler)) {
+        const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+        await profilerSubprovider.writeProfilerOutputAsync();
+    }
+    provider.stop();
+});

contracts/utils/test/wrappers.ts

@@ -5,56 +5,42 @@
  */
 export * from '../test/generated-wrappers/authorizable';
 export * from '../test/generated-wrappers/authorizable_v06';
-export * from '../test/generated-wrappers/authorizable_v08';
 export * from '../test/generated-wrappers/d18';
 export * from '../test/generated-wrappers/deployment_constants';
 export * from '../test/generated-wrappers/i_authorizable';
 export * from '../test/generated-wrappers/i_authorizable_v06';
-export * from '../test/generated-wrappers/i_authorizable_v08';
 export * from '../test/generated-wrappers/i_ownable';
 export * from '../test/generated-wrappers/i_ownable_v06';
-export * from '../test/generated-wrappers/i_ownable_v08';
 export * from '../test/generated-wrappers/lib_address';
 export * from '../test/generated-wrappers/lib_address_array';
 export * from '../test/generated-wrappers/lib_address_array_rich_errors';
 export * from '../test/generated-wrappers/lib_authorizable_rich_errors';
 export * from '../test/generated-wrappers/lib_authorizable_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_authorizable_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_bytes';
 export * from '../test/generated-wrappers/lib_bytes_rich_errors';
 export * from '../test/generated-wrappers/lib_bytes_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_bytes_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_bytes_v06';
-export * from '../test/generated-wrappers/lib_bytes_v08';
 export * from '../test/generated-wrappers/lib_e_i_p1271';
 export * from '../test/generated-wrappers/lib_e_i_p712';
 export * from '../test/generated-wrappers/lib_fractions';
 export * from '../test/generated-wrappers/lib_math';
 export * from '../test/generated-wrappers/lib_math_rich_errors';
 export * from '../test/generated-wrappers/lib_math_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_math_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_math_v06';
-export * from '../test/generated-wrappers/lib_math_v08';
 export * from '../test/generated-wrappers/lib_ownable_rich_errors';
 export * from '../test/generated-wrappers/lib_ownable_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_ownable_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_reentrancy_guard_rich_errors';
 export * from '../test/generated-wrappers/lib_reentrancy_guard_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_reentrancy_guard_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_rich_errors';
 export * from '../test/generated-wrappers/lib_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_safe_math';
 export * from '../test/generated-wrappers/lib_safe_math_rich_errors';
 export * from '../test/generated-wrappers/lib_safe_math_rich_errors_v06';
-export * from '../test/generated-wrappers/lib_safe_math_rich_errors_v08';
 export * from '../test/generated-wrappers/lib_safe_math_v06';
 export * from '../test/generated-wrappers/ownable';
 export * from '../test/generated-wrappers/ownable_v06';
-export * from '../test/generated-wrappers/ownable_v08';
 export * from '../test/generated-wrappers/reentrancy_guard';
 export * from '../test/generated-wrappers/reentrancy_guard_v06';
-export * from '../test/generated-wrappers/reentrancy_guard_v08';
 export * from '../test/generated-wrappers/refundable';
 export * from '../test/generated-wrappers/test_authorizable';
 export * from '../test/generated-wrappers/test_lib_address';

contracts/utils/truffle-config.js

@@ -0,0 +1,96 @@
+/**
+ * Use this file to configure your truffle project. It's seeded with some
+ * common settings for different networks and features like migrations,
+ * compilation and testing. Uncomment the ones you need or modify
+ * them to suit your project as necessary.
+ *
+ * More information about configuration can be found at:
+ *
+ * truffleframework.com/docs/advanced/configuration
+ *
+ * To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
+ * to sign your transactions before they're sent to a remote public node. Infura accounts
+ * are available for free at: infura.io/register.
+ *
+ * You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
+ * public/private key pairs. If you're publishing your code to GitHub make sure you load this
+ * phrase from a file you've .gitignored so it doesn't accidentally become public.
+ *
+ */
+
+// const HDWalletProvider = require('truffle-hdwallet-provider');
+// const infuraKey = "fj4jll3k.....";
+//
+// const fs = require('fs');
+// const mnemonic = fs.readFileSync(".secret").toString().trim();
+
+module.exports = {
+    /**
+     * Networks define how you connect to your ethereum client and let you set the
+     * defaults web3 uses to send transactions. If you don't specify one truffle
+     * will spin up a development blockchain for you on port 9545 when you
+     * run `develop` or `test`. You can ask a truffle command to use a specific
+     * network from the command line, e.g
+     *
+     * $ truffle test --network <network-name>
+     */
+
+    networks: {
+        // Useful for testing. The `development` name is special - truffle uses it by default
+        // if it's defined here and no other network is specified at the command line.
+        // You should run a client (like ganache-cli, geth or parity) in a separate terminal
+        // tab if you use this network and you must also set the `host`, `port` and `network_id`
+        // options below to some value.
+        //
+        // development: {
+        //  host: "127.0.0.1",     // Localhost (default: none)
+        //  port: 8545,            // Standard Ethereum port (default: none)
+        //  network_id: "*",       // Any network (default: none)
+        // },
+        // Another network with more advanced options...
+        // advanced: {
+        // port: 8777,             // Custom port
+        // network_id: 1342,       // Custom network
+        // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
+        // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
+        // from: <address>,        // Account to send txs from (default: accounts[0])
+        // websockets: true        // Enable EventEmitter interface for web3 (default: false)
+        // },
+        // Useful for deploying to a public network.
+        // NB: It's important to wrap the provider as a function.
+        // ropsten: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+        // network_id: 3,       // Ropsten's id
+        // gas: 5500000,        // Ropsten has a lower block limit than mainnet
+        // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
+        // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
+        // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
+        // },
+        // Useful for private networks
+        // private: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
+        // network_id: 2111,   // This network is yours, in the cloud.
+        // production: true    // Treats this network as if it was a public net. (default: false)
+        // }
+    },
+
+    // Set default mocha options here, use special reporters etc.
+    mocha: {
+        // timeout: 100000
+    },
+
+    // Configure your compilers
+    compilers: {
+        solc: {
+            version: '0.5.9',
+            settings: {
+                evmVersion: 'istanbul',
+                optimizer: {
+                    enabled: true,
+                    runs: 1000000,
+                    details: { yul: true, deduplicate: true, cse: true, constantOptimizer: true },
+                },
+            },
+        },
+    },
+};

contracts/utils/tsconfig.json

@@ -27,56 +27,42 @@
         "generated-artifacts/Refundable.json",
         "test/generated-artifacts/Authorizable.json",
         "test/generated-artifacts/AuthorizableV06.json",
-        "test/generated-artifacts/AuthorizableV08.json",
         "test/generated-artifacts/D18.json",
         "test/generated-artifacts/DeploymentConstants.json",
         "test/generated-artifacts/IAuthorizable.json",
         "test/generated-artifacts/IAuthorizableV06.json",
-        "test/generated-artifacts/IAuthorizableV08.json",
         "test/generated-artifacts/IOwnable.json",
         "test/generated-artifacts/IOwnableV06.json",
-        "test/generated-artifacts/IOwnableV08.json",
         "test/generated-artifacts/LibAddress.json",
         "test/generated-artifacts/LibAddressArray.json",
         "test/generated-artifacts/LibAddressArrayRichErrors.json",
         "test/generated-artifacts/LibAuthorizableRichErrors.json",
         "test/generated-artifacts/LibAuthorizableRichErrorsV06.json",
-        "test/generated-artifacts/LibAuthorizableRichErrorsV08.json",
         "test/generated-artifacts/LibBytes.json",
         "test/generated-artifacts/LibBytesRichErrors.json",
         "test/generated-artifacts/LibBytesRichErrorsV06.json",
-        "test/generated-artifacts/LibBytesRichErrorsV08.json",
         "test/generated-artifacts/LibBytesV06.json",
-        "test/generated-artifacts/LibBytesV08.json",
         "test/generated-artifacts/LibEIP1271.json",
         "test/generated-artifacts/LibEIP712.json",
         "test/generated-artifacts/LibFractions.json",
         "test/generated-artifacts/LibMath.json",
         "test/generated-artifacts/LibMathRichErrors.json",
         "test/generated-artifacts/LibMathRichErrorsV06.json",
-        "test/generated-artifacts/LibMathRichErrorsV08.json",
         "test/generated-artifacts/LibMathV06.json",
-        "test/generated-artifacts/LibMathV08.json",
         "test/generated-artifacts/LibOwnableRichErrors.json",
         "test/generated-artifacts/LibOwnableRichErrorsV06.json",
-        "test/generated-artifacts/LibOwnableRichErrorsV08.json",
         "test/generated-artifacts/LibReentrancyGuardRichErrors.json",
         "test/generated-artifacts/LibReentrancyGuardRichErrorsV06.json",
-        "test/generated-artifacts/LibReentrancyGuardRichErrorsV08.json",
         "test/generated-artifacts/LibRichErrors.json",
         "test/generated-artifacts/LibRichErrorsV06.json",
-        "test/generated-artifacts/LibRichErrorsV08.json",
         "test/generated-artifacts/LibSafeMath.json",
         "test/generated-artifacts/LibSafeMathRichErrors.json",
         "test/generated-artifacts/LibSafeMathRichErrorsV06.json",
-        "test/generated-artifacts/LibSafeMathRichErrorsV08.json",
         "test/generated-artifacts/LibSafeMathV06.json",
         "test/generated-artifacts/Ownable.json",
         "test/generated-artifacts/OwnableV06.json",
-        "test/generated-artifacts/OwnableV08.json",
         "test/generated-artifacts/ReentrancyGuard.json",
         "test/generated-artifacts/ReentrancyGuardV06.json",
-        "test/generated-artifacts/ReentrancyGuardV08.json",
         "test/generated-artifacts/Refundable.json",
         "test/generated-artifacts/TestAuthorizable.json",
         "test/generated-artifacts/TestLibAddress.json",

contracts/zero-ex/CHANGELOG.json

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

contracts/zero-ex/CHANGELOG.md

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

contracts/zero-ex/README.md

@@ -20,7 +20,7 @@ We strongly recommend that the community help us make improvements and determine
 
 For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
 
-Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
@@ -68,21 +68,27 @@ yarn lint
 yarn test
 ```
 
-### Run Integration Tests
+### Run Foundry 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........
+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......
+
+FOUNDRY_PROFILE=forked 
+//or 
+FOUNDRY_PROFILE=local
+
 ```
 
 ```bash
 git submodule update --init --recursive
 foundryup
-yarn test:integration
+yarn forge
 ```

contracts/zero-ex/compiler.json

@@ -110,7 +110,6 @@
         "./contracts/src/transformers/Transformer.sol",
         "./contracts/src/transformers/WethTransformer.sol",
         "./contracts/src/transformers/bridges/AbstractBridgeAdapter.sol",
-        "./contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/BSCBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/BridgeProtocols.sol",
@@ -158,6 +157,8 @@
         "./contracts/src/vendor/v3/IERC20Bridge.sol",
         "./contracts/src/vendor/v3/IStaking.sol",
         "./contracts/test/ITestSimpleFunctionRegistryFeature.sol",
+        "./contracts/test/TestBridge.sol",
+        "./contracts/test/TestCallTarget.sol",
         "./contracts/test/TestDelegateCaller.sol",
         "./contracts/test/TestFeeCollectorController.sol",
         "./contracts/test/TestFeeRecipient.sol",
@@ -191,6 +192,7 @@
         "./contracts/test/TestTransformerHost.sol",
         "./contracts/test/TestUniswapV3Feature.sol",
         "./contracts/test/TestWethTransformerHost.sol",
+        "./contracts/test/TestZeroExFeature.sol",
         "./contracts/test/integration/TestCurve.sol",
         "./contracts/test/integration/TestLiquidityProvider.sol",
         "./contracts/test/integration/TestMooniswap.sol",

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2021 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+  Copyright 2020 ZeroEx Intl.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2021 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2022 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6;

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

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+  Copyright 2021 ZeroEx Intl.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2021 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2021 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;

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

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
-  Copyright 2023 ZeroEx Intl.
+
+  Copyright 2020 ZeroEx Intl.
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+
 */
 
 pragma solidity ^0.6.5;