add multiplex TokenForEth functions to metatransactions

* Remove TestAuthorizable

* Remove contracts/utils Authorizable and IAuthorizable

* Remove contracts/utils D18 contract

* Remove contracts/utils LibAddress contracts

* Remove contracts/utils LogDecoding contracts

* Remove contracts/utils Refundable contracts

* Remove contracts/utils LibAuthorizableRichErrors contracts

* Remove contracts/utils EIP712 contracts

* Remove contracts/utils TestRefundableReceiver contracts

* Remove contracts/utils EIP1271 contracts

* Remove contracts/utils ReentrancyGuardV06 contracts

* Remove contracts/utils LibMath contracts

* Remove contracts/utils LibFractions contracts

* Remove contracts/utils LibMathRichErrors contracts

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

.circleci/config.yml

@@ -1,209 +0,0 @@
-version: 2.1
-
-jobs:
-    build:
-        resource_class: xlarge
-        docker:
-            - image: node:16
-        environment:
-            NODE_OPTIONS: '--max-old-space-size=16384'
-        working_directory: ~/repo
-        steps:
-            - checkout
-            - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
-            - 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 || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci
-            - save_cache:
-                  key: repo-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo
-            - store_artifacts:
-                  path: ~/repo/packages/abi-gen/test-cli/output
-            - store_artifacts:
-                  path: ~/repo/packages/contract-wrappers/generated_docs
-    test-exchange-ganache:
-        resource_class: medium+
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
-    test-integrations-ganache:
-        resource_class: medium+
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
-    test-contracts-staking-ganache:
-        resource_class: medium+
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
-    test-contracts-extra-ganache:
-        resource_class: medium+
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
-    test-contracts-rest-ganache:
-        resource_class: medium+
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - 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-publish:
-        resource_class: large
-        environment:
-            NODE_OPTIONS: '--max-old-space-size=6442'
-        docker:
-            - image: node:16
-            - image: 0xorg/verdaccio
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: yarn test:publish:circleci
-                  no_output_timeout: 1800
-            - store_artifacts:
-                  path: ~/.npm/_logs
-    test-doc-generation:
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: yarn test:generate_docs:circleci
-                  no_output_timeout: 1200
-    test-rest:
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        environment:
-            RUST_ROUTER: 'true'
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun -p @0x/contracts-test-utils -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
-            - run: yarn wsrun -p @0x/asset-swapper -m --serial -c test:circleci
-            - save_cache:
-                  key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/contract-wrappers-test/coverage/lcov.info
-            - save_cache:
-                  key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/order-utils/coverage/lcov.info
-            - save_cache:
-                  key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/web3-wrapper/coverage/lcov.info
-    static-tests:
-        resource_class: large
-        working_directory: ~/repo
-        docker:
-            - image: node:16
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn lerna run lint
-            - run: yarn prettier:ci
-            - run: yarn deps_versions:ci
-            - run: yarn diff_md_docs:ci
-    submit-coverage:
-        docker:
-            - image: node:16
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
-            - 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-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

@@ -0,0 +1,18 @@
+# See https://help.github.com/articles/about-codeowners/
+
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+# Dev tools & setup
+
+.github/ @dekz
+packages/contract-addresses/ @dekz @dextracker @kyu-c
+packages/contract-artifacts/ @dekz
+packages/protocol-utils/ @dekz
+
+# Protocol/smart contracts
+
+contracts/ @dekz @dextracker

.github/CONTRIBUTING.md

@@ -8,13 +8,13 @@ We welcome contributions from anyone on the internet and are grateful for even t
 2.  Clone your fork
 3.  Follow the [installation & build steps](https://github.com/0xProject/0x-tools#install-dependencies) in the repo's top-level README.
 4.  Setup the recommended [Development Tooling](#development-tooling).
-5.  Open a PR with the `[WIP]` flag against the `development` branch and describe the change you are intending to undertake in the PR description. (see [our branch naming conventions](#branch-structure))
+5.  Open a [draft PR](https://github.blog/2019-02-14-introducing-draft-pull-requests/) against the `development` branch and describe the change you are intending to undertake in the PR description. (see [our branch naming conventions](#branch-structure))
 
-Before removing the `[WIP]` tag and submitting the PR for review, make sure:
+Before making the PR "Ready for review", make sure:
 
 -   It passes our linter checks (`yarn lint`)
 -   It is properly formatted with Prettier (`yarn prettier`)
--   It passes our continuous integration tests (See: [Enabling code coverage checks on your fork](#enabling-code-coverage-checks-on-your-fork) for instructions on getting the `submit-coverage` test to pass on forks)
+-   It passes our continuous integration tests (See: [Enabling code coverage checks on your fork](#fix-submit-coverage-ci-failure) for instructions on getting the `submit-coverage` test to pass on forks)
 -   You've created/updated the corresponding [CHANGELOG](#CHANGELOGs) entries.
 -   Your changes have sufficient test coverage (e.g regression tests have been added for bug fixes)
 
@@ -59,16 +59,14 @@ We strongly recommend you use the [VSCode](https://code.visualstudio.com/) text
 
 #### Linter
 
-We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/0x-tools/tree/development/packages/tslint-config) to keep our code-style consistent.
+We use [ESLint](https://eslint.org/docs/latest/) to keep our code-style consistent.
 
-Use `yarn:lint` to lint the entire monorepo, and `PKG={PACKAGE_NAME} yarn lint` to lint a specific package.
-
-If you want to change a rule, or add a custom rule, please make these changes to our [tslint-config](https://github.com/0xProject/0x-tools/tree/development/packages/tslint-config) package. All other packages have it as a dependency.
+Use `yarn lint` to lint the entire monorepo, and `PKG={PACKAGE_NAME} yarn lint` to lint a specific package.
 
 Integrate it into your text editor:
 
--   VSCode: [vscode-tslint](https://marketplace.visualstudio.com/items?itemName=eg2.tslint)
--   Atom: [linter-tslint](https://atom.io/packages/linter-tslint)
+-   VSCode: [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+-   Atom: [ESLint](https://atom.io/packages/eslint)
 
 #### Auto-formatter
 
@@ -91,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/PULL_REQUEST_TEMPLATE.md

@@ -20,7 +20,6 @@
 
 <!--- The following points should be used to indicate the progress of your PR.  Put an `x` in all the boxes that apply right now, and come back over time and check them off as you make progress.  If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 
--   [ ] Prefix PR title with `[WIP]` if necessary.
 -   [ ] Add tests to cover changes as needed.
 -   [ ] Update documentation as needed.
 -   [ ] Add new entries to the relevant CHANGELOG.jsons.

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

.github/workflows/stale.yml

@@ -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,98 +77,25 @@ 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/
+
+# forge std-lib
+contracts/zero-ex/contracts/deps/forge-std
+
+# foundry artifacts
+foundry-artifacts/
+
+# foundry cache
+cache/
+
+#foundry output artifacts
+out/
+
+# typechain wrappers
+contracts/zero-ex/typechain-wrappers/
 
 # Doc README copy
 packages/*/docs/README.md

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "contracts/zero-ex/contracts/deps/forge-std"]
+	path = contracts/zero-ex/contracts/deps/forge-std
+	url = https://github.com/foundry-rs/forge-std

.husky/pre-commit

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

.prettierignore

@@ -1,90 +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/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/extensions/build/
-/contracts/exchange-forwarder/build/
-/packages/asset-swapper/generated-artifacts
-/packages/asset-swapper/generated-wrappers
-/packages/asset-swapper/test/generated-artifacts
-/packages/asset-swapper/test/generated-wrappers
+generated-artifacts/
+generated-wrappers/
+foundry-artifacts/
+out/
+cache/
 package.json
-packages/*/docs
-docs/
-*.sol
+packages

.prettierrc

@@ -4,5 +4,17 @@
     "singleQuote": true,
     "trailingComma": "all",
     "bracketSpacing": true,
-    "arrowParens": "avoid"
+    "arrowParens": "avoid",
+    "overrides": [
+        {
+          "files": "**/*.sol",
+          "options": {
+            "printWidth": 120,
+            "tabWidth": 4,
+            "useTabs": false,
+            "singleQuote": false,
+            "bracketSpacing": false
+          }
+        }
+      ]
 }

.solhint.json

@@ -0,0 +1,17 @@
+{
+    "extends": "solhint:recommended",
+    "plugins": ["prettier"],
+    "rules": {
+        "prettier/prettier": "error",
+        "avoid-low-level-calls": "off",
+        "avoid-tx-origin": "warn",
+        "code-complexity": "off",
+        "const-name-snakecase": "error",
+        "function-max-lines": ["error", 350],
+        "max-line-length": ["error", 120],
+        "no-inline-assembly": "off",
+        "quotes": ["error", "double"],
+        "no-empty-blocks": "off",
+        "compiler-version": "off"
+    }
+}

.solhintignore

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

CODEOWNERS

@@ -1,20 +0,0 @@
-# See https://help.github.com/articles/about-codeowners/
-
-# for more info about CODEOWNERS file
-
-# It uses the same pattern rule for gitignore file
-
-# https://git-scm.com/docs/gitignore#_pattern_format
-
-packages/asset-swapper/ @dekz @mzhu25 @dextracker @kh-chang
-
-# Dev tools & setup
-
-.circleci/ @dekz @mzhu25
-packages/contract-addresses/ @dekz @mzhu25 @dextracker @kh-chang
-packages/contract-artifacts/ @dekz @mzhu25
-packages/protocol-utils/ @dekz @mzhu25
-
-# Protocol/smart contracts
-
-contracts/ @dekz @mzhu25 @dextracker

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)
 
@@ -34,7 +33,6 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 
 | Package                                                  | Version                                                                                                                 | Description                                                                                    |
 | -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
-| [`@0x/asset-swapper`](/packages/asset-swapper)           | [![npm](https://img.shields.io/npm/v/@0x/asset-swapper.svg)](https://www.npmjs.com/package/@0x/asset-swapper)           | Package used to find and create aggregated swaps                                               |
 | [`@0x/protocol-utils`](/packages/protocol-utils)         | [![npm](https://img.shields.io/npm/v/@0x/protocol-utils.svg)](https://www.npmjs.com/package/@0x/protocol-utils)         | A set of utilities for generating, parsing, signing and validating 0x orders                   |
 | [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. |
 | [`@0x/contract-wrappers`](/packages/contract-wrappers)   | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers)   | JS/TS wrappers for interacting with the 0x smart contracts                                     |
@@ -55,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
 
@@ -82,7 +80,7 @@ yarn build
 To build a specific package:
 
 ```bash
-PKG=@0x/asset-swapper yarn build
+PKG=@0x/protocol-utils yarn build
 ```
 
 To build all contracts packages:
@@ -105,7 +103,7 @@ To watch a specific package and all it's dependent packages:
 PKG=[NPM_PACKAGE_NAME] yarn watch
 
 e.g
-PKG=@0x/asset-swapper yarn watch
+PKG=@0x/protocol-utils yarn watch
 ```
 
 ### Clean
@@ -119,7 +117,7 @@ yarn clean
 Clean a specific package
 
 ```bash
-PKG=@0x/asset-swapper yarn clean
+PKG=@0x/protocol-utils yarn clean
 ```
 
 ### Rebuild
@@ -133,7 +131,7 @@ yarn rebuild
 To re-build (clean & build) a specific package & it's deps:
 
 ```bash
-PKG=@0x/asset-swapper yarn rebuild
+PKG=@0x/protocol-utils yarn rebuild
 ```
 
 ### Lint
@@ -147,7 +145,7 @@ yarn lint
 Lint a specific package:
 
 ```bash
-PKG=@0x/asset-swapper yarn lint
+PKG=@0x/protocol-utils yarn lint
 ```
 
 ### Run Tests
@@ -161,7 +159,7 @@ yarn test
 Run a specific package's test:
 
 ```bash
-PKG=@0x/asset-swapper yarn test
+PKG=@0x/protocol-utils yarn test
 ```
 
 Run all contracts packages tests:

contracts/.solhint.json

@@ -1,22 +0,0 @@
-{
-    "extends": "default",
-    "rules": {
-        "avoid-low-level-calls": false,
-        "avoid-tx-origin": "warn",
-        "bracket-align": false,
-        "code-complexity": false,
-        "compiler-fixed": false,
-        "const-name-snakecase": "error",
-        "expression-indent": "error",
-        "function-max-lines": false,
-        "func-order": "error",
-        "indent": ["error", 4],
-        "max-line-length": ["warn", 160],
-        "no-inline-assembly": false,
-        "quotes": ["error", "double"],
-        "separate-by-one-line-in-contract": "error",
-        "space-after-comma": "error",
-        "statement-indent": "error",
-        "no-empty-blocks": false
-    }
-}

contracts/erc20/.eslintrc

@@ -0,0 +1,25 @@
+{
+  "env": {
+      "es2021": true,
+      "node": true
+  },
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  "overrides": [],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+      "project": "./tsconfig.json",
+      "ecmaVersion": "latest",
+      "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint"],
+  "ignorePatterns": [
+      "lib/**/*",
+      "contracts/**/*",
+      "generated-wrappers/**/*",
+      "generated-artifacts/**/*",
+      "test/generated-wrappers/**/*",
+      "test/generated-artifacts/**/*"
+
+  ],
+  "rules": {}
+}

contracts/erc20/.solhintignore

@@ -1 +0,0 @@
-contracts/src/ZRXToken.sol

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,230 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "3.3.57",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "3.3.56",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1674517560,
+        "version": "3.3.55",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "3.3.54",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "3.3.53",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1668477029,
+        "version": "3.3.52",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667607537,
+        "version": "3.3.51",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667427402,
+        "version": "3.3.50",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666645023,
+        "version": "3.3.49",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666381417,
+        "version": "3.3.48",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665670315,
+        "version": "3.3.47",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665531940,
+        "version": "3.3.46",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "3.3.45",
+        "changes": [
+            {
+                "note": "Migrate from TSLint to ESLint and fix linting errors",
+                "pr": 589
+            }
+        ],
+        "timestamp": 1665013355
+    },
+    {
+        "timestamp": 1663786955,
+        "version": "3.3.44",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662998180,
+        "version": "3.3.43",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662559804,
+        "version": "3.3.42",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662147076,
+        "version": "3.3.41",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662046042,
+        "version": "3.3.40",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661462289,
+        "version": "3.3.39",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661459661,
+        "version": "3.3.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661145612,
+        "version": "3.3.37",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "3.3.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "3.3.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1659750766,
+        "version": "3.3.34",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1658950329,
+        "version": "3.3.33",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1655244958,
         "version": "3.3.32",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,106 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.57 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v3.3.56 - _January 30, 2023_
+
+    * Dependencies updated
+
+## v3.3.55 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v3.3.54 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v3.3.53 - _November 23, 2022_
+
+    * Dependencies updated
+
+## v3.3.52 - _November 15, 2022_
+
+    * Dependencies updated
+
+## v3.3.51 - _November 5, 2022_
+
+    * Dependencies updated
+
+## v3.3.50 - _November 2, 2022_
+
+    * Dependencies updated
+
+## v3.3.49 - _October 24, 2022_
+
+    * Dependencies updated
+
+## v3.3.48 - _October 21, 2022_
+
+    * Dependencies updated
+
+## v3.3.47 - _October 13, 2022_
+
+    * Dependencies updated
+
+## v3.3.46 - _October 11, 2022_
+
+    * Dependencies updated
+
+## v3.3.45 - _October 5, 2022_
+
+    * Migrate from TSLint to ESLint and fix linting errors (#589)
+
+## v3.3.44 - _September 21, 2022_
+
+    * Dependencies updated
+
+## v3.3.43 - _September 12, 2022_
+
+    * Dependencies updated
+
+## v3.3.42 - _September 7, 2022_
+
+    * Dependencies updated
+
+## v3.3.41 - _September 2, 2022_
+
+    * Dependencies updated
+
+## v3.3.40 - _September 1, 2022_
+
+    * Dependencies updated
+
+## v3.3.39 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v3.3.38 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v3.3.37 - _August 22, 2022_
+
+    * Dependencies updated
+
+## v3.3.36 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v3.3.35 - _August 9, 2022_
+
+    * Dependencies updated
+
+## v3.3.34 - _August 6, 2022_
+
+    * Dependencies updated
+
+## v3.3.33 - _July 27, 2022_
+
+    * Dependencies updated
+
 ## v3.3.32 - _June 14, 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
 
@@ -67,7 +67,3 @@ yarn lint
 ```bash
 yarn test
 ```
-
-#### Testing options
-
-Contracts testing options like coverage, profiling, revert traces or backing node choosing - are described [here](../TESTING.md).

contracts/erc20/contracts/src/ERC20Token.sol

@@ -20,12 +20,9 @@ pragma solidity ^0.5.9;
 
 import "./interfaces/IERC20Token.sol";
 
-
-contract ERC20Token is
-    IERC20Token
-{
-    mapping (address => uint256) internal balances;
-    mapping (address => mapping (address => uint256)) internal allowed;
+contract ERC20Token is IERC20Token {
+    mapping(address => uint256) internal balances;
+    mapping(address => mapping(address => uint256)) internal allowed;
 
     uint256 internal _totalSupply;
 
@@ -33,27 +30,14 @@ contract ERC20Token is
     /// @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)
-    {
-        require(
-            balances[msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
+    function transfer(address _to, uint256 _value) external returns (bool) {
+        require(balances[msg.sender] >= _value, "ERC20_INSUFFICIENT_BALANCE");
+        require(balances[_to] + _value >= balances[_to], "UINT256_OVERFLOW");
 
         balances[msg.sender] -= _value;
         balances[_to] += _value;
 
-        emit Transfer(
-            msg.sender,
-            _to,
-            _value
-        );
+        emit Transfer(msg.sender, _to, _value);
 
         return true;
     }
@@ -63,36 +47,16 @@ contract ERC20Token is
     /// @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)
-    {
-        require(
-            balances[_from] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            allowed[_from][msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_ALLOWANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
+    function transferFrom(address _from, address _to, uint256 _value) external returns (bool) {
+        require(balances[_from] >= _value, "ERC20_INSUFFICIENT_BALANCE");
+        require(allowed[_from][msg.sender] >= _value, "ERC20_INSUFFICIENT_ALLOWANCE");
+        require(balances[_to] + _value >= balances[_to], "UINT256_OVERFLOW");
 
         balances[_to] += _value;
         balances[_from] -= _value;
         allowed[_from][msg.sender] -= _value;
 
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
+        emit Transfer(_from, _to, _value);
 
         return true;
     }
@@ -101,48 +65,29 @@ contract ERC20Token is
     /// @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)
-    {
+    function approve(address _spender, uint256 _value) external returns (bool) {
         allowed[msg.sender][_spender] = _value;
-        emit Approval(
-            msg.sender,
-            _spender,
-            _value
-        );
+        emit Approval(msg.sender, _spender, _value);
         return true;
     }
 
     /// @dev Query total supply of token
     /// @return Total supply of token
-    function totalSupply()
-        external
-        view
-        returns (uint256)
-    {
+    function totalSupply() external view returns (uint256) {
         return _totalSupply;
     }
 
     /// @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)
-        external
-        view
-        returns (uint256)
-    {
+    function balanceOf(address _owner) external view returns (uint256) {
         return balances[_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)
-    {
+    function allowance(address _owner, address _spender) external view returns (uint256) {
         return allowed[_owner][_spender];
     }
 }

contracts/erc20/contracts/src/LibERC20Token.sol

@@ -22,9 +22,8 @@ import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 import "../src/interfaces/IERC20Token.sol";
 
-
 library LibERC20Token {
-    bytes constant private DECIMALS_CALL_DATA = hex"313ce567";
+    bytes private constant DECIMALS_CALL_DATA = hex"313ce567";
 
     /// @dev Calls `IERC20Token(token).approve()`.
     ///      Reverts if `false` is returned or if the return
@@ -32,18 +31,8 @@ library LibERC20Token {
     /// @param token The address of the token contract.
     /// @param spender The address that receives an allowance.
     /// @param allowance The allowance to set.
-    function approve(
-        address token,
-        address spender,
-        uint256 allowance
-    )
-        internal
-    {
-        bytes memory callData = abi.encodeWithSelector(
-            IERC20Token(0).approve.selector,
-            spender,
-            allowance
-        );
+    function approve(address token, address spender, uint256 allowance) internal {
+        bytes memory callData = abi.encodeWithSelector(IERC20Token(0).approve.selector, spender, allowance);
         _callWithOptionalBooleanResult(token, callData);
     }
 
@@ -54,13 +43,7 @@ library LibERC20Token {
     /// @param token The address of the token contract.
     /// @param spender The address that receives an allowance.
     /// @param amount The minimum allowance needed.
-    function approveIfBelow(
-        address token,
-        address spender,
-        uint256 amount
-    )
-        internal
-    {
+    function approveIfBelow(address token, address spender, uint256 amount) internal {
         if (IERC20Token(token).allowance(address(this), spender) < amount) {
             approve(token, spender, uint256(-1));
         }
@@ -72,18 +55,8 @@ library LibERC20Token {
     /// @param token The address of the token contract.
     /// @param to The address that receives the tokens
     /// @param amount Number of tokens to transfer.
-    function transfer(
-        address token,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        bytes memory callData = abi.encodeWithSelector(
-            IERC20Token(0).transfer.selector,
-            to,
-            amount
-        );
+    function transfer(address token, address to, uint256 amount) internal {
+        bytes memory callData = abi.encodeWithSelector(IERC20Token(0).transfer.selector, to, amount);
         _callWithOptionalBooleanResult(token, callData);
     }
 
@@ -94,20 +67,8 @@ library LibERC20Token {
     /// @param from The owner of the tokens.
     /// @param to The address that receives the tokens
     /// @param amount Number of tokens to transfer.
-    function transferFrom(
-        address token,
-        address from,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        bytes memory callData = abi.encodeWithSelector(
-            IERC20Token(0).transferFrom.selector,
-            from,
-            to,
-            amount
-        );
+    function transferFrom(address token, address from, address to, uint256 amount) internal {
+        bytes memory callData = abi.encodeWithSelector(IERC20Token(0).transferFrom.selector, from, to, amount);
         _callWithOptionalBooleanResult(token, callData);
     }
 
@@ -115,11 +76,7 @@ library LibERC20Token {
     ///      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 decimals(address token)
-        internal
-        view
-        returns (uint8 tokenDecimals)
-    {
+    function decimals(address token) internal view returns (uint8 tokenDecimals) {
         tokenDecimals = 18;
         (bool didSucceed, bytes memory resultData) = token.staticcall(DECIMALS_CALL_DATA);
         if (didSucceed && resultData.length == 32) {
@@ -133,17 +90,9 @@ library LibERC20Token {
     /// @param owner The owner of the tokens.
     /// @param spender The address the spender.
     /// @return allowance The allowance for a token, owner, and spender.
-    function allowance(address token, address owner, address spender)
-        internal
-        view
-        returns (uint256 allowance_)
-    {
+    function allowance(address token, address owner, address spender) internal view returns (uint256 allowance_) {
         (bool didSucceed, bytes memory resultData) = token.staticcall(
-            abi.encodeWithSelector(
-                IERC20Token(0).allowance.selector,
-                owner,
-                spender
-            )
+            abi.encodeWithSelector(IERC20Token(0).allowance.selector, owner, spender)
         );
         if (didSucceed && resultData.length == 32) {
             allowance_ = LibBytes.readUint256(resultData, 0);
@@ -155,16 +104,9 @@ library LibERC20Token {
     /// @param token The address of the token contract.
     /// @param owner The owner of the tokens.
     /// @return balance The token balance of an owner.
-    function balanceOf(address token, address owner)
-        internal
-        view
-        returns (uint256 balance)
-    {
+    function balanceOf(address token, address owner) internal view returns (uint256 balance) {
         (bool didSucceed, bytes memory resultData) = token.staticcall(
-            abi.encodeWithSelector(
-                IERC20Token(0).balanceOf.selector,
-                owner
-            )
+            abi.encodeWithSelector(IERC20Token(0).balanceOf.selector, owner)
         );
         if (didSucceed && resultData.length == 32) {
             balance = LibBytes.readUint256(resultData, 0);
@@ -176,12 +118,7 @@ library LibERC20Token {
     ///      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
-    {
+    function _callWithOptionalBooleanResult(address target, bytes memory callData) private {
         (bool didSucceed, bytes memory resultData) = target.call(callData);
         if (didSucceed) {
             if (resultData.length == 0) {

contracts/erc20/contracts/src/MintableERC20Token.sol

@@ -21,41 +21,26 @@ pragma solidity ^0.5.9;
 import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
 import "./UnlimitedAllowanceERC20Token.sol";
 
-
-contract MintableERC20Token is
-    UnlimitedAllowanceERC20Token
-{
+contract MintableERC20Token is UnlimitedAllowanceERC20Token {
     using LibSafeMath for uint256;
 
     /// @dev Mints new tokens
     /// @param _to Address of the beneficiary that will own the minted token
     /// @param _value Amount of tokens to mint
-    function _mint(address _to, uint256 _value)
-        internal
-    {
+    function _mint(address _to, uint256 _value) internal {
         balances[_to] = _value.safeAdd(balances[_to]);
         _totalSupply = _totalSupply.safeAdd(_value);
 
-        emit Transfer(
-            address(0),
-            _to,
-            _value
-        );
+        emit Transfer(address(0), _to, _value);
     }
 
     /// @dev Mints new tokens
     /// @param _owner Owner of tokens that will be burned
     /// @param _value Amount of tokens to burn
-    function _burn(address _owner, uint256 _value)
-        internal
-    {
+    function _burn(address _owner, uint256 _value) internal {
         balances[_owner] = balances[_owner].safeSub(_value);
         _totalSupply = _totalSupply.safeSub(_value);
 
-        emit Transfer(
-            _owner,
-            address(0),
-            _value
-        );
+        emit Transfer(_owner, address(0), _value);
     }
 }

contracts/erc20/contracts/src/UnlimitedAllowanceERC20Token.sol

@@ -20,38 +20,20 @@ pragma solidity ^0.5.9;
 
 import "./ERC20Token.sol";
 
+contract UnlimitedAllowanceERC20Token is ERC20Token {
+    uint256 internal constant MAX_UINT = 2 ** 256 - 1;
 
-contract UnlimitedAllowanceERC20Token is
-    ERC20Token
-{
-    uint256 constant internal MAX_UINT = 2**256 - 1;
-
-    /// @dev ERC20 transferFrom, modified such that an allowance of MAX_UINT represents an unlimited allowance. See https://github.com/ethereum/EIPs/issues/717
+    /// @dev ERC20 transferFrom, modified such that an allowance of MAX_UINT represents an unlimited allowance.
+    // See https://github.com/ethereum/EIPs/issues/717
     /// @param _from Address to transfer from.
     /// @param _to Address to transfer to.
     /// @param _value Amount to transfer.
     /// @return Success of transfer.
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
+    function transferFrom(address _from, address _to, uint256 _value) external returns (bool) {
         uint256 allowance = allowed[_from][msg.sender];
-        require(
-            balances[_from] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            allowance >= _value,
-            "ERC20_INSUFFICIENT_ALLOWANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
+        require(balances[_from] >= _value, "ERC20_INSUFFICIENT_BALANCE");
+        require(allowance >= _value, "ERC20_INSUFFICIENT_ALLOWANCE");
+        require(balances[_to] + _value >= balances[_to], "UINT256_OVERFLOW");
 
         balances[_to] += _value;
         balances[_from] -= _value;
@@ -59,11 +41,7 @@ contract UnlimitedAllowanceERC20Token is
             allowed[_from][msg.sender] -= _value;
         }
 
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
+        emit Transfer(_from, _to, _value);
 
         return true;
     }

contracts/erc20/contracts/src/WETH9.sol

@@ -13,58 +13,55 @@
 // 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.5.9;
 
-
 contract WETH9 {
-    string public name     = "Wrapped Ether";
-    string public symbol   = "WETH";
-    uint8  public decimals = 18;
+    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);
+    event Approval(address indexed _owner, address indexed _spender, uint256 _value);
+    event Transfer(address indexed _from, address indexed _to, uint256 _value);
+    event Deposit(address indexed _owner, uint256 _value);
+    event Withdrawal(address indexed _owner, uint256 _value);
 
-    mapping (address => uint)                       public  balanceOf;
-    mapping (address => mapping (address => uint))  public  allowance;
+    mapping(address => uint256) public balanceOf;
+    mapping(address => mapping(address => uint256)) public allowance;
 
     function() external payable {
         deposit();
     }
+
     function deposit() public payable {
         balanceOf[msg.sender] += msg.value;
         emit Deposit(msg.sender, msg.value);
     }
-    function withdraw(uint wad) public {
+
+    function withdraw(uint256 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) {
+    function totalSupply() public view returns (uint256) {
         return address(this).balance;
     }
 
-    function approve(address guy, uint wad) public returns (bool) {
+    function approve(address guy, uint256 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) {
+    function transfer(address dst, uint256 wad) public returns (bool) {
         return transferFrom(msg.sender, dst, wad);
     }
 
-    function transferFrom(address src, address dst, uint wad)
-        public
-        returns (bool)
-    {
+    function transferFrom(address src, address dst, uint256 wad) public returns (bool) {
         require(balanceOf[src] >= wad);
 
-        if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {
+        if (src != msg.sender && allowance[src][msg.sender] != uint256(-1)) {
             require(allowance[src][msg.sender] >= wad);
             allowance[src][msg.sender] -= wad;
         }
@@ -78,7 +75,6 @@ contract WETH9 {
     }
 }
 
-
 /*
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007

contracts/erc20/contracts/src/ZRXToken.sol

@@ -18,105 +18,99 @@
 
 pragma solidity 0.4.11;
 
-
 contract Token {
-
     /// @return total amount of tokens
-    function totalSupply() constant returns (uint supply) {}
+    function totalSupply() constant returns (uint256 supply) {}
 
     /// @param _owner The address from which the balance will be retrieved
     /// @return The balance
-    function balanceOf(address _owner) constant returns (uint balance) {}
+    function balanceOf(address _owner) constant returns (uint256 balance) {}
 
     /// @notice 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 Whether the transfer was successful or not
-    function transfer(address _to, uint _value) returns (bool success) {}
+    function transfer(address _to, uint256 _value) returns (bool success) {}
 
     /// @notice 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 Whether the transfer was successful or not
-    function transferFrom(address _from, address _to, uint _value) returns (bool success) {}
+    function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {}
 
     /// @notice `msg.sender` approves `_addr` 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 Whether the approval was successful or not
-    function approve(address _spender, uint _value) returns (bool success) {}
+    function approve(address _spender, uint256 _value) returns (bool success) {}
 
     /// @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) constant returns (uint remaining) {}
+    function allowance(address _owner, address _spender) constant returns (uint256 remaining) {}
 
-    event Transfer(address indexed _from, address indexed _to, uint _value);
-    event Approval(address indexed _owner, address indexed _spender, uint _value);
+    event Transfer(address indexed _from, address indexed _to, uint256 _value);
+    event Approval(address indexed _owner, address indexed _spender, uint256 _value);
 }
 
-
 contract ERC20Token is Token {
-
-    function transfer(address _to, uint _value) returns (bool) {
+    function transfer(address _to, uint256 _value) returns (bool) {
         //Default assumes totalSupply can't be over max (2^256 - 1).
         if (balances[msg.sender] >= _value && balances[_to] + _value >= balances[_to]) {
             balances[msg.sender] -= _value;
             balances[_to] += _value;
             Transfer(msg.sender, _to, _value);
             return true;
-        } else { return false; }
+        } else {
+            return false;
+        }
     }
 
-    function transferFrom(address _from, address _to, uint _value) returns (bool) {
-        if (balances[_from] >= _value && allowed[_from][msg.sender] >= _value && balances[_to] + _value >= balances[_to]) {
+    function transferFrom(address _from, address _to, uint256 _value) returns (bool) {
+        if (
+            balances[_from] >= _value && allowed[_from][msg.sender] >= _value && balances[_to] + _value >= balances[_to]
+        ) {
             balances[_to] += _value;
             balances[_from] -= _value;
             allowed[_from][msg.sender] -= _value;
             Transfer(_from, _to, _value);
             return true;
-        } else { return false; }
+        } else {
+            return false;
+        }
     }
 
-    function balanceOf(address _owner) constant returns (uint) {
+    function balanceOf(address _owner) constant returns (uint256) {
         return balances[_owner];
     }
 
-    function approve(address _spender, uint _value) returns (bool) {
+    function approve(address _spender, uint256 _value) returns (bool) {
         allowed[msg.sender][_spender] = _value;
         Approval(msg.sender, _spender, _value);
         return true;
     }
 
-    function allowance(address _owner, address _spender) constant returns (uint) {
+    function allowance(address _owner, address _spender) constant returns (uint256) {
         return allowed[_owner][_spender];
     }
 
-    mapping (address => uint) balances;
-    mapping (address => mapping (address => uint)) allowed;
-    uint public totalSupply;
+    mapping(address => uint256) balances;
+    mapping(address => mapping(address => uint256)) allowed;
+    uint256 public totalSupply;
 }
 
-
 contract UnlimitedAllowanceToken is ERC20Token {
-
-    uint constant MAX_UINT = 2**256 - 1;
+    uint256 constant MAX_UINT = 2 ** 256 - 1;
 
     /// @dev ERC20 transferFrom, modified such that an allowance of MAX_UINT represents an unlimited allowance.
     /// @param _from Address to transfer from.
     /// @param _to Address to transfer to.
     /// @param _value Amount to transfer.
     /// @return Success of transfer.
-    function transferFrom(address _from, address _to, uint _value)
-        public
-        returns (bool)
-    {
-        uint allowance = allowed[_from][msg.sender];
-        if (balances[_from] >= _value
-            && allowance >= _value
-            && balances[_to] + _value >= balances[_to]
-        ) {
+    function transferFrom(address _from, address _to, uint256 _value) public returns (bool) {
+        uint256 allowance = allowed[_from][msg.sender];
+        if (balances[_from] >= _value && allowance >= _value && balances[_to] + _value >= balances[_to]) {
             balances[_to] += _value;
             balances[_from] -= _value;
             if (allowance < MAX_UINT) {
@@ -130,21 +124,13 @@ contract UnlimitedAllowanceToken is ERC20Token {
     }
 }
 
+contract ZRXToken is UnlimitedAllowanceToken {
+    uint8 public constant decimals = 18;
+    uint256 public totalSupply = 10 ** 27; // 1 billion tokens, 18 decimal places
+    string public constant name = "0x Protocol Token";
+    string public constant symbol = "ZRX";
 
-contract ZRXToken is 
-    UnlimitedAllowanceToken
-{
-
-    // solhint-disable const-name-snakecase
-    uint8 constant public decimals = 18;
-    uint256 public totalSupply = 10**27; // 1 billion tokens, 18 decimal places
-    string constant public name = "0x Protocol Token";
-    string constant public symbol = "ZRX";
-    // solhint-enableconst-name-snakecase
-
-    function ZRXToken()
-        public
-    {
+    function ZRXToken() public {
         balances[msg.sender] = totalSupply;
     }
 }

contracts/erc20/contracts/src/interfaces/IERC20Token.sol

@@ -18,70 +18,40 @@
 
 pragma solidity ^0.5.9;
 
-
 contract IERC20Token {
+    event Transfer(address indexed _from, address indexed _to, uint256 _value);
 
-    // solhint-disable no-simple-event-func-name
-    event Transfer(
-        address indexed _from,
-        address indexed _to,
-        uint256 _value
-    );
-
-    event Approval(
-        address indexed _owner,
-        address indexed _spender,
-        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);
+    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);
+    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);
+    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);
+    function totalSupply() external view returns (uint256);
 
     /// @param _owner The address from which the balance will be retrieved
     /// @return Balance of owner
-    function balanceOf(address _owner)
-        external
-        view
-        returns (uint256);
+    function balanceOf(address _owner) external view 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)
-        external
-        view
-        returns (uint256);
+    function allowance(address _owner, address _spender) external view returns (uint256);
 }

contracts/erc20/contracts/src/interfaces/IEtherToken.sol

@@ -20,14 +20,8 @@ pragma solidity ^0.5.9;
 
 import "./IERC20Token.sol";
 
+contract IEtherToken is IERC20Token {
+    function deposit() public payable;
 
-contract IEtherToken is
-    IERC20Token
-{
-    function deposit()
-        public
-        payable;
-    
-    function withdraw(uint256 amount)
-        public;
+    function withdraw(uint256 amount) public;
 }

contracts/erc20/contracts/src/v06/IERC20TokenV06.sol

@@ -19,78 +19,45 @@
 
 pragma solidity ^0.6.5;
 
-
 interface IERC20TokenV06 {
+    event Transfer(address indexed from, address indexed to, uint256 value);
 
-    // solhint-disable no-simple-event-func-name
-    event Transfer(
-        address indexed from,
-        address indexed to,
-        uint256 value
-    );
-
-    event Approval(
-        address indexed owner,
-        address indexed spender,
-        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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    function decimals() external view returns (uint8);
 }

contracts/erc20/contracts/src/v06/IEtherTokenV06.sol

@@ -21,10 +21,7 @@ pragma solidity ^0.6.5;
 
 import "./IERC20TokenV06.sol";
 
-
-interface IEtherTokenV06 is
-    IERC20TokenV06
-{
+interface IEtherTokenV06 is IERC20TokenV06 {
     /// @dev Wrap ether.
     function deposit() external payable;
 

contracts/erc20/contracts/src/v06/LibERC20TokenV06.sol

@@ -23,27 +23,16 @@ import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibBytesV06.sol";
 import "./IERC20TokenV06.sol";
 
-
 library LibERC20TokenV06 {
-    bytes constant private DECIMALS_CALL_DATA = hex"313ce567";
+    bytes private constant DECIMALS_CALL_DATA = hex"313ce567";
 
     /// @dev Calls `IERC20TokenV06(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(
-        IERC20TokenV06 token,
-        address spender,
-        uint256 allowance
-    )
-        internal
-    {
-        bytes memory callData = abi.encodeWithSelector(
-            token.approve.selector,
-            spender,
-            allowance
-        );
+    function compatApprove(IERC20TokenV06 token, address spender, uint256 allowance) internal {
+        bytes memory callData = abi.encodeWithSelector(token.approve.selector, spender, allowance);
         _callWithOptionalBooleanResult(address(token), callData);
     }
 
@@ -53,13 +42,7 @@ library LibERC20TokenV06 {
     /// @param token The address of the token contract.
     /// @param spender The address that receives an allowance.
     /// @param amount The minimum allowance needed.
-    function approveIfBelow(
-        IERC20TokenV06 token,
-        address spender,
-        uint256 amount
-    )
-        internal
-    {
+    function approveIfBelow(IERC20TokenV06 token, address spender, uint256 amount) internal {
         if (token.allowance(address(this), spender) < amount) {
             compatApprove(token, spender, uint256(-1));
         }
@@ -70,18 +53,8 @@ library LibERC20TokenV06 {
     /// @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(
-        IERC20TokenV06 token,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        bytes memory callData = abi.encodeWithSelector(
-            token.transfer.selector,
-            to,
-            amount
-        );
+    function compatTransfer(IERC20TokenV06 token, address to, uint256 amount) internal {
+        bytes memory callData = abi.encodeWithSelector(token.transfer.selector, to, amount);
         _callWithOptionalBooleanResult(address(token), callData);
     }
 
@@ -91,20 +64,8 @@ library LibERC20TokenV06 {
     /// @param from The owner of the tokens.
     /// @param to The address that receives the tokens
     /// @param amount Number of tokens to transfer.
-    function compatTransferFrom(
-        IERC20TokenV06 token,
-        address from,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        bytes memory callData = abi.encodeWithSelector(
-            token.transferFrom.selector,
-            from,
-            to,
-            amount
-        );
+    function compatTransferFrom(IERC20TokenV06 token, address from, address to, uint256 amount) internal {
+        bytes memory callData = abi.encodeWithSelector(token.transferFrom.selector, from, to, amount);
         _callWithOptionalBooleanResult(address(token), callData);
     }
 
@@ -112,11 +73,7 @@ library LibERC20TokenV06 {
     ///      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(IERC20TokenV06 token)
-        internal
-        view
-        returns (uint8 tokenDecimals)
-    {
+    function compatDecimals(IERC20TokenV06 token) internal view returns (uint8 tokenDecimals) {
         tokenDecimals = 18;
         (bool didSucceed, bytes memory resultData) = address(token).staticcall(DECIMALS_CALL_DATA);
         if (didSucceed && resultData.length >= 32) {
@@ -130,17 +87,13 @@ library LibERC20TokenV06 {
     /// @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(IERC20TokenV06 token, address owner, address spender)
-        internal
-        view
-        returns (uint256 allowance_)
-    {
+    function compatAllowance(
+        IERC20TokenV06 token,
+        address owner,
+        address spender
+    ) internal view returns (uint256 allowance_) {
         (bool didSucceed, bytes memory resultData) = address(token).staticcall(
-            abi.encodeWithSelector(
-                token.allowance.selector,
-                owner,
-                spender
-            )
+            abi.encodeWithSelector(token.allowance.selector, owner, spender)
         );
         if (didSucceed && resultData.length >= 32) {
             allowance_ = LibBytesV06.readUint256(resultData, 0);
@@ -152,16 +105,9 @@ library LibERC20TokenV06 {
     /// @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(IERC20TokenV06 token, address owner)
-        internal
-        view
-        returns (uint256 balance)
-    {
+    function compatBalanceOf(IERC20TokenV06 token, address owner) internal view returns (uint256 balance) {
         (bool didSucceed, bytes memory resultData) = address(token).staticcall(
-            abi.encodeWithSelector(
-                token.balanceOf.selector,
-                owner
-            )
+            abi.encodeWithSelector(token.balanceOf.selector, owner)
         );
         if (didSucceed && resultData.length >= 32) {
             balance = LibBytesV06.readUint256(resultData, 0);
@@ -173,12 +119,7 @@ library LibERC20TokenV06 {
     ///      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
-    {
+    function _callWithOptionalBooleanResult(address target, bytes memory callData) private {
         (bool didSucceed, bytes memory resultData) = target.call(callData);
         // Revert if the call reverted.
         if (!didSucceed) {
@@ -188,7 +129,9 @@ library LibERC20TokenV06 {
         // does not return a boolean. Check that it at least contains code.
         if (resultData.length == 0) {
             uint256 size;
-            assembly { size := extcodesize(target) }
+            assembly {
+                size := extcodesize(target)
+            }
             require(size > 0, "invalid token address, contains no code");
             return;
         }

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

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

contracts/erc20/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,17 +17,14 @@
 
 */
 
-pragma solidity ^0.6;
+pragma solidity ^0.8.0;
 
+import "./IERC20TokenV08.sol";
 
-interface IMStable {
+interface IEtherTokenV08 is IERC20TokenV08 {
+    /// @dev Wrap ether.
+    function deposit() external payable;
 
-    function getSwapOutput(
-        address _input,
-        address _output,
-        uint256 _quantity
-    )
-        external
-        view
-        returns (uint256 swapOutput);
+    /// @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/contracts/test/DummyERC20Token.sol

@@ -22,11 +22,7 @@ import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
 import "@0x/contracts-utils/contracts/src/Ownable.sol";
 import "../src/MintableERC20Token.sol";
 
-
-contract DummyERC20Token is
-    Ownable,
-    MintableERC20Token
-{
+contract DummyERC20Token is Ownable, MintableERC20Token {
     using LibSafeMath for uint256;
 
     string public name;
@@ -34,14 +30,7 @@ contract DummyERC20Token is
     uint256 public decimals;
     uint256 public constant MAX_MINT_AMOUNT = 10000000000000000000000;
 
-    constructor (
-        string memory _name,
-        string memory _symbol,
-        uint256 _decimals,
-        uint256 _totalSupply
-    )
-        public
-    {
+    constructor(string memory _name, string memory _symbol, uint256 _decimals, uint256 _totalSupply) public {
         name = _name;
         symbol = _symbol;
         decimals = _decimals;
@@ -52,10 +41,7 @@ contract DummyERC20Token is
     /// @dev Sets the balance of target address
     /// @param _target Address or which balance will be updated
     /// @param _value New balance of target address
-    function setBalance(address _target, uint256 _value)
-        external
-        onlyOwner
-    {
+    function setBalance(address _target, uint256 _value) external onlyOwner {
         uint256 currBalance = balances[_target];
         if (_value < currBalance) {
             _totalSupply = _totalSupply.safeSub(currBalance.safeSub(_value));
@@ -67,13 +53,8 @@ contract DummyERC20Token is
 
     /// @dev Mints new tokens for sender
     /// @param _value Amount of tokens to mint
-    function mint(uint256 _value)
-        external
-    {
-        require(
-            _value <= MAX_MINT_AMOUNT,
-            "VALUE_TOO_LARGE"
-        );
+    function mint(uint256 _value) external {
+        require(_value <= MAX_MINT_AMOUNT, "VALUE_TOO_LARGE");
 
         _mint(msg.sender, _value);
     }

contracts/erc20/contracts/test/DummyMultipleReturnERC20Token.sol

@@ -20,45 +20,23 @@ pragma solidity ^0.5.5;
 
 import "./DummyERC20Token.sol";
 
-
-// solhint-disable no-empty-blocks
-contract DummyMultipleReturnERC20Token is
-    DummyERC20Token
-{
-    constructor (
+contract DummyMultipleReturnERC20Token is DummyERC20Token {
+    constructor(
         string memory _name,
         string memory _symbol,
         uint256 _decimals,
         uint256 _totalSupply
-    )
-        public
-        DummyERC20Token(
-            _name,
-            _symbol,
-            _decimals,
-            _totalSupply
-        )
-    {}
+    ) public DummyERC20Token(_name, _symbol, _decimals, _totalSupply) {}
 
     /// @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
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
+    function transferFrom(address _from, address _to, uint256 _value) external returns (bool) {
+        emit Transfer(_from, _to, _value);
 
-        // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return 64 bytes (equiavalent to true, true)
+        // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return 64 bytes
+        // (equiavalent to true, true)
         assembly {
             mstore(0, 1)
             mstore(32, 1)
@@ -66,4 +44,3 @@ contract DummyMultipleReturnERC20Token is
         }
     }
 }
-

contracts/erc20/contracts/test/DummyNoReturnERC20Token.sol

@@ -20,50 +20,25 @@ pragma solidity ^0.5.5;
 
 import "./DummyERC20Token.sol";
 
-
-// solhint-disable no-empty-blocks
-contract DummyNoReturnERC20Token is
-    DummyERC20Token
-{
-    constructor (
+contract DummyNoReturnERC20Token is DummyERC20Token {
+    constructor(
         string memory _name,
         string memory _symbol,
         uint256 _decimals,
         uint256 _totalSupply
-    )
-        public
-        DummyERC20Token(
-            _name,
-            _symbol,
-            _decimals,
-            _totalSupply
-        )
-    {}
+    ) public DummyERC20Token(_name, _symbol, _decimals, _totalSupply) {}
 
     /// @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
-    function transfer(address _to, uint256 _value)
-        external
-        returns (bool)
-    {
-        require(
-            balances[msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
+    function transfer(address _to, uint256 _value) external returns (bool) {
+        require(balances[msg.sender] >= _value, "ERC20_INSUFFICIENT_BALANCE");
+        require(balances[_to] + _value >= balances[_to], "UINT256_OVERFLOW");
 
         balances[msg.sender] -= _value;
         balances[_to] += _value;
 
-        emit Transfer(
-            msg.sender,
-            _to,
-            _value
-        );
+        emit Transfer(msg.sender, _to, _value);
 
         // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return no data
         assembly {
@@ -75,36 +50,16 @@ contract DummyNoReturnERC20Token is
     /// @param _from The address of the sender
     /// @param _to The address of the recipient
     /// @param _value The amount of token to be transferred
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        require(
-            balances[_from] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            allowed[_from][msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_ALLOWANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
+    function transferFrom(address _from, address _to, uint256 _value) external returns (bool) {
+        require(balances[_from] >= _value, "ERC20_INSUFFICIENT_BALANCE");
+        require(allowed[_from][msg.sender] >= _value, "ERC20_INSUFFICIENT_ALLOWANCE");
+        require(balances[_to] + _value >= balances[_to], "UINT256_OVERFLOW");
 
         balances[_to] += _value;
         balances[_from] -= _value;
         allowed[_from][msg.sender] -= _value;
-    
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
+
+        emit Transfer(_from, _to, _value);
 
         // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return no data
         assembly {
@@ -112,4 +67,3 @@ contract DummyNoReturnERC20Token is
         }
     }
 }
-

contracts/erc20/contracts/test/TestLibERC20Token.sol

@@ -21,9 +21,7 @@ pragma solidity ^0.5.9;
 import "../src/LibERC20Token.sol";
 import "./TestLibERC20TokenTarget.sol";
 
-
 contract TestLibERC20Token {
-
     TestLibERC20TokenTarget public target;
 
     constructor() public {
@@ -36,9 +34,7 @@ contract TestLibERC20Token {
         bytes calldata returnData,
         address spender,
         uint256 allowance
-    )
-        external
-    {
+    ) external {
         target.setBehavior(shouldRevert, revertData, returnData);
         LibERC20Token.approve(address(target), spender, allowance);
     }
@@ -49,9 +45,7 @@ contract TestLibERC20Token {
         bytes calldata returnData,
         address to,
         uint256 amount
-    )
-        external
-    {
+    ) external {
         target.setBehavior(shouldRevert, revertData, returnData);
         LibERC20Token.transfer(address(target), to, amount);
     }
@@ -63,9 +57,7 @@ contract TestLibERC20Token {
         address from,
         address to,
         uint256 amount
-    )
-        external
-    {
+    ) external {
         target.setBehavior(shouldRevert, revertData, returnData);
         LibERC20Token.transferFrom(address(target), from, to, amount);
     }
@@ -74,10 +66,7 @@ contract TestLibERC20Token {
         bool shouldRevert,
         bytes calldata revertData,
         bytes calldata returnData
-    )
-        external
-        returns (uint8)
-    {
+    ) external returns (uint8) {
         target.setBehavior(shouldRevert, revertData, returnData);
         return LibERC20Token.decimals(address(target));
     }

contracts/erc20/contracts/test/TestLibERC20TokenTarget.sol

@@ -18,89 +18,52 @@
 
 pragma solidity ^0.5.9;
 
-
 contract TestLibERC20TokenTarget {
+    event ApproveCalled(address spender, uint256 allowance);
 
-    event ApproveCalled(
-        address spender,
-        uint256 allowance
-    );
+    event TransferCalled(address to, uint256 amount);
 
-    event TransferCalled(
-        address to,
-        uint256 amount
-    );
-
-    event TransferFromCalled(
-        address from,
-        address to,
-        uint256 amount
-    );
+    event TransferFromCalled(address from, address to, uint256 amount);
 
     bool private _shouldRevert;
     bytes private _revertData;
     bytes private _returnData;
 
-    function setBehavior(
-        bool shouldRevert,
-        bytes calldata revertData,
-        bytes calldata returnData
-    )
-        external
-    {
+    function setBehavior(bool shouldRevert, bytes calldata revertData, bytes calldata returnData) external {
         _shouldRevert = shouldRevert;
         _revertData = revertData;
         _returnData = returnData;
     }
 
-    function approve(
-        address spender,
-        uint256 allowance
-    )
-        external
-        returns (bool)
-    {
+    function approve(address spender, uint256 allowance) external returns (bool) {
         emit ApproveCalled(spender, allowance);
         _execute();
     }
 
-    function transfer(
-        address to,
-        uint256 amount
-    )
-        external
-        returns (bool)
-    {
+    function transfer(address to, uint256 amount) external returns (bool) {
         emit TransferCalled(to, amount);
         _execute();
     }
 
-    function transferFrom(
-        address from,
-        address to,
-        uint256 amount
-    )
-        external
-        returns (bool)
-    {
+    function transferFrom(address from, address to, uint256 amount) external returns (bool) {
         emit TransferFromCalled(from, to, amount);
         _execute();
     }
 
-    function decimals()
-        external
-        view
-        returns (uint8)
-    {
+    function decimals() external view returns (uint8) {
         _execute();
     }
 
     function _execute() private view {
         if (_shouldRevert) {
             bytes memory revertData = _revertData;
-            assembly { revert(add(revertData, 0x20), mload(revertData)) }
+            assembly {
+                revert(add(revertData, 0x20), mload(revertData))
+            }
         }
         bytes memory returnData = _returnData;
-        assembly { return(add(returnData, 0x20), mload(returnData)) }
+        assembly {
+            return(add(returnData, 0x20), mload(returnData))
+        }
     }
 }

contracts/erc20/contracts/test/UntransferrableDummyERC20Token.sol

@@ -20,43 +20,19 @@ pragma solidity ^0.5.5;
 
 import "./DummyERC20Token.sol";
 
-
-// solhint-disable no-empty-blocks
-// solhint-disable no-unused-vars
-contract UntransferrableDummyERC20Token is
-    DummyERC20Token
-{
-    constructor (
+contract UntransferrableDummyERC20Token is DummyERC20Token {
+    constructor(
         string memory _name,
         string memory _symbol,
         uint256 _decimals,
         uint256 _totalSupply
-    )
-        public
-        DummyERC20Token(
-            _name,
-            _symbol,
-            _decimals,
-            _totalSupply
-        )
-    {}
+    ) public DummyERC20Token(_name, _symbol, _decimals, _totalSupply) {}
 
     /// @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
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        require(
-            false,
-            "TRANSFER_DISABLED"
-        );
+    function transferFrom(address _from, address _to, uint256 _value) external returns (bool) {
+        require(false, "TRANSFER_DISABLED");
     }
 }
-

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.32",
+    "version": "3.3.57",
     "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",
@@ -23,22 +22,17 @@
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
         "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
-        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "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",
+        "lint": "eslint src test",
+        "fix": "eslint --fix src test",
+        "test:ci": "yarn test",
         "contracts:gen": "contracts-gen generate",
         "contracts:copy": "contracts-gen copy",
-        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
         "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
         "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "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|ZRXToken).json",
+        "abis": "./test/generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IERC20TokenV06|IERC20TokenV08|IEtherToken|IEtherTokenV06|IEtherTokenV08|LibERC20Token|LibERC20TokenV06|LibERC20TokenV08|MintableERC20Token|TestLibERC20Token|TestLibERC20TokenTarget|UnlimitedAllowanceERC20Token|UntransferrableDummyERC20Token|WETH9|WETH9V06|ZRXToken).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -51,38 +45,39 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.0",
-        "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.23",
-        "@0x/contracts-utils": "^4.8.13",
-        "@0x/dev-utils": "^4.2.14",
-        "@0x/sol-compiler": "^4.8.1",
+        "@0x/abi-gen": "^5.8.1",
+        "@0x/contracts-gen": "^2.0.48",
+        "@0x/contracts-test-utils": "^5.4.47",
+        "@0x/contracts-utils": "^4.8.38",
+        "@0x/dev-utils": "^5.0.0",
+        "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.4",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^6.5.3",
-        "@0x/web3-wrapper": "^7.6.5",
+        "@0x/utils": "^7.0.0",
+        "@0x/web3-wrapper": "^8.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
+        "@typescript-eslint/eslint-plugin": "^5.38.0",
+        "@typescript-eslint/parser": "^5.38.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.7.0",
+        "eslint": "^8.23.1",
+        "eslint-config-prettier": "^8.5.0",
+        "ethereum-types": "^3.7.1",
         "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solhint": "^1.4.1",
-        "tslint": "5.11.0",
         "typedoc": "~0.16.11",
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.5.0",
+        "@0x/base-contract": "^7.0.0",
         "ethers": "~4.0.4"
     },
     "publishConfig": {

contracts/erc20/src/artifacts.ts

@@ -15,7 +15,7 @@ export const artifacts = {
     DummyERC20Token: DummyERC20Token as ContractArtifact,
     ERC20Token: ERC20Token as ContractArtifact,
     WETH9: WETH9 as ContractArtifact,
-    ZRXToken: (ZRXToken as any) as ContractArtifact,
+    ZRXToken: ZRXToken as any as ContractArtifact,
     DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
     DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
 };

contracts/erc20/test/artifacts.ts

@@ -11,16 +11,20 @@ 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,
@@ -28,12 +32,16 @@ export const artifacts = {
     MintableERC20Token: MintableERC20Token as ContractArtifact,
     UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact,
     WETH9: WETH9 as ContractArtifact,
-    ZRXToken: (ZRXToken as any) as ContractArtifact,
+    ZRXToken: ZRXToken as any as ContractArtifact,
     IERC20Token: IERC20Token as ContractArtifact,
     IEtherToken: IEtherToken as ContractArtifact,
     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,14 +9,18 @@ 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,16 +15,20 @@
         "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/erc20/tslint.json

@@ -1,6 +0,0 @@
-{
-    "extends": ["@0x/tslint-config"],
-    "rules": {
-        "custom-no-magic-numbers": false
-    }
-}

contracts/test-utils/.eslintrc

@@ -0,0 +1,25 @@
+{
+  "env": {
+      "es2021": true,
+      "node": true
+  },
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  "overrides": [],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+      "project": "./tsconfig.json",
+      "ecmaVersion": "latest",
+      "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint"],
+  "ignorePatterns": [
+      "lib/**/*",
+      "contracts/**/*",
+      "generated-wrappers/**/*",
+      "generated-artifacts/**/*",
+      "test/generated-wrappers/**/*",
+      "test/generated-artifacts/**/*"
+
+  ],
+  "rules": {}
+}

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,221 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "5.4.47",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "5.4.46",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1674517560,
+        "version": "5.4.45",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "5.4.44",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "5.4.43",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1668477029,
+        "version": "5.4.42",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667607537,
+        "version": "5.4.41",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667427402,
+        "version": "5.4.40",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666645023,
+        "version": "5.4.39",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666381417,
+        "version": "5.4.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665531940,
+        "version": "5.4.37",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "5.4.36",
+        "changes": [
+            {
+                "note": "Migrate from TSLint to ESLint and fix linting errors",
+                "pr": 589
+            }
+        ],
+        "timestamp": 1665013355
+    },
+    {
+        "timestamp": 1663786955,
+        "version": "5.4.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662998180,
+        "version": "5.4.34",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662559804,
+        "version": "5.4.33",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662147076,
+        "version": "5.4.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662046042,
+        "version": "5.4.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661462289,
+        "version": "5.4.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661459661,
+        "version": "5.4.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661145612,
+        "version": "5.4.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "5.4.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "5.4.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1659750766,
+        "version": "5.4.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1658950329,
+        "version": "5.4.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1655244958,
         "version": "5.4.23",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,102 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.47 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v5.4.46 - _January 30, 2023_
+
+    * Dependencies updated
+
+## v5.4.45 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v5.4.44 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v5.4.43 - _November 23, 2022_
+
+    * Dependencies updated
+
+## v5.4.42 - _November 15, 2022_
+
+    * Dependencies updated
+
+## v5.4.41 - _November 5, 2022_
+
+    * Dependencies updated
+
+## v5.4.40 - _November 2, 2022_
+
+    * Dependencies updated
+
+## v5.4.39 - _October 24, 2022_
+
+    * Dependencies updated
+
+## v5.4.38 - _October 21, 2022_
+
+    * Dependencies updated
+
+## v5.4.37 - _October 11, 2022_
+
+    * Dependencies updated
+
+## v5.4.36 - _October 5, 2022_
+
+    * Migrate from TSLint to ESLint and fix linting errors (#589)
+
+## v5.4.35 - _September 21, 2022_
+
+    * Dependencies updated
+
+## v5.4.34 - _September 12, 2022_
+
+    * Dependencies updated
+
+## v5.4.33 - _September 7, 2022_
+
+    * Dependencies updated
+
+## v5.4.32 - _September 2, 2022_
+
+    * Dependencies updated
+
+## v5.4.31 - _September 1, 2022_
+
+    * Dependencies updated
+
+## v5.4.30 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v5.4.29 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v5.4.28 - _August 22, 2022_
+
+    * Dependencies updated
+
+## v5.4.27 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v5.4.26 - _August 9, 2022_
+
+    * Dependencies updated
+
+## v5.4.25 - _August 6, 2022_
+
+    * Dependencies updated
+
+## v5.4.24 - _July 27, 2022_
+
+    * Dependencies updated
+
 ## v5.4.23 - _June 14, 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.23",
+    "version": "5.4.47",
     "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": "tslint --format stylish --project tsconfig.lint.json",
-        "fix": "tslint --fix --format stylish --project tsconfig.lint.json",
-        "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"
+        "lint": "eslint src test",
+        "fix": "eslint --fix src test",
+        "test:ci": "yarn test"
     },
     "repository": {
         "type": "git",
@@ -34,28 +29,29 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
     "devDependencies": {
-        "@0x/sol-compiler": "^4.8.1",
-        "@0x/tslint-config": "^4.1.4",
+        "@0x/sol-compiler": "^4.8.2",
+        "@typescript-eslint/eslint-plugin": "^5.38.0",
+        "@typescript-eslint/parser": "^5.38.0",
+        "eslint": "^8.23.1",
+        "eslint-config-prettier": "^8.5.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "tslint": "5.11.0",
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.34",
-        "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.16.0",
-        "@0x/dev-utils": "^4.2.14",
+        "@0x/assert": "^3.0.35",
+        "@0x/base-contract": "^7.0.0",
+        "@0x/contract-addresses": "^8.0.3",
+        "@0x/dev-utils": "^5.0.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",
-        "@0x/sol-coverage": "^4.0.45",
-        "@0x/sol-profiler": "^4.1.35",
-        "@0x/sol-trace": "^3.0.45",
-        "@0x/subproviders": "^6.6.5",
+        "@0x/sol-profiler": "^4.1.36",
+        "@0x/sol-trace": "^3.0.46",
+        "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^6.5.3",
-        "@0x/web3-wrapper": "^7.6.5",
+        "@0x/utils": "^7.0.0",
+        "@0x/web3-wrapper": "^8.0.0",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",
@@ -67,7 +63,7 @@
         "chai-bignumber": "^3.0.0",
         "decimal.js": "^10.2.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.7.0",
+        "ethereum-types": "^3.7.1",
         "ethereumjs-util": "^7.0.10",
         "ethers": "~4.0.4",
         "js-combinatorics": "^0.5.3",

contracts/test-utils/src/assertions.ts

@@ -38,7 +38,7 @@ async function _getGanacheOrGethErrorAsync(ganacheError: string, gethError: stri
 }
 
 async function _getInsufficientFundsErrorMessageAsync(): Promise<string> {
-    return _getGanacheOrGethErrorAsync("sender doesn't have enough funds", 'insufficient funds');
+    return _getGanacheOrGethErrorAsync('insufficient funds for gas * price + value', 'insufficient funds');
 }
 
 async function _getTransactionFailedErrorMessageAsync(): Promise<string> {
@@ -102,9 +102,9 @@ export async function expectTransactionFailedAsync(p: sendTransactionResult, rea
     if (nodeType === undefined) {
         nodeType = await web3Wrapper.getNodeTypeAsync();
     }
+    const rejectionMessageRegex = new RegExp(`^VM Exception while processing transaction: revert ${reason}$`);
     switch (nodeType) {
         case NodeType.Ganache:
-            const rejectionMessageRegex = new RegExp(`^VM Exception while processing transaction: revert ${reason}$`);
             return expect(p).to.be.rejectedWith(rejectionMessageRegex);
         case NodeType.Geth:
             logUtils.warn(

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/lang_utils.ts

@@ -11,9 +11,14 @@ export function shortZip<T1, T2>(a: T1[], b: T2[]): Array<[T1, T2]> {
 /**
  * Replaces the keys in a deeply nested object. Adapted from https://stackoverflow.com/a/39126851
  */
-export function replaceKeysDeep(obj: {}, mapKeys: (key: string) => string | void): _.Dictionary<{}> {
+export function replaceKeysDeep(
+    obj: Record<string, unknown>,
+    mapKeys: (key: string) => string | void,
+): _.Dictionary<Record<string, unknown>> {
     return _.transform(obj, (result, value, key) => {
         const currentKey = mapKeys(key) || key;
-        result[currentKey] = _.isObject(value) ? replaceKeysDeep(value as {}, mapKeys) : (value as {});
+        result[currentKey] = _.isObject(value)
+            ? replaceKeysDeep(value as Record<string, unknown>, mapKeys)
+            : (value as Record<string, unknown>);
     });
 }

contracts/test-utils/src/log_decoder.ts

@@ -35,7 +35,6 @@ export class LogDecoder {
     }
     public decodeLogOrThrow<ArgsType extends DecodedLogArgs>(log: LogEntry): LogWithDecodedArgs<ArgsType> | RawLog {
         const logWithDecodedArgsOrLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
-        // tslint:disable-next-line:no-unnecessary-type-assertion
         if ((logWithDecodedArgsOrLog as LogWithDecodedArgs<ArgsType>).args === undefined) {
             throw new Error(`Unable to decode log: ${JSON.stringify(log)}`);
         }

contracts/test-utils/src/log_utils.ts

@@ -2,8 +2,6 @@ import { LogEntry, LogWithDecodedArgs, TransactionReceiptWithDecodedLogs } from
 
 import { expect } from './chai_setup';
 
-// tslint:disable no-unnecessary-type-assertion
-
 /**
  * Filter logs by event name/type.
  */

contracts/test-utils/src/mocha_blockchain.ts

@@ -8,8 +8,6 @@ import * as process from 'process';
 
 import { provider, providerConfigs, txDefaults, web3Wrapper } from './web3_wrapper';
 
-// tslint:disable: no-namespace only-arrow-functions no-unbound-method max-classes-per-file
-
 export type ISuite = mocha.ISuite;
 export type ISuiteCallbackContext = mocha.ISuiteCallbackContext;
 export type SuiteCallback = (this: ISuiteCallbackContext) => void;
@@ -236,7 +234,7 @@ export const describe = _.assign(mochaDescribe, {
  * Like mocha's `describe()`, but sets up a blockchain environment for you.
  */
 export const blockchainTests: BlockchainContextDefinition = _.assign(
-    function(description: string, callback: BlockchainSuiteCallback): ISuite {
+    function (description: string, callback: BlockchainSuiteCallback): ISuite {
         return defineBlockchainSuite(StandardBlockchainTestsEnvironmentSingleton, description, callback, describe);
     },
     {
@@ -275,7 +273,7 @@ export const blockchainTests: BlockchainContextDefinition = _.assign(
             );
         },
         fork: _.assign(
-            function(description: string, callback: BlockchainSuiteCallback): ISuite | void {
+            function (description: string, callback: BlockchainSuiteCallback): ISuite | void {
                 return defineBlockchainSuite(
                     ForkedBlockchainTestsEnvironmentSingleton,
                     description,
@@ -319,7 +317,7 @@ export const blockchainTests: BlockchainContextDefinition = _.assign(
             },
         ),
         live: _.assign(
-            function(description: string, callback: BlockchainSuiteCallback): ISuite | void {
+            function (description: string, callback: BlockchainSuiteCallback): ISuite | void {
                 return defineBlockchainSuite(
                     LiveBlockchainTestsEnvironmentSingleton,
                     description,
@@ -355,7 +353,7 @@ export const blockchainTests: BlockchainContextDefinition = _.assign(
             },
         ),
         resets: _.assign(
-            function(description: string, callback: BlockchainSuiteCallback): ISuite {
+            function (description: string, callback: BlockchainSuiteCallback): ISuite {
                 return defineResetsBlockchainSuite(
                     StandardBlockchainTestsEnvironmentSingleton,
                     description,
@@ -399,7 +397,7 @@ function defineBlockchainSuite<T>(
     callback: BlockchainSuiteCallback,
     describeCall: ContextDefinitionCallback<T>,
 ): T {
-    return describeCall(description, function(this: ISuiteCallbackContext): void {
+    return describeCall(description, function (this: ISuiteCallbackContext): void {
         callback.call(this, envFactory.create());
     });
 }
@@ -410,7 +408,7 @@ function defineResetsBlockchainSuite<T>(
     callback: BlockchainSuiteCallback,
     describeCall: ContextDefinitionCallback<T>,
 ): T {
-    return describeCall(description, function(this: ISuiteCallbackContext): void {
+    return describeCall(description, function (this: ISuiteCallbackContext): void {
         const env = envFactory.create();
         beforeEach(async () => env.blockchainLifecycle.startAsync());
         afterEach(async () => env.blockchainLifecycle.revertAsync());

contracts/test-utils/src/number_utils.ts

@@ -40,10 +40,7 @@ export function getRandomPortion(total: Numberish): BigNumber {
 export function getRandomFloat(min: Numberish, max: Numberish): BigNumber {
     // Generate a really high precision number between [0, 1]
     const r = new BigNumber(crypto.randomBytes(32).toString('hex'), 16).dividedBy(new BigNumber(2).pow(256).minus(1));
-    return new BigNumber(max)
-        .minus(min)
-        .times(r)
-        .plus(min);
+    return new BigNumber(max).minus(min).times(r).plus(min);
 }
 
 export const FIXED_POINT_BASE = new BigNumber(2).pow(127);
@@ -66,7 +63,7 @@ export function fromFixed(n: Numberish): BigNumber {
  * Converts two decimal numbers to integers with `precision` digits, then returns
  * the absolute difference.
  */
-export function getNumericalDivergence(a: Numberish, b: Numberish, precision: number = 18): number {
+export function getNumericalDivergence(a: Numberish, b: Numberish, precision = 18): number {
     const _a = new BigNumber(a);
     const _b = new BigNumber(b);
     const maxIntegerDigits = Math.max(
@@ -77,16 +74,13 @@ export function getNumericalDivergence(a: Numberish, b: Numberish, precision: nu
         const base = 10 ** (precision - maxIntegerDigits);
         return n.times(base).integerValue(BigNumber.ROUND_DOWN);
     };
-    return _toInteger(_a)
-        .minus(_toInteger(_b))
-        .abs()
-        .toNumber();
+    return _toInteger(_a).minus(_toInteger(_b)).abs().toNumber();
 }
 
 /**
  * Asserts that two numbers are equal up to `precision` digits.
  */
-export function assertRoughlyEquals(actual: Numberish, expected: Numberish, precision: number = 18): void {
+export function assertRoughlyEquals(actual: Numberish, expected: Numberish, precision = 18): void {
     if (getNumericalDivergence(actual, expected, precision) <= 1) {
         return;
     }
@@ -96,16 +90,8 @@ export function assertRoughlyEquals(actual: Numberish, expected: Numberish, prec
 /**
  * Asserts that two numbers are equal with up to `maxError` difference between them.
  */
-export function assertIntegerRoughlyEquals(
-    actual: Numberish,
-    expected: Numberish,
-    maxError: number = 1,
-    msg?: string,
-): void {
-    const diff = new BigNumber(actual)
-        .minus(expected)
-        .abs()
-        .toNumber();
+export function assertIntegerRoughlyEquals(actual: Numberish, expected: Numberish, maxError = 1, msg?: string): void {
+    const diff = new BigNumber(actual).minus(expected).abs().toNumber();
     if (diff <= maxError) {
         return;
     }

contracts/test-utils/src/order_factory.ts

@@ -29,7 +29,7 @@ export class OrderFactory {
             salt: generatePseudoRandomSalt(),
             ...this._defaultOrderParams,
             ...customOrderParams,
-        } as Order; // tslint:disable-line:no-object-literal-type-assertion
+        } as Order;
         const orderHashBuff = orderHashUtils.getOrderHashBuffer(order);
         const signature = signingUtils.signMessage(orderHashBuff, this._privateKey, signatureType);
         const signedOrder = {

contracts/test-utils/src/order_utils.ts

@@ -8,10 +8,7 @@ import { BatchMatchOrder, CancelOrder, MatchOrder } from './types';
 
 export const orderUtils = {
     getPartialAmountFloor(numerator: BigNumber, denominator: BigNumber, target: BigNumber): BigNumber {
-        const partialAmount = numerator
-            .multipliedBy(target)
-            .div(denominator)
-            .integerValue(BigNumber.ROUND_FLOOR);
+        const partialAmount = numerator.multipliedBy(target).div(denominator).integerValue(BigNumber.ROUND_FLOOR);
         return partialAmount;
     },
     createFill: (signedOrder: SignedOrder, takerAssetFillAmount?: BigNumber) => {

contracts/test-utils/src/type_encoding_utils.ts

@@ -9,7 +9,6 @@ export const typeEncodingUtils = {
         const base = 10;
         const formattedValue = new BN(value.toString(base));
         const encodedValue = ethUtil.toBuffer(formattedValue);
-        // tslint:disable-next-line:custom-no-magic-numbers
         const paddedValue = ethUtil.setLengthLeft(encodedValue, constants.WORD_LENGTH);
         return paddedValue;
     },

contracts/test-utils/src/types.ts

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

contracts/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';
 
@@ -15,7 +14,7 @@ export const txDefaults = {
     gasPrice: constants.DEFAULT_GAS_PRICE,
 };
 
-export let providerConfigs: Web3Config = {
+export const providerConfigs: Web3Config = {
     total_accounts: constants.NUM_TEST_ACCOUNTS,
     shouldUseInProcessGanache: true,
     shouldAllowUnlimitedContractSize: true,
@@ -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/test-utils/test/mocha_blockchain.ts

@@ -4,6 +4,7 @@ import * as process from 'process';
 import { expect } from '../src/chai_setup';
 import { constants } from '../src/constants';
 import { blockchainTests, describe } from '../src/mocha_blockchain';
+import { append } from './subtests/mocha_blockchain_1';
 
 blockchainTests('mocha blockchain extensions', env => {
     describe('blockchainTests()', () => {
@@ -12,11 +13,8 @@ blockchainTests('mocha blockchain extensions', env => {
             expect(env.provider).to.exist('');
             expect(env.txDefaults).to.exist('');
             expect(env.web3Wrapper).to.exist('');
-            // HACK(dorothy-zbornak): tslint seems to get confused by these assertions.
-            // tslint:disable: no-unbound-method
             expect(typeof env.getChainIdAsync).to.eq('function');
             expect(typeof env.getAccountAddressesAsync).to.eq('function');
-            // tslint:enable: no-unbound-method
         });
 
         it('initializes the test environment', async () => {
@@ -78,7 +76,7 @@ blockchainTests('mocha blockchain extensions', env => {
         });
 
         describe('subtests', () => {
-            require('./subtests/mocha_blockchain_1').append(env);
+            append(env);
         });
     });
 
@@ -95,8 +93,7 @@ blockchainTests('mocha blockchain extensions', env => {
 
 function createHookedObject(obj: any, handler: (name: string) => void, methods: string[]): any {
     const hookedMethods = _.map(methods, methodName => {
-        // tslint:disable: only-arrow-functions
-        return function(this: any, ...args: any[]): any {
+        return function (this: any, ...args: any[]): any {
             handler(methodName);
             return obj[methodName].call(this, ...args);
         };

contracts/test-utils/test/order_hash_test.ts

@@ -42,7 +42,6 @@ describe('Order hashing', () => {
             // It's common for developers using javascript to provide the amounts
             // as strings. Since we eventually toString() the BigNumber
             // before encoding we should result in the same orderHash in this scenario
-            // tslint:disable-next-line:no-unnecessary-type-assertion
             const orderHash = orderHashUtils.getOrderHashHex({
                 ...order,
                 makerAssetAmount: '0',
@@ -55,7 +54,7 @@ describe('Order hashing', () => {
         it('throws a readable error message if taker format is invalid', async () => {
             const orderWithInvalidtakerFormat = {
                 ...order,
-                takerAddress: (null as any) as string,
+                takerAddress: null as any as string,
             };
             const expectedErrorMessage = `Expected order to conform to schema`;
             expect(() => orderHashUtils.getOrderHashHex(orderWithInvalidtakerFormat)).to.throw(expectedErrorMessage);

contracts/test-utils/test/subtests/mocha_blockchain_1.ts

@@ -1,7 +1,6 @@
 import { expect } from '../../src/chai_setup';
 import { blockchainTests, BlockchainTestsEnvironment } from '../../src/mocha_blockchain';
 
-// tslint:disable: no-default-export completed-docs
 export function append(env: BlockchainTestsEnvironment): void {
     blockchainTests('imported subtests', subtestsEnv => {
         it('shares the same environment object', () => {

contracts/test-utils/test/transaction_hash.ts

@@ -35,7 +35,6 @@ describe('0x transaction hashing', () => {
             // It's common for developers using javascript to provide the amounts
             // as strings. Since we eventually toString() the BigNumber
             // before encoding we should result in the same orderHash in this scenario
-            // tslint:disable-next-line:no-unnecessary-type-assertion
             const transactionHash = transactionHashUtils.getTransactionHashHex({
                 ...transaction,
                 salt: '0',

contracts/test-utils/tsconfig.lint.json

@@ -1,7 +0,0 @@
-{
-    // This file is a workaround that issue: https://github.com/palantir/tslint/issues/4148#issuecomment-419872702
-    "extends": "./tsconfig",
-    "compilerOptions": {
-        "composite": false
-    }
-}

contracts/test-utils/tslint.json

@@ -1,6 +0,0 @@
-{
-    "extends": ["@0x/tslint-config"],
-    "rules": {
-        "custom-no-magic-numbers": false
-    }
-}

contracts/treasury/.eslintrc

@@ -0,0 +1,25 @@
+{
+  "env": {
+      "es2021": true,
+      "node": true
+  },
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  "overrides": [],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+      "project": "./tsconfig.json",
+      "ecmaVersion": "latest",
+      "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint"],
+  "ignorePatterns": [
+      "lib/**/*",
+      "contracts/**/*",
+      "generated-wrappers/**/*",
+      "generated-artifacts/**/*",
+      "test/generated-wrappers/**/*",
+      "test/generated-artifacts/**/*"
+
+  ],
+  "rules": {}
+}

contracts/treasury/CHANGELOG.json

@@ -1,4 +1,230 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "1.4.40",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "1.4.39",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1674517560,
+        "version": "1.4.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "1.4.37",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "1.4.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1668477029,
+        "version": "1.4.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667607537,
+        "version": "1.4.34",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667427402,
+        "version": "1.4.33",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666645023,
+        "version": "1.4.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666381417,
+        "version": "1.4.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665670315,
+        "version": "1.4.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665531940,
+        "version": "1.4.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.4.28",
+        "changes": [
+            {
+                "note": "Migrate from TSLint to ESLint and fix linting errors",
+                "pr": 589
+            }
+        ],
+        "timestamp": 1665013355
+    },
+    {
+        "timestamp": 1663786955,
+        "version": "1.4.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662998180,
+        "version": "1.4.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662559804,
+        "version": "1.4.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662147076,
+        "version": "1.4.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662046042,
+        "version": "1.4.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661462289,
+        "version": "1.4.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661459661,
+        "version": "1.4.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661145612,
+        "version": "1.4.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "1.4.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "1.4.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1659750766,
+        "version": "1.4.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1658950329,
+        "version": "1.4.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1655244958,
         "version": "1.4.15",

contracts/treasury/CHANGELOG.md

@@ -5,6 +5,106 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.4.40 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v1.4.39 - _January 30, 2023_
+
+    * Dependencies updated
+
+## v1.4.38 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v1.4.37 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v1.4.36 - _November 23, 2022_
+
+    * Dependencies updated
+
+## v1.4.35 - _November 15, 2022_
+
+    * Dependencies updated
+
+## v1.4.34 - _November 5, 2022_
+
+    * Dependencies updated
+
+## v1.4.33 - _November 2, 2022_
+
+    * Dependencies updated
+
+## v1.4.32 - _October 24, 2022_
+
+    * Dependencies updated
+
+## v1.4.31 - _October 21, 2022_
+
+    * Dependencies updated
+
+## v1.4.30 - _October 13, 2022_
+
+    * Dependencies updated
+
+## v1.4.29 - _October 11, 2022_
+
+    * Dependencies updated
+
+## v1.4.28 - _October 5, 2022_
+
+    * Migrate from TSLint to ESLint and fix linting errors (#589)
+
+## v1.4.27 - _September 21, 2022_
+
+    * Dependencies updated
+
+## v1.4.26 - _September 12, 2022_
+
+    * Dependencies updated
+
+## v1.4.25 - _September 7, 2022_
+
+    * Dependencies updated
+
+## v1.4.24 - _September 2, 2022_
+
+    * Dependencies updated
+
+## v1.4.23 - _September 1, 2022_
+
+    * Dependencies updated
+
+## v1.4.22 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v1.4.21 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v1.4.20 - _August 22, 2022_
+
+    * Dependencies updated
+
+## v1.4.19 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v1.4.18 - _August 9, 2022_
+
+    * Dependencies updated
+
+## v1.4.17 - _August 6, 2022_
+
+    * Dependencies updated
+
+## v1.4.16 - _July 27, 2022_
+
+    * Dependencies updated
+
 ## v1.4.15 - _June 14, 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/contracts/external/ISablier.sol

@@ -36,7 +36,9 @@ interface ISablier {
 
     function balanceOf(uint256 streamId, address who) external view returns (uint256 balance);
 
-    function getStream(uint256 streamId)
+    function getStream(
+        uint256 streamId
+    )
         external
         view
         returns (
@@ -50,11 +52,15 @@ interface ISablier {
             uint256 ratePerSecond
         );
 
-    function createStream(address recipient, uint256 deposit, address tokenAddress, uint256 startTime, uint256 stopTime)
-        external
-        returns (uint256 streamId);
+    function createStream(
+        address recipient,
+        uint256 deposit,
+        address tokenAddress,
+        uint256 startTime,
+        uint256 stopTime
+    ) external returns (uint256 streamId);
 
     function withdrawFromStream(uint256 streamId, uint256 funds) external returns (bool);
 
     function cancelStream(uint256 streamId) external returns (bool);
-}
+}

contracts/treasury/contracts/src/DefaultPoolOperator.sol

@@ -23,7 +23,6 @@ pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 import "./IStaking.sol";
 
-
 contract DefaultPoolOperator {
     // Immutables
     IStaking public immutable stakingProxy;
@@ -33,12 +32,7 @@ contract DefaultPoolOperator {
     /// @dev Initializes this contract and creates a staking pool.
     /// @param stakingProxy_ The 0x staking proxy contract.
     /// @param weth_ The WETH token contract.
-    constructor(
-        IStaking stakingProxy_,
-        IERC20TokenV06 weth_
-    )
-        public
-    {
+    constructor(IStaking stakingProxy_, IERC20TokenV06 weth_) public {
         stakingProxy = stakingProxy_;
         weth = weth_;
         // operator share = 100%
@@ -51,9 +45,7 @@ contract DefaultPoolOperator {
     ///      market making for some reason, thus earning this contract
     ///      some staking rewards. Note that anyone can call this
     ///      function at any time.
-    function returnStakingRewards()
-        external
-    {
+    function returnStakingRewards() external {
         uint256 wethBalance = weth.balanceOf(address(this));
         weth.transfer(address(stakingProxy), wethBalance);
     }

contracts/treasury/contracts/src/IStaking.sol

@@ -20,7 +20,6 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-
 interface IStaking {
     /// @dev Statuses that stake can exist in.
     ///      Any stake can be (re)delegated effective at the next epoch
@@ -55,45 +54,28 @@ interface IStaking {
     /// @param operatorShare Portion of rewards owned by the operator, in ppm.
     /// @param addOperatorAsMaker Adds operator to the created pool as a maker for convenience iff true.
     /// @return poolId The unique pool id generated for this pool.
-    function createStakingPool(uint32 operatorShare, bool addOperatorAsMaker)
-        external
-        returns (bytes32 poolId);
+    function createStakingPool(uint32 operatorShare, bool addOperatorAsMaker) external returns (bytes32 poolId);
 
     /// @dev Returns the current staking epoch number.
     /// @return epoch The current epoch.
-    function currentEpoch()
-        external
-        view
-        returns (uint256 epoch);
+    function currentEpoch() external view returns (uint256 epoch);
 
     /// @dev Returns the time (in seconds) at which the current staking epoch started.
     /// @return startTime The start time of the current epoch, in seconds.
-    function currentEpochStartTimeInSeconds()
-        external
-        view
-        returns (uint256 startTime);
+    function currentEpochStartTimeInSeconds() external view returns (uint256 startTime);
 
     /// @dev Returns the duration of an epoch in seconds. This value can be updated.
     /// @return duration The duration of an epoch, in seconds.
-    function epochDurationInSeconds()
-        external
-        view
-        returns (uint256 duration);
+    function epochDurationInSeconds() external view returns (uint256 duration);
 
     /// @dev Returns a staking pool
     /// @param poolId Unique id of pool.
-    function getStakingPool(bytes32 poolId)
-        external
-        view
-        returns (Pool memory);
+    function getStakingPool(bytes32 poolId) external view returns (Pool memory);
 
     /// @dev Gets global stake for a given status.
     /// @param stakeStatus UNDELEGATED or DELEGATED
     /// @return balance Global stake for given status.
-    function getGlobalStakeByStatus(StakeStatus stakeStatus)
-        external
-        view
-        returns (StoredBalance memory balance);
+    function getGlobalStakeByStatus(StakeStatus stakeStatus) external view returns (StoredBalance memory balance);
 
     /// @dev Gets an owner's stake balances by status.
     /// @param staker Owner of stake.
@@ -102,26 +84,20 @@ interface IStaking {
     function getOwnerStakeByStatus(
         address staker,
         StakeStatus stakeStatus
-    )
-        external
-        view
-        returns (StoredBalance memory balance);
+    ) external view returns (StoredBalance memory balance);
 
     /// @dev Returns the total stake delegated to a specific staking pool,
     ///      across all members.
     /// @param poolId Unique Id of pool.
     /// @return balance Total stake delegated to pool.
-    function getTotalStakeDelegatedToPool(bytes32 poolId)
-        external
-        view
-        returns (StoredBalance memory balance);
+    function getTotalStakeDelegatedToPool(bytes32 poolId) external view returns (StoredBalance memory balance);
 
     /// @dev Returns the stake delegated to a specific staking pool, by a given staker.
     /// @param staker of stake.
     /// @param poolId Unique Id of pool.
     /// @return balance Stake delegated to pool by staker.
-    function getStakeDelegatedToPoolByOwner(address staker, bytes32 poolId)
-        external
-        view
-        returns (StoredBalance memory balance);
+    function getStakeDelegatedToPoolByOwner(
+        address staker,
+        bytes32 poolId
+    ) external view returns (StoredBalance memory balance);
 }

contracts/treasury/contracts/src/IZrxTreasury.sol

@@ -23,9 +23,7 @@ pragma experimental ABIEncoderV2;
 import "./DefaultPoolOperator.sol";
 import "./IStaking.sol";
 
-
 interface IZrxTreasury {
-
     struct TreasuryParameters {
         uint256 votingPeriod;
         uint256 proposalThreshold;
@@ -57,45 +55,21 @@ interface IZrxTreasury {
         string description
     );
 
-    event VoteCast(
-        address voter,
-        bytes32[] operatedPoolIds,
-        uint256 proposalId,
-        bool support,
-        uint256 votingPower
-    );
+    event VoteCast(address voter, bytes32[] operatedPoolIds, uint256 proposalId, bool support, uint256 votingPower);
 
     event ProposalExecuted(uint256 proposalId);
 
-    function stakingProxy()
-        external
-        view
-        returns (IStaking);
+    function stakingProxy() external view returns (IStaking);
 
-    function defaultPoolOperator()
-        external
-        view
-        returns (DefaultPoolOperator);
+    function defaultPoolOperator() external view returns (DefaultPoolOperator);
 
-    function defaultPoolId()
-        external
-        view
-        returns (bytes32);
+    function defaultPoolId() external view returns (bytes32);
 
-    function votingPeriod()
-        external
-        view
-        returns (uint256);
+    function votingPeriod() external view returns (uint256);
 
-    function proposalThreshold()
-        external
-        view
-        returns (uint256);
+    function proposalThreshold() external view returns (uint256);
 
-    function quorumThreshold()
-        external
-        view
-        returns (uint256);
+    function quorumThreshold() external view returns (uint256);
 
     /// @dev Updates the proposal and quorum thresholds to the given
     ///      values. Note that this function is only callable by the
@@ -103,11 +77,7 @@ interface IZrxTreasury {
     ///      updated via a successful treasury proposal.
     /// @param newProposalThreshold The new value for the proposal threshold.
     /// @param newQuorumThreshold The new value for the quorum threshold.
-    function updateThresholds(
-        uint256 newProposalThreshold,
-        uint256 newQuorumThreshold
-    )
-        external;
+    function updateThresholds(uint256 newProposalThreshold, uint256 newQuorumThreshold) external;
 
     /// @dev Creates a proposal to send ZRX from this treasury on the
     ///      the given actions. Must have at least `proposalThreshold`
@@ -131,9 +101,7 @@ interface IZrxTreasury {
         uint256 executionEpoch,
         string calldata description,
         bytes32[] calldata operatedPoolIds
-    )
-        external
-        returns (uint256 proposalId);
+    ) external returns (uint256 proposalId);
 
     /// @dev Casts a vote for the given proposal. Only callable
     ///      during the voting period for that proposal.
@@ -144,12 +112,7 @@ interface IZrxTreasury {
     /// @param operatedPoolIds The pools operated by `msg.sender`. The
     ///        ZRX currently delegated to those pools will be accounted
     ///        for in the voting power.
-    function castVote(
-        uint256 proposalId,
-        bool support,
-        bytes32[] calldata operatedPoolIds
-    )
-        external;
+    function castVote(uint256 proposalId, bool support, bytes32[] calldata operatedPoolIds) external;
 
     /// @dev Casts a vote for the given proposal, by signature.
     ///      Only callable during the voting period for that proposal.
@@ -170,23 +133,17 @@ interface IZrxTreasury {
         uint8 v,
         bytes32 r,
         bytes32 s
-    )
-        external;
+    ) external;
 
     /// @dev Executes a proposal that has passed and is
     ///      currently executable.
     /// @param proposalId The ID of the proposal to execute.
     /// @param actions Actions associated with the proposal to execute.
-    function execute(uint256 proposalId, ProposedAction[] memory actions)
-        external
-        payable;
+    function execute(uint256 proposalId, ProposedAction[] memory actions) external payable;
 
     /// @dev Returns the total number of proposals.
     /// @return count The number of proposals.
-    function proposalCount()
-        external
-        view
-        returns (uint256 count);
+    function proposalCount() external view returns (uint256 count);
 
     /// @dev Computes the current voting power of the given account.
     ///      Voting power is equal to:
@@ -198,8 +155,8 @@ interface IZrxTreasury {
     ///        ZRX currently delegated to those pools will be accounted
     ///        for in the voting power.
     /// @return votingPower The current voting power of the given account.
-    function getVotingPower(address account, bytes32[] calldata operatedPoolIds)
-        external
-        view
-        returns (uint256 votingPower);
+    function getVotingPower(
+        address account,
+        bytes32[] calldata operatedPoolIds
+    ) external view returns (uint256 votingPower);
 }

contracts/treasury/contracts/src/ZrxTreasury.sol

@@ -26,10 +26,7 @@ import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
 import "@0x/contracts-zero-ex/contracts/src/features/libs/LibSignature.sol";
 import "./IZrxTreasury.sol";
 
-
-contract ZrxTreasury is
-    IZrxTreasury
-{
+contract ZrxTreasury is IZrxTreasury {
     using LibSafeMathV06 for uint256;
     using LibRichErrorsV06 for bytes;
     using LibBytesV06 for bytes;
@@ -41,10 +38,12 @@ contract ZrxTreasury is
     string private constant CONTRACT_VERSION = "1.0.0";
 
     /// The EIP-712 typehash for the contract's domain
-    bytes32 private constant DOMAIN_TYPEHASH = keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");
+    bytes32 private constant DOMAIN_TYPEHASH =
+        keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");
 
     /// The EIP-712 typehash for the vote struct
-    bytes32 private constant VOTE_TYPEHASH = keccak256("TreasuryVote(uint256 proposalId,bool support,bytes32[] operatedPoolIds)");
+    bytes32 private constant VOTE_TYPEHASH =
+        keccak256("TreasuryVote(uint256 proposalId,bool support,bytes32[] operatedPoolIds)");
 
     // Immutables
     IStaking public immutable override stakingProxy;
@@ -58,22 +57,14 @@ contract ZrxTreasury is
 
     // Storage
     Proposal[] public proposals;
-    mapping (uint256 => mapping (address => bool)) public hasVoted;
+    mapping(uint256 => mapping(address => bool)) public hasVoted;
 
     /// @dev Initializes the ZRX treasury and creates the default
     ///      staking pool.
     /// @param stakingProxy_ The 0x staking proxy contract.
     /// @param params Immutable treasury parameters.
-    constructor(
-        IStaking stakingProxy_,
-        TreasuryParameters memory params
-    )
-        public
-    {
-        require(
-            params.votingPeriod < stakingProxy_.epochDurationInSeconds(),
-            "VOTING_PERIOD_TOO_LONG"
-        );
+    constructor(IStaking stakingProxy_, TreasuryParameters memory params) public {
+        require(params.votingPeriod < stakingProxy_.epochDurationInSeconds(), "VOTING_PERIOD_TOO_LONG");
         stakingProxy = stakingProxy_;
         votingPeriod = params.votingPeriod;
         proposalThreshold = params.proposalThreshold;
@@ -92,10 +83,8 @@ contract ZrxTreasury is
         );
     }
 
-    // solhint-disable
     /// @dev Allows this contract to receive ether.
     receive() external payable {}
-    // solhint-enable
 
     /// @dev Updates the proposal and quorum thresholds to the given
     ///      values. Note that this function is only callable by the
@@ -103,13 +92,7 @@ contract ZrxTreasury is
     ///      updated via a successful treasury proposal.
     /// @param newProposalThreshold The new value for the proposal threshold.
     /// @param newQuorumThreshold The new value for the quorum threshold.
-    function updateThresholds(
-        uint256 newProposalThreshold,
-        uint256 newQuorumThreshold
-    )
-        external
-        override
-    {
+    function updateThresholds(uint256 newProposalThreshold, uint256 newQuorumThreshold) external override {
         require(msg.sender == address(this), "updateThresholds/ONLY_SELF");
         proposalThreshold = newProposalThreshold;
         quorumThreshold = newQuorumThreshold;
@@ -137,24 +120,11 @@ contract ZrxTreasury is
         uint256 executionEpoch,
         string memory description,
         bytes32[] memory operatedPoolIds
-    )
-        public
-        override
-        returns (uint256 proposalId)
-    {
-        require(
-            getVotingPower(msg.sender, operatedPoolIds) >= proposalThreshold,
-            "propose/INSUFFICIENT_VOTING_POWER"
-        );
-        require(
-            actions.length > 0,
-            "propose/NO_ACTIONS_PROPOSED"
-        );
+    ) public override returns (uint256 proposalId) {
+        require(getVotingPower(msg.sender, operatedPoolIds) >= proposalThreshold, "propose/INSUFFICIENT_VOTING_POWER");
+        require(actions.length > 0, "propose/NO_ACTIONS_PROPOSED");
         uint256 currentEpoch = stakingProxy.currentEpoch();
-        require(
-            executionEpoch >= currentEpoch + 2,
-            "propose/INVALID_EXECUTION_EPOCH"
-        );
+        require(executionEpoch >= currentEpoch + 2, "propose/INVALID_EXECUTION_EPOCH");
 
         proposalId = proposalCount();
         Proposal storage newProposal = proposals.push();
@@ -162,14 +132,7 @@ contract ZrxTreasury is
         newProposal.executionEpoch = executionEpoch;
         newProposal.voteEpoch = currentEpoch + 2;
 
-        emit ProposalCreated(
-            msg.sender,
-            operatedPoolIds,
-            proposalId,
-            actions,
-            executionEpoch,
-            description
-        );
+        emit ProposalCreated(msg.sender, operatedPoolIds, proposalId, actions, executionEpoch, description);
     }
 
     /// @dev Casts a vote for the given proposal. Only callable
@@ -181,14 +144,7 @@ contract ZrxTreasury is
     /// @param operatedPoolIds The pools operated by `msg.sender`. The
     ///        ZRX currently delegated to those pools will be accounted
     ///        for in the voting power.
-    function castVote(
-        uint256 proposalId,
-        bool support,
-        bytes32[] memory operatedPoolIds
-    )
-        public
-        override
-    {
+    function castVote(uint256 proposalId, bool support, bytes32[] memory operatedPoolIds) public override {
         return _castVote(msg.sender, proposalId, support, operatedPoolIds);
     }
 
@@ -211,10 +167,7 @@ contract ZrxTreasury is
         uint8 v,
         bytes32 r,
         bytes32 s
-    )
-        public
-        override
-    {
+    ) public override {
         bytes32 structHash = keccak256(
             abi.encode(VOTE_TYPEHASH, proposalId, support, keccak256(abi.encodePacked(operatedPoolIds)))
         );
@@ -228,11 +181,7 @@ contract ZrxTreasury is
     ///      currently executable.
     /// @param proposalId The ID of the proposal to execute.
     /// @param actions Actions associated with the proposal to execute.
-    function execute(uint256 proposalId, ProposedAction[] memory actions)
-        public
-        payable
-        override
-    {
+    function execute(uint256 proposalId, ProposedAction[] memory actions) public payable override {
         if (proposalId >= proposalCount()) {
             revert("execute/INVALID_PROPOSAL_ID");
         }
@@ -244,10 +193,7 @@ contract ZrxTreasury is
         for (uint256 i = 0; i != actions.length; i++) {
             ProposedAction memory action = actions[i];
             (bool didSucceed, ) = action.target.call{value: action.value}(action.data);
-            require(
-                didSucceed,
-                "execute/ACTION_EXECUTION_FAILED"
-            );
+            require(didSucceed, "execute/ACTION_EXECUTION_FAILED");
         }
 
         emit ProposalExecuted(proposalId);
@@ -255,12 +201,7 @@ contract ZrxTreasury is
 
     /// @dev Returns the total number of proposals.
     /// @return count The number of proposals.
-    function proposalCount()
-        public
-        override
-        view
-        returns (uint256 count)
-    {
+    function proposalCount() public view override returns (uint256 count) {
         return proposals.length;
     }
 
@@ -274,41 +215,29 @@ contract ZrxTreasury is
     ///        ZRX currently delegated to those pools will be accounted
     ///        for in the voting power.
     /// @return votingPower The current voting power of the given account.
-    function getVotingPower(address account, bytes32[] memory operatedPoolIds)
-        public
-        override
-        view
-        returns (uint256 votingPower)
-    {
-        uint256 delegatedBalance = stakingProxy.getOwnerStakeByStatus(
-            account,
-            IStaking.StakeStatus.DELEGATED
-        ).currentEpochBalance;
-        uint256 balanceDelegatedToDefaultPool = stakingProxy.getStakeDelegatedToPoolByOwner(
-            account,
-            defaultPoolId
-        ).currentEpochBalance;
+    function getVotingPower(
+        address account,
+        bytes32[] memory operatedPoolIds
+    ) public view override returns (uint256 votingPower) {
+        uint256 delegatedBalance = stakingProxy
+            .getOwnerStakeByStatus(account, IStaking.StakeStatus.DELEGATED)
+            .currentEpochBalance;
+        uint256 balanceDelegatedToDefaultPool = stakingProxy
+            .getStakeDelegatedToPoolByOwner(account, defaultPoolId)
+            .currentEpochBalance;
 
         // Voting power for ZRX delegated to the default pool is not diluted,
         // so we double-count the balance delegated to the default pool before
         // dividing by 2.
-        votingPower = delegatedBalance
-            .safeAdd(balanceDelegatedToDefaultPool)
-            .safeDiv(2);
+        votingPower = delegatedBalance.safeAdd(balanceDelegatedToDefaultPool).safeDiv(2);
 
         // Add voting power for operated staking pools.
         for (uint256 i = 0; i != operatedPoolIds.length; i++) {
             for (uint256 j = 0; j != i; j++) {
-                require(
-                    operatedPoolIds[i] != operatedPoolIds[j],
-                    "getVotingPower/DUPLICATE_POOL_ID"
-                );
+                require(operatedPoolIds[i] != operatedPoolIds[j], "getVotingPower/DUPLICATE_POOL_ID");
             }
             IStaking.Pool memory pool = stakingProxy.getStakingPool(operatedPoolIds[i]);
-            require(
-                pool.operator == account,
-                "getVotingPower/POOL_NOT_OPERATED_BY_ACCOUNT"
-            );
+            require(pool.operator == account, "getVotingPower/POOL_NOT_OPERATED_BY_ACCOUNT");
             uint96 stakeDelegatedToPool = stakingProxy
                 .getTotalStakeDelegatedToPool(operatedPoolIds[i])
                 .currentEpochBalance;
@@ -322,25 +251,10 @@ contract ZrxTreasury is
     /// @dev Checks whether the given proposal is executable.
     ///      Reverts if not.
     /// @param proposal The proposal to check.
-    function _assertProposalExecutable(
-        Proposal memory proposal,
-        ProposedAction[] memory actions
-    )
-        private
-        view
-    {
-        require(
-            keccak256(abi.encode(actions)) == proposal.actionsHash,
-            "_assertProposalExecutable/INVALID_ACTIONS"
-        );
-        require(
-            _hasProposalPassed(proposal),
-            "_assertProposalExecutable/PROPOSAL_HAS_NOT_PASSED"
-        );
-        require(
-            !proposal.executed,
-            "_assertProposalExecutable/PROPOSAL_ALREADY_EXECUTED"
-        );
+    function _assertProposalExecutable(Proposal memory proposal, ProposedAction[] memory actions) private view {
+        require(keccak256(abi.encode(actions)) == proposal.actionsHash, "_assertProposalExecutable/INVALID_ACTIONS");
+        require(_hasProposalPassed(proposal), "_assertProposalExecutable/PROPOSAL_HAS_NOT_PASSED");
+        require(!proposal.executed, "_assertProposalExecutable/PROPOSAL_ALREADY_EXECUTED");
         require(
             stakingProxy.currentEpoch() == proposal.executionEpoch,
             "_assertProposalExecutable/CANNOT_EXECUTE_THIS_EPOCH"
@@ -350,11 +264,7 @@ contract ZrxTreasury is
     /// @dev Checks whether the given proposal has passed or not.
     /// @param proposal The proposal to check.
     /// @return hasPassed Whether the proposal has passed.
-    function _hasProposalPassed(Proposal memory proposal)
-        private
-        view
-        returns (bool hasPassed)
-    {
+    function _hasProposalPassed(Proposal memory proposal) private view returns (bool hasPassed) {
         // Proposal is not passed until the vote is over.
         if (!_hasVoteEnded(proposal.voteEpoch)) {
             return false;
@@ -374,11 +284,7 @@ contract ZrxTreasury is
     ///      epoch has ended or not.
     /// @param voteEpoch The epoch at which the vote started.
     /// @return hasEnded Whether the vote has ended.
-    function _hasVoteEnded(uint256 voteEpoch)
-        private
-        view
-        returns (bool hasEnded)
-    {
+    function _hasVoteEnded(uint256 voteEpoch) private view returns (bool hasEnded) {
         uint256 currentEpoch = stakingProxy.currentEpoch();
         if (currentEpoch < voteEpoch) {
             return false;
@@ -388,23 +294,14 @@ contract ZrxTreasury is
         }
         // voteEpoch == currentEpoch
         // Vote ends at currentEpochStartTime + votingPeriod
-        uint256 voteEndTime = stakingProxy
-            .currentEpochStartTimeInSeconds()
-            .safeAdd(votingPeriod);
+        uint256 voteEndTime = stakingProxy.currentEpochStartTimeInSeconds().safeAdd(votingPeriod);
         return block.timestamp > voteEndTime;
     }
 
     /// @dev Casts a vote for the given proposal. Only callable
     ///      during the voting period for that proposal. See
     ///      `getVotingPower` for how voting power is computed.
-    function _castVote(
-        address voter,
-        uint256 proposalId,
-        bool support,
-        bytes32[] memory operatedPoolIds
-    )
-        private
-    {
+    function _castVote(address voter, uint256 proposalId, bool support, bytes32[] memory operatedPoolIds) private {
         if (proposalId >= proposalCount()) {
             revert("_castVote/INVALID_PROPOSAL_ID");
         }
@@ -413,10 +310,7 @@ contract ZrxTreasury is
         }
 
         Proposal memory proposal = proposals[proposalId];
-        if (
-            proposal.voteEpoch != stakingProxy.currentEpoch() ||
-            _hasVoteEnded(proposal.voteEpoch)
-        ) {
+        if (proposal.voteEpoch != stakingProxy.currentEpoch() || _hasVoteEnded(proposal.voteEpoch)) {
             revert("_castVote/VOTING_IS_CLOSED");
         }
 
@@ -426,27 +320,21 @@ contract ZrxTreasury is
         }
 
         if (support) {
-            proposals[proposalId].votesFor = proposals[proposalId].votesFor
-                .safeAdd(votingPower);
+            proposals[proposalId].votesFor = proposals[proposalId].votesFor.safeAdd(votingPower);
         } else {
-            proposals[proposalId].votesAgainst = proposals[proposalId].votesAgainst
-                .safeAdd(votingPower);
+            proposals[proposalId].votesAgainst = proposals[proposalId].votesAgainst.safeAdd(votingPower);
         }
         hasVoted[proposalId][voter] = true;
 
-        emit VoteCast(
-            voter,
-            operatedPoolIds,
-            proposalId,
-            support,
-            votingPower
-        );
+        emit VoteCast(voter, operatedPoolIds, proposalId, support, votingPower);
     }
 
     /// @dev Gets the Ethereum chain id
     function _getChainId() private pure returns (uint256) {
         uint256 chainId;
-        assembly { chainId := chainid() }
+        assembly {
+            chainId := chainid()
+        }
         return chainId;
     }
 }

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.15",
+    "version": "1.4.40",
     "engines": {
         "node": ">=6.12"
     },
@@ -21,12 +21,11 @@
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
         "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
-        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-wrappers/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "test:circleci": "yarn test",
+        "lint": "eslint src test",
+        "fix": "eslint --fix src test",
+        "test:ci": "yarn test",
         "contracts:gen": "contracts-gen generate",
         "contracts:copy": "contracts-gen copy",
-        "lint-contracts": "#solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
         "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
         "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES",
         "publish:private": "yarn build && gitpkg publish"
@@ -46,40 +45,41 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.0",
-        "@0x/contract-addresses": "^6.16.0",
+        "@0x/abi-gen": "^5.8.1",
+        "@0x/contract-addresses": "^8.0.3",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.32",
-        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-erc20": "^3.3.57",
+        "@0x/contracts-gen": "^2.0.48",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.23",
-        "@0x/sol-compiler": "^4.8.1",
+        "@0x/contracts-test-utils": "^5.4.47",
+        "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.4",
         "@types/isomorphic-fetch": "^0.0.35",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/prompts": "^2.0.9",
+        "@typescript-eslint/eslint-plugin": "^5.38.0",
+        "@typescript-eslint/parser": "^5.38.0",
+        "eslint": "^8.23.1",
+        "eslint-config-prettier": "^8.5.0",
         "isomorphic-fetch": "^3.0.0",
         "lodash": "^4.17.11",
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "prompts": "^2.4.0",
         "shx": "^0.2.2",
-        "solhint": "^1.4.1",
-        "tslint": "5.11.0",
         "typedoc": "~0.16.11",
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.5.0",
-        "@0x/protocol-utils": "^11.15.0",
-        "@0x/subproviders": "^6.6.5",
+        "@0x/base-contract": "^7.0.0",
+        "@0x/protocol-utils": "^11.17.6",
+        "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^6.5.3",
-        "@0x/web3-wrapper": "^7.6.5",
-        "ethereum-types": "^3.7.0",
+        "@0x/utils": "^7.0.0",
+        "@0x/web3-wrapper": "^8.0.0",
+        "ethereum-types": "^3.7.1",
         "ethereumjs-util": "^7.0.10"
     },
     "publishConfig": {

contracts/treasury/tslint.json

@@ -1,13 +0,0 @@
-{
-    "extends": ["@0x/tslint-config"],
-    "rules": {
-        "custom-no-magic-numbers": false,
-        "max-file-line-count": false,
-        "no-non-null-assertion": false,
-        "no-unnecessary-type-assertion": false,
-        "number-literal-format": false
-    },
-    "linterOptions": {
-        "exclude": ["src/artifacts.ts", "test/artifacts.ts"]
-    }
-}

contracts/utils/.eslintrc

@@ -0,0 +1,25 @@
+{
+  "env": {
+      "es2021": true,
+      "node": true
+  },
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  "overrides": [],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+      "project": "./tsconfig.json",
+      "ecmaVersion": "latest",
+      "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint"],
+  "ignorePatterns": [
+      "lib/**/*",
+      "contracts/**/*",
+      "generated-wrappers/**/*",
+      "generated-artifacts/**/*",
+      "test/generated-wrappers/**/*",
+      "test/generated-artifacts/**/*"
+
+  ],
+  "rules": {}
+}

contracts/utils/CHANGELOG.json

@@ -1,4 +1,230 @@
 [
+    {
+        "timestamp": 1675210931,
+        "version": "4.8.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1675105183,
+        "version": "4.8.37",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1674517560,
+        "version": "4.8.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1670879498,
+        "version": "4.8.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1669235113,
+        "version": "4.8.34",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1668477029,
+        "version": "4.8.33",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667607537,
+        "version": "4.8.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1667427402,
+        "version": "4.8.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666645023,
+        "version": "4.8.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1666381417,
+        "version": "4.8.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665670315,
+        "version": "4.8.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1665531940,
+        "version": "4.8.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "4.8.26",
+        "changes": [
+            {
+                "note": "Migrate from TSLint to ESLint and fix linting errors",
+                "pr": 589
+            }
+        ],
+        "timestamp": 1665013355
+    },
+    {
+        "timestamp": 1663786955,
+        "version": "4.8.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662998180,
+        "version": "4.8.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662559804,
+        "version": "4.8.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662147076,
+        "version": "4.8.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1662046042,
+        "version": "4.8.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661462289,
+        "version": "4.8.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661459661,
+        "version": "4.8.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1661145612,
+        "version": "4.8.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "4.8.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "4.8.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1659750766,
+        "version": "4.8.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1658950329,
+        "version": "4.8.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1655244958,
         "version": "4.8.13",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,106 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.8.38 - _February 1, 2023_
+
+    * Dependencies updated
+
+## v4.8.37 - _January 30, 2023_
+
+    * Dependencies updated
+
+## v4.8.36 - _January 23, 2023_
+
+    * Dependencies updated
+
+## v4.8.35 - _December 12, 2022_
+
+    * Dependencies updated
+
+## v4.8.34 - _November 23, 2022_
+
+    * Dependencies updated
+
+## v4.8.33 - _November 15, 2022_
+
+    * Dependencies updated
+
+## v4.8.32 - _November 5, 2022_
+
+    * Dependencies updated
+
+## v4.8.31 - _November 2, 2022_
+
+    * Dependencies updated
+
+## v4.8.30 - _October 24, 2022_
+
+    * Dependencies updated
+
+## v4.8.29 - _October 21, 2022_
+
+    * Dependencies updated
+
+## v4.8.28 - _October 13, 2022_
+
+    * Dependencies updated
+
+## v4.8.27 - _October 11, 2022_
+
+    * Dependencies updated
+
+## v4.8.26 - _October 5, 2022_
+
+    * Migrate from TSLint to ESLint and fix linting errors (#589)
+
+## v4.8.25 - _September 21, 2022_
+
+    * Dependencies updated
+
+## v4.8.24 - _September 12, 2022_
+
+    * Dependencies updated
+
+## v4.8.23 - _September 7, 2022_
+
+    * Dependencies updated
+
+## v4.8.22 - _September 2, 2022_
+
+    * Dependencies updated
+
+## v4.8.21 - _September 1, 2022_
+
+    * Dependencies updated
+
+## v4.8.20 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v4.8.19 - _August 25, 2022_
+
+    * Dependencies updated
+
+## v4.8.18 - _August 22, 2022_
+
+    * Dependencies updated
+
+## v4.8.17 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v4.8.16 - _August 9, 2022_
+
+    * Dependencies updated
+
+## v4.8.15 - _August 6, 2022_
+
+    * Dependencies updated
+
+## v4.8.14 - _July 27, 2022_
+
+    * Dependencies updated
+
 ## v4.8.13 - _June 14, 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
 
@@ -63,7 +63,3 @@ yarn lint
 ```bash
 yarn test
 ```
-
-#### Testing options
-
-Contracts testing options like coverage, profiling, revert traces or backing node choosing - are described [here](../TESTING.md).

contracts/utils/contracts/src/D18.sol

@@ -1,248 +0,0 @@
-/*
-
-  Copyright 2019 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.5.16;
-
-
-/// @dev A library for working with 18 digit, base 10 decimals.
-library D18 {
-
-    /// @dev Decimal places for dydx value quantities.
-    uint256 private constant PRECISION = 18;
-    /// @dev 1.0 in base-18 decimal.
-    int256 private constant DECIMAL_ONE = int256(10 ** PRECISION);
-    /// @dev Minimum signed integer value.
-    int256 private constant MIN_INT256_VALUE = int256(0x8000000000000000000000000000000000000000000000000000000000000000);
-
-    /// @dev Return `1.0`
-    function one()
-        internal
-        pure
-        returns (int256 r)
-    {
-        r = DECIMAL_ONE;
-    }
-
-    /// @dev Add two decimals.
-    function add(int256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        r = _add(a, b);
-    }
-
-    /// @dev Add two decimals.
-    function add(uint256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), b);
-    }
-
-    /// @dev Add two decimals.
-    function add(int256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(a, int256(b));
-    }
-
-    /// @dev Add two decimals.
-    function add(uint256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), int256(b));
-    }
-
-    /// @dev Subract two decimals.
-    function sub(int256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        r = _add(a, -b);
-    }
-
-    /// @dev Subract two decimals.
-    function sub(uint256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), -b);
-    }
-
-    /// @dev Subract two decimals.
-    function sub(uint256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _add(int256(a), -int256(b));
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(int256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        r = _div(_mul(a, b), DECIMAL_ONE);
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(uint256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), b), DECIMAL_ONE);
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(int256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(a, int256(b)), DECIMAL_ONE);
-    }
-
-    /// @dev Multiply two decimals.
-    function mul(uint256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), int256(b)), DECIMAL_ONE);
-    }
-
-    /// @dev Divide two decimals.
-    function div(int256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        r = _div(_mul(a, DECIMAL_ONE), b);
-    }
-
-    /// @dev Divide two decimals.
-    function div(uint256 a, int256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), DECIMAL_ONE), b);
-    }
-
-    /// @dev Divide two decimals.
-    function div(int256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(a, DECIMAL_ONE), int256(b));
-    }
-
-    /// @dev Divide two decimals.
-    function div(uint256 a, uint256 b)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        require(int256(b) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = _div(_mul(int256(a), DECIMAL_ONE), int256(b));
-    }
-
-    /// @dev Safely convert an unsigned integer into a signed integer.
-    function toSigned(uint256 a)
-        internal
-        pure
-        returns (int256 r)
-    {
-        require(int256(a) >= 0, "D18/DECIMAL_VALUE_TOO_BIG");
-        r = int256(a);
-    }
-
-    /// @dev Clip a signed value to be positive.
-    function clip(int256 a)
-        internal
-        pure
-        returns (int256 r)
-    {
-        r = a < 0 ? 0 : a;
-    }
-
-    /// @dev Safely multiply two signed integers.
-    function _mul(int256 a, int256 b)
-        private
-        pure
-        returns (int256 r)
-    {
-        if (a == 0 || b == 0) {
-            return 0;
-        }
-        r = a * b;
-        require(r / a == b && r / b == a, "D18/DECIMAL_MUL_OVERFLOW");
-        return r;
-    }
-
-    /// @dev Safely divide two signed integers.
-    function _div(int256 a, int256 b)
-        private
-        pure
-        returns (int256 r)
-    {
-        require(b != 0, "D18/DECIMAL_DIV_BY_ZERO");
-        require(a != MIN_INT256_VALUE || b != -1, "D18/DECIMAL_DIV_OVERFLOW");
-        r = a / b;
-    }
-
-    /// @dev Safely add two signed integers.
-    function _add(int256 a, int256 b)
-        private
-        pure
-        returns (int256 r)
-    {
-        r = a + b;
-        require(
-            !((a < 0 && b < 0 && r > a) || (a > 0 && b > 0 && r < a)),
-            "D18/DECIMAL_ADD_OVERFLOW"
-        );
-    }
-
-}

contracts/utils/contracts/src/DeploymentConstants.sol

@@ -1,323 +0,0 @@
-/*
-
-  Copyright 2020 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.5.9;
-
-
-contract DeploymentConstants {
-
-    // solhint-disable separate-by-one-line-in-contract
-
-    // Mainnet addresses ///////////////////////////////////////////////////////
-    /// @dev Mainnet address of the WETH contract.
-    address constant private WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
-    /// @dev Mainnet address of the KyberNetworkProxy contract.
-    address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x9AAb3f75489902f3a48495025729a0AF77d4b11e;
-    /// @dev Mainnet address of the KyberHintHandler contract.
-    address constant private KYBER_HINT_HANDLER_ADDRESS = 0xa1C0Fa73c39CFBcC11ec9Eb1Afc665aba9996E2C;
-    /// @dev Mainnet address of the `UniswapExchangeFactory` contract.
-    address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95;
-    /// @dev Mainnet address of the `UniswapV2Router01` contract.
-    address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
-    address constant private ETH2DAI_ADDRESS = 0x794e6e91555438aFc3ccF1c5076A74F42133d08D;
-    /// @dev Mainnet address of the `ERC20BridgeProxy` contract
-    address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0x8ED95d1746bf1E4dAb58d8ED4724f1Ef95B20Db0;
-    ///@dev Mainnet address of the `Dai` (multi-collateral) contract
-    address constant private DAI_ADDRESS = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
-    /// @dev Mainnet address of the `Chai` contract
-    address constant private CHAI_ADDRESS = 0x06AF07097C9Eeb7fD685c692751D5C66dB49c215;
-    /// @dev Mainnet address of the 0x DevUtils contract.
-    address constant private DEV_UTILS_ADDRESS = 0x74134CF88b21383713E096a5ecF59e297dc7f547;
-    /// @dev Kyber ETH pseudo-address.
-    address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    /// @dev Mainnet address of the dYdX contract.
-    address constant private DYDX_ADDRESS = 0x1E0447b19BB6EcFdAe1e4AE1694b0C3659614e4e;
-    /// @dev Mainnet address of the GST2 contract
-    address constant private GST_ADDRESS = 0x0000000000b3F879cb30FE243b4Dfee438691c04;
-    /// @dev Mainnet address of the GST Collector
-    address constant private GST_COLLECTOR_ADDRESS = 0x000000D3b08566BE75A6DB803C03C85C0c1c5B96;
-    /// @dev Mainnet address of the mStable mUSD contract.
-    address constant private MUSD_ADDRESS = 0xe2f2a5C287993345a840Db3B0845fbC70f5935a5;
-    /// @dev Mainnet address of the Mooniswap Registry contract
-    address constant private MOONISWAP_REGISTRY = 0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303;
-    /// @dev Mainnet address of the DODO Registry (ZOO) contract
-    address constant private DODO_REGISTRY = 0x3A97247DF274a17C59A3bd12735ea3FcDFb49950;
-    /// @dev Mainnet address of the DODO Helper contract
-    address constant private DODO_HELPER = 0x533dA777aeDCE766CEAe696bf90f8541A4bA80Eb;
-
-    // // Ropsten addresses ///////////////////////////////////////////////////////
-    // /// @dev Mainnet address of the WETH contract.
-    // address constant private WETH_ADDRESS = 0xc778417E063141139Fce010982780140Aa0cD5Ab;
-    // /// @dev Mainnet address of the KyberNetworkProxy contract.
-    // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0xd719c34261e099Fdb33030ac8909d5788D3039C4;
-    // /// @dev Mainnet address of the `UniswapExchangeFactory` contract.
-    // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0x9c83dCE8CA20E9aAF9D3efc003b2ea62aBC08351;
-    // /// @dev Mainnet address of the `UniswapV2Router01` contract.
-    // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    // /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
-    // address constant private ETH2DAI_ADDRESS = address(0);
-    // /// @dev Mainnet address of the `ERC20BridgeProxy` contract
-    // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xb344afeD348de15eb4a9e180205A2B0739628339;
-    // ///@dev Mainnet address of the `Dai` (multi-collateral) contract
-    // address constant private DAI_ADDRESS = address(0);
-    // /// @dev Mainnet address of the `Chai` contract
-    // address constant private CHAI_ADDRESS = address(0);
-    // /// @dev Mainnet address of the 0x DevUtils contract.
-    // address constant private DEV_UTILS_ADDRESS = 0xC812AF3f3fBC62F76ea4262576EC0f49dB8B7f1c;
-    // /// @dev Kyber ETH pseudo-address.
-    // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    // /// @dev Mainnet address of the dYdX contract.
-    // address constant private DYDX_ADDRESS = address(0);
-    // /// @dev Mainnet address of the GST2 contract
-    // address constant private GST_ADDRESS = address(0);
-    // /// @dev Mainnet address of the GST Collector
-    // address constant private GST_COLLECTOR_ADDRESS = address(0);
-    // /// @dev Mainnet address of the mStable mUSD contract.
-    // address constant private MUSD_ADDRESS = 0x4E1000616990D83e56f4b5fC6CC8602DcfD20459;
-
-    // // Rinkeby addresses ///////////////////////////////////////////////////////
-    // /// @dev Mainnet address of the WETH contract.
-    // address constant private WETH_ADDRESS = 0xc778417E063141139Fce010982780140Aa0cD5Ab;
-    // /// @dev Mainnet address of the KyberNetworkProxy contract.
-    // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x0d5371e5EE23dec7DF251A8957279629aa79E9C5;
-    // /// @dev Mainnet address of the `UniswapExchangeFactory` contract.
-    // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xf5D915570BC477f9B8D6C0E980aA81757A3AaC36;
-    // /// @dev Mainnet address of the `UniswapV2Router01` contract.
-    // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    // /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
-    // address constant private ETH2DAI_ADDRESS = address(0);
-    // /// @dev Mainnet address of the `ERC20BridgeProxy` contract
-    // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xA2AA4bEFED748Fba27a3bE7Dfd2C4b2c6DB1F49B;
-    // ///@dev Mainnet address of the `Dai` (multi-collateral) contract
-    // address constant private DAI_ADDRESS = address(0);
-    // /// @dev Mainnet address of the `Chai` contract
-    // address constant private CHAI_ADDRESS = address(0);
-    // /// @dev Mainnet address of the 0x DevUtils contract.
-    // address constant private DEV_UTILS_ADDRESS = 0x46B5BC959e8A754c0256FFF73bF34A52Ad5CdfA9;
-    // /// @dev Kyber ETH pseudo-address.
-    // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    // /// @dev Mainnet address of the dYdX contract.
-    // address constant private DYDX_ADDRESS = address(0);
-    // /// @dev Mainnet address of the GST2 contract
-    // address constant private GST_ADDRESS = address(0);
-    // /// @dev Mainnet address of the GST Collector
-    // address constant private GST_COLLECTOR_ADDRESS = address(0);
-    // /// @dev Mainnet address of the mStable mUSD contract.
-    // address constant private MUSD_ADDRESS = address(0);
-
-    // // Kovan addresses /////////////////////////////////////////////////////////
-    // /// @dev Kovan address of the WETH contract.
-    // address constant private WETH_ADDRESS = 0xd0A1E359811322d97991E03f863a0C30C2cF029C;
-    // /// @dev Kovan address of the KyberNetworkProxy contract.
-    // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x692f391bCc85cefCe8C237C01e1f636BbD70EA4D;
-    // /// @dev Kovan address of the `UniswapExchangeFactory` contract.
-    // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xD3E51Ef092B2845f10401a0159B2B96e8B6c3D30;
-    // /// @dev Kovan address of the `UniswapV2Router01` contract.
-    // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a;
-    // /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract.
-    // address constant private ETH2DAI_ADDRESS = 0xe325acB9765b02b8b418199bf9650972299235F4;
-    // /// @dev Kovan address of the `ERC20BridgeProxy` contract
-    // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0x3577552C1Fb7A44aD76BeEB7aB53251668A21F8D;
-    // /// @dev Kovan address of the `Chai` contract
-    // address constant private CHAI_ADDRESS = address(0);
-    // /// @dev Kovan address of the `Dai` (multi-collateral) contract
-    // address constant private DAI_ADDRESS = 0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa;
-    // /// @dev Kovan address of the 0x DevUtils contract.
-    // address constant private DEV_UTILS_ADDRESS = 0x9402639A828BdF4E9e4103ac3B69E1a6E522eB59;
-    // /// @dev Kyber ETH pseudo-address.
-    // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    // /// @dev Kovan address of the dYdX contract.
-    // address constant private DYDX_ADDRESS = address(0);
-    // /// @dev Kovan address of the GST2 contract
-    // address constant private GST_ADDRESS = address(0);
-    // /// @dev Kovan address of the GST Collector
-    // address constant private GST_COLLECTOR_ADDRESS = address(0);
-    // /// @dev Mainnet address of the mStable mUSD contract.
-    // address constant private MUSD_ADDRESS = address(0);
-
-    /// @dev Overridable way to get the `KyberNetworkProxy` address.
-    /// @return kyberAddress The `IKyberNetworkProxy` address.
-    function _getKyberNetworkProxyAddress()
-        internal
-        view
-        returns (address kyberAddress)
-    {
-        return KYBER_NETWORK_PROXY_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the `KyberHintHandler` address.
-    /// @return kyberAddress The `IKyberHintHandler` address.
-    function _getKyberHintHandlerAddress()
-        internal
-        view
-        returns (address hintHandlerAddress)
-    {
-        return KYBER_HINT_HANDLER_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the WETH address.
-    /// @return wethAddress The WETH address.
-    function _getWethAddress()
-        internal
-        view
-        returns (address wethAddress)
-    {
-        return WETH_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the `UniswapExchangeFactory` address.
-    /// @return uniswapAddress The `UniswapExchangeFactory` address.
-    function _getUniswapExchangeFactoryAddress()
-        internal
-        view
-        returns (address uniswapAddress)
-    {
-        return UNISWAP_EXCHANGE_FACTORY_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the `UniswapV2Router01` address.
-    /// @return uniswapRouterAddress The `UniswapV2Router01` address.
-    function _getUniswapV2Router01Address()
-        internal
-        view
-        returns (address uniswapRouterAddress)
-    {
-        return UNISWAP_V2_ROUTER_01_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the Eth2Dai `MatchingMarket` contract.
-    /// @return eth2daiAddress The Eth2Dai `MatchingMarket` contract.
-    function _getEth2DaiAddress()
-        internal
-        view
-        returns (address eth2daiAddress)
-    {
-        return ETH2DAI_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the `ERC20BridgeProxy` contract.
-    /// @return erc20BridgeProxyAddress The `ERC20BridgeProxy` contract.
-    function _getERC20BridgeProxyAddress()
-        internal
-        view
-        returns (address erc20BridgeProxyAddress)
-    {
-        return ERC20_BRIDGE_PROXY_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the `Dai` contract.
-    /// @return daiAddress The `Dai` contract.
-    function _getDaiAddress()
-        internal
-        view
-        returns (address daiAddress)
-    {
-        return DAI_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the `Chai` contract.
-    /// @return chaiAddress The `Chai` contract.
-    function _getChaiAddress()
-        internal
-        view
-        returns (address chaiAddress)
-    {
-        return CHAI_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the 0x `DevUtils` contract address.
-    /// @return devUtils The 0x `DevUtils` contract address.
-    function _getDevUtilsAddress()
-        internal
-        view
-        returns (address devUtils)
-    {
-        return DEV_UTILS_ADDRESS;
-    }
-
-    /// @dev Overridable way to get the DyDx contract.
-    /// @return exchange The DyDx exchange contract.
-    function _getDydxAddress()
-        internal
-        view
-        returns (address dydxAddress)
-    {
-        return DYDX_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the GST2 contract address.
-    /// @return gst The GST contract.
-    function _getGstAddress()
-        internal
-        view
-        returns (address gst)
-    {
-        return GST_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the GST Collector address.
-    /// @return collector The GST collector address.
-    function _getGstCollectorAddress()
-        internal
-        view
-        returns (address collector)
-    {
-        return GST_COLLECTOR_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the mStable mUSD address.
-    /// @return musd The mStable mUSD address.
-    function _getMUsdAddress()
-        internal
-        view
-        returns (address musd)
-    {
-        return MUSD_ADDRESS;
-    }
-
-    /// @dev An overridable way to retrieve the Mooniswap registry address.
-    /// @return registry The Mooniswap registry address.
-    function _getMooniswapAddress()
-        internal
-        view
-        returns (address)
-    {
-        return MOONISWAP_REGISTRY;
-    }
-
-    /// @dev An overridable way to retrieve the DODO Registry contract address.
-    /// @return registry The DODO Registry contract address.
-    function _getDODORegistryAddress()
-        internal
-        view
-        returns (address)
-    {
-        return DODO_REGISTRY;
-    }
-
-    /// @dev An overridable way to retrieve the DODO Helper contract address.
-    /// @return registry The DODO Helper contract address.
-    function _getDODOHelperAddress()
-        internal
-        view
-        returns (address)
-    {
-        return DODO_HELPER;
-    }
-}

contracts/utils/contracts/src/LibAddress.sol

@@ -1,47 +0,0 @@
-/*
-
-  Copyright 2019 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.5.9;
-
-
-/**
- * Utility library of inline functions on addresses
- */
-library LibAddress {
-
-    /**
-     * Returns whether the target address is a contract
-     * @dev This function will return false if invoked during the constructor of a contract,
-     * as the code is not actually created until after the constructor finishes.
-     * @param account address of the account to check
-     * @return whether the target address is a contract
-     */
-    function isContract(address account) internal view returns (bool) {
-        uint256 size;
-        // XXX Currently there is no better way to check if there is a contract in an address
-        // than to check the size of the code at that address.
-        // See https://ethereum.stackexchange.com/a/14016/36603
-        // for more details about how this works.
-        // TODO Check this again before the Serenity release, because all addresses will be
-        // contracts then.
-        // solium-disable-next-line security/no-inline-assembly
-        assembly { size := extcodesize(account) }
-        return size > 0;
-    }
-
-}

contracts/utils/contracts/src/LibAddressArray.sol

@@ -1,163 +0,0 @@
-/*
-
-  Copyright 2019 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.5.9;
-
-import "./LibAddressArrayRichErrors.sol";
-import "./LibBytes.sol";
-import "./LibRichErrors.sol";
-
-
-library LibAddressArray {
-
-    /// @dev Append a new address to an array of addresses.
-    ///      The `addressArray` may need to be reallocated to make space
-    ///      for the new address. Because of this we return the resulting
-    ///      memory location of `addressArray`.
-    /// @param addressArray Array of addresses.
-    /// @param addressToAppend  Address to append.
-    /// @return Array of addresses: [... addressArray, addressToAppend]
-    function append(address[] memory addressArray, address addressToAppend)
-        internal
-        pure
-        returns (address[] memory)
-    {
-        // Get stats on address array and free memory
-        uint256 freeMemPtr = 0;
-        uint256 addressArrayBeginPtr = 0;
-        uint256 addressArrayEndPtr = 0;
-        uint256 addressArrayLength = addressArray.length;
-        uint256 addressArrayMemSizeInBytes = 32 + (32 * addressArrayLength);
-        assembly {
-            freeMemPtr := mload(0x40)
-            addressArrayBeginPtr := addressArray
-            addressArrayEndPtr := add(addressArray, addressArrayMemSizeInBytes)
-        }
-
-        // Cases for `freeMemPtr`:
-        //  `freeMemPtr` == `addressArrayEndPtr`: Nothing occupies memory after `addressArray`
-        //  `freeMemPtr` > `addressArrayEndPtr`: Some value occupies memory after `addressArray`
-        //  `freeMemPtr` < `addressArrayEndPtr`: Memory has not been managed properly.
-        if (freeMemPtr < addressArrayEndPtr) {
-            LibRichErrors.rrevert(LibAddressArrayRichErrors.MismanagedMemoryError(
-                freeMemPtr,
-                addressArrayEndPtr
-            ));
-        }
-
-        // If free memory begins at the end of `addressArray`
-        // then we can append `addressToAppend` directly.
-        // Otherwise, we must copy the array to free memory
-        // before appending new values to it.
-        if (freeMemPtr > addressArrayEndPtr) {
-            LibBytes.memCopy(freeMemPtr, addressArrayBeginPtr, addressArrayMemSizeInBytes);
-            assembly {
-                addressArray := freeMemPtr
-                addressArrayBeginPtr := addressArray
-            }
-        }
-
-        // Append `addressToAppend`
-        addressArrayLength += 1;
-        addressArrayMemSizeInBytes += 32;
-        addressArrayEndPtr = addressArrayBeginPtr + addressArrayMemSizeInBytes;
-        freeMemPtr = addressArrayEndPtr;
-        assembly {
-            // Store new array length
-            mstore(addressArray, addressArrayLength)
-
-            // Update `freeMemPtr`
-            mstore(0x40, freeMemPtr)
-        }
-        addressArray[addressArrayLength - 1] = addressToAppend;
-        return addressArray;
-    }
-
-    /// @dev Checks if an address array contains the target address.
-    /// @param addressArray Array of addresses.
-    /// @param target Address to search for in array.
-    /// @return True if the addressArray contains the target.
-    function contains(address[] memory addressArray, address target)
-        internal
-        pure
-        returns (bool success)
-    {
-        assembly {
-
-            // Calculate byte length of array
-            let arrayByteLen := mul(mload(addressArray), 32)
-            // Calculate beginning of array contents
-            let arrayContentsStart := add(addressArray, 32)
-            // Calclulate end of array contents
-            let arrayContentsEnd := add(arrayContentsStart, arrayByteLen)
-
-            // Loop through array
-            for {let i:= arrayContentsStart} lt(i, arrayContentsEnd) {i := add(i, 32)} {
-
-                // Load array element
-                let arrayElement := mload(i)
-
-                // Return true if array element equals target
-                if eq(target, arrayElement) {
-                    // Set success to true
-                    success := 1
-                    // Break loop
-                    i := arrayContentsEnd
-                }
-            }
-        }
-        return success;
-    }
-
-    /// @dev Finds the index of an address within an array.
-    /// @param addressArray Array of addresses.
-    /// @param target Address to search for in array.
-    /// @return Existence and index of the target in the array.
-    function indexOf(address[] memory addressArray, address target)
-        internal
-        pure
-        returns (bool success, uint256 index)
-    {
-        assembly {
-
-            // Calculate byte length of array
-            let arrayByteLen := mul(mload(addressArray), 32)
-            // Calculate beginning of array contents
-            let arrayContentsStart := add(addressArray, 32)
-            // Calclulate end of array contents
-            let arrayContentsEnd := add(arrayContentsStart, arrayByteLen)
-
-            // Loop through array
-            for {let i:= arrayContentsStart} lt(i, arrayContentsEnd) {i := add(i, 32)} {
-
-                // Load array element
-                let arrayElement := mload(i)
-
-                // Return true if array element equals target
-                if eq(target, arrayElement) {
-                    // Set success and index
-                    success := 1
-                    index := div(sub(i, arrayContentsStart), 32)
-                    // Break loop
-                    i := arrayContentsEnd
-                }
-            }
-        }
-        return (success, index);
-    }
-}

contracts/utils/contracts/src/LibAddressArrayRichErrors.sol

@@ -1,43 +0,0 @@
-/*
-
-  Copyright 2019 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.5.9;
-
-
-library LibAddressArrayRichErrors {
-
-    // bytes4(keccak256("MismanagedMemoryError(uint256,uint256)"))
-    bytes4 internal constant MISMANAGED_MEMORY_ERROR_SELECTOR =
-        0x5fc83722;
-
-    // solhint-disable func-name-mixedcase
-    function MismanagedMemoryError(
-        uint256 freeMemPtr,
-        uint256 addressArrayEndPtr
-    )
-        internal
-        pure
-        returns (bytes memory)
-    {
-        return abi.encodeWithSelector(
-            MISMANAGED_MEMORY_ERROR_SELECTOR,
-            freeMemPtr,
-            addressArrayEndPtr
-        );
-    }
-}