Publish

- @0x/contracts-erc20@3.3.55
 - @0x/contracts-test-utils@5.4.45
 - @0x/contracts-treasury@1.4.38
 - @0x/contracts-utils@4.8.36
 - @0x/contracts-zero-ex@0.38.4
 - @0x/contract-addresses@8.0.1
 - @0x/contract-artifacts@3.18.3
 - @0x/contract-wrappers@13.22.14
 - @0x/protocol-utils@11.17.4

.circleci/config.yml

@@ -1,341 +0,0 @@
-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:
-        resource_class: xlarge
-        docker:
-            # Using nightly as foundry:latest is ~2 months old
-            - 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: 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:
-                  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/CODEOWNERS

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

.github/CONTRIBUTING.md

@@ -89,15 +89,3 @@ 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.

.github/ISSUE_TEMPLATE.md

@@ -2,15 +2,13 @@
 
 <!--- 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 -->
+<!--- If you're suggesting a contract or protocol change/improvement, visit our ZEIPs repo https://github.com/0xProject/ZEIPs -->
 
 ## Current Behavior
 
@@ -50,8 +48,8 @@
 | ------: | :------ |
 
 <!-- For example:
-|             `0x.js` | 2.0.4   |
-| `Exchange Contract` | v2      |
+|    `protocol-utils` | 2.0.4   |
+| `Exchange Contract` | v3      |
 -->
 
 | Network |
@@ -60,6 +58,6 @@
 
 <!-- For example:
 | mainnet |
-| kovan |
-| testrpc |
+| goerli |
+| development |
 -->

.github/autolabeler.yml

@@ -1,6 +1,2 @@
-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']
+documentation: ['docs']
+liquidity integrations: ['contracts/zero-ex/contracts/src/transformers']

.github/dependabot.yml

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

.github/stale.yml

@@ -1,19 +0,0 @@
-# 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

@@ -0,0 +1,105 @@
+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
+        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

@@ -0,0 +1,40 @@
+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,9 +15,6 @@ pids
 *.db
 *.sqlite
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
 # Coverage directory used by tools like istanbul
 coverage
 
@@ -80,104 +77,19 @@ TODO.md
 .idea
 
 # generated contract 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-artifacts/
 
 # generated contract wrappers
-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/
+generated-wrappers/
 
 # foundry artifacts
-contracts/zero-ex/foundry-artifacts/
+foundry-artifacts/
 
-# foundry cache 
-contracts/zero-ex/foundry-cache/
+# foundry cache
+cache/
+
+#foundry output artifacts
+out/
 
 # typechain wrappers
 contracts/zero-ex/typechain-wrappers/

.husky/pre-commit

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

.prettierignore

@@ -1,91 +1,10 @@
 lib
+deps
 .nyc_output
-/contracts/broker/generated-wrappers
-/contracts/broker/test/generated-wrappers
-/contracts/broker/generated-artifacts
-/contracts/broker/test/generated-artifacts
-/contracts/integrations/generated-wrappers
-/contracts/integrations/test/generated-wrappers
-/contracts/integrations/generated-artifacts
-/contracts/integrations/test/generated-artifacts
-/contracts/staking/generated-wrappers
-/contracts/staking/test/generated-wrappers
-/contracts/staking/generated-artifacts
-/contracts/staking/test/generated-artifacts
-/contracts/coordinator/generated-wrappers
-/contracts/coordinator/test/generated-wrappers
-/contracts/coordinator/generated-artifacts
-/contracts/coordinator/test/generated-artifacts
-/contracts/exchange/generated-wrappers
-/contracts/exchange/test/generated-wrappers
-/contracts/exchange/generated-artifacts
-/contracts/exchange/test/generated-artifacts
-/contracts/asset-proxy/generated-wrappers
-/contracts/asset-proxy/test/generated-wrappers
-/contracts/asset-proxy/generated-artifacts
-/contracts/asset-proxy/test/generated-artifacts
-/contracts/multisig/generated-wrappers
-/contracts/multisig/test/generated-wrappers
-/contracts/multisig/generated-artifacts
-/contracts/multisig/test/generated-artifacts
-/contracts/utils/generated-wrappers
-/contracts/utils/test/generated-wrappers
-/contracts/utils/generated-artifacts
-/contracts/utils/test/generated-artifacts
-/contracts/exchange-libs/generated-wrappers
-/contracts/exchange-libs/test/generated-wrappers
-/contracts/exchange-libs/generated-artifacts
-/contracts/exchange-libs/test/generated-artifacts
-/contracts/erc20/generated-wrappers
-/contracts/erc20/test/generated-wrappers
-/contracts/erc20/generated-artifacts
-/contracts/erc20/test/generated-artifacts
-/contracts/erc721/generated-wrappers
-/contracts/erc721/test/generated-wrappers
-/contracts/erc721/generated-artifacts
-/contracts/erc721/test/generated-artifacts
-/contracts/erc1155/generated-wrappers
-/contracts/erc1155/test/generated-wrappers
-/contracts/erc1155/generated-artifacts
-/contracts/erc1155/test/generated-artifacts
-/contracts/extensions/generated-wrappers
-/contracts/extensions/test/generated-wrappers
-/contracts/extensions/generated-artifacts
-/contracts/extensions/test/generated-artifacts
-/contracts/exchange-forwarder/generated-wrappers
-/contracts/exchange-forwarder/test/generated-wrappers
-/contracts/exchange-forwarder/generated-artifacts
-/contracts/exchange-forwarder/test/generated-artifacts
-/contracts/dev-utils/generated-wrappers
-/contracts/dev-utils/test/generated-wrappers
-/contracts/dev-utils/generated-artifacts
-/contracts/dev-utils/test/generated-artifacts
-/contracts/zero-ex/foundry-artifacts
-/contracts/zero-ex/generated-wrappers
-/contracts/zero-ex/test/generated-wrappers
-/contracts/zero-ex/generated-artifacts
-/contracts/zero-ex/test/generated-artifacts
-/contracts/treasury/generated-wrappers
-/contracts/treasury/test/generated-wrappers
-/contracts/treasury/generated-artifacts
-/contracts/treasury/test/generated-artifacts
-/contracts/staking/build/
-/contracts/coordinator/build/
-/contracts/exchange/build/
-/contracts/asset-proxy/build/
-/contracts/multisig/build/
-/contracts/utils/build/
-/contracts/exchange-libs/build/
-/contracts/erc20/build/
-/contracts/erc721/build/
-/contracts/erc1155/build/
-/contracts/zero-ex/foundry-artifacts
-/contracts/zero-ex/foundry-cache
-/contracts/zero-ex/contracts/deps
-/contracts/extensions/build/
-/contracts/exchange-forwarder/build/
-/packages/asset-swapper/
-/packages/contract-wrappers/src/generated-wrappers/
+generated-artifacts/
+generated-wrappers/
+foundry-artifacts/
+out/
+cache/
 package.json
-packages/*/docs
-docs/
+packages

.solhintignore

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

README.md

@@ -8,8 +8,7 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 [website-url]: https://0x.org
 
-[![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)
+[![Coverage Status](https://coveralls.io/repos/github/0xProject/protocol/badge.svg?branch=development)](https://coveralls.io/github/0xProject/protocol?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)
 
@@ -54,7 +53,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](./CONTRIBUTING.md).
+#### Read our [contribution guidelines](.github/CONTRIBUTING.md).
 
 ### Install dependencies
 

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1674517560,
+        "version": "3.3.55",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "3.3.54",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "3.3.53",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1668477029,
         "version": "3.3.52",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.55 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v3.3.54 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v3.3.53 - _November 23, 2022_
+
+    * Dependencies updated
+
 ## v3.3.52 - _November 15, 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](../../CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

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

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

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

@@ -0,0 +1,63 @@
+// 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

@@ -17,12 +17,14 @@
 
 */
 
-pragma solidity ^0.6;
+pragma solidity ^0.8.0;
 
-interface IMStable {
-    function getSwapOutput(
-        address _input,
-        address _output,
-        uint256 _quantity
-    ) external view returns (uint256 swapOutput);
+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

@@ -0,0 +1,146 @@
+// 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.52",
+    "version": "3.3.55",
     "engines": {
         "node": ">=6.12"
     },
@@ -15,7 +15,6 @@
         "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",
@@ -25,11 +24,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",
-        "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",
+        "test:ci": "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",
@@ -37,7 +32,7 @@
     },
     "config": {
         "publicInterfaceContracts": "DummyERC20Token,ERC20Token,WETH9,ZRXToken,DummyNoReturnERC20Token,DummyMultipleReturnERC20Token",
-        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IEtherToken|IEtherTokenV06|LibERC20Token|LibERC20TokenV06|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|WETH9V06|ZRXToken).json",
+        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IERC20TokenV08|IEtherToken|IEtherTokenV06|IEtherTokenV08|LibERC20Token|LibERC20TokenV06|LibERC20TokenV08|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|ZRXToken).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -52,8 +47,8 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.42",
-        "@0x/contracts-utils": "^4.8.33",
+        "@0x/contracts-test-utils": "^5.4.45",
+        "@0x/contracts-utils": "^4.8.36",
         "@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,17 +11,19 @@ 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';
 import * as UnlimitedAllowanceERC20Token from '../test/generated-artifacts/UnlimitedAllowanceERC20Token.json';
 import * as UntransferrableDummyERC20Token from '../test/generated-artifacts/UntransferrableDummyERC20Token.json';
 import * as WETH9 from '../test/generated-artifacts/WETH9.json';
-import * as WETH9V06 from '../test/generated-artifacts/WETH9V06.json';
 import * as ZRXToken from '../test/generated-artifacts/ZRXToken.json';
 export const artifacts = {
     ERC20Token: ERC20Token as ContractArtifact,
@@ -35,7 +37,9 @@ export const artifacts = {
     IERC20TokenV06: IERC20TokenV06 as ContractArtifact,
     IEtherTokenV06: IEtherTokenV06 as ContractArtifact,
     LibERC20TokenV06: LibERC20TokenV06 as ContractArtifact,
-    WETH9V06: WETH9V06 as ContractArtifact,
+    IERC20TokenV08: IERC20TokenV08 as ContractArtifact,
+    IEtherTokenV08: IEtherTokenV08 as ContractArtifact,
+    LibERC20TokenV08: LibERC20TokenV08 as ContractArtifact,
     DummyERC20Token: DummyERC20Token as ContractArtifact,
     DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
     DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,

contracts/erc20/test/global_hooks.ts

@@ -1,19 +0,0 @@
-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,15 +9,17 @@ 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';
 export * from '../test/generated-wrappers/unlimited_allowance_erc20_token';
 export * from '../test/generated-wrappers/untransferrable_dummy_erc20_token';
 export * from '../test/generated-wrappers/weth9';
-export * from '../test/generated-wrappers/weth9v06';
 export * from '../test/generated-wrappers/zrx_token';

contracts/erc20/truffle-config.js

@@ -1,96 +0,0 @@
-/**
- * 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,17 +15,19 @@
         "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",
         "test/generated-artifacts/UnlimitedAllowanceERC20Token.json",
         "test/generated-artifacts/UntransferrableDummyERC20Token.json",
         "test/generated-artifacts/WETH9.json",
-        "test/generated-artifacts/WETH9V06.json",
         "test/generated-artifacts/ZRXToken.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1674517560,
+        "version": "5.4.45",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "5.4.44",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "5.4.43",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1668477029,
         "version": "5.4.42",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.45 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v5.4.44 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v5.4.43 - _November 23, 2022_
+
+    * Dependencies updated
+
 ## v5.4.42 - _November 15, 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](../../CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.42",
+    "version": "5.4.45",
     "engines": {
         "node": ">=6.12"
     },
@@ -13,16 +13,11 @@
         "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",
-        "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"
+        "test:ci": "yarn test"
     },
     "repository": {
         "type": "git",
@@ -46,11 +41,10 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^7.4.0",
+        "@0x/contract-addresses": "^8.0.1",
         "@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

@@ -1,26 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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,7 +20,6 @@ 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,7 +5,6 @@ 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';
 
@@ -39,11 +38,7 @@ const enabledSubproviderCount = _.filter(
     _.identity.bind(_),
 ).length;
 if (enabledSubproviderCount > 1) {
-    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);
+    throw new Error(`Only one of profiler or revert trace subproviders can be enabled at a time`);
 }
 if (isProfilerEnabled) {
     const profilerSubprovider = profiler.getProfilerSubproviderSingleton();

contracts/treasury/CHANGELOG.json

@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1674517560,
+        "version": "1.4.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "1.4.37",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "1.4.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1668477029,
         "version": "1.4.35",

contracts/treasury/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.4.38 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v1.4.37 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v1.4.36 - _November 23, 2022_
+
+    * Dependencies updated
+
 ## v1.4.35 - _November 15, 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](../../CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.35",
+    "version": "1.4.38",
     "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:circleci": "yarn test",
+        "test:ci": "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": "^7.4.0",
+        "@0x/contract-addresses": "^8.0.1",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.52",
+        "@0x/contracts-erc20": "^3.3.55",
         "@0x/contracts-gen": "^2.0.48",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.42",
+        "@0x/contracts-test-utils": "^5.4.45",
         "@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.1",
+        "@0x/protocol-utils": "^11.17.4",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1674517560,
+        "version": "4.8.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "4.8.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "4.8.34",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1668477029,
         "version": "4.8.33",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.8.36 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v4.8.35 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v4.8.34 - _November 23, 2022_
+
+    * Dependencies updated
+
 ## v4.8.33 - _November 15, 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](../../CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 

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

@@ -0,0 +1,125 @@
+// 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

@@ -0,0 +1,434 @@
+// 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

@@ -0,0 +1,201 @@
+// 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

@@ -0,0 +1,56 @@
+// 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

@@ -0,0 +1,50 @@
+// 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

@@ -0,0 +1,64 @@
+// 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

@@ -0,0 +1,44 @@
+// 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

@@ -0,0 +1,40 @@
+// 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

@@ -0,0 +1,35 @@
+// 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

@@ -17,10 +17,13 @@
 
 */
 
-pragma solidity ^0.6;
+pragma solidity ^0.8;
 
-interface IShell {
-    function viewOriginSwap(address from, address to, uint256 fromAmount) external view returns (uint256 toAmount);
+library LibReentrancyGuardRichErrorsV08 {
+    // bytes4(keccak256("IllegalReentrancyError()"))
+    bytes internal constant ILLEGAL_REENTRANCY_ERROR_SELECTOR_BYTES = hex"0c3b823f";
 
-    function viewTargetSwap(address from, address to, uint256 toAmount) external view returns (uint256 fromAmount);
+    function IllegalReentrancyError() internal pure returns (bytes memory) {
+        return ILLEGAL_REENTRANCY_ERROR_SELECTOR_BYTES;
+    }
 }

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

@@ -0,0 +1,42 @@
+// 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

@@ -0,0 +1,50 @@
+// 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

@@ -0,0 +1,57 @@
+// 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

@@ -0,0 +1,35 @@
+// 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.33",
+    "version": "4.8.36",
     "engines": {
         "node": ">=6.12"
     },
@@ -15,7 +15,6 @@
         "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",
@@ -25,19 +24,15 @@
         "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",
-        "coverage:report:lcov": "istanbul report lcov",
-        "test:circleci": "yarn test",
+        "test:ci": "yarn test",
         "contracts:gen": "contracts-gen generate",
-        "contracts:copy": "contracts-gen copy",
-        "compile:truffle": "truffle compile"
+        "contracts:copy": "contracts-gen copy"
     },
     "config": {
         "publicInterfaceContracts": "Authorizable,IAuthorizable,IOwnable,LibAddress,LibAddressArray,LibAddressArrayRichErrors,LibAuthorizableRichErrors,LibBytes,LibBytesRichErrors,LibEIP1271,LibEIP712,LibFractions,LibOwnableRichErrors,LibReentrancyGuardRichErrors,LibRichErrors,LibMath,LibMathRichErrors,LibSafeMath,LibSafeMathRichErrors,Ownable,ReentrancyGuard,Refundable",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "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"
+        "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"
     },
     "repository": {
         "type": "git",
@@ -51,7 +46,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.48",
-        "@0x/contracts-test-utils": "^5.4.42",
+        "@0x/contracts-test-utils": "^5.4.45",
         "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
@@ -75,7 +70,6 @@
         "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,42 +7,56 @@ 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';
@@ -98,6 +112,20 @@ 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

@@ -1,19 +0,0 @@
-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,42 +5,56 @@
  */
 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

@@ -1,96 +0,0 @@
-/**
- * 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,42 +27,56 @@
         "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,4 +1,31 @@
 [
+    {
+        "timestamp": 1674517560,
+        "version": "0.38.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "0.38.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "0.38.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1668477029,
         "version": "0.38.1",

contracts/zero-ex/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.38.4 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v0.38.3 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v0.38.2 - _November 23, 2022_
+
+    * Dependencies updated
+
 ## v0.38.1 - _November 15, 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](../../CONTRIBUTING.md) before getting started.
+Please read our [contribution guidelines](../../.github/CONTRIBUTING.md) before getting started.
 
 ### Install Dependencies
 
@@ -67,22 +67,3 @@ yarn lint
 ```bash
 yarn test
 ```
-
-### 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
-FORGE_ARBITRUM_RPC=https://arb-mainnet........
-FORGE_AVALANCHE_RPC=https://avalanche-........
-FORGE_BSC_RPC=https://winter-frosty-fi........
-FORGE_FANTOM_RPC=https://muddy-rough-m........
-FORGE_MAINNET_RPC=https://eth-mainnet.........
-FORGE_OPTIMISM_RPC=https://opt-mainnet........
-FORGE_POLYGON_RPC=https://polygon-main........
-```
-
-```bash
-yarn foundry:SU
-foundryup
-yarn forge
-```

contracts/zero-ex/compiler.json

@@ -121,7 +121,6 @@
         "./contracts/src/transformers/bridges/PolygonBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/mixins/MixinAaveV2.sol",
         "./contracts/src/transformers/bridges/mixins/MixinBalancer.sol",
-        "./contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol",
         "./contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol",
         "./contracts/src/transformers/bridges/mixins/MixinBancor.sol",
         "./contracts/src/transformers/bridges/mixins/MixinBancorV3.sol",
@@ -158,8 +157,6 @@
         "./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",
@@ -193,7 +190,6 @@
         "./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/transformers/FillQuoteTransformer.sol

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

contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol

@@ -1,15 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 /*
+
   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.5;
@@ -17,7 +22,7 @@ pragma experimental ABIEncoderV2;
 
 import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
-import "./mixins/MixinBalancerV2.sol";
+import "./mixins/MixinAaveV3.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
@@ -31,7 +36,7 @@ import "./mixins/MixinZeroExBridge.sol";
 
 contract ArbitrumBridgeAdapter is
     AbstractBridgeAdapter(42161, "Arbitrum"),
-    MixinBalancerV2,
+    MixinAaveV3,
     MixinBalancerV2Batch,
     MixinCurve,
     MixinCurveV2,
@@ -43,7 +48,7 @@ contract ArbitrumBridgeAdapter is
     MixinUniswapV2,
     MixinZeroExBridge
 {
-    constructor(IEtherTokenV06 weth) public MixinCurve(weth) {}
+    constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(true) {}
 
     function _trade(
         BridgeOrder memory order,
@@ -53,12 +58,7 @@ contract ArbitrumBridgeAdapter is
         bool dryRun
     ) internal override returns (uint256 boughtAmount, bool supportedSource) {
         uint128 protocolId = uint128(uint256(order.source) >> 128);
-        if (protocolId == BridgeProtocols.BALANCERV2) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
+        if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
             if (dryRun) {
                 return (0, true);
             }
@@ -108,6 +108,11 @@ contract ArbitrumBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeZeroExBridge(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.AAVEV3) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeAaveV3(sellToken, buyToken, sellAmount, order.bridgeData);
         }
 
         emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);

contracts/zero-ex/contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol

@@ -22,6 +22,7 @@ pragma experimental ABIEncoderV2;
 
 import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
+import "./mixins/MixinAaveV3.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
 import "./mixins/MixinGMX.sol";
@@ -35,6 +36,7 @@ import "./mixins/MixinZeroExBridge.sol";
 
 contract AvalancheBridgeAdapter is
     AbstractBridgeAdapter(43114, "Avalanche"),
+    MixinAaveV3,
     MixinCurve,
     MixinCurveV2,
     MixinGMX,
@@ -46,7 +48,7 @@ contract AvalancheBridgeAdapter is
     MixinWOOFi,
     MixinZeroExBridge
 {
-    constructor(IEtherTokenV06 weth) public MixinCurve(weth) {}
+    constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(false) {}
 
     function _trade(
         BridgeOrder memory order,
@@ -106,6 +108,11 @@ contract AvalancheBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeZeroExBridge(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.AAVEV3) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeAaveV3(sellToken, buyToken, sellAmount, order.bridgeData);
         }
 
         emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);

contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol

@@ -58,4 +58,5 @@ library BridgeProtocols {
     uint128 internal constant SOLIDLY = 29;
     uint128 internal constant SYNTHETIX = 30;
     uint128 internal constant WOOFI = 31;
+    uint128 internal constant AAVEV3 = 32;
 }

contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol

@@ -24,7 +24,6 @@ import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
 import "./mixins/MixinAaveV2.sol";
 import "./mixins/MixinBalancer.sol";
-import "./mixins/MixinBalancerV2.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinBancor.sol";
 import "./mixins/MixinBancorV3.sol";
@@ -50,7 +49,6 @@ contract EthereumBridgeAdapter is
     AbstractBridgeAdapter(1, "Ethereum"),
     MixinAaveV2,
     MixinBalancer,
-    MixinBalancerV2,
     MixinBalancerV2Batch,
     MixinBancor,
     MixinBancorV3,
@@ -122,11 +120,6 @@ contract EthereumBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeBalancer(sellToken, buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BALANCERV2) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData);
         } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
             if (dryRun) {
                 return (0, true);

contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol

@@ -22,8 +22,6 @@ pragma experimental ABIEncoderV2;
 
 import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
-import "./mixins/MixinAaveV2.sol";
-import "./mixins/MixinBalancerV2.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
@@ -34,8 +32,6 @@ import "./mixins/MixinZeroExBridge.sol";
 
 contract FantomBridgeAdapter is
     AbstractBridgeAdapter(250, "Fantom"),
-    MixinAaveV2,
-    MixinBalancerV2,
     MixinBalancerV2Batch,
     MixinCurve,
     MixinCurveV2,
@@ -69,11 +65,6 @@ contract FantomBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BALANCERV2) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData);
         } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
             if (dryRun) {
                 return (0, true);
@@ -84,11 +75,6 @@ contract FantomBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeNerve(sellToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.AAVEV2) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeAaveV2(sellToken, buyToken, sellAmount, order.bridgeData);
         } else if (protocolId == BridgeProtocols.WOOFI) {
             if (dryRun) {
                 return (0, true);

contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol

@@ -17,7 +17,7 @@ pragma experimental ABIEncoderV2;
 
 import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
-import "./mixins/MixinBalancerV2.sol";
+import "./mixins/MixinAaveV3.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
@@ -29,7 +29,7 @@ import "./mixins/MixinZeroExBridge.sol";
 
 contract OptimismBridgeAdapter is
     AbstractBridgeAdapter(10, "Optimism"),
-    MixinBalancerV2,
+    MixinAaveV3,
     MixinBalancerV2Batch,
     MixinCurve,
     MixinCurveV2,
@@ -39,7 +39,7 @@ contract OptimismBridgeAdapter is
     MixinSolidly,
     MixinZeroExBridge
 {
-    constructor(IEtherTokenV06 weth) public MixinCurve(weth) {}
+    constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(true) {}
 
     function _trade(
         BridgeOrder memory order,
@@ -84,16 +84,16 @@ contract OptimismBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeZeroExBridge(sellToken, buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BALANCERV2) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData);
         } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
             if (dryRun) {
                 return (0, true);
             }
             boughtAmount = _tradeBalancerV2Batch(sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.AAVEV3) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeAaveV3(sellToken, buyToken, sellAmount, order.bridgeData);
         }
 
         emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);

contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol

@@ -22,8 +22,8 @@ pragma experimental ABIEncoderV2;
 
 import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
+import "./mixins/MixinAaveV3.sol";
 import "./mixins/MixinAaveV2.sol";
-import "./mixins/MixinBalancerV2.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
@@ -40,8 +40,8 @@ import "./mixins/MixinZeroExBridge.sol";
 
 contract PolygonBridgeAdapter is
     AbstractBridgeAdapter(137, "Polygon"),
+    MixinAaveV3,
     MixinAaveV2,
-    MixinBalancerV2,
     MixinBalancerV2Batch,
     MixinCurve,
     MixinCurveV2,
@@ -56,7 +56,7 @@ contract PolygonBridgeAdapter is
     MixinWOOFi,
     MixinZeroExBridge
 {
-    constructor(IEtherTokenV06 weth) public MixinCurve(weth) {}
+    constructor(IEtherTokenV06 weth) public MixinCurve(weth) MixinAaveV3(false) {}
 
     function _trade(
         BridgeOrder memory order,
@@ -86,11 +86,6 @@ contract PolygonBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BALANCERV2) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData);
         } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
             if (dryRun) {
                 return (0, true);
@@ -141,6 +136,11 @@ contract PolygonBridgeAdapter is
                 return (0, true);
             }
             boughtAmount = _tradeZeroExBridge(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.AAVEV3) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeAaveV3(sellToken, buyToken, sellAmount, order.bridgeData);
         }
 
         emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);

contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAaveV3.sol

@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  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;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+
+// Minimal Aave V3 Pool interface
+interface IPool {
+    /**
+     * @notice Supplies an `amount` of underlying asset into the reserve, receiving in return overlying aTokens.
+     * - E.g. User supplies 100 USDC and gets in return 100 aUSDC
+     * @param asset The address of the underlying asset to supply
+     * @param amount The amount to be supplied
+     * @param onBehalfOf The address that will receive the aTokens, same as msg.sender if the user
+     *   wants to receive them on his own wallet, or a different address if the beneficiary of aTokens
+     *   is a different wallet
+     * @param referralCode Code used to register the integrator originating the operation, for potential rewards.
+     *   0 if the action is executed directly by the user, without any middle-man
+     **/
+    function supply(address asset, uint256 amount, address onBehalfOf, uint16 referralCode) external;
+
+    /**
+     * @notice Withdraws an `amount` of underlying asset from the reserve, burning the equivalent aTokens owned
+     * E.g. User has 100 aUSDC, calls withdraw() and receives 100 USDC, burning the 100 aUSDC
+     * @param asset The address of the underlying asset to withdraw
+     * @param amount The underlying amount to be withdrawn
+     *   - Send the value type(uint256).max in order to withdraw the whole aToken balance
+     * @param to The address that will receive the underlying, same as msg.sender if the user
+     *   wants to receive it on his own wallet, or a different address if the beneficiary is a
+     *   different wallet
+     * @return The final amount withdrawn
+     **/
+    function withdraw(address asset, uint256 amount, address to) external returns (uint256);
+}
+
+// Minimal Aave V3 L2Pool interface
+interface IL2Pool {
+    /**
+     * @notice Calldata efficient wrapper of the supply function on behalf of the caller
+     * @param args Arguments for the supply function packed in one bytes32
+     *    96 bits       16 bits         128 bits      16 bits
+     * | 0-padding | referralCode | shortenedAmount | assetId |
+     * @dev the shortenedAmount is cast to 256 bits at decode time, if type(uint128).max the value will be expanded to
+     * type(uint256).max
+     * @dev assetId is the index of the asset in the reservesList.
+     */
+    function supply(bytes32 args) external;
+
+    /**
+     * @notice Calldata efficient wrapper of the withdraw function, withdrawing to the caller
+     * @param args Arguments for the withdraw function packed in one bytes32
+     *    112 bits       128 bits      16 bits
+     * | 0-padding | shortenedAmount | assetId |
+     * @dev the shortenedAmount is cast to 256 bits at decode time, if type(uint128).max the value will be expanded to
+     * type(uint256).max
+     * @dev assetId is the index of the asset in the reservesList.
+     */
+    function withdraw(bytes32 args) external;
+}
+
+contract MixinAaveV3 {
+    using LibERC20TokenV06 for IERC20TokenV06;
+
+    bool private immutable _isL2;
+
+    constructor(bool isL2) public {
+        _isL2 = isL2;
+    }
+
+    function _tradeAaveV3(
+        IERC20TokenV06 sellToken,
+        IERC20TokenV06 buyToken,
+        uint256 sellAmount,
+        bytes memory bridgeData
+    ) internal returns (uint256) {
+        if (_isL2) {
+            (IL2Pool pool, address aToken, bytes32 l2Params) = abi.decode(bridgeData, (IL2Pool, address, bytes32));
+
+            sellToken.approveIfBelow(address(pool), sellAmount);
+
+            if (address(buyToken) == aToken) {
+                pool.supply(l2Params);
+                // 1:1 mapping token --> aToken and have the same number of decimals as the underlying token
+                return sellAmount;
+            } else if (address(sellToken) == aToken) {
+                pool.withdraw(l2Params);
+                return sellAmount;
+            }
+
+            revert("MixinAaveV3/UNSUPPORTED_TOKEN_PAIR");
+        }
+        (IPool pool, address aToken, ) = abi.decode(bridgeData, (IPool, address, bytes32));
+
+        sellToken.approveIfBelow(address(pool), sellAmount);
+
+        if (address(buyToken) == aToken) {
+            pool.supply(address(sellToken), sellAmount, address(this), 0);
+            // 1:1 mapping token -> aToken and have the same number of decimals as the underlying token
+            return sellAmount;
+        } else if (address(sellToken) == aToken) {
+            return pool.withdraw(address(buyToken), sellAmount, address(this));
+        }
+
+        revert("MixinAaveV3/UNSUPPORTED_TOKEN_PAIR");
+    }
+}

contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol

@@ -1,119 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-
-interface IBalancerV2Vault {
-    enum SwapKind {
-        GIVEN_IN,
-        GIVEN_OUT
-    }
-
-    // solhint-disable max-line-length
-    /**
-     * @dev Performs a swap with a single Pool.
-     *
-     * If the swap is given in (the number of tokens to send to the Pool is known), returns the amount of tokens
-     * taken from the Pool, which must be greater than or equal to `limit`.
-     *
-     * If the swap is given out (the number of tokens to take from the Pool is known), returns the amount of
-     * tokens sent to the Pool, which must be less than or equal to `limit`.
-     *
-     * Internal Balance usage and the recipient are determined by the `funds` struct.
-     *
-     * Emits a `Swap` event.
-     * For full documentation see https://github.com/balancer-labs/balancer-core-v2/blob/master/contracts/vault/interfaces/IVault.sol
-     */
-
-    // solhint-enable max-line-length
-
-    function swap(
-        SingleSwap calldata request,
-        FundManagement calldata funds,
-        uint256 limit,
-        uint256 deadline
-    ) external payable returns (uint256);
-
-    struct SingleSwap {
-        bytes32 poolId;
-        SwapKind kind;
-        IERC20TokenV06 assetIn;
-        IERC20TokenV06 assetOut;
-        uint256 amount;
-        bytes userData;
-    }
-
-    struct FundManagement {
-        address sender;
-        bool fromInternalBalance;
-        address payable recipient;
-        bool toInternalBalance;
-    }
-}
-
-contract MixinBalancerV2 {
-    using LibERC20TokenV06 for IERC20TokenV06;
-
-    struct BalancerV2BridgeData {
-        IBalancerV2Vault vault;
-        bytes32 poolId;
-    }
-
-    function _tradeBalancerV2(
-        IERC20TokenV06 sellToken,
-        IERC20TokenV06 buyToken,
-        uint256 sellAmount,
-        bytes memory bridgeData
-    ) internal returns (uint256 boughtAmount) {
-        // Decode the bridge data.
-        BalancerV2BridgeData memory data = abi.decode(bridgeData, (BalancerV2BridgeData));
-
-        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
-        sellToken.approveIfBelow(address(data.vault), sellAmount);
-
-        // Sell the entire sellAmount
-        IBalancerV2Vault.SingleSwap memory request = IBalancerV2Vault.SingleSwap({
-            poolId: data.poolId,
-            kind: IBalancerV2Vault.SwapKind.GIVEN_IN,
-            assetIn: sellToken,
-            assetOut: buyToken,
-            amount: sellAmount, // amount in
-            userData: ""
-        });
-
-        IBalancerV2Vault.FundManagement memory funds = IBalancerV2Vault.FundManagement({
-            sender: address(this),
-            fromInternalBalance: false,
-            recipient: payable(address(this)),
-            toInternalBalance: false
-        });
-
-        boughtAmount = data.vault.swap(
-            request,
-            funds,
-            1, // min amount out
-            block.timestamp // expires after this block
-        );
-        return boughtAmount;
-    }
-}

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

@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-
-/*
-  Copyright 2020 ZeroEx Intl.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "../src/vendor/v3/IERC20Bridge.sol";
-
-contract TestBridge is IERC20Bridge {
-    IERC20TokenV06 public immutable xAsset;
-    IERC20TokenV06 public immutable yAsset;
-
-    constructor(IERC20TokenV06 xAsset_, IERC20TokenV06 yAsset_) public {
-        xAsset = xAsset_;
-        yAsset = yAsset_;
-    }
-
-    /// @dev Transfers `amount` of the ERC20 `tokenAddress` from `from` to `to`.
-    /// @param tokenAddress The address of the ERC20 token to transfer.
-    /// @param from Address to transfer asset from.
-    /// @param to Address to transfer asset to.
-    /// @param amount Amount of asset to transfer.
-    /// @return success The magic bytes `0xdc1600f3` if successful.
-    function bridgeTransferFrom(
-        address tokenAddress,
-        address from,
-        address to,
-        uint256 amount,
-        bytes calldata /* bridgeData */
-    ) external override returns (bytes4 success) {
-        IERC20TokenV06 takerToken = tokenAddress == address(xAsset) ? yAsset : xAsset;
-        uint256 takerTokenBalance = takerToken.balanceOf(address(this));
-        emit ERC20BridgeTransfer(address(takerToken), tokenAddress, takerTokenBalance, amount, from, to);
-        return 0xdecaf000;
-    }
-}

contracts/zero-ex/contracts/test/foundry/LiveBridgeOrderTests.sol

@@ -1,229 +0,0 @@
-pragma solidity ^0.6;
-
-pragma experimental ABIEncoderV2;
-
-import "./utils/ForkUtils.sol";
-import "./utils/TestUtils.sol";
-import "src/IZeroEx.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
-import "src/features/TransformERC20Feature.sol";
-import "src/external/TransformerDeployer.sol";
-import "src/transformers/WethTransformer.sol";
-import "src/transformers/FillQuoteTransformer.sol";
-import "src/transformers/bridges/BridgeProtocols.sol";
-import "src/features/OtcOrdersFeature.sol";
-import "samplers/UniswapV2Sampler.sol";
-
-contract ETHToERC20TransformTest is Test, ForkUtils, TestUtils {
-    //use forge-std json library for strings
-    using stdJson for string;
-
-    //utility mapping to get chainId by name
-    mapping(string => string) public chainsByChainId;
-    //utility mapping to get indexingChainId by Chain
-    mapping(string => string) public indexChainsByChain;
-
-    string json;
-
-    /*//////////////////////////////////////////////////////////////
-                                 Rpc Setup
-    //////////////////////////////////////////////////////////////*/
-    function setUp() public {
-        //get out addresses.json file that defines contract addresses for each chain we are currently deployed on
-        createForks();
-
-        for (uint256 i = 0; i < chains.length; i++) {
-            chainsByChainId[chains[i]] = chainIds[i];
-            indexChainsByChain[chains[i]] = indexChainIds[i];
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                                 Dispatch
-    //////////////////////////////////////////////////////////////*/
-
-    function testSwapEthForERC20OnUniswap() public {
-        log_string("SwapEthForERC20OnUniswap");
-        /* */
-        for (uint256 i = 0; i < chains.length; i++) {
-            //skip fantom/avax failing test
-            if (i == 3 || i == 4) {
-                continue;
-            }
-            vm.selectFork(forkIds[chains[i]]);
-            log_named_string("  Selecting Fork On", chains[i]);
-            labelAddresses(
-                chains[i],
-                indexChainsByChain[chains[i]],
-                getTokens(i),
-                getContractAddresses(i),
-                getLiquiditySourceAddresses(i)
-            );
-            swapOnUniswap(getTokens(i), getContractAddresses(i), getLiquiditySourceAddresses(i));
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                                 Settlement
-    //////////////////////////////////////////////////////////////*/
-
-    function swapOnUniswap(
-        TokenAddresses memory tokens,
-        Addresses memory addresses,
-        LiquiditySources memory sources
-    ) public onlyForked {
-        if (sources.UniswapV2Router != address(0)) {
-            // Create our list of transformations, let's do WethTransformer and FillQuoteTransformer
-            ITransformERC20Feature.Transformation[]
-                memory transformations = new ITransformERC20Feature.Transformation[](2);
-
-            /*//////////////////////////////////////////////////////////////
-                                    WethTransformer
-            //////////////////////////////////////////////////////////////*/
-
-            // Use our cheeky search helper to find the nonce rather than hardcode it
-            transformations[0].deploymentNonce = _findTransformerNonce(
-                address(addresses.wethTransformer),
-                address(addresses.exchangeProxyTransformerDeployer)
-            );
-            emit log_named_uint("           WethTransformer nonce", transformations[0].deploymentNonce);
-            createNewFQT(
-                tokens.WrappedNativeToken,
-                addresses.exchangeProxy,
-                addresses.exchangeProxyTransformerDeployer
-            );
-            // Set the first transformation to transform ETH into WETH
-            transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
-
-            /*//////////////////////////////////////////////////////////////
-                                    FillQuoteTransformer
-            //////////////////////////////////////////////////////////////*/
-
-            transformations[1].deploymentNonce = _findTransformerNonce(
-                address(fillQuoteTransformer),
-                address(addresses.exchangeProxyTransformerDeployer)
-            );
-            emit log_named_uint("           FillQuoteTransformer nonce", transformations[1].deploymentNonce);
-            // Set up the FillQuoteTransformer data
-            FillQuoteTransformer.TransformData memory fqtData;
-            fqtData.side = FillQuoteTransformer.Side.Sell;
-            fqtData.sellToken = IERC20TokenV06(address(tokens.WrappedNativeToken));
-            fqtData.buyToken = IERC20TokenV06(address(tokens.USDT));
-            // the FQT has a sequence, e.g first RFQ then Limit then Bridge
-            // since solidity doesn't support arrays of different types, this is one simple solution
-            // We use a Bridge order type here as we will fill on UniswapV2
-            fqtData.fillSequence = new FillQuoteTransformer.OrderType[](1);
-            fqtData.fillSequence[0] = FillQuoteTransformer.OrderType.Bridge;
-            // The amount to fill
-            fqtData.fillAmount = 1e18;
-
-            /*//////////////////////////////////////////////////////////////
-                                    Sampling
-            //////////////////////////////////////////////////////////////*/
-
-            uint256 amountOut = sampleLiquiditySource(
-                fqtData.fillAmount,
-                address(fqtData.sellToken),
-                address(fqtData.buyToken),
-                sources.UniswapV2Router
-            );
-
-            /*//////////////////////////////////////////////////////////////
-                                    BridgeAdapter
-            //////////////////////////////////////////////////////////////*/
-            // Now let's set up a UniswapV2 fill
-            fqtData.bridgeOrders = new IBridgeAdapter.BridgeOrder[](1);
-            IBridgeAdapter.BridgeOrder memory order;
-            // The ID is shifted so we can concat <PROTOCOL><NAME>
-            // e.g <UniswapV2Protocol><UniswapV2>
-            // or  <UniswapV2Protocol><SushiSwap> for forks
-            order.source = bytes32(uint256(BridgeProtocols.UNISWAPV2) << 128);
-            // How much we want to fill on this order, which can be different to the total
-            // e.g 50/50 split this would be half
-            order.takerTokenAmount = 1e18;
-            // Set this low as the price of ETH/USDT can change
-            order.makerTokenAmount = amountOut;
-            // The data needed specifically for the source to fill,
-            // e.g for UniswapV2 it is the router contract and a path. See MixinUniswapV2
-            address[] memory uniPath = new address[](2);
-            uniPath[0] = address(tokens.WrappedNativeToken);
-            uniPath[1] = address(tokens.USDT);
-            order.bridgeData = abi.encode(address(sources.UniswapV2Router), uniPath);
-            fqtData.bridgeOrders[0] = order;
-            // Now encode the FQT data into the transformation
-            transformations[1].data = abi.encode(fqtData);
-
-            vm.deal(address(this), 1e18);
-            uint256 balanceETHBefore = address(this).balance;
-            uint256 balanceERC20Before = IERC20TokenV06(tokens.USDT).balanceOf(address(this));
-
-            IZeroEx(payable(addresses.exchangeProxy)).transformERC20{value: 1e18}(
-                // input token
-                IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
-                // output token
-                IERC20TokenV06(address(tokens.USDT)),
-                // input token amount
-                1e18,
-                // min output token amount
-                order.makerTokenAmount,
-                // list of transform
-                transformations
-            );
-
-            log_named_uint("        NativeAsset balance before", balanceETHBefore);
-            log_named_uint("        ERC-20 balance before", balanceERC20Before);
-            log_named_uint("        NativeAsset balance after", balanceETHBefore - address(this).balance);
-            log_named_uint(
-                "        ERC-20 balance after",
-                IERC20TokenV06(tokens.USDT).balanceOf(address(this)) - balanceERC20Before
-            );
-            assert(IERC20TokenV06(tokens.USDT).balanceOf(address(this)) > 0);
-        } else {
-            log_string("    Liquidity Source Not available on this chain");
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                            Sampler Dispatch
-    //////////////////////////////////////////////////////////////*/
-    // get a real quote from uniswap
-    function sampleLiquiditySource(
-        uint256 amount,
-        address takerToken,
-        address makerToken,
-        address router
-    ) public returns (uint256 makerTokenAmounts) {
-        UniswapV2Sampler sampler = new UniswapV2Sampler();
-        vm.label(address(sampler), "UniswapV2Sampler");
-        address[] memory path = new address[](2);
-        path[0] = address(takerToken);
-        path[1] = address(makerToken);
-        uint256[] memory amounts = new uint256[](1);
-        amounts[0] = amount;
-        uint256 out = sampler.sampleSellsFromUniswapV2(router, path, amounts)[0];
-
-        log_string("       Sampling Uniswap for tokens");
-        log_named_address("        ", takerToken);
-        log_string("           -> ");
-        log_named_address("        ", makerToken);
-        return out;
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                                HELPERS
-    //////////////////////////////////////////////////////////////*/
-
-    function createNewFQT(
-        IEtherTokenV06 wrappedNativeToken,
-        address payable exchangeProxy,
-        address transformerDeployer
-    ) public {
-        vm.startPrank(transformerDeployer);
-        // deploy a new instance of the bridge adapter from the transformerDeployer
-        bridgeAdapter = createBridgeAdapter(IEtherTokenV06(wrappedNativeToken));
-        // deploy a new instance of the fill quote transformer from the transformerDeployer
-        fillQuoteTransformer = new FillQuoteTransformer(IBridgeAdapter(bridgeAdapter), IZeroEx(exchangeProxy));
-        vm.label(address(fillQuoteTransformer), "zeroEx/FillQuoteTransformer");
-        vm.stopPrank();
-    }
-}

contracts/zero-ex/contracts/test/foundry/Local0xSwap.sol

@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "./utils/ForkUtils.sol";
-import "./utils/TestUtils.sol";
-import "./utils/DeployZeroEx.sol";
-import "forge-std/Test.sol";
-import "src/IZeroEx.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
-import "src/features/TransformERC20Feature.sol";
-import "src/external/TransformerDeployer.sol";
-import "src/transformers/WethTransformer.sol";
-import "src/transformers/FillQuoteTransformer.sol";
-import "src/transformers/bridges/BridgeProtocols.sol";
-import "src/transformers/bridges/EthereumBridgeAdapter.sol";
-import "src/IZeroEx.sol";
-
-contract BasicSwapTest is Test, ForkUtils, TestUtils {
-    DeployZeroEx.ZeroExDeployed zeroExDeployed;
-
-    function setUp() public {
-        zeroExDeployed = new DeployZeroEx().deployZeroEx();
-        vm.deal(address(this), 1e19);
-    }
-
-    function testTransformERC20() public {
-        emit log_string("-----Preparing ETH->WETH transformation through TransformERC20()-----");
-        emit log_string("   --Building Up Transformations--");
-        ITransformERC20Feature.Transformation[] memory transformations = new ITransformERC20Feature.Transformation[](1);
-
-        emit log_named_address("    Finding TransformerDeployer nonce @", address(zeroExDeployed.transformerDeployer));
-        emit log_named_uint(
-            "       Deployer nonce",
-            _findTransformerNonce(
-                address(zeroExDeployed.transformers.wethTransformer),
-                address(zeroExDeployed.transformerDeployer)
-            )
-        );
-        transformations[0].deploymentNonce = _findTransformerNonce(
-            address(zeroExDeployed.transformers.wethTransformer),
-            address(zeroExDeployed.transformerDeployer)
-        );
-        transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
-
-        emit log_string("   ---Calling TransformERC20()---");
-        uint256 balanceETHBefore = address(this).balance;
-        uint256 balanceWETHBefore = zeroExDeployed.weth.balanceOf(address(this));
-        zeroExDeployed.zeroEx.transformERC20{value: 1e18}(
-            // input token
-            IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
-            // output token
-            IERC20TokenV06(address(zeroExDeployed.weth)),
-            // input token amount
-            1e18,
-            // min output token amount
-            1e18,
-            // list of transform
-            transformations
-        );
-        assert(zeroExDeployed.weth.balanceOf(address(this)) == 1e18);
-        emit log_string("       Successful Transformation Complete");
-        emit log_named_uint("           ETH BALANCE BEFORE:", balanceETHBefore);
-        emit log_named_uint("           ETH BALANCE AFTER:", address(this).balance);
-        emit log_named_uint("           WETH BALANCE BEFORE:", balanceWETHBefore);
-        emit log_named_uint("           WETH BALANCE AFTER:", zeroExDeployed.weth.balanceOf(address(this)));
-    }
-}

contracts/zero-ex/contracts/test/foundry/OtcOrderTests.sol

@@ -1,212 +0,0 @@
-pragma solidity ^0.6;
-
-pragma experimental ABIEncoderV2;
-
-import "./utils/ForkUtils.sol";
-import "./utils/TestUtils.sol";
-import "src/IZeroEx.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
-import "src/features/TransformERC20Feature.sol";
-import "src/external/TransformerDeployer.sol";
-import "src/transformers/WethTransformer.sol";
-import "src/transformers/FillQuoteTransformer.sol";
-import "src/transformers/bridges/BridgeProtocols.sol";
-import "src/features/OtcOrdersFeature.sol";
-import "samplers/UniswapV2Sampler.sol";
-
-contract NativeTokenToERC20WithOtcTest is Test, ForkUtils, TestUtils {
-    //use forge-std json library for strings
-    using stdJson for string;
-
-    //utility mapping to get chainId by name
-    mapping(string => string) public chainsByChainId;
-    //utility mapping to get indexingChainId by Chain
-    mapping(string => string) public indexChainsByChain;
-
-    string json;
-
-    /*//////////////////////////////////////////////////////////////
-                                 Rpc Setup
-    //////////////////////////////////////////////////////////////*/
-    function setUp() public {
-        //get out addresses.json file that defines contract addresses for each chain we are currently deployed on
-        createForks();
-
-        for (uint256 i = 0; i < chains.length; i++) {
-            chainsByChainId[chains[i]] = chainIds[i];
-            indexChainsByChain[chains[i]] = indexChainIds[i];
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                                 Dispatch
-    //////////////////////////////////////////////////////////////*/
-
-    function testSwapEthForUSDTThroughFqtOtcs() public {
-        log_string("SwapEthForUSDTThroughFqtOtc");
-        /* */
-        for (uint256 i = 0; i < 1; i++) {
-            //skip fantom/avax failing test
-            if (i == 3 || i == 4) {
-                continue;
-            }
-            vm.selectFork(forkIds[chains[i]]);
-            log_named_string("  Selecting Fork On", chains[i]);
-            vm.deal(address(this), 1e18);
-            labelAddresses(
-                chains[i],
-                indexChainsByChain[chains[i]],
-                getTokens(i),
-                getContractAddresses(i),
-                getLiquiditySourceAddresses(i)
-            );
-            swapWithOtcOrder(getTokens(i), getContractAddresses(i), getLiquiditySourceAddresses(i));
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                                 Settlement
-    //////////////////////////////////////////////////////////////*/
-
-    function swapWithOtcOrder(
-        TokenAddresses memory tokens,
-        Addresses memory addresses,
-        LiquiditySources memory sources
-    ) public onlyForked {
-        IZERO_EX = IZeroEx(addresses.exchangeProxy);
-        address USDC = address(tokens.USDC);
-        // Create our list of transformations, let's do WethTransformer and FillQuoteTransformer
-        ITransformERC20Feature.Transformation[] memory transformations = new ITransformERC20Feature.Transformation[](2);
-
-        /*//////////////////////////////////////////////////////////////
-                                WethTransformer
-        //////////////////////////////////////////////////////////////*/
-
-        // Use our cheeky search helper to find the nonce rather than hardcode it
-        transformations[0].deploymentNonce = _findTransformerNonce(
-            address(addresses.wethTransformer),
-            address(addresses.exchangeProxyTransformerDeployer)
-        );
-        emit log_named_uint("           WethTransformer nonce", transformations[0].deploymentNonce);
-        createNewFQT(tokens.WrappedNativeToken, addresses.exchangeProxy, addresses.exchangeProxyTransformerDeployer);
-        // Set the first transformation to transform ETH into WETH
-        transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
-
-        /*//////////////////////////////////////////////////////////////
-                                FillQuoteTransformer
-        //////////////////////////////////////////////////////////////*/
-
-        transformations[1].deploymentNonce = _findTransformerNonce(
-            address(fillQuoteTransformer),
-            address(addresses.exchangeProxyTransformerDeployer)
-        );
-        log_named_uint("           FillQuoteTransformer nonce", transformations[1].deploymentNonce);
-        // Set up the FillQuoteTransformer data
-        FillQuoteTransformer.TransformData memory fqtData;
-        fqtData.side = FillQuoteTransformer.Side.Sell;
-        fqtData.sellToken = IERC20TokenV06(address(tokens.WrappedNativeToken));
-        fqtData.buyToken = tokens.USDC;
-        // the FQT has a sequence, e.g first RFQ then Limit then Bridge
-        // since solidity doesn't support arrays of different types, this is one simple solution
-        // We use a Bridge order type here as we will fill on UniswapV2
-        fqtData.fillSequence = new FillQuoteTransformer.OrderType[](1);
-        fqtData.fillSequence[0] = FillQuoteTransformer.OrderType.Otc;
-        // The amount to fill
-        fqtData.fillAmount = 1e18;
-
-        /*//////////////////////////////////////////////////////////////
-                                Sampling
-        //////////////////////////////////////////////////////////////*/
-
-        /*//////////////////////////////////////////////////////////////
-                                BridgeAdapter
-        //////////////////////////////////////////////////////////////*/
-
-        // Now let's set up an OTC fill
-        fqtData.otcOrders = new FillQuoteTransformer.OtcOrderInfo[](1);
-        LibNativeOrder.OtcOrder memory order;
-        FillQuoteTransformer.OtcOrderInfo memory orderInfo;
-
-        order.makerToken = fqtData.buyToken;
-        order.takerToken = fqtData.sellToken;
-        order.makerAmount = 1e18;
-        order.takerAmount = 1e18;
-        uint privateKey;
-        (order.maker, privateKey) = getSigner();
-        deal(address(order.makerToken), order.maker, 1e20);
-        vm.prank(order.maker);
-        IERC20TokenV06(tokens.USDC).approve(address(addresses.exchangeProxy), 1e20);
-        // vm.startPrank(whale);
-        // tokens.USDC.approve(address(this), uint(-1));
-        // //tokens.USDC.transferFrom(address(whale), address(order.maker), balance);
-        // balance = tokens.USDC.balanceOf(order.maker);
-        // vm.stopPrank();
-        //vm.deal(address(order.makerToken), address(order.maker), 1e20);
-        vm.prank(order.maker);
-        // tokens.USDC.approve(
-        //     address(IZERO_EX),
-        //     uint256(-1)
-        // );
-
-        order.taker = address(0);
-        order.txOrigin = address(tx.origin);
-        order.expiryAndNonce = encodeExpiryAndNonce(order.maker);
-        orderInfo.order = order;
-
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, IZERO_EX.getOtcOrderHash(order));
-        // How much we want to fill on this order, which can be different to the total
-        // e.g 50/50 split this would be half
-        order.takerAmount = 1e18;
-        // Set this low as the price of ETH/USDC can change
-        order.makerAmount = 1e18;
-
-        orderInfo.signature.signatureType = LibSignature.SignatureType.EIP712;
-        orderInfo.signature.v = v;
-        orderInfo.signature.r = r;
-        orderInfo.signature.s = s;
-
-        orderInfo.maxTakerTokenFillAmount = 1e18;
-
-        fqtData.otcOrders[0] = orderInfo;
-        transformations[1].data = abi.encode(fqtData);
-        log_string("        Successful fill, makerTokens bought");
-        IZERO_EX.transformERC20{value: 1e18}(
-            // input token
-            IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
-            // output token
-            tokens.USDC,
-            // input token amount
-            order.takerAmount,
-            // min output token amount
-            order.makerAmount,
-            // list of transform
-            transformations
-        );
-        assert(tokens.USDC.balanceOf(address(this)) > 0);
-    }
-
-    function encodeExpiryAndNonce(address maker) public returns (uint256) {
-        uint256 expiry = (block.timestamp + 120) << 192;
-        uint256 bucket = 0 << 128;
-        uint256 nonce = vm.getNonce(maker);
-        return expiry | bucket | nonce;
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                                HELPERS
-    //////////////////////////////////////////////////////////////*/
-
-    function createNewFQT(
-        IEtherTokenV06 wrappedNativeToken,
-        address payable exchangeProxy,
-        address transformerDeployer
-    ) public {
-        vm.startPrank(transformerDeployer);
-        // deploy a new instance of the bridge adapter from the transformerDeployer
-        bridgeAdapter = createBridgeAdapter(IEtherTokenV06(wrappedNativeToken));
-        // deploy a new instance of the fill quote transformer from the transformerDeployer
-        fillQuoteTransformer = new FillQuoteTransformer(IBridgeAdapter(bridgeAdapter), IZeroEx(exchangeProxy));
-        vm.label(address(fillQuoteTransformer), "zeroEx/FillQuoteTransformer");
-        vm.stopPrank();
-    }
-}

contracts/zero-ex/contracts/test/foundry/WethTransformerTests.sol

@@ -1,114 +0,0 @@
-pragma solidity ^0.6;
-
-pragma experimental ABIEncoderV2;
-
-import "./utils/ForkUtils.sol";
-import "./utils/TestUtils.sol";
-import "src/IZeroEx.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
-import "src/features/TransformERC20Feature.sol";
-import "src/external/TransformerDeployer.sol";
-import "src/transformers/WethTransformer.sol";
-import "src/transformers/FillQuoteTransformer.sol";
-import "src/transformers/bridges/BridgeProtocols.sol";
-import "src/transformers/bridges/EthereumBridgeAdapter.sol";
-import "src/transformers/bridges/PolygonBridgeAdapter.sol";
-import "src/transformers/bridges/ArbitrumBridgeAdapter.sol";
-import "src/transformers/bridges/OptimismBridgeAdapter.sol";
-import "src/transformers/bridges/AvalancheBridgeAdapter.sol";
-import "src/transformers/bridges/FantomBridgeAdapter.sol";
-import "src/transformers/bridges/CeloBridgeAdapter.sol";
-import "src/features/OtcOrdersFeature.sol";
-
-contract transformERC20Tests is Test, ForkUtils, TestUtils {
-    //use forge-std json library for strings
-    using stdJson for string;
-
-    //utility mapping to get chainId by name
-    mapping(string => string) public chainsByChainId;
-    //utility mapping to get indexingChainId by Chain
-    mapping(string => string) public indexChainsByChain;
-
-    string json;
-
-    function setUp() public {
-        //get out addresses.json file that defines contract addresses for each chain we are currently deployed on
-        string memory root = vm.projectRoot();
-        string memory path = string(abi.encodePacked(root, "/", "contracts/test/foundry/addresses/addresses.json"));
-        json = vm.readFile(path);
-        createForks();
-
-        for (uint256 i = 0; i < chains.length; i++) {
-            chainsByChainId[chains[i]] = chainIds[i];
-            indexChainsByChain[chains[i]] = indexChainIds[i];
-            bytes memory details = json.parseRaw(indexChainIds[i]);
-            addresses = abi.decode(details, (Addresses));
-        }
-    }
-
-    function testTransformERC20Forked() public {
-        log_string("TransformERC20Tests");
-        for (uint256 i = 0; i < chains.length; i++) {
-            vm.selectFork(forkIds[chains[i]]);
-            log_named_string("  Selecting Fork On", chains[i]);
-            _wrapNativeToken(chains[i], indexChainsByChain[chains[i]]);
-        }
-    }
-
-    function logAddresses(string memory chainName, string memory chainId) public {
-        bytes memory details = json.parseRaw(chainId);
-        addresses = abi.decode(details, (Addresses));
-    }
-
-    function _wrapNativeToken(string memory chainName, string memory chainId) public onlyForked {
-        bytes memory details = json.parseRaw(chainId);
-        addresses = abi.decode(details, (Addresses));
-
-        vm.deal(address(this), 1e19);
-
-        emit log_string("-----Preparing ETH->WETH transformation through TransformERC20()-----");
-        emit log_string("   --Building Up Transformations--");
-        ITransformERC20Feature.Transformation[] memory transformations = new ITransformERC20Feature.Transformation[](1);
-
-        emit log_named_address(
-            "    Finding TransformerDeployer nonce @",
-            address(addresses.exchangeProxyTransformerDeployer)
-        );
-        emit log_named_uint(
-            "       Deployer nonce",
-            _findTransformerNonce(
-                address(addresses.wethTransformer),
-                address(addresses.exchangeProxyTransformerDeployer)
-            )
-        );
-        transformations[0].deploymentNonce = _findTransformerNonce(
-            address(addresses.wethTransformer),
-            address(addresses.exchangeProxyTransformerDeployer)
-        );
-        transformations[0].data = abi.encode(LibERC20Transformer.ETH_TOKEN_ADDRESS, 1e18);
-
-        emit log_string("   ---Calling TransformERC20()---");
-        uint256 balanceETHBefore = address(this).balance;
-        uint256 balanceWETHBefore = IERC20TokenV06(addresses.etherToken).balanceOf(address(this));
-
-        IZeroEx(payable(addresses.exchangeProxy)).transformERC20{value: 1e18}(
-            // input token
-            IERC20TokenV06(LibERC20Transformer.ETH_TOKEN_ADDRESS),
-            // output token
-            IERC20TokenV06(address(addresses.etherToken)),
-            // input token amount
-            1e18,
-            // min output token amount
-            1e18,
-            // list of transform
-            transformations
-        );
-        log_named_uint("        NativeAsset balance before", balanceETHBefore);
-        log_named_uint("        ERC-20 balance before", balanceWETHBefore);
-        log_named_uint("        NativeAsset balance after", balanceETHBefore - address(this).balance);
-        log_named_uint(
-            "        ERC-20 balance after",
-            IERC20TokenV06(addresses.etherToken).balanceOf(address(this)) - balanceWETHBefore
-        );
-    }
-}

contracts/zero-ex/contracts/test/foundry/addresses/addresses.json

@@ -1,149 +0,0 @@
-{
-    "1": {
-        "zrxToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-        "etherToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-        "zeroExGovernor": "0x7d3455421bbc5ed534a83c88fd80387dc8271392",
-        "zrxVault": "0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf",
-        "staking": "0x2a17c35ff147b32f13f19f2e311446eeb02503f3",
-        "stakingProxy": "0xa26e80e7dea86279c6d778d702cc413e6cffa777",
-        "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
-        "erc20BridgeSampler": "0xd8c38704c9937ea3312de29f824b4ad3450a5e61",
-        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb",
-        "exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18",
-        "exchangeProxyLiquidityProviderSandbox": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a",
-        "zrxTreasury": "0x0bb1810061c2f5b2088054ee184e6c79e1591101",
-        "wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
-        "payTakerTransformer": "0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e",
-        "affiliateFeeTransformer": "0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f",
-        "fillQuoteTransformer": "0xd75a9019a2a1782ea670e4f4a55f04b43514ed53",
-        "positiveSlippageFeeTransformer": "0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd"
-    },
-    "56": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0xccc9769c1a58766e79423a34b2cc5052d65c1983",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0xde7b2747624a647600fdb349184d0448ab954929",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f",
-        "payTakerTransformer": "0x4f5e8ca2cadecd4a467ae441e4b03de4278a4574",
-        "affiliateFeeTransformer": "0x1be34ab9b2acb5c4ddd89454bdce637967e65230",
-        "fillQuoteTransformer": "0xbd7fd6e116fc8589bb658fba3a2cc6273050bcf2",
-        "positiveSlippageFeeTransformer": "0x7f5c79ad1788573b1145f4651a248523c54f5d1f"
-    },
-    "137": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0x4d3e56c56a55d23fc7aa9a9ffad61631cf7d1ae6",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0xe6d9207df11c55bce2f7a189ae95e3222d5484d3",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0x4dd97080adf36103bd3db822f9d3c0e44890fd69",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "wethTransformer": "0xe309d011cc6f189a3e8dcba85922715a019fed38",
-        "payTakerTransformer": "0x5ba7b9be86cda01cfbf56e0fb97184783be9dda1",
-        "affiliateFeeTransformer": "0xbed27284b42e5684e987169cf1da09c5d6c49fa8",
-        "fillQuoteTransformer": "0x01c082e47c8dc6dedd01e3fcb07bfd3eb72e044d",
-        "positiveSlippageFeeTransformer": "0x4cd8f1c0df4d40fcc1e073845d5f6f4ed5cc8dab"
-    },
-    "43114": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0x8953c63d0858d286cc407cd6f8e26b9cbd02a511",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c",
-        "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3",
-        "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c",
-        "fillQuoteTransformer": "0xcee9118bc14e1fe740c54c754b901629b322ee4f",
-        "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857"
-    },
-    "250": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0xf760c5b88d970d6f97e64e264dac5a3767dafd74",
-        "exchangeProxy": "0xdef189deaef76e379df891899eb5a00a94cbc250",
-        "exchangeProxyTransformerDeployer": "0x47f01db18a38261e4cb153bae6db7d3743acb33c",
-        "exchangeProxyFlashWallet": "0xb4d961671cadfed687e040b076eee29840c142e5",
-        "exchangeProxyLiquidityProviderSandbox": "0xca64d4225804f2ae069760cb5ff2f1d8bac1c2f9",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703",
-        "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2",
-        "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88",
-        "fillQuoteTransformer": "0xe40f81ef6e9c95ba04c659b8d032eab73152aafd",
-        "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600"
-    },
-    "10": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x4200000000000000000000000000000000000006",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0x6d506b2847df0c6f04d2628da1adaf4d8fb2e81b",
-        "exchangeProxy": "0xdef1abe32c034e558cdd535791643c58a13acc10",
-        "exchangeProxyTransformerDeployer": "0x3a539ed6bd42de8fbaf3899fb490c792e153d647",
-        "exchangeProxyFlashWallet": "0xa3128d9b7cca7d5af29780a56abeec12b05a6740",
-        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
-        "payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11",
-        "affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553",
-        "fillQuoteTransformer": "0x845c75a791cceb1a451f4ca5778c011226dda95c",
-        "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
-    },
-    "42161": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0x29f80c1f685e19ae1807063eda432f431ac623d0",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
-        "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
-        "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
-        "fillQuoteTransformer": "0x466b00a77662245c2cc7b093a7102a687afc16f3",
-        "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
-    }
-}

contracts/zero-ex/contracts/test/foundry/addresses/sourceAddresses.json

@@ -1,23 +0,0 @@
-{
-    "1": {
-        "UniswapV2Router": "0xf164fc0ec4e93095b804a4795bbe1e041497b92a"
-    },
-    "56": {
-        "UniswapV2Router": "0x10ed43c718714eb63d5aa57b78b54704e256024e"
-    },
-    "137": {
-        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"
-    },
-    "43114": {
-        "UniswapV2Router": "0x9Ad6C38BE94206cA50bb0d90783181662f0Cfa10"
-    },
-    "250": {
-        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"
-    },
-    "10": {
-        "UniswapV2Router": "0x0000000000000000000000000000000000000000"
-    },
-    "42161": {
-        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"
-    }
-}

contracts/zero-ex/contracts/test/foundry/addresses/tokenAddresses.json

@@ -1,44 +0,0 @@
-{
-    "1": {
-        "WrappedNativeToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-        "DAI": "0x6b175474e89094c44da98b954eedeac495271d0f",
-        "USDC": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-        "USDT": "0xdac17f958d2ee523a2206206994597c13d831ec7"
-    },
-    "56": {
-        "WrappedNativeToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
-        "DAI": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
-        "USDC": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
-        "USDT": "0x55d398326f99059ff775485246999027b3197955"
-    },
-    "137": {
-        "WrappedNativeToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
-        "DAI": "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
-        "USDC": "0x2791bca1f2de4661ed88a30c99a7a9449aa84174",
-        "USDT": "0xc2132d05d31c914a87c6611c10748aeb04b58e8f"
-    },
-    "43114": {
-        "WrappedNativeToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
-        "DAI": "0xd586e7f844cea2f87f50152665bcbc2c279d8d70",
-        "USDC": "0xa7d7079b0fead91f3e65f86e8915cb59c1a4c664",
-        "USDT": "0xc7198437980c041c805A1EDcbA50c1Ce5db95118"
-    },
-    "250": {
-        "WrappedNativeToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
-        "DAI": "0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e",
-        "USDC": "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
-        "USDT": "0x049d68029688eabf473097a2fc38ef61633a3c7a"
-    },
-    "10": {
-        "WrappedNativeToken": "0x4200000000000000000000000000000000000006",
-        "DAI": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
-        "USDC": "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
-        "USDT": "0x94b008aa00579c1307b0ef2c499ad98a8ce58e58"
-    },
-    "42161": {
-        "WrappedNativeToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
-        "DAI": "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
-        "USDC": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
-        "USDT": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9"
-    }
-}

contracts/zero-ex/contracts/test/foundry/utils/DeployZeroEx.sol

@@ -1,306 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "forge-std/Test.sol";
-
-import "src/IZeroEx.sol";
-import "src/ZeroEx.sol";
-import "src/migrations/InitialMigration.sol";
-import "src/features/OwnableFeature.sol";
-import "src/features/SimpleFunctionRegistryFeature.sol";
-import "src/features/NativeOrdersFeature.sol";
-import "src/features/BatchFillNativeOrdersFeature.sol";
-import "src/features/FundRecoveryFeature.sol";
-import "src/features/TransformERC20Feature.sol";
-import "src/features/OtcOrdersFeature.sol";
-import "src/features/MetaTransactionsFeature.sol";
-import "src/features/nft_orders/ERC1155OrdersFeature.sol";
-import "src/features/nft_orders/ERC721OrdersFeature.sol";
-import "src/features/UniswapFeature.sol";
-import "src/features/multiplex/MultiplexFeature.sol";
-import "src/external/TransformerDeployer.sol";
-import "src/external/FeeCollectorController.sol";
-import "src/transformers/WethTransformer.sol";
-import "src/transformers/FillQuoteTransformer.sol";
-import "src/transformers/PayTakerTransformer.sol";
-import "src/transformers/AffiliateFeeTransformer.sol";
-import "src/transformers/PositiveSlippageFeeTransformer.sol";
-import "src/transformers/bridges/IBridgeAdapter.sol";
-import "src/transformers/bridges/EthereumBridgeAdapter.sol";
-
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
-import "@0x/contracts-erc20/contracts/src/v06/WETH9V06.sol";
-
-contract DeployZeroEx is Test {
-    ZeroEx public ZERO_EX = ZeroEx(0xDef1C0ded9bec7F1a1670819833240f027b25EfF);
-    IZeroEx public IZERO_EX = IZeroEx(address(ZERO_EX));
-    address VANITY_DEPLOYER_ADDRESS = 0xe750ad66DE350F8110E305fb78Ec6A9f594445E3;
-    bytes deployerBytecode =
-        hex"608060405234801561001057600080fd5b506040516103da3803806103da83398101604081905261002f91610077565b8060405161003c9061006a565b610046919061011f565b604051809103906000f080158015610062573d6000803e3d6000fd5b505050610198565b6101f5806101e583390190565b600060208284031215610088578081fd5b81516001600160401b038082111561009e578283fd5b818401915084601f8301126100b1578283fd5b8151818111156100c3576100c3610182565b604051601f8201601f19908116603f011681019083821181831017156100eb576100eb610182565b81604052828152876020848701011115610103578586fd5b610114836020830160208801610152565b979650505050505050565b600060208252825180602084015261013e816040850160208701610152565b601f01601f19169190910160400192915050565b60005b8381101561016d578181015183820152602001610155565b8381111561017c576000848401525b50505050565b634e487b7160e01b600052604160045260246000fd5b603f806101a66000396000f3fe6080604052600080fdfea26469706673582212201bd8b1a777b100d67435ca4bb0b2fdccb13a2c2dde019b227bb553ff9a95bd4464736f6c63430008020033608060405234801561001057600080fd5b506040516101f53803806101f583398101604081905261002f916100c9565b60008151602083016000f090506001600160a01b0381166100865760405162461bcd60e51b815260206004820152600d60248201526c1111541313d657d19052531151609a1b604482015260640160405180910390fd5b6040516001600160a01b03821681527ff40fcec21964ffb566044d083b4073f29f7f7929110ea19e1b3ebe375d89055e9060200160405180910390a150506101a8565b600060208083850312156100db578182fd5b82516001600160401b03808211156100f1578384fd5b818501915085601f830112610104578384fd5b81518181111561011657610116610192565b604051601f8201601f19908116603f0116810190838211818310171561013e5761013e610192565b816040528281528886848701011115610155578687fd5b8693505b828410156101765784840186015181850187015292850192610159565b8284111561018657868684830101525b98975050505050505050565b634e487b7160e01b600052604160045260246000fd5b603f806101b66000396000f3fe6080604052600080fdfea2646970667358221220fbca036a163ed7f008cefa7c834d98d25109a456a051d41d9c89d55d7185d12b64736f6c63430008020033";
-
-    address[] transformerSigners = [address(this)];
-
-    bool isDeployed = false;
-
-    struct Features {
-        NativeOrdersFeature nativeOrdersFeature;
-        BatchFillNativeOrdersFeature batchFillNativeOrdersFeature;
-        OtcOrdersFeature otcOrdersFeature;
-        UniswapFeature uniswapFeature;
-        // UniswapV3Feature
-        FundRecoveryFeature fundRecoveryFeature;
-        TransformERC20Feature transformERC20Feature;
-        MetaTransactionsFeature metaTransactionsFeature;
-        ERC1155OrdersFeature erc1155OrdersFeature;
-        ERC721OrdersFeature erc721OrdersFeature;
-        MultiplexFeature multiplexFeature;
-    }
-
-    struct Transformers {
-        FillQuoteTransformer fillQuoteTransformer;
-        WethTransformer wethTransformer;
-        AffiliateFeeTransformer affiliateFeeTransformer;
-        PayTakerTransformer payTakerTransformer;
-    }
-
-    struct ZeroExDeployed {
-        IZeroEx zeroEx;
-        TransformerDeployer transformerDeployer;
-        FeeCollectorController feeCollectorController;
-        IStaking staking; // address(0)
-        // Features
-        Features features;
-        // Transformers
-        Transformers transformers;
-        IEtherTokenV06 weth;
-    }
-
-    ZeroExDeployed ZERO_EX_DEPLOYED;
-
-    function getDeployedZeroEx() public returns (ZeroExDeployed memory) {
-        if (!isDeployed) {
-            deployZeroEx();
-        }
-        return ZERO_EX_DEPLOYED;
-    }
-
-    function logDeployedZeroEx() public {
-        emit log_string("--- Deployed ZeroEx ---");
-        emit log_named_address("ZeroEx", address(ZERO_EX));
-        emit log_named_address("TransformerDeployer", address(ZERO_EX_DEPLOYED.transformerDeployer));
-        emit log_named_address("FeeCollectorController", address(ZERO_EX_DEPLOYED.feeCollectorController));
-        emit log_named_address("Staking", address(ZERO_EX_DEPLOYED.staking));
-
-        emit log_string("----- Features -----");
-        emit log_named_address("NativeOrdersFeature", address(ZERO_EX_DEPLOYED.features.nativeOrdersFeature));
-        emit log_named_address(
-            "BatchFillNativeOrdersFeature",
-            address(ZERO_EX_DEPLOYED.features.batchFillNativeOrdersFeature)
-        );
-        emit log_named_address("OtcOrdersFeature", address(ZERO_EX_DEPLOYED.features.otcOrdersFeature));
-        emit log_named_address("UniswapFeature", address(ZERO_EX_DEPLOYED.features.uniswapFeature));
-        emit log_named_address("FundRecoveryFeature", address(ZERO_EX_DEPLOYED.features.fundRecoveryFeature));
-        emit log_named_address("MetaTransactionsFeature", address(ZERO_EX_DEPLOYED.features.metaTransactionsFeature));
-        emit log_named_address("ERC1155OrdersFeature", address(ZERO_EX_DEPLOYED.features.erc1155OrdersFeature));
-        emit log_named_address("ERC721OrdersFeature", address(ZERO_EX_DEPLOYED.features.erc721OrdersFeature));
-        emit log_named_address("TransformERC20Feature", address(ZERO_EX_DEPLOYED.features.transformERC20Feature));
-        emit log_named_address("MultiplexFeature", address(ZERO_EX_DEPLOYED.features.multiplexFeature));
-
-        emit log_string("----- Transformers -----");
-        emit log_named_address("FillQuoteTransformer", address(ZERO_EX_DEPLOYED.transformers.fillQuoteTransformer));
-        emit log_named_address("WethTransformer", address(ZERO_EX_DEPLOYED.transformers.wethTransformer));
-        emit log_named_address(
-            "AffiliateFeeTransformer",
-            address(ZERO_EX_DEPLOYED.transformers.affiliateFeeTransformer)
-        );
-        emit log_named_address("PayTakerTransformer", address(ZERO_EX_DEPLOYED.transformers.payTakerTransformer));
-
-        emit log_string("----- Other -----");
-        emit log_named_address("WETH", address(ZERO_EX_DEPLOYED.weth));
-    }
-
-    function deployZeroEx() public returns (ZeroExDeployed memory) {
-        if (isDeployed) {
-            return ZERO_EX_DEPLOYED;
-        }
-
-        ZERO_EX_DEPLOYED.weth = IEtherTokenV06(address(new WETH9V06()));
-        InitialMigration initialMigration = new InitialMigration(address(this));
-        // Append the required ZeroEx constructor arguments (address bootstrapper)
-        bytes memory zeroExDeploycode = abi.encodePacked(type(ZeroEx).creationCode, abi.encode(initialMigration));
-        // Append the required deployer code constructor arguments (bytes initCode)
-        bytes memory deployerDeploycode = abi.encodePacked(deployerBytecode, abi.encode(zeroExDeploycode));
-        // HERE BE DRAGONS, feel free to ignore this for now
-        // We want to deploy the ZeroEx contract, at 0xDef1C0ded9bec7F1a1670819833240f027b25EfF
-
-        // We use a special mechanism to deploy the ZeroEx contract.
-        // Must occur from this address as the first transaction
-        // The address is technically emitted in an event, but we know we did it correctly
-        //│   │   ├─  emit topic 0: 0xf40fcec21964ffb566044d083b4073f29f7f7929110ea19e1b3ebe375d89055e
-        //│   │   │           data: 0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff
-        hoax(VANITY_DEPLOYER_ADDRESS);
-        assembly {
-            pop(create(0, add(deployerDeploycode, 0x20), mload(deployerDeploycode)))
-        }
-        // Staking = address(0);
-        ZERO_EX_DEPLOYED.staking = IStaking(address(0));
-        ZERO_EX_DEPLOYED.transformerDeployer = new TransformerDeployer(transformerSigners);
-        ZERO_EX_DEPLOYED.feeCollectorController = new FeeCollectorController(
-            IEtherTokenV06(ZERO_EX_DEPLOYED.weth),
-            IStaking(ZERO_EX_DEPLOYED.staking)
-        );
-
-        // Features
-        ZERO_EX_DEPLOYED.features.transformERC20Feature = new TransformERC20Feature();
-        ZERO_EX_DEPLOYED.features.nativeOrdersFeature = new NativeOrdersFeature(
-            address(ZERO_EX), // EP address
-            ZERO_EX_DEPLOYED.weth,
-            ZERO_EX_DEPLOYED.staking,
-            ZERO_EX_DEPLOYED.feeCollectorController, // feeCollectorController address
-            uint32(0) // protocolFeeMultiplier
-        );
-        ZERO_EX_DEPLOYED.features.batchFillNativeOrdersFeature = new BatchFillNativeOrdersFeature(address(ZERO_EX));
-        ZERO_EX_DEPLOYED.features.otcOrdersFeature = new OtcOrdersFeature(address(ZERO_EX), ZERO_EX_DEPLOYED.weth);
-        ZERO_EX_DEPLOYED.features.uniswapFeature = new UniswapFeature(ZERO_EX_DEPLOYED.weth);
-        ZERO_EX_DEPLOYED.features.fundRecoveryFeature = new FundRecoveryFeature();
-        ZERO_EX_DEPLOYED.features.metaTransactionsFeature = new MetaTransactionsFeature(address(ZERO_EX));
-        ZERO_EX_DEPLOYED.features.erc1155OrdersFeature = new ERC1155OrdersFeature(
-            address(ZERO_EX),
-            ZERO_EX_DEPLOYED.weth
-        );
-        ZERO_EX_DEPLOYED.features.erc721OrdersFeature = new ERC721OrdersFeature(
-            address(ZERO_EX),
-            ZERO_EX_DEPLOYED.weth
-        );
-        ZERO_EX_DEPLOYED.features.multiplexFeature = new MultiplexFeature(
-            address(ZERO_EX),
-            ZERO_EX_DEPLOYED.weth,
-            ILiquidityProviderSandbox(address(0)),
-            address(0), // uniswapFactory
-            address(0), // sushiswapFactory
-            bytes32(0), // uniswapPairInitCodeHash
-            bytes32(0) // sushiswapPairInitCodeHash
-        );
-
-        initialMigration.initializeZeroEx(
-            payable(address(this)),
-            ZERO_EX,
-            InitialMigration.BootstrapFeatures({
-                registry: new SimpleFunctionRegistryFeature(),
-                ownable: new OwnableFeature()
-            })
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.batchFillNativeOrdersFeature),
-            abi.encodeWithSelector(BatchFillNativeOrdersFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.transformERC20Feature),
-            abi.encodeWithSelector(
-                TransformERC20Feature.migrate.selector,
-                address(ZERO_EX_DEPLOYED.transformerDeployer)
-            ),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.nativeOrdersFeature),
-            abi.encodeWithSelector(NativeOrdersFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.otcOrdersFeature),
-            abi.encodeWithSelector(OtcOrdersFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.uniswapFeature),
-            abi.encodeWithSelector(UniswapFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.fundRecoveryFeature),
-            abi.encodeWithSelector(FundRecoveryFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.metaTransactionsFeature),
-            abi.encodeWithSelector(MetaTransactionsFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.erc1155OrdersFeature),
-            abi.encodeWithSelector(ERC1155OrdersFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.erc721OrdersFeature),
-            abi.encodeWithSelector(ERC721OrdersFeature.migrate.selector),
-            address(this)
-        );
-        IZERO_EX.migrate(
-            address(ZERO_EX_DEPLOYED.features.multiplexFeature),
-            abi.encodeWithSelector(MultiplexFeature.migrate.selector),
-            address(this)
-        );
-
-        // Transformers
-        ZERO_EX_DEPLOYED.transformers.wethTransformer = WethTransformer(
-            ZERO_EX_DEPLOYED.transformerDeployer.deploy(
-                abi.encodePacked(
-                    // Deploy the WethTransformer code
-                    type(WethTransformer).creationCode,
-                    // WethTransformer takes WETH address as a constructor argument
-                    abi.encode(address(ZERO_EX_DEPLOYED.weth))
-                )
-            )
-        );
-
-        // Deploy the FQT, NOTE: No bridge adapter in tests
-        ZERO_EX_DEPLOYED.transformers.fillQuoteTransformer = FillQuoteTransformer(
-            ZERO_EX_DEPLOYED.transformerDeployer.deploy(
-                abi.encodePacked(
-                    // Deploy the FQT code
-                    type(FillQuoteTransformer).creationCode,
-                    // FQT takes a BridgeAdapter and ZeroEx
-                    abi.encode(
-                        address(0), // Note: No BridgeAdapter in tests
-                        INativeOrdersFeature(address(ZERO_EX))
-                    )
-                )
-            )
-        );
-
-        ZERO_EX_DEPLOYED.transformers.affiliateFeeTransformer = AffiliateFeeTransformer(
-            ZERO_EX_DEPLOYED.transformerDeployer.deploy(type(AffiliateFeeTransformer).creationCode)
-        );
-
-        ZERO_EX_DEPLOYED.transformers.payTakerTransformer = PayTakerTransformer(
-            ZERO_EX_DEPLOYED.transformerDeployer.deploy(type(PayTakerTransformer).creationCode)
-        );
-
-        ZERO_EX_DEPLOYED.zeroEx = IZERO_EX;
-        isDeployed = true;
-        logDeployedZeroEx();
-        return ZERO_EX_DEPLOYED;
-    }
-}

contracts/zero-ex/contracts/test/foundry/utils/ForkUtils.sol

@@ -1,240 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "forge-std/Test.sol";
-import "src/features/TransformERC20Feature.sol";
-import "src/external/TransformerDeployer.sol";
-import "src/transformers/WethTransformer.sol";
-import "src/transformers/FillQuoteTransformer.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "src/transformers/bridges/BridgeProtocols.sol";
-import "src/transformers/bridges/EthereumBridgeAdapter.sol";
-import "src/transformers/bridges/PolygonBridgeAdapter.sol";
-import "src/transformers/bridges/BSCBridgeAdapter.sol";
-import "src/transformers/bridges/ArbitrumBridgeAdapter.sol";
-import "src/transformers/bridges/OptimismBridgeAdapter.sol";
-import "src/transformers/bridges/AvalancheBridgeAdapter.sol";
-import "src/transformers/bridges/FantomBridgeAdapter.sol";
-import "src/transformers/bridges/CeloBridgeAdapter.sol";
-import "src/IZeroEx.sol";
-
-//contract-addresses/addresses.json interfaces
-//need to be alphebetized in solidity but not in addresses.json
-struct Addresses {
-    address affiliateFeeTransformer;
-    address erc20BridgeProxy;
-    address erc20BridgeSampler;
-    address etherToken;
-    address payable exchangeProxy;
-    address exchangeProxyFlashWallet;
-    address exchangeProxyGovernor;
-    address exchangeProxyLiquidityProviderSandbox;
-    address exchangeProxyTransformerDeployer;
-    address fillQuoteTransformer;
-    address payTakerTransformer;
-    address positiveSlippageFeeTransformer;
-    address staking;
-    address stakingProxy;
-    address wethTransformer;
-    address zeroExGovernor;
-    address zrxToken;
-    address zrxTreasury;
-    address zrxVault;
-}
-
-struct TokenAddresses {
-    IERC20TokenV06 DAI;
-    IERC20TokenV06 USDC;
-    IERC20TokenV06 USDT;
-    IEtherTokenV06 WrappedNativeToken;
-}
-
-struct LiquiditySources {
-    address UniswapV2Router;
-}
-
-interface IFQT {
-    function bridgeAdapter() external returns (address);
-}
-
-contract ForkUtils is Test {
-    using stdJson for string;
-    //forked providers for each chain
-    mapping(string => uint256) public forkIds;
-
-    IZeroEx IZERO_EX;
-
-    IBridgeAdapter bridgeAdapter;
-    FillQuoteTransformer fillQuoteTransformer;
-
-    TokenAddresses tokens;
-    Addresses addresses;
-    LiquiditySources sources;
-
-    uint256 forkBlock = 15_000_000;
-
-    string[] chains = ["mainnet"]; //, "bsc", "polygon", "avalanche", "fantom", "optimism", "arbitrum"
-    string[] indexChainIds = [".1", ".56", ".137", ".43114", ".250", ".10", ".42161"];
-    string[] chainIds = ["1", "56", "137", "43114", "250", "10", "42161"];
-    uint256[] chainId = [1, 56, 137, 43114, 250, 10, 42161];
-
-    //special fork block number for fantom since it produces blocks faster and more frequently
-    uint256[] blockNumber = [forkBlock, forkBlock, 33447149, forkBlock, 32000000, forkBlock, forkBlock];
-    /// Only run this function if the block number
-    // is greater than some constant for Ethereum Mainnet
-
-    string addressesJson;
-    string tokensJson;
-    string sourcesJson;
-
-    function createForks() public returns (uint256[] memory) {
-        for (uint256 i = 0; i < chains.length; i++) {
-            emit log_named_string("chains[i]", chains[i]);
-            forkIds[chains[i]] = vm.createFork(vm.rpcUrl(chains[i]), blockNumber[i]);
-            //forkIds[chains[i]] = vm.createFork(vm.rpcUrl(chains[i]), blockNumber[i]);
-        }
-    }
-
-    function getSigner() public returns (address, uint) {
-        string memory mnemonic = "test test test test test test test test test test test junk";
-        uint256 privateKey = vm.deriveKey(mnemonic, 0);
-
-        vm.label(vm.addr(privateKey), "zeroEx/MarketMaker");
-        return (vm.addr(privateKey), privateKey);
-    }
-
-    function readLiquiditySourceAddresses() public returns (string memory) {
-        string memory root = vm.projectRoot();
-        string memory path = string(
-            abi.encodePacked(root, "/", "contracts/test/foundry/addresses/sourceAddresses.json")
-        );
-        sourcesJson = vm.readFile(path);
-        return vm.readFile(path);
-    }
-
-    function getLiquiditySourceAddresses(uint index) public returns (LiquiditySources memory sources) {
-        readLiquiditySourceAddresses();
-        bytes memory liquiditySources = sourcesJson.parseRaw(indexChainIds[index]);
-        return abi.decode(liquiditySources, (LiquiditySources));
-    }
-
-    function readAddresses() public returns (string memory) {
-        string memory root = vm.projectRoot();
-        string memory path = string(abi.encodePacked(root, "/", "contracts/test/foundry/addresses/addresses.json"));
-        addressesJson = vm.readFile(path);
-        return vm.readFile(path);
-    }
-
-    function getContractAddresses(uint index) public returns (Addresses memory addresses) {
-        readAddresses();
-        bytes memory contractAddresses = addressesJson.parseRaw(indexChainIds[index]);
-        return abi.decode(contractAddresses, (Addresses));
-        //log_named_address("WETH/NATIVE_ASSET", address(tokens.WrappedNativeToken));
-    }
-
-    function readTokens() public returns (string memory) {
-        string memory root = vm.projectRoot();
-        string memory path = string(
-            abi.encodePacked(root, "/", "contracts/test/foundry/addresses/tokenAddresses.json")
-        );
-        tokensJson = vm.readFile(path);
-        return vm.readFile(path);
-    }
-
-    function getTokens(uint index) public returns (TokenAddresses memory addresses) {
-        readTokens();
-        bytes memory chainTokens = tokensJson.parseRaw(indexChainIds[index]);
-        return abi.decode(chainTokens, (TokenAddresses));
-        log_named_address("WETH/NATIVE_ASSET", address(tokens.WrappedNativeToken));
-    }
-
-    function createBridgeAdapter(IEtherTokenV06 weth) public returns (IBridgeAdapter bridgeAdapter) {
-        uint chainId;
-
-        assembly {
-            chainId := chainid()
-        }
-        if (chainId == 1) {
-            return IBridgeAdapter(new EthereumBridgeAdapter(weth));
-        } else if (chainId == 56) {
-            return IBridgeAdapter(new BSCBridgeAdapter(weth));
-        } else if (chainId == 137) {
-            return IBridgeAdapter(new PolygonBridgeAdapter(weth));
-        } else if (chainId == 43114) {
-            return IBridgeAdapter(new AvalancheBridgeAdapter(weth));
-        } else if (chainId == 250) {
-            return IBridgeAdapter(new FantomBridgeAdapter(weth));
-        } else if (chainId == 10) {
-            return IBridgeAdapter(new OptimismBridgeAdapter(weth));
-        } else if (chainId == 42161) {
-            return IBridgeAdapter(new ArbitrumBridgeAdapter(weth));
-        }
-    }
-
-    function labelAddresses(
-        string memory chainName,
-        string memory chainId,
-        TokenAddresses memory tokens,
-        Addresses memory addresses,
-        LiquiditySources memory sources
-    ) public {
-        log_named_string("   Using contract addresses on chain", chainName);
-        // log_named_address("     zeroEx/exchangeProxy",addresses.exchangeProxy);
-        // log_named_address("     zeroEx/fillQuoteTransformer",addresses.fillQuoteTransformer);
-        // log_named_address("     zeroEx/payTakerTransformer",addresses.payTakerTransformer);
-        // log_named_address("     zeroEx/positiveSlippageFeeTransformer",addresses.positiveSlippageFeeTransformer);
-        // log_named_address("     zeroEx/wethTransformer",addresses.wethTransformer);
-        vm.label(addresses.affiliateFeeTransformer, "zeroEx/affiliateFeeTransformer");
-        vm.label(addresses.erc20BridgeProxy, "zeroEx/erc20BridgeProxy");
-        vm.label(addresses.erc20BridgeSampler, "zeroEx/erc20BridgeSampler");
-        vm.label(addresses.etherToken, "zeroEx/etherToken");
-        vm.label(addresses.exchangeProxy, "zeroEx/exchangeProxy");
-        vm.label(addresses.exchangeProxyFlashWallet, "zeroEx/exchangeProxyFlashWallet");
-        vm.label(addresses.exchangeProxyGovernor, "zeroEx/exchangeProxyGovernor");
-        vm.label(addresses.exchangeProxyLiquidityProviderSandbox, "zeroEx/exchangeProxyLiquidityProviderSandbox");
-        vm.label(addresses.exchangeProxyTransformerDeployer, "zeroEx/exchangeProxyTransformerDeployer");
-        vm.label(addresses.fillQuoteTransformer, "zeroEx/fillQuoteTransformer");
-        vm.label(addresses.payTakerTransformer, "zeroEx/payTakerTransformer");
-        vm.label(addresses.positiveSlippageFeeTransformer, "zeroEx/positiveSlippageFeeTransformer");
-        vm.label(addresses.staking, "zeroEx/staking");
-        vm.label(addresses.stakingProxy, "zeroEx/stakingProxy");
-        vm.label(addresses.wethTransformer, "zeroEx/wethTransformer");
-        vm.label(addresses.zeroExGovernor, "zeroEx/zeroExGovernor");
-        vm.label(addresses.zrxToken, "zeroEx/zrxToken");
-        vm.label(addresses.zrxTreasury, "zeroEx/zrxTreasury");
-        vm.label(addresses.zrxVault, "zeroEx/zrxVault");
-        vm.label(address(tokens.WrappedNativeToken), "WrappedNativeToken");
-        vm.label(address(tokens.USDT), "USDT");
-        vm.label(address(tokens.USDC), "USDC");
-        vm.label(address(tokens.DAI), "DAI");
-        vm.label(address(sources.UniswapV2Router), "UniswapRouter");
-    }
-
-    modifier onlyForked() {
-        if (block.number >= 15000000) {
-            _;
-        } else {
-            emit log_string("Requires fork mode, skipping");
-        }
-    }
-}

contracts/zero-ex/contracts/test/foundry/utils/TestUtils.sol

@@ -1,65 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "forge-std/Test.sol";
-
-import "src/transformers/LibERC20Transformer.sol";
-
-contract TestUtils is Test {
-    uint256 private constant MAX_UINT256_STRING_LENGTH = 78;
-    uint8 private constant ASCII_DIGIT_OFFSET = 48;
-
-    function _toString(uint256 n) internal pure returns (string memory nstr) {
-        if (n == 0) {
-            return "0";
-        }
-        // Overallocate memory
-        nstr = new string(MAX_UINT256_STRING_LENGTH);
-        uint256 k = MAX_UINT256_STRING_LENGTH;
-        // Populate string from right to left (lsb to msb).
-        while (n != 0) {
-            assembly {
-                let char := add(ASCII_DIGIT_OFFSET, mod(n, 10))
-                mstore(add(nstr, k), char)
-                k := sub(k, 1)
-                n := div(n, 10)
-            }
-        }
-        assembly {
-            // Shift pointer over to actual start of string.
-            nstr := add(nstr, k)
-            // Store actual string length.
-            mstore(nstr, sub(MAX_UINT256_STRING_LENGTH, k))
-        }
-        return nstr;
-    }
-
-    function _findTransformerNonce(address transformer, address deployer) internal pure returns (uint32) {
-        address current;
-        for (uint32 i = 0; i < 1024; i++) {
-            current = LibERC20Transformer.getDeployedAddress(deployer, i);
-            if (current == transformer) {
-                return i;
-            }
-        }
-    }
-}

contracts/zero-ex/contracts/test/samplers/ApproximateBuys.sol

@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
-
-contract ApproximateBuys {
-    /// @dev Information computing buy quotes for sources that do not have native
-    ///      buy quote support.
-    struct ApproximateBuyQuoteOpts {
-        // Arbitrary maker token data to pass to `getSellQuoteCallback`.
-        bytes makerTokenData;
-        // Arbitrary taker token data to pass to `getSellQuoteCallback`.
-        bytes takerTokenData;
-        // Callback to retrieve a sell quote.
-        function(bytes memory, bytes memory, uint256) internal view returns (uint256) getSellQuoteCallback;
-    }
-
-    uint256 private constant ONE_HUNDED_PERCENT_BPS = 1e4;
-    /// @dev Maximum approximate (positive) error rate when approximating a buy quote.
-    uint256 private constant APPROXIMATE_BUY_TARGET_EPSILON_BPS = 0.0005e4;
-    /// @dev Maximum iterations to perform when approximating a buy quote.
-    uint256 private constant APPROXIMATE_BUY_MAX_ITERATIONS = 5;
-
-    function _sampleApproximateBuys(
-        ApproximateBuyQuoteOpts memory opts,
-        uint256[] memory makerTokenAmounts
-    ) internal view returns (uint256[] memory takerTokenAmounts) {
-        takerTokenAmounts = new uint256[](makerTokenAmounts.length);
-        if (makerTokenAmounts.length == 0) {
-            return takerTokenAmounts;
-        }
-
-        uint256 sellAmount = opts.getSellQuoteCallback(opts.makerTokenData, opts.takerTokenData, makerTokenAmounts[0]);
-        if (sellAmount == 0) {
-            return takerTokenAmounts;
-        }
-
-        uint256 buyAmount = opts.getSellQuoteCallback(opts.takerTokenData, opts.makerTokenData, sellAmount);
-        if (buyAmount == 0) {
-            return takerTokenAmounts;
-        }
-
-        for (uint256 i = 0; i < makerTokenAmounts.length; i++) {
-            uint256 eps = 0;
-            for (uint256 iter = 0; iter < APPROXIMATE_BUY_MAX_ITERATIONS; iter++) {
-                // adjustedSellAmount = previousSellAmount * (target/actual) * JUMP_MULTIPLIER
-                sellAmount = _safeGetPartialAmountCeil(makerTokenAmounts[i], buyAmount, sellAmount);
-                if (sellAmount == 0) {
-                    break;
-                }
-                sellAmount = _safeGetPartialAmountCeil(
-                    (ONE_HUNDED_PERCENT_BPS + APPROXIMATE_BUY_TARGET_EPSILON_BPS),
-                    ONE_HUNDED_PERCENT_BPS,
-                    sellAmount
-                );
-                if (sellAmount == 0) {
-                    break;
-                }
-                uint256 _buyAmount = opts.getSellQuoteCallback(opts.takerTokenData, opts.makerTokenData, sellAmount);
-                if (_buyAmount == 0) {
-                    break;
-                }
-                // We re-use buyAmount next iteration, only assign if it is
-                // non zero
-                buyAmount = _buyAmount;
-                // If we've reached our goal, exit early
-                if (buyAmount >= makerTokenAmounts[i]) {
-                    eps = ((buyAmount - makerTokenAmounts[i]) * ONE_HUNDED_PERCENT_BPS) / makerTokenAmounts[i];
-                    if (eps <= APPROXIMATE_BUY_TARGET_EPSILON_BPS) {
-                        break;
-                    }
-                }
-            }
-            if (eps == 0 || eps > APPROXIMATE_BUY_TARGET_EPSILON_BPS) {
-                break;
-            }
-            // We do our best to close in on the requested amount, but we can either over buy or under buy and exit
-            // if we hit a max iteration limit
-            // We scale the sell amount to get the approximate target
-            takerTokenAmounts[i] = _safeGetPartialAmountCeil(makerTokenAmounts[i], buyAmount, sellAmount);
-        }
-    }
-
-    function _safeGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    ) internal view returns (uint256 partialAmount) {
-        if (numerator == 0 || target == 0 || denominator == 0) return 0;
-        uint256 c = numerator * target;
-        if (c / numerator != target) return 0;
-        return (c + (denominator - 1)) / denominator;
-    }
-}

contracts/zero-ex/contracts/test/samplers/BalanceChecker.sol

@@ -1,129 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-
-// ERC20 contract interface
-abstract contract IToken {
-    /// @dev Query the balance of owner
-    /// @param _owner The address from which the balance will be retrieved
-    /// @return Balance of owner
-    function balanceOf(address _owner) public view virtual returns (uint256);
-
-    /// @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) public view virtual returns (uint256);
-}
-
-contract BalanceChecker {
-    /*
-      Check the token balances of wallet-token pairs.
-      Pass 0xeee... as a "token" address to get ETH balance.
-      Possible error throws:
-        - extremely large arrays for user and or tokens (gas cost too high)
-
-      Returns a one-dimensional that's user.length long.
-    */
-    function balances(address[] calldata users, address[] calldata tokens) external view returns (uint256[] memory) {
-        // make sure the users array and tokens array are of equal length
-        require(users.length == tokens.length, "users array is a different length than the tokens array");
-
-        uint256[] memory addrBalances = new uint256[](users.length);
-
-        for (uint i = 0; i < users.length; i++) {
-            if (tokens[i] != address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
-                addrBalances[i] = IToken(tokens[i]).balanceOf(users[i]);
-            } else {
-                addrBalances[i] = users[i].balance; // ETH balance
-            }
-        }
-
-        return addrBalances;
-    }
-
-    /*
-      Check the token balances of wallet-token pairs with a spender contract for an allowance check.
-      Pass 0xeee... as a "token" address to get ETH balance.
-      Possible error throws:
-        - extremely large arrays for user and or tokens (gas cost too high)
-
-      Returns a one-dimensional that's user.length long. It is the lesser of balance and allowance
-    */
-    function getMinOfBalancesOrAllowances(
-        address[] calldata users,
-        address[] calldata tokens,
-        address spender
-    ) external view returns (uint256[] memory) {
-        // make sure the users array and tokens array are of equal length
-        require(users.length == tokens.length, "users array is a different length than the tokens array");
-
-        uint256[] memory addrBalances = new uint256[](users.length);
-
-        for (uint i = 0; i < users.length; i++) {
-            if (tokens[i] != address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
-                uint256 balance;
-                uint256 allowance;
-                balance = IToken(tokens[i]).balanceOf(users[i]);
-                allowance = IToken(tokens[i]).allowance(users[i], spender);
-                if (allowance < balance) {
-                    addrBalances[i] = allowance;
-                } else {
-                    addrBalances[i] = balance;
-                }
-            } else {
-                addrBalances[i] = users[i].balance; // ETH balance
-            }
-        }
-
-        return addrBalances;
-    }
-
-    /*
-      Check the allowances of an array of owner-spender-tokens
-      
-      Returns 0 for 0xeee... (ETH)
-      Possible error throws:
-        - extremely large arrays for user and or tokens (gas cost too high)
-
-      Returns a one-dimensional array that's owners.length long.
-    */
-    function allowances(
-        address[] calldata owners,
-        address[] calldata spenders,
-        address[] calldata tokens
-    ) external view returns (uint256[] memory) {
-        // make sure the arrays are all of equal length
-        require(owners.length == spenders.length, "all arrays must be of equal length");
-        require(owners.length == tokens.length, "all arrays must be of equal length");
-
-        uint256[] memory addrAllowances = new uint256[](owners.length);
-
-        for (uint i = 0; i < owners.length; i++) {
-            if (tokens[i] != address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
-                addrAllowances[i] = IToken(tokens[i]).allowance(owners[i], spenders[i]);
-            } else {
-                // ETH
-                addrAllowances[i] = 0;
-            }
-        }
-
-        return addrAllowances;
-    }
-}

contracts/zero-ex/contracts/test/samplers/BalancerSampler.sol

@@ -1,177 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/IBalancer.sol";
-
-contract BalancerSampler {
-    /// @dev Base gas limit for Balancer calls.
-    uint256 private constant BALANCER_CALL_GAS = 300e3; // 300k
-
-    // Balancer math constants
-    // https://github.com/balancer-labs/balancer-core/blob/master/contracts/BConst.sol
-    uint256 private constant BONE = 10 ** 18;
-    uint256 private constant MAX_IN_RATIO = BONE / 2;
-    uint256 private constant MAX_OUT_RATIO = (BONE / 3) + 1 wei;
-
-    struct BalancerState {
-        uint256 takerTokenBalance;
-        uint256 makerTokenBalance;
-        uint256 takerTokenWeight;
-        uint256 makerTokenWeight;
-        uint256 swapFee;
-    }
-
-    /// @dev Sample sell quotes from Balancer.
-    /// @param poolAddress Address of the Balancer pool to query.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromBalancer(
-        address poolAddress,
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    ) public view returns (uint256[] memory makerTokenAmounts) {
-        IBalancer pool = IBalancer(poolAddress);
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        if (!pool.isBound(takerToken) || !pool.isBound(makerToken)) {
-            return makerTokenAmounts;
-        }
-
-        BalancerState memory poolState;
-        poolState.takerTokenBalance = pool.getBalance(takerToken);
-        poolState.makerTokenBalance = pool.getBalance(makerToken);
-        poolState.takerTokenWeight = pool.getDenormalizedWeight(takerToken);
-        poolState.makerTokenWeight = pool.getDenormalizedWeight(makerToken);
-        poolState.swapFee = pool.getSwapFee();
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            // Handles this revert scenario:
-            // https://github.com/balancer-labs/balancer-core/blob/master/contracts/BPool.sol#L443
-            if (takerTokenAmounts[i] > _bmul(poolState.takerTokenBalance, MAX_IN_RATIO)) {
-                break;
-            }
-            try
-                pool.calcOutGivenIn{gas: BALANCER_CALL_GAS}(
-                    poolState.takerTokenBalance,
-                    poolState.takerTokenWeight,
-                    poolState.makerTokenBalance,
-                    poolState.makerTokenWeight,
-                    takerTokenAmounts[i],
-                    poolState.swapFee
-                )
-            returns (uint256 amount) {
-                makerTokenAmounts[i] = amount;
-                // Break early if there are 0 amounts
-                if (makerTokenAmounts[i] == 0) {
-                    break;
-                }
-            } catch (bytes memory) {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-
-    /// @dev Sample buy quotes from Balancer.
-    /// @param poolAddress Address of the Balancer pool to query.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromBalancer(
-        address poolAddress,
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    ) public view returns (uint256[] memory takerTokenAmounts) {
-        IBalancer pool = IBalancer(poolAddress);
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        if (!pool.isBound(takerToken) || !pool.isBound(makerToken)) {
-            return takerTokenAmounts;
-        }
-
-        BalancerState memory poolState;
-        poolState.takerTokenBalance = pool.getBalance(takerToken);
-        poolState.makerTokenBalance = pool.getBalance(makerToken);
-        poolState.takerTokenWeight = pool.getDenormalizedWeight(takerToken);
-        poolState.makerTokenWeight = pool.getDenormalizedWeight(makerToken);
-        poolState.swapFee = pool.getSwapFee();
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            // Handles this revert scenario:
-            // https://github.com/balancer-labs/balancer-core/blob/master/contracts/BPool.sol#L505
-            if (makerTokenAmounts[i] > _bmul(poolState.makerTokenBalance, MAX_OUT_RATIO)) {
-                break;
-            }
-            try
-                pool.calcInGivenOut{gas: BALANCER_CALL_GAS}(
-                    poolState.takerTokenBalance,
-                    poolState.takerTokenWeight,
-                    poolState.makerTokenBalance,
-                    poolState.makerTokenWeight,
-                    makerTokenAmounts[i],
-                    poolState.swapFee
-                )
-            returns (uint256 amount) {
-                // Handles this revert scenario:
-                // https://github.com/balancer-labs/balancer-core/blob/master/contracts/BPool.sol#L443
-                if (amount > _bmul(poolState.takerTokenBalance, MAX_IN_RATIO)) {
-                    break;
-                }
-
-                takerTokenAmounts[i] = amount;
-                // Break early if there are 0 amounts
-                if (takerTokenAmounts[i] == 0) {
-                    break;
-                }
-            } catch (bytes memory) {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-
-    /// @dev Hacked version of Balancer's `bmul` function, returning 0 instead
-    ///      of reverting.
-    ///      https://github.com/balancer-labs/balancer-core/blob/master/contracts/BNum.sol#L63-L73
-    /// @param a The first operand.
-    /// @param b The second operand.
-    /// @param c The result of the multiplication, or 0 if `bmul` would've reverted.
-    function _bmul(uint256 a, uint256 b) private pure returns (uint256 c) {
-        uint c0 = a * b;
-        if (a != 0 && c0 / a != b) {
-            return 0;
-        }
-        uint c1 = c0 + (BONE / 2);
-        if (c1 < c0) {
-            return 0;
-        }
-        uint c2 = c1 / BONE;
-        return c2;
-    }
-}

contracts/zero-ex/contracts/test/samplers/BalancerV2BatchSampler.sol

@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/IBalancerV2Vault.sol";
-import "./BalancerV2Common.sol";
-
-contract BalancerV2BatchSampler is BalancerV2Common {
-    // Replaces amount for first step with each takerTokenAmount and calls queryBatchSwap using supplied steps
-    /// @dev Sample sell quotes from Balancer V2 supporting multihops.
-    /// @param swapSteps Array of swap steps (can be >= 1).
-    /// @param swapAssets Array of token address for swaps.
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    function sampleMultihopSellsFromBalancerV2(
-        IBalancerV2Vault vault,
-        IBalancerV2Vault.BatchSwapStep[] memory swapSteps,
-        address[] memory swapAssets,
-        uint256[] memory takerTokenAmounts
-    ) public returns (uint256[] memory makerTokenAmounts) {
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        IBalancerV2Vault.FundManagement memory swapFunds = _createSwapFunds();
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            swapSteps[0].amount = takerTokenAmounts[i];
-            try
-                // For sells we specify the takerToken which is what the vault will receive from the trade
-                vault.queryBatchSwap(IBalancerV2Vault.SwapKind.GIVEN_IN, swapSteps, swapAssets, swapFunds)
-            returns (
-                // amounts represent pool balance deltas from the swap (incoming balance, outgoing balance)
-                int256[] memory amounts
-            ) {
-                // Outgoing balance is negative so we need to flip the sign
-                // Note - queryBatchSwap will return a delta for each token in the assets array and last asset should be tokenOut
-                int256 amountOutFromPool = amounts[amounts.length - 1] * -1;
-                if (amountOutFromPool <= 0) {
-                    break;
-                }
-                makerTokenAmounts[i] = uint256(amountOutFromPool);
-            } catch {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-
-    // Replaces amount for first step with each makerTokenAmount and calls queryBatchSwap using supplied steps
-    /// @dev Sample buy quotes from Balancer V2 supporting multihops.
-    /// @param swapSteps Array of swap steps (can be >= 1).
-    /// @param swapAssets Array of token address for swaps.
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    function sampleMultihopBuysFromBalancerV2(
-        IBalancerV2Vault vault,
-        IBalancerV2Vault.BatchSwapStep[] memory swapSteps,
-        address[] memory swapAssets,
-        uint256[] memory makerTokenAmounts
-    ) public returns (uint256[] memory takerTokenAmounts) {
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        IBalancerV2Vault.FundManagement memory swapFunds = _createSwapFunds();
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            swapSteps[0].amount = makerTokenAmounts[i];
-            try
-                // Uses GIVEN_OUT type for Buy
-                vault.queryBatchSwap(IBalancerV2Vault.SwapKind.GIVEN_OUT, swapSteps, swapAssets, swapFunds)
-            returns (
-                // amounts represent pool balance deltas from the swap (incoming balance, outgoing balance)
-                int256[] memory amounts
-            ) {
-                int256 amountIntoPool = amounts[0];
-                if (amountIntoPool <= 0) {
-                    break;
-                }
-                takerTokenAmounts[i] = uint256(amountIntoPool);
-            } catch {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-}

contracts/zero-ex/contracts/test/samplers/BalancerV2Common.sol

@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/IBalancerV2Vault.sol";
-
-contract BalancerV2Common {
-    function _createSwapFunds() internal view returns (IBalancerV2Vault.FundManagement memory) {
-        return
-            IBalancerV2Vault.FundManagement({
-                sender: address(this),
-                fromInternalBalance: false,
-                recipient: payable(address(this)),
-                toInternalBalance: false
-            });
-    }
-}

contracts/zero-ex/contracts/test/samplers/BalancerV2Sampler.sol

@@ -1,131 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "./SamplerUtils.sol";
-import "./interfaces/IBalancerV2Vault.sol";
-import "./BalancerV2Common.sol";
-
-contract BalancerV2Sampler is SamplerUtils, BalancerV2Common {
-    /// @dev Sample sell quotes from Balancer V2.
-    /// @param poolInfo Struct with pool related data
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromBalancerV2(
-        IBalancerV2Vault.BalancerV2PoolInfo memory poolInfo,
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    ) public returns (uint256[] memory makerTokenAmounts) {
-        _assertValidPair(makerToken, takerToken);
-        IBalancerV2Vault vault = IBalancerV2Vault(poolInfo.vault);
-        address[] memory swapAssets = new address[](2);
-        swapAssets[0] = takerToken;
-        swapAssets[1] = makerToken;
-
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        IBalancerV2Vault.FundManagement memory swapFunds = _createSwapFunds();
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            IBalancerV2Vault.BatchSwapStep[] memory swapSteps = _createSwapSteps(poolInfo, takerTokenAmounts[i]);
-
-            try
-                // For sells we specify the takerToken which is what the vault will receive from the trade
-                vault.queryBatchSwap(IBalancerV2Vault.SwapKind.GIVEN_IN, swapSteps, swapAssets, swapFunds)
-            returns (
-                // amounts represent pool balance deltas from the swap (incoming balance, outgoing balance)
-                int256[] memory amounts
-            ) {
-                // Outgoing balance is negative so we need to flip the sign
-                int256 amountOutFromPool = amounts[amounts.length - 1] * -1;
-                if (amountOutFromPool <= 0) {
-                    break;
-                }
-                makerTokenAmounts[i] = uint256(amountOutFromPool);
-            } catch (bytes memory) {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-
-    /// @dev Sample buy quotes from Balancer V2.
-    /// @param poolInfo Struct with pool related data
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromBalancerV2(
-        IBalancerV2Vault.BalancerV2PoolInfo memory poolInfo,
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    ) public returns (uint256[] memory takerTokenAmounts) {
-        _assertValidPair(makerToken, takerToken);
-        IBalancerV2Vault vault = IBalancerV2Vault(poolInfo.vault);
-        address[] memory swapAssets = new address[](2);
-        swapAssets[0] = takerToken;
-        swapAssets[1] = makerToken;
-
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        IBalancerV2Vault.FundManagement memory swapFunds = _createSwapFunds();
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            IBalancerV2Vault.BatchSwapStep[] memory swapSteps = _createSwapSteps(poolInfo, makerTokenAmounts[i]);
-
-            try
-                // For buys we specify the makerToken which is what taker will receive from the trade
-                vault.queryBatchSwap(IBalancerV2Vault.SwapKind.GIVEN_OUT, swapSteps, swapAssets, swapFunds)
-            returns (int256[] memory amounts) {
-                int256 amountIntoPool = amounts[0];
-                if (amountIntoPool <= 0) {
-                    break;
-                }
-                takerTokenAmounts[i] = uint256(amountIntoPool);
-            } catch (bytes memory) {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-
-    function _createSwapSteps(
-        IBalancerV2Vault.BalancerV2PoolInfo memory poolInfo,
-        uint256 amount
-    ) private pure returns (IBalancerV2Vault.BatchSwapStep[] memory) {
-        IBalancerV2Vault.BatchSwapStep[] memory swapSteps = new IBalancerV2Vault.BatchSwapStep[](1);
-        swapSteps[0] = IBalancerV2Vault.BatchSwapStep({
-            poolId: poolInfo.poolId,
-            assetInIndex: 0,
-            assetOutIndex: 1,
-            amount: amount,
-            userData: ""
-        });
-
-        return swapSteps;
-    }
-}

contracts/zero-ex/contracts/test/samplers/BancorSampler.sol

@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/IBancor.sol";
-
-contract BancorSampler {
-    /// @dev Base gas limit for Bancor calls.
-    uint256 private constant BANCOR_CALL_GAS = 300e3; // 300k
-
-    struct BancorSamplerOpts {
-        IBancorRegistry registry;
-        address[][] paths;
-    }
-
-    /// @dev Sample sell quotes from Bancor.
-    /// @param opts BancorSamplerOpts The Bancor registry contract address and paths
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return bancorNetwork the Bancor Network address
-    /// @return path the selected conversion path from bancor
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromBancor(
-        BancorSamplerOpts memory opts,
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    ) public view returns (address bancorNetwork, address[] memory path, uint256[] memory makerTokenAmounts) {
-        if (opts.paths.length == 0) {
-            return (bancorNetwork, path, makerTokenAmounts);
-        }
-        (bancorNetwork, path) = _findBestPath(opts, takerToken, makerToken, takerTokenAmounts);
-        makerTokenAmounts = new uint256[](takerTokenAmounts.length);
-
-        for (uint256 i = 0; i < makerTokenAmounts.length; i++) {
-            try IBancorNetwork(bancorNetwork).rateByPath{gas: BANCOR_CALL_GAS}(path, takerTokenAmounts[i]) returns (
-                uint256 amount
-            ) {
-                makerTokenAmounts[i] = amount;
-                // Break early if there are 0 amounts
-                if (makerTokenAmounts[i] == 0) {
-                    break;
-                }
-            } catch {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-        return (bancorNetwork, path, makerTokenAmounts);
-    }
-
-    /// @dev Sample buy quotes from Bancor. Unimplemented
-    /// @param opts BancorSamplerOpts The Bancor registry contract address and paths
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return bancorNetwork the Bancor Network address
-    /// @return path the selected conversion path from bancor
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromBancor(
-        BancorSamplerOpts memory opts,
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    ) public view returns (address bancorNetwork, address[] memory path, uint256[] memory takerTokenAmounts) {}
-
-    function _findBestPath(
-        BancorSamplerOpts memory opts,
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    ) internal view returns (address bancorNetwork, address[] memory path) {
-        bancorNetwork = opts.registry.getAddress(opts.registry.BANCOR_NETWORK());
-        if (opts.paths.length == 0) {
-            return (bancorNetwork, path);
-        }
-        uint256 maxBoughtAmount = 0;
-        // Find the best path by selling the largest taker amount
-        for (uint256 i = 0; i < opts.paths.length; i++) {
-            if (opts.paths[i].length < 2) {
-                continue;
-            }
-
-            try
-                IBancorNetwork(bancorNetwork).rateByPath{gas: BANCOR_CALL_GAS}(
-                    opts.paths[i],
-                    takerTokenAmounts[takerTokenAmounts.length - 1]
-                )
-            returns (uint256 amount) {
-                if (amount > maxBoughtAmount) {
-                    maxBoughtAmount = amount;
-                    path = opts.paths[i];
-                }
-            } catch {
-                // Swallow failures, leaving all results as zero.
-                continue;
-            }
-        }
-    }
-}

contracts/zero-ex/contracts/test/samplers/BancorV3Sampler.sol

@@ -1,108 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/IBancorV3.sol";
-
-contract BancorV3Sampler {
-    /// @dev Gas limit for BancorV3 calls.
-    uint256 private constant BancorV3_CALL_GAS = 150e3; // 150k
-
-    address public constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-
-    /// @dev Sample sell quotes from BancorV3.
-    /// @param weth The WETH contract address
-    /// @param router Router to look up tokens and amounts
-    /// @param path Token route. Should be takerToken -> makerToken
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromBancorV3(
-        address weth,
-        address router,
-        address[] memory path,
-        uint256[] memory takerTokenAmounts
-    ) public view returns (uint256[] memory makerTokenAmounts) {
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-
-        if (path[0] == weth) {
-            path[0] = ETH;
-        }
-        if (path[1] == weth) {
-            path[1] = ETH;
-        }
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            try IBancorV3(router).tradeOutputBySourceAmount(path[0], path[1], takerTokenAmounts[i]) returns (
-                uint256 amount
-            ) {
-                makerTokenAmounts[i] = amount;
-                // Break early if there are 0 amounts
-                if (makerTokenAmounts[i] == 0) {
-                    break;
-                }
-            } catch (bytes memory) {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-
-    /// @dev Sample buy quotes from BancorV3.
-    /// @param weth The WETH contract address
-    /// @param router Router to look up tokens and amounts
-    /// @param path Token route. Should be takerToken -> makerToken.
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromBancorV3(
-        address weth,
-        address router,
-        address[] memory path,
-        uint256[] memory makerTokenAmounts
-    ) public view returns (uint256[] memory takerTokenAmounts) {
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-
-        if (path[0] == weth) {
-            path[0] = ETH;
-        }
-        if (path[1] == weth) {
-            path[1] = ETH;
-        }
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            try IBancorV3(router).tradeInputByTargetAmount(path[0], path[1], makerTokenAmounts[i]) returns (
-                uint256 amount
-            ) {
-                takerTokenAmounts[i] = amount;
-                // Break early if there are 0 amounts
-                if (takerTokenAmounts[i] == 0) {
-                    break;
-                }
-            } catch (bytes memory) {
-                // Swallow failures, leaving all results as zero.
-                break;
-            }
-        }
-    }
-}

contracts/zero-ex/contracts/test/samplers/CompoundSampler.sol

@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "./SamplerUtils.sol";
-import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-
-// Minimal CToken interface
-interface ICToken {
-    function mint(uint mintAmount) external returns (uint);
-
-    function redeem(uint redeemTokens) external returns (uint);
-
-    function redeemUnderlying(uint redeemAmount) external returns (uint);
-
-    function exchangeRateStored() external view returns (uint);
-
-    function decimals() external view returns (uint8);
-}
-
-contract CompoundSampler is SamplerUtils {
-    uint256 private constant EXCHANGE_RATE_SCALE = 1e10;
-
-    function sampleSellsFromCompound(
-        ICToken cToken,
-        IERC20TokenV06 takerToken,
-        IERC20TokenV06 makerToken,
-        uint256[] memory takerTokenAmounts
-    ) public view returns (uint256[] memory makerTokenAmounts) {
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        // Exchange rate is scaled by 1 * 10^(18 - 8 + Underlying Token Decimals
-        uint256 exchangeRate = cToken.exchangeRateStored();
-        uint256 cTokenDecimals = uint256(cToken.decimals());
-
-        if (address(makerToken) == address(cToken)) {
-            // mint
-            for (uint256 i = 0; i < numSamples; i++) {
-                makerTokenAmounts[i] =
-                    (takerTokenAmounts[i] * EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals) /
-                    exchangeRate;
-            }
-        } else if (address(takerToken) == address(cToken)) {
-            // redeem
-            for (uint256 i = 0; i < numSamples; i++) {
-                makerTokenAmounts[i] =
-                    (takerTokenAmounts[i] * exchangeRate) /
-                    (EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals);
-            }
-        }
-    }
-
-    function sampleBuysFromCompound(
-        ICToken cToken,
-        IERC20TokenV06 takerToken,
-        IERC20TokenV06 makerToken,
-        uint256[] memory makerTokenAmounts
-    ) public view returns (uint256[] memory takerTokenAmounts) {
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        // Exchange rate is scaled by 1 * 10^(18 - 8 + Underlying Token Decimals
-        uint256 exchangeRate = cToken.exchangeRateStored();
-        uint256 cTokenDecimals = uint256(cToken.decimals());
-
-        if (address(makerToken) == address(cToken)) {
-            // mint
-            for (uint256 i = 0; i < numSamples; i++) {
-                takerTokenAmounts[i] =
-                    (makerTokenAmounts[i] * exchangeRate) /
-                    (EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals);
-            }
-        } else if (address(takerToken) == address(cToken)) {
-            // redeem
-            for (uint256 i = 0; i < numSamples; i++) {
-                takerTokenAmounts[i] =
-                    (makerTokenAmounts[i] * EXCHANGE_RATE_SCALE * 10 ** cTokenDecimals) /
-                    exchangeRate;
-            }
-        }
-    }
-}

contracts/zero-ex/contracts/test/samplers/CurveSampler.sol

@@ -1,145 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/ICurve.sol";
-import "./ApproximateBuys.sol";
-import "./SamplerUtils.sol";
-
-contract CurveSampler is SamplerUtils, ApproximateBuys {
-    /// @dev Information for sampling from curve sources.
-    struct CurveInfo {
-        address poolAddress;
-        bytes4 sellQuoteFunctionSelector;
-        bytes4 buyQuoteFunctionSelector;
-    }
-
-    /// @dev Base gas limit for Curve calls. Some Curves have multiple tokens
-    ///      So a reasonable ceil is 150k per token. Biggest Curve has 4 tokens.
-    uint256 private constant CURVE_CALL_GAS = 2000e3; // Was 600k for Curve but SnowSwap is using 1500k+
-
-    /// @dev Sample sell quotes from Curve.
-    /// @param curveInfo Curve information specific to this token pair.
-    /// @param fromTokenIdx Index of the taker token (what to sell).
-    /// @param toTokenIdx Index of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromCurve(
-        CurveInfo memory curveInfo,
-        int128 fromTokenIdx,
-        int128 toTokenIdx,
-        uint256[] memory takerTokenAmounts
-    ) public view returns (uint256[] memory makerTokenAmounts) {
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        for (uint256 i = 0; i < numSamples; i++) {
-            (bool didSucceed, bytes memory resultData) = curveInfo.poolAddress.staticcall.gas(CURVE_CALL_GAS)(
-                abi.encodeWithSelector(
-                    curveInfo.sellQuoteFunctionSelector,
-                    fromTokenIdx,
-                    toTokenIdx,
-                    takerTokenAmounts[i]
-                )
-            );
-            uint256 buyAmount = 0;
-            if (didSucceed) {
-                buyAmount = abi.decode(resultData, (uint256));
-            }
-            makerTokenAmounts[i] = buyAmount;
-            // Break early if there are 0 amounts
-            if (makerTokenAmounts[i] == 0) {
-                break;
-            }
-        }
-    }
-
-    /// @dev Sample buy quotes from Curve.
-    /// @param curveInfo Curve information specific to this token pair.
-    /// @param fromTokenIdx Index of the taker token (what to sell).
-    /// @param toTokenIdx Index of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromCurve(
-        CurveInfo memory curveInfo,
-        int128 fromTokenIdx,
-        int128 toTokenIdx,
-        uint256[] memory makerTokenAmounts
-    ) public view returns (uint256[] memory takerTokenAmounts) {
-        if (curveInfo.buyQuoteFunctionSelector == bytes4(0)) {
-            // Buys not supported on this curve, so approximate it.
-            return
-                _sampleApproximateBuys(
-                    ApproximateBuyQuoteOpts({
-                        makerTokenData: abi.encode(toTokenIdx, curveInfo),
-                        takerTokenData: abi.encode(fromTokenIdx, curveInfo),
-                        getSellQuoteCallback: _sampleSellForApproximateBuyFromCurve
-                    }),
-                    makerTokenAmounts
-                );
-        }
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        for (uint256 i = 0; i < numSamples; i++) {
-            (bool didSucceed, bytes memory resultData) = curveInfo.poolAddress.staticcall.gas(CURVE_CALL_GAS)(
-                abi.encodeWithSelector(
-                    curveInfo.buyQuoteFunctionSelector,
-                    fromTokenIdx,
-                    toTokenIdx,
-                    makerTokenAmounts[i]
-                )
-            );
-            uint256 sellAmount = 0;
-            if (didSucceed) {
-                sellAmount = abi.decode(resultData, (uint256));
-            }
-            takerTokenAmounts[i] = sellAmount;
-            // Break early if there are 0 amounts
-            if (takerTokenAmounts[i] == 0) {
-                break;
-            }
-        }
-    }
-
-    function _sampleSellForApproximateBuyFromCurve(
-        bytes memory takerTokenData,
-        bytes memory makerTokenData,
-        uint256 sellAmount
-    ) private view returns (uint256 buyAmount) {
-        (int128 takerTokenIdx, CurveInfo memory curveInfo) = abi.decode(takerTokenData, (int128, CurveInfo));
-        int128 makerTokenIdx = abi.decode(makerTokenData, (int128));
-        (bool success, bytes memory resultData) = address(this).staticcall(
-            abi.encodeWithSelector(
-                this.sampleSellsFromCurve.selector,
-                curveInfo,
-                takerTokenIdx,
-                makerTokenIdx,
-                _toSingleValueArray(sellAmount)
-            )
-        );
-        if (!success) {
-            return 0;
-        }
-        // solhint-disable-next-line indent
-        return abi.decode(resultData, (uint256[]))[0];
-    }
-}