add debridge support

2022-08-16 11:07:09 -04:00 · 2022-08-11 17:39:44 -04:00
52 changed files with 2340 additions and 7194 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,27 +1,17 @@
 version: 2.1

-parameters:
-    cache_version:
-        type: string
-        default: v4
-
 jobs:
    build:
        resource_class: xlarge
        docker:
            - image: node:16
        environment:
-            NODE_OPTIONS: "--max-old-space-size=16384"
+            NODE_OPTIONS: '--max-old-space-size=16384'
+        working_directory: ~/repo
        steps:
            - checkout
            - run: git submodule update --init --recursive
            - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
-            - restore_cache:
-                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
            - run:
                  name: install-yarn
                  command: npm install --force --global yarn@1.22.0
@@ -29,176 +19,88 @@ jobs:
                  name: yarn
                  command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
            - setup_remote_docker
-            - run: yarn build:ci
+            - run: yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci
            - save_cache:
-                  key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+                  key: repo-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
-                      - ~/project/contracts/erc20/node_modules
-                      - ~/project/contracts/test-utils/node_modules
-                      - ~/project/contracts/treasury/node_modules
-                      - ~/project/contracts/utils/node_modules
-                      - ~/project/contracts/zero-ex/node_modules
-                      - ~/project/node_modules
-                      - ~/project/packages/asset-swapper/node_modules
-                      - ~/project/packages/contract-addresses/node_modules
-                      - ~/project/packages/contract-artifacts/node_modules
-                      - ~/project/packages/contract-wrappers/node_modules
-                      - ~/project/packages/protocol-utils/node_modules
-                      - ~/.cache/yarn
-            - save_cache:
-                  key: lib-{{ .Environment.CIRCLE_BRANCH }}
-                  paths:
-                      - ~/project/contracts/erc20/generated-artifacts/
-                      - ~/project/contracts/erc20/generated-wrappers/
-                      - ~/project/contracts/erc20/lib/
-                      - ~/project/contracts/erc20/test/generated-artifacts/
-                      - ~/project/contracts/erc20/test/generated-wrappers/
-                      - ~/project/contracts/test-utils/lib/
-                      - ~/project/contracts/treasury/generated-artifacts/
-                      - ~/project/contracts/treasury/generated-wrappers/
-                      - ~/project/contracts/treasury/lib/
-                      - ~/project/contracts/treasury/test/generated-artifacts/
-                      - ~/project/contracts/treasury/test/generated-wrappers/
-                      - ~/project/contracts/utils/generated-artifacts/
-                      - ~/project/contracts/utils/generated-wrappers/
-                      - ~/project/contracts/utils/lib/
-                      - ~/project/contracts/utils/test/generated-artifacts/
-                      - ~/project/contracts/utils/test/generated-wrappers/
-                      - ~/project/contracts/zero-ex/generated-artifacts/
-                      - ~/project/contracts/zero-ex/generated-wrappers/
-                      - ~/project/contracts/zero-ex/lib/
-                      - ~/project/contracts/zero-ex/test/generated-artifacts/
-                      - ~/project/contracts/zero-ex/test/generated-wrappers/
-                      - ~/project/packages/contract-addresses/lib/
-                      - ~/project/packages/contract-artifacts/lib/
-                      - ~/project/packages/contract-wrappers/lib/
-                      - ~/project/packages/protocol-utils/lib/
+                      - ~/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: xlarge
+        resource_class: medium+
        docker:
            - image: node:16
+        working_directory: ~/repo
        steps:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
    test-integrations-ganache:
-        resource_class: xlarge
+        resource_class: medium+
        docker:
            - image: node:16
+        working_directory: ~/repo
        steps:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
    test-contracts-staking-ganache:
-        resource_class: xlarge
+        resource_class: medium+
        docker:
            - image: node:16
+        working_directory: ~/repo
        steps:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
    test-contracts-extra-ganache:
-        resource_class: xlarge
+        resource_class: medium+
        docker:
            - image: node:16
+        working_directory: ~/repo
        steps:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - 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: xlarge
+        resource_class: medium+
        docker:
            - image: node:16
+        working_directory: ~/repo
        steps:
-            - checkout
-            - run: |
-                  git diff --name-only development >> changed.txt
-                  if ! grep -q \.sol changed.txt; then
-                    circleci-agent step halt
-                  fi
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
-            - 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
+                      - 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-foundry:
-        resource_class: xlarge
+        resource_class: medium+
        docker:
            - image: ghcr.io/foundry-rs/foundry:latest
+        working_directory: ~/repo/contracts/zero-ex
        steps:
-            - checkout
-            - run: |
-                  git diff --name-only development >> changed.txt
-                  cat changed.txt
-                  if ! grep -q \.sol changed.txt; then
-                    circleci-agent step halt
-                  fi
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
-            - run: git submodule update --init --recursive
-            - run:
-                command: forge test
-                working_directory: ~/project/contracts/zero-ex
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            # - run: forge install
+            - run: forge test
    test-publish:
        resource_class: large
        environment:
-            NODE_OPTIONS: "--max-old-space-size=6442"
+            NODE_OPTIONS: '--max-old-space-size=6442'
        docker:
            - image: node:16
            - image: 0xorg/verdaccio
+        working_directory: ~/repo
        steps:
-            - checkout
-            - run: |
-                  git diff --name-only development >> changed.txt
-                  cat changed.txt
-                  if ! grep -q packages/ changed.txt; then
-                    circleci-agent step halt
-                  fi
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run:
                  command: yarn test:publish:circleci
                  no_output_timeout: 1800
@@ -207,84 +109,72 @@ jobs:
    test-doc-generation:
        docker:
            - image: node:16
+        working_directory: ~/repo
        steps:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - 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"
+            RUST_ROUTER: 'true'
        steps:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci
            - run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci
            - run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci
            - run: yarn wsrun -p @0x/contract-wrappers-test -m --serial -c test:circleci
            - run: yarn wsrun -p @0x/order-utils -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/asset-swapper -m --serial -c test:circleci
            - save_cache:
-                  key: coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
+                  key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
                      - ~/repo/packages/contract-wrappers-test/coverage/lcov.info
            - save_cache:
-                  key: coverage-order-utils-{{ checksum "yarn.lock" }}
+                  key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
                      - ~/repo/packages/order-utils/coverage/lcov.info
            - save_cache:
-                  key: coverage-web3-wrapper-{{ checksum "yarn.lock" }}
+                  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:
-            - checkout
            - restore_cache:
                  keys:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
-            - run:
-                  command: yarn lerna run lint
-            - run:
-                  command: yarn prettier:ci
-            - run:
-                  command: yarn deps_versions:ci
-            - run:
-                  command: yarn diff_md_docs:ci
+                      - 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:
-                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}
+                      - coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
-                      - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
+                      - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
-                      - coverage-order-utils-{{ checksum "yarn.lock" }}
-            - restore_cache:
-                  keys:
-                      - coverage-contracts-{{ checksum "yarn.lock" }}
+                      - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn report_coverage
 workflows:
    version: 2
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ 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                                     |
@@ -81,7 +82,7 @@ yarn build
 To build a specific package:

 ```bash
-PKG=@0x/protocol-utils yarn build
+PKG=@0x/asset-swapper yarn build
 ```

 To build all contracts packages:
@@ -104,7 +105,7 @@ To watch a specific package and all it's dependent packages:
 PKG=[NPM_PACKAGE_NAME] yarn watch

 e.g
-PKG=@0x/protocol-utils yarn watch
+PKG=@0x/asset-swapper yarn watch
 ```

 ### Clean
@@ -118,7 +119,7 @@ yarn clean
 Clean a specific package

 ```bash
-PKG=@0x/protocol-utils yarn clean
+PKG=@0x/asset-swapper yarn clean
 ```

 ### Rebuild
@@ -132,7 +133,7 @@ yarn rebuild
 To re-build (clean & build) a specific package & it's deps:

 ```bash
-PKG=@0x/protocol-utils yarn rebuild
+PKG=@0x/asset-swapper yarn rebuild
 ```

 ### Lint
@@ -146,7 +147,7 @@ yarn lint
 Lint a specific package:

 ```bash
-PKG=@0x/protocol-utils yarn lint
+PKG=@0x/asset-swapper yarn lint
 ```

 ### Run Tests
@@ -160,7 +161,7 @@ yarn test
 Run a specific package's test:

 ```bash
-PKG=@0x/protocol-utils yarn test
+PKG=@0x/asset-swapper yarn test
 ```

 Run all contracts packages tests:
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,58 +1,4 @@
 [
-    {
-        "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",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,30 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## 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
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "3.3.42",
+    "version": "3.3.36",
    "engines": {
        "node": ">=6.12"
    },
@@ -51,18 +51,18 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
    "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
-        "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.33",
-        "@0x/contracts-utils": "^4.8.23",
-        "@0x/dev-utils": "^5.0.0",
-        "@0x/sol-compiler": "^4.8.2",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.27",
+        "@0x/contracts-utils": "^4.8.17",
+        "@0x/dev-utils": "^4.2.14",
+        "@0x/sol-compiler": "^4.8.1",
        "@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": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
        "@types/node": "12.12.54",
@@ -70,7 +70,7 @@
        "chai-as-promised": "^7.1.0",
        "chai-bignumber": "^3.0.0",
        "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.7.1",
+        "ethereum-types": "^3.7.0",
        "lodash": "^4.17.11",
        "make-promises-safe": "^1.1.0",
        "mocha": "^6.2.0",
@@ -82,7 +82,7 @@
        "typescript": "4.6.3"
    },
    "dependencies": {
-        "@0x/base-contract": "^7.0.0",
+        "@0x/base-contract": "^6.5.0",
        "ethers": "~4.0.4"
    },
    "publishConfig": {
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,58 +1,4 @@
 [
-    {
-        "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",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,30 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## 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
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-test-utils",
-    "version": "5.4.33",
+    "version": "5.4.27",
    "engines": {
        "node": ">=6.12"
    },
@@ -34,7 +34,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
    "devDependencies": {
-        "@0x/sol-compiler": "^4.8.2",
+        "@0x/sol-compiler": "^4.8.1",
        "@0x/tslint-config": "^4.1.4",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
@@ -42,20 +42,20 @@
        "typescript": "4.6.3"
    },
    "dependencies": {
-        "@0x/assert": "^3.0.35",
-        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.23.2",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/assert": "^3.0.34",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/contract-addresses": "^6.19.2",
+        "@0x/dev-utils": "^4.2.14",
        "@0x/json-schemas": "^6.4.4",
        "@0x/order-utils": "^10.4.28",
-        "@0x/sol-coverage": "^4.0.46",
-        "@0x/sol-profiler": "^4.1.36",
-        "@0x/sol-trace": "^3.0.46",
-        "@0x/subproviders": "^7.0.0",
+        "@0x/sol-coverage": "^4.0.45",
+        "@0x/sol-profiler": "^4.1.35",
+        "@0x/sol-trace": "^3.0.45",
+        "@0x/subproviders": "^6.6.5",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
        "@types/bn.js": "^4.11.0",
        "@types/js-combinatorics": "^0.5.29",
        "@types/lodash": "4.14.104",
@@ -67,7 +67,7 @@
        "chai-bignumber": "^3.0.0",
        "decimal.js": "^10.2.0",
        "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.7.1",
+        "ethereum-types": "^3.7.0",
        "ethereumjs-util": "^7.0.10",
        "ethers": "~4.0.4",
        "js-combinatorics": "^0.5.3",
--- a/contracts/test-utils/src/assertions.ts
+++ b/contracts/test-utils/src/assertions.ts
@@ -38,7 +38,7 @@ async function _getGanacheOrGethErrorAsync(ganacheError: string, gethError: stri
 }

 async function _getInsufficientFundsErrorMessageAsync(): Promise<string> {
-    return _getGanacheOrGethErrorAsync('insufficient funds for gas * price + value', 'insufficient funds');
+    return _getGanacheOrGethErrorAsync("sender doesn't have enough funds", 'insufficient funds');
 }

 async function _getTransactionFailedErrorMessageAsync(): Promise<string> {
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,58 +1,4 @@
 [
-    {
-        "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",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,30 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## 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
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.25",
+    "version": "1.4.19",
    "engines": {
        "node": ">=6.12"
    },
@@ -46,14 +46,14 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
    "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^6.23.2",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contract-addresses": "^6.19.2",
        "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.42",
-        "@0x/contracts-gen": "^2.0.47",
+        "@0x/contracts-erc20": "^3.3.36",
+        "@0x/contracts-gen": "^2.0.46",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.33",
-        "@0x/sol-compiler": "^4.8.2",
+        "@0x/contracts-test-utils": "^5.4.27",
+        "@0x/sol-compiler": "^4.8.1",
        "@0x/ts-doc-gen": "^0.0.28",
        "@0x/tslint-config": "^4.1.4",
        "@types/isomorphic-fetch": "^0.0.35",
@@ -72,14 +72,14 @@
        "typescript": "4.6.3"
    },
    "dependencies": {
-        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.9",
-        "@0x/subproviders": "^7.0.0",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/protocol-utils": "^11.16.3",
+        "@0x/subproviders": "^6.6.5",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
-        "ethereum-types": "^3.7.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
+        "ethereum-types": "^3.7.0",
        "ethereumjs-util": "^7.0.10"
    },
    "publishConfig": {
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,58 +1,4 @@
 [
-    {
-        "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",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,30 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## 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
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.23",
+    "version": "4.8.17",
    "engines": {
        "node": ">=6.12"
    },
@@ -50,15 +50,15 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
    "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
-        "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.33",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.27",
+        "@0x/dev-utils": "^4.2.14",
        "@0x/order-utils": "^10.4.28",
-        "@0x/sol-compiler": "^4.8.2",
+        "@0x/sol-compiler": "^4.8.1",
        "@0x/tslint-config": "^4.1.4",
        "@0x/types": "^3.3.6",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/web3-wrapper": "^7.6.5",
        "@types/bn.js": "^4.11.0",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
@@ -79,11 +79,11 @@
        "typescript": "4.6.3"
    },
    "dependencies": {
-        "@0x/base-contract": "^7.0.0",
+        "@0x/base-contract": "^6.5.0",
        "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^7.0.0",
+        "@0x/utils": "^6.5.3",
        "bn.js": "^4.11.8",
-        "ethereum-types": "^3.7.1"
+        "ethereum-types": "^3.7.0"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,63 +1,4 @@
 [
-    {
-        "timestamp": 1662559804,
-        "version": "0.37.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "0.37.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "0.37.0",
-        "changes": [
-            {
-                "note": "Add support for OTC orders in the FillQuoteTransformer",
-                "pr": "565"
-            },
-            {
-                "note": "fix CI",
-                "pr": "569"
-            }
-        ],
-        "timestamp": 1662046042
-    },
-    {
-        "timestamp": 1661462289,
-        "version": "0.36.6",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1661459661,
-        "version": "0.36.5",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1661145612,
-        "version": "0.36.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1660093941,
        "version": "0.36.3",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,31 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v0.37.2 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v0.37.1 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v0.37.0 - _September 1, 2022_
-
-    * Add support for OTC orders in the FillQuoteTransformer (#565)
-    * fix CI (#569)
-
-## v0.36.6 - _August 25, 2022_
-
-    * Dependencies updated
-
-## v0.36.5 - _August 25, 2022_
-
-    * Dependencies updated
-
-## v0.36.4 - _August 22, 2022_
-
-    * Dependencies updated
-
 ## v0.36.3 - _August 10, 2022_

    * Dependencies updated
--- a/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
@@ -31,7 +31,6 @@ import "../features/libs/LibNativeOrder.sol";
 import "./bridges/IBridgeAdapter.sol";
 import "./Transformer.sol";
 import "./LibERC20Transformer.sol";
-import "../IZeroEx.sol";

 /// @dev A transformer that fills an ERC20 market sell/buy quote.
 ///      This transformer shortcuts bridge orders and fills them directly
@@ -53,8 +52,7 @@ contract FillQuoteTransformer is
    enum OrderType {
        Bridge,
        Limit,
-        Rfq,
-        Otc
+        Rfq
    }

    struct LimitOrderInfo {
@@ -71,13 +69,6 @@ contract FillQuoteTransformer is
        uint256 maxTakerTokenFillAmount;
    }

-    struct OtcOrderInfo {
-        LibNativeOrder.OtcOrder order;
-        LibSignature.Signature signature;
-        // Maximum taker token amount of this limit order to fill.
-        uint256 maxTakerTokenFillAmount;
-    }
-
    /// @dev Transform data to ABI-encode and pass into `transform()`.
    struct TransformData {
        // Whether we are performing a market sell or buy.
@@ -93,8 +84,6 @@ contract FillQuoteTransformer is
        IBridgeAdapter.BridgeOrder[] bridgeOrders;
        // Native limit orders. Sorted by fill sequence.
        LimitOrderInfo[] limitOrders;
-        // Otc orders. Sorted by fill sequence.
-        OtcOrderInfo[] otcOrders;
        // Native RFQ orders. Sorted by fill sequence.
        RfqOrderInfo[] rfqOrders;

@@ -134,7 +123,7 @@ contract FillQuoteTransformer is
        uint256 soldAmount;
        uint256 protocolFee;
        uint256 takerTokenBalanceRemaining;
-        uint256[4] currentIndices;
+        uint256[3] currentIndices;
        OrderType currentOrderType;
    }

@@ -158,12 +147,12 @@ contract FillQuoteTransformer is
    IBridgeAdapter public immutable bridgeAdapter;

    /// @dev The exchange proxy contract.
-    IZeroEx public immutable zeroEx;
+    INativeOrdersFeature public immutable zeroEx;

    /// @dev Create this contract.
    /// @param bridgeAdapter_ The bridge adapter contract.
    /// @param zeroEx_ The Exchange Proxy contract.
-    constructor(IBridgeAdapter bridgeAdapter_, IZeroEx zeroEx_)
+    constructor(IBridgeAdapter bridgeAdapter_, INativeOrdersFeature zeroEx_)
        public
        Transformer()
    {
@@ -194,8 +183,7 @@ contract FillQuoteTransformer is

        if (data.bridgeOrders.length
                + data.limitOrders.length
-                + data.rfqOrders.length
-                + data.otcOrders.length != data.fillSequence.length
+                + data.rfqOrders.length != data.fillSequence.length
        ) {
            LibTransformERC20RichErrors.InvalidTransformDataError(
                LibTransformERC20RichErrors.InvalidTransformDataErrorCode.INVALID_ARRAY_LENGTH,
@@ -210,7 +198,7 @@ contract FillQuoteTransformer is

        // Approve the exchange proxy to spend our sell tokens if native orders
        // are present.
-        if (data.limitOrders.length + data.rfqOrders.length + data.otcOrders.length != 0) {
+        if (data.limitOrders.length + data.rfqOrders.length != 0) {
            data.sellToken.approveIfBelow(address(zeroEx), data.fillAmount);
            // Compute the protocol fee if a limit order is present.
            if (data.limitOrders.length != 0) {
@@ -242,8 +230,6 @@ contract FillQuoteTransformer is
                results = _fillLimitOrder(data.limitOrders[orderIndex], data, state);
            } else if (state.currentOrderType == OrderType.Rfq) {
                results = _fillRfqOrder(data.rfqOrders[orderIndex], data, state);
-            } else if (state.currentOrderType == OrderType.Otc) {
-                results = _fillOtcOrder(data.otcOrders[orderIndex], data, state);
            } else {
                revert("INVALID_ORDER_TYPE");
            }
@@ -416,42 +402,6 @@ contract FillQuoteTransformer is
        } catch {}
    }

-    // Fill a single OTC order.
-    function _fillOtcOrder(
-        OtcOrderInfo memory orderInfo,
-        TransformData memory data,
-        FillState memory state
-    )
-        private
-        returns (FillOrderResults memory results)
-    {
-
-        uint256 takerTokenFillAmount = LibSafeMathV06.min256(
-            _computeTakerTokenFillAmount(
-                data,
-                state,
-                orderInfo.order.takerAmount,
-                orderInfo.order.makerAmount,
-                0
-            ),
-            orderInfo.maxTakerTokenFillAmount
-        );
-        try
-            zeroEx.fillOtcOrder
-                (
-                    orderInfo.order,
-                    orderInfo.signature,
-                    takerTokenFillAmount.safeDowncastToUint128()
-                )
-            returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
-        {
-            results.takerTokenSoldAmount = takerTokenFilledAmount;
-            results.makerTokenBoughtAmount = makerTokenFilledAmount;
-        } catch {
-            revert("FillQuoteTransformer/OTC_ORDER_FILL_FAILED");
-        }
-    }
-
    // Compute the next taker token fill amount of a generic order.
    function _computeTakerTokenFillAmount(
        TransformData memory data,
--- a/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
@@ -1,113 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2022 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-import "./AbstractBridgeAdapter.sol";
-import "./BridgeProtocols.sol";
-import "./mixins/MixinBalancerV2.sol";
-import "./mixins/MixinCurve.sol";
-import "./mixins/MixinDodoV2.sol";
-import "./mixins/MixinGMX.sol";
-import "./mixins/MixinUniswapV3.sol";
-import "./mixins/MixinZeroExBridge.sol";
-
-contract ArbitrumBridgeAdapter is
-    AbstractBridgeAdapter(42161, "Arbitrum"),
-    MixinBalancerV2,
-    MixinCurve,
-    MixinDodoV2,
-    MixinGMX,
-    MixinUniswapV3,
-    MixinZeroExBridge
-{
-    constructor(IEtherTokenV06 weth)
-        public
-        MixinCurve(weth)
-    {}
-
-    function _trade(
-        BridgeOrder memory order,
-        IERC20TokenV06 sellToken,
-        IERC20TokenV06 buyToken,
-        uint256 sellAmount,
-        bool dryRun
-    )
-        internal
-        override
-        returns (uint256 boughtAmount, bool supportedSource)
-    {
-        uint128 protocolId = uint128(uint256(order.source) >> 128);
-        if (protocolId == BridgeProtocols.BALANCERV2) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeBalancerV2(
-                sellToken,
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
-        } else if (protocolId == BridgeProtocols.CURVE) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeCurve(
-                sellToken,
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
-        } else if (protocolId == BridgeProtocols.DODOV2) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeDodoV2(
-                sellToken,
-                sellAmount,
-                order.bridgeData
-            );
-        } else if (protocolId == BridgeProtocols.UNISWAPV3) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeUniswapV3(
-                sellToken,
-                sellAmount,
-                order.bridgeData
-            );
-        } else if (protocolId == BridgeProtocols.GMX) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeGMX(
-                sellToken,
-                sellAmount,
-                order.bridgeData
-            );
-        } else if (protocolId == BridgeProtocols.UNKNOWN) {
-            if (dryRun) { return (0, true); }            
-            boughtAmount = _tradeZeroExBridge(
-                sellToken,
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
-        }
-
-        emit BridgeFill(
-            order.source,
-            sellToken,
-            buyToken,
-            sellAmount,
-            boughtAmount
-        );
-    }
-}
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.37.2",
+    "version": "0.36.3",
    "engines": {
        "node": ">=6.12"
    },
@@ -56,14 +56,14 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^6.23.2",
-        "@0x/contracts-erc20": "^3.3.42",
-        "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.33",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contract-addresses": "^6.19.2",
+        "@0x/contracts-erc20": "^3.3.36",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.27",
+        "@0x/dev-utils": "^4.2.14",
        "@0x/order-utils": "^10.4.28",
-        "@0x/sol-compiler": "^4.8.2",
+        "@0x/sol-compiler": "^4.8.1",
        "@0x/ts-doc-gen": "^0.0.28",
        "@0x/tslint-config": "^4.1.4",
        "@typechain/ethers-v5": "^10.0.0",
@@ -85,14 +85,14 @@
        "typescript": "4.6.3"
    },
    "dependencies": {
-        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.9",
-        "@0x/subproviders": "^7.0.0",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/protocol-utils": "^11.16.3",
+        "@0x/subproviders": "^6.6.5",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
-        "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
-        "ethereum-types": "^3.7.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
+        "ethereum-types": "^3.7.0",
        "ethereumjs-util": "^7.0.10",
        "ethers": "~4.0.4"
    },
--- a/contracts/zero-ex/test/features/meta_transactions_test.ts
+++ b/contracts/zero-ex/test/features/meta_transactions_test.ts
@@ -30,7 +30,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
    let maker: string;
    let sender: string;
    let notSigner: string;
-    const signers: string[] = [];
+    let signers: string[];
    let zeroEx: IZeroExContract;
    let feature: MetaTransactionsFeatureContract;
    let feeToken: TestMintableERC20TokenContract;
@@ -45,8 +45,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
    const REENTRANCY_FLAG_MTX = 0x1;

    before(async () => {
-        let possibleSigners: string[];
-        [owner, maker, sender, notSigner, ...possibleSigners] = await env.getAccountAddressesAsync();
+        [owner, maker, sender, notSigner, ...signers] = await env.getAccountAddressesAsync();
        transformERC20Feature = await TestMetaTransactionsTransformERC20FeatureContract.deployFrom0xArtifactAsync(
            artifacts.TestMetaTransactionsTransformERC20Feature,
            env.provider,
@@ -75,26 +74,20 @@ blockchainTests.resets('MetaTransactions feature', env => {
            env.txDefaults,
            {},
        );
-
-        // some accounts returned can be unfunded
-        for (const possibleSigner of possibleSigners) {
-            const balance = await env.web3Wrapper.getBalanceInWeiAsync(possibleSigner);
-            if (balance.isGreaterThan(0)) {
-                signers.push(possibleSigner);
-                await feeToken
-                    .approve(zeroEx.address, MAX_FEE_AMOUNT)
-                    .awaitTransactionSuccessAsync({ from: possibleSigner });
-                await feeToken.mint(possibleSigner, MAX_FEE_AMOUNT).awaitTransactionSuccessAsync();
-            }
-        }
+        // Fund signers with fee tokens.
+        await Promise.all(
+            signers.map(async signer => {
+                await feeToken.mint(signer, MAX_FEE_AMOUNT).awaitTransactionSuccessAsync();
+                await feeToken.approve(zeroEx.address, MAX_FEE_AMOUNT).awaitTransactionSuccessAsync({ from: signer });
+            }),
+        );
    });

    function getRandomMetaTransaction(fields: Partial<MetaTransactionFields> = {}): MetaTransaction {
        return new MetaTransaction({
            signer: _.sampleSize(signers)[0],
            sender,
-            // TODO: dekz Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
-            minGasPrice: ZERO_AMOUNT,
+            minGasPrice: getRandomInteger('2', '1e9'),
            maxGasPrice: getRandomInteger('1e9', '100e9'),
            expirationTimeSeconds: new BigNumber(Math.floor(_.now() / 1000) + 360),
            salt: new BigNumber(hexUtils.random()),
@@ -152,7 +145,6 @@ blockchainTests.resets('MetaTransactions feature', env => {
                gasPrice: mtx.minGasPrice,
                value: mtx.value,
            };
-
            const rawResult = await feature.executeMetaTransaction(mtx, signature).callAsync(callOpts);
            expect(rawResult).to.eq(RAW_ORDER_SUCCESS_RESULT);
            const receipt = await feature.executeMetaTransaction(mtx, signature).awaitTransactionSuccessAsync(callOpts);
@@ -442,8 +434,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
            );
        });

-        // Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
-        it.skip('fails if gas price too low', async () => {
+        it('fails if gas price too low', async () => {
            const mtx = getRandomMetaTransaction();
            const mtxHash = mtx.getHash();
            const signature = await mtx.getSignatureWithProviderAsync(env.provider);
@@ -462,8 +453,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
            );
        });

-        // Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
-        it.skip('fails if gas price too high', async () => {
+        it('fails if gas price too high', async () => {
            const mtx = getRandomMetaTransaction();
            const mtxHash = mtx.getHash();
            const signature = await mtx.getSignatureWithProviderAsync(env.provider);
--- a/contracts/zero-ex/test/features/native_orders_feature_test.ts
+++ b/contracts/zero-ex/test/features/native_orders_feature_test.ts
@@ -938,8 +938,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
            );
        });

-        // TODO: dekz Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
-        it.skip('fails if no protocol fee attached', async () => {
+        it('fails if no protocol fee attached', async () => {
            const order = getTestLimitOrder();
            await testUtils.prepareBalancesForOrdersAsync([order]);
            const tx = zeroEx
--- a/contracts/zero-ex/test/protocol_fees_test.ts
+++ b/contracts/zero-ex/test/protocol_fees_test.ts
@@ -10,8 +10,7 @@ import {
    TestWethContract,
 } from './wrappers';

-// TODO: dekz Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
-blockchainTests.resets.skip('ProtocolFees', env => {
+blockchainTests.resets('ProtocolFees', env => {
    const FEE_MULTIPLIER = 70e3;
    let taker: string;
    let unauthorized: string;
@@ -63,7 +62,7 @@ blockchainTests.resets.skip('ProtocolFees', env => {
        it('should disallow unauthorized initialization', async () => {
            const pool = hexUtils.random();

-            await protocolFees.collectProtocolFee(pool).awaitTransactionSuccessAsync({ value: 1e9 });
+            await protocolFees.collectProtocolFee(pool).awaitTransactionSuccessAsync({ value: singleFeeAmount });
            await protocolFees.transferFeesForPool(pool).awaitTransactionSuccessAsync();

            const feeCollector = new FeeCollectorContract(
@@ -90,7 +89,6 @@ blockchainTests.resets.skip('ProtocolFees', env => {
            feeCollector2Address = await protocolFees.getFeeCollector(pool2).callAsync();
        });

-        // Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
        it('should revert if insufficient ETH transferred', async () => {
            const tooLittle = singleFeeAmount.minus(1);
            const tx = protocolFees.collectProtocolFee(pool1).awaitTransactionSuccessAsync({ value: tooLittle });
--- a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
+++ b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
@@ -393,7 +393,6 @@ blockchainTests.resets('FillQuoteTransformer', env => {
            buyToken: makerToken.address,
            bridgeOrders: [],
            limitOrders: [],
-            otcOrders: [],
            rfqOrders: [],
            fillSequence: [],
            fillAmount: MAX_UINT256,
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
    },
    "config": {
        "contractsPackages": "@0x/contracts-erc20 @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-zero-ex @0x/contracts-treasury",
-        "nonContractPackages": "@0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test",
+        "nonContractPackages": "@0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test @0x/asset-swapper",
        "ignoreTestsForPackages": "",
        "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
        "packagesWithDocPages": "@0x/contract-wrappers",
@@ -75,6 +75,7 @@
        "wsrun": "^5.2.4"
    },
    "resolutions": {
+        "merkle-patricia-tree": "3.0.0",
        "**/bignumber.js": "^9.0.2"
    }
 }
--- a/packages/asset-swapper/CHANGELOG.json
+++ b/packages/asset-swapper/CHANGELOG.json
@@ -5,13 +5,8 @@
            {
                "note": "Offboard Cream",
                "pr": 546
-            },
-            {
-                "note": "Change WooFi gas estimates",
-                "pr": 551
            }
-        ],
-        "timestamp": 1661145612
+        ]
    },
    {
        "timestamp": 1660093941,
--- a/packages/asset-swapper/CHANGELOG.md
+++ b/packages/asset-swapper/CHANGELOG.md
@@ -5,11 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v16.66.4 - _August 22, 2022_
-
-    * Offboard Cream (#546)
-    * Change WooFi gas estimates (#551)
-
 ## v16.66.3 - _August 10, 2022_

    * Dependencies updated
--- a/packages/asset-swapper/README.md
+++ b/packages/asset-swapper/README.md
@@ -1,5 +1,3 @@
-> :warning: **@0x/asset-swapper has been deprecated!** The `asset-swapper` code has been moved to [0x-api](https://github.com/0xProject/0x-api). Please do not open a PR with `asset-swapper` changes.
-
 ## @0x/asset-swapper

 Convenience package for swapping assets represented on the Ethereum blockchain using 0x. The package helps to perform all the off-chain computations to execute a marketBuy or marketSell function execution with 0x exchange contracts, or 0x extension contracts. Given some liquidity (0x signed orders), it helps estimate the cost of buying or selling a certain asset (giving a range) and then provide varying consumable outputs to execute the buy or sell.
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,7 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "16.66.9",
-    "private": true,
+    "version": "16.66.3",
    "engines": {
        "node": ">=6.12"
    },
@@ -9,8 +8,8 @@
    "main": "lib/src/index.js",
    "types": "lib/src/index.d.ts",
    "scripts": {
-        "build": "#yarn pre_build && tsc -b",
-        "build:ts": "#tsc -b",
+        "build": "yarn pre_build && tsc -b",
+        "build:ts": "tsc -b",
        "watch": "tsc -w -p tsconfig.json",
        "watch:contracts": "sol-compiler -w",
        "build:ci": "yarn build",
@@ -20,11 +19,11 @@
        "lint-contracts": "#solhint -c .solhint.json contracts/**/**/**/**/*.sol",
        "prettier": "prettier --write '**/*.{ts,tsx,json}' --config ../../.prettierrc  --ignore-path ../../.prettierignore",
        "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": "#yarn run_mocha",
+        "test": "yarn run_mocha",
        "rebuild_and_test": "run-s clean build test",
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "test:circleci": "#yarn test:coverage",
+        "test:circleci": "yarn test:coverage",
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*_test.js' lib/test/global_hooks.js --timeout 30000 --bail --exit",
        "clean": "shx rm -rf lib test_temp generated_docs test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
        "diff_docs": "git diff --exit-code ./docs",
@@ -60,21 +59,21 @@
        "registry": "git@github.com:0xProject/gitpkg-registry.git"
    },
    "dependencies": {
-        "@0x/assert": "^3.0.35",
-        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.23.2",
-        "@0x/contract-wrappers": "^13.22.2",
-        "@0x/contracts-erc20": "^3.3.42",
-        "@0x/contracts-zero-ex": "^0.37.2",
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/assert": "^3.0.34",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/contract-addresses": "^6.19.2",
+        "@0x/contract-wrappers": "^13.20.8",
+        "@0x/contracts-erc20": "^3.3.36",
+        "@0x/contracts-zero-ex": "^0.36.3",
+        "@0x/dev-utils": "^4.2.14",
        "@0x/fast-abi": "^0.0.5",
        "@0x/json-schemas": "^6.4.4",
        "@0x/neon-router": "^0.3.5",
-        "@0x/protocol-utils": "^11.16.9",
+        "@0x/protocol-utils": "^11.16.3",
        "@0x/quote-server": "^8.0.0",
        "@0x/types": "^3.3.6",
-        "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
        "@balancer-labs/sdk": "0.1.6",
        "@bancor/sdk": "0.2.9",
        "@ethersproject/abi": "^5.0.1",
@@ -85,7 +84,7 @@
        "axios": "^0.21.1",
        "axios-mock-adapter": "^1.19.0",
        "balancer-labs-sor-v1": "npm:@balancer-labs/sor@0.3.2",
-        "ethereum-types": "^3.7.1",
+        "ethereum-types": "^3.7.0",
        "graphql": "^15.4.0",
        "graphql-request": "^3.4.0",
        "heartbeats": "^5.0.1",
@@ -93,11 +92,11 @@
        "msw": "^0.44.2"
    },
    "devDependencies": {
-        "@0x/abi-gen": "^5.8.1",
-        "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.33",
-        "@0x/sol-compiler": "^4.8.2",
-        "@0x/subproviders": "^7.0.0",
+        "@0x/abi-gen": "^5.8.0",
+        "@0x/contracts-gen": "^2.0.46",
+        "@0x/contracts-test-utils": "^5.4.27",
+        "@0x/sol-compiler": "^4.8.1",
+        "@0x/subproviders": "^6.6.5",
        "@0x/ts-doc-gen": "^0.0.28",
        "@0x/tslint-config": "^4.1.4",
        "@types/lodash": "4.14.137",
--- a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts
@@ -71,8 +71,6 @@ function valueByChainId<T>(rest: Partial<{ [key in ChainId]: T }>, defaultValue:
        [ChainId.Fantom]: defaultValue,
        [ChainId.Celo]: defaultValue,
        [ChainId.Optimism]: defaultValue,
-        [ChainId.ArbitrumRinkeby]: defaultValue,
-        [ChainId.Arbitrum]: defaultValue,
        ...(rest || {}),
    };
 }
@@ -224,7 +222,6 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
            ERC20BridgeSource.Velodrome,
            ERC20BridgeSource.Synthetix,
        ]),
-        [ChainId.ArbitrumRinkeby]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
    },
    new SourceFilters([]),
 );
@@ -376,7 +373,6 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
            ERC20BridgeSource.Velodrome,
            ERC20BridgeSource.Synthetix,
        ]),
-        [ChainId.ArbitrumRinkeby]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
    },
    new SourceFilters([]),
 );
@@ -401,7 +397,6 @@ export const FEE_QUOTE_SOURCES_BY_CHAIN_ID = valueByChainId<ERC20BridgeSource[]>
        [ChainId.Fantom]: [ERC20BridgeSource.SpiritSwap, ERC20BridgeSource.SpookySwap, ERC20BridgeSource.SushiSwap],
        [ChainId.Celo]: [ERC20BridgeSource.UbeSwap, ERC20BridgeSource.SushiSwap],
        [ChainId.Optimism]: [ERC20BridgeSource.UniswapV3],
-        [ChainId.ArbitrumRinkeby]: [ERC20BridgeSource.UniswapV3],
    },
    [],
 );
@@ -555,6 +550,7 @@ export const POLYGON_TOKENS = {
    nUSD: '0xb6c473756050de474286bed418b77aeac39b02af',
    ANY: '0x6aB6d61428fde76768D7b45D8BFeec19c6eF91A8',
    WOO: '0x1b815d120b3ef02039ee11dc2d33de7aa4a8c603',
+    deUSDC: '0x1ddcaa4ed761428ae348befc6718bcb12e63bfaa',
 };

 export const AVALANCHE_TOKENS = {
@@ -582,6 +578,7 @@ export const AVALANCHE_TOKENS = {
    FRAX: '0xd24c2ad096400b6fbcd2ad8b24e7acbc21a1da64',
    YUSD: '0x111111111111ed1d73f860f57b2798b683f2d325',
    WOO: '0xabc9547b534519ff73921b1fba6e672b5f58d083',
+    deUSDC: '0x28690ec942671aC8d9Bc442B667EC338eDE6dFd3',
 };

 export const CELO_TOKENS = {
@@ -736,6 +733,7 @@ export const CURVE_V2_POOLS = {
 export const CURVE_POLYGON_POOLS = {
    aave: '0x445fe580ef8d70ff569ab36e80c647af338db351',
    ren: '0xc2d95eef97ec6c17551d45e77b590dc1f9117c67',
+    deUSDC: '0xda43bfd7ecc6835aa6f1761ced30b986a574c0d2'
 };

 export const CURVE_V2_POLYGON_POOLS = {
@@ -746,6 +744,7 @@ export const CURVE_AVALANCHE_POOLS = {
    aave: '0x7f90122bf0700f9e7e1f688fe926940e8839f353',
    mim: '0xaea2e71b631fa93683bcf256a8689dfa0e094fcd',
    USDC: '0x3a43a5851a3e3e0e25a3c1089670269786be1577',
+    deUSDC: '0xd39016475200ab8957e9c772c949ef54bda69111'
 };

 export const CURVE_V2_AVALANCHE_POOLS = {
@@ -919,11 +918,6 @@ export const DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID = valueByChainId<string[]>(
            '0x11fE4B6AE13d2a6055C8D9cF65c55bac32B5d844', // DAI
            '0x07865c6E87B9F70255377e024ace6630C1Eaa37F', // USDC
        ],
-        [ChainId.ArbitrumRinkeby]: [
-            getContractAddressesForChainOrThrow(ChainId.ArbitrumRinkeby).etherToken,
-            '0x237b3B5238D2022aA80cAd1f67dAE53f353F74bF', // USDT
-            '0xF61Cffd6071a8DB7cD5E8DF1D3A5450D9903cF1c', // USDC
-        ],
        [ChainId.PolygonMumbai]: [
            getContractAddressesForChainOrThrow(ChainId.PolygonMumbai).etherToken,
            '0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747', // USDC
@@ -1055,7 +1049,6 @@ export const NATIVE_FEE_TOKEN_BY_CHAIN_ID = valueByChainId<string>(
        [ChainId.Ropsten]: getContractAddressesForChainOrThrow(ChainId.Ropsten).etherToken,
        [ChainId.Goerli]: getContractAddressesForChainOrThrow(ChainId.Goerli).etherToken,
        [ChainId.PolygonMumbai]: getContractAddressesForChainOrThrow(ChainId.PolygonMumbai).etherToken,
-        [ChainId.ArbitrumRinkeby]: getContractAddressesForChainOrThrow(ChainId.ArbitrumRinkeby).etherToken,
        [ChainId.Rinkeby]: getContractAddressesForChainOrThrow(ChainId.Rinkeby).etherToken,
        [ChainId.Kovan]: getContractAddressesForChainOrThrow(ChainId.Kovan).etherToken,
        [ChainId.Polygon]: getContractAddressesForChainOrThrow(ChainId.Polygon).etherToken,
@@ -1475,6 +1468,11 @@ export const CURVE_POLYGON_INFOS: { [name: string]: CurveInfo } = {
        pool: CURVE_POLYGON_POOLS.ren,
        gasSchedule: 350e3,
    }),
+    [CURVE_POLYGON_POOLS.deUSDC]: createCurveExchangeUnderlyingPool({
+        tokens: [POLYGON_TOKENS.deUSDC, POLYGON_TOKENS.amDAI, POLYGON_TOKENS.amUSDC, POLYGON_TOKENS.amUSDT],
+        pool: CURVE_POLYGON_POOLS.deUSDC,
+        gasSchedule: 150e3,
+    }),
 };

 export const CURVE_V2_POLYGON_INFOS: { [name: string]: CurveInfo } = {
@@ -1506,6 +1504,11 @@ export const CURVE_AVALANCHE_INFOS: { [name: string]: CurveInfo } = {
        pool: CURVE_AVALANCHE_POOLS.USDC,
        gasSchedule: 150e3,
    }),
+    [CURVE_AVALANCHE_POOLS.deUSDC]: createCurveExchangePool({
+        tokens: [AVALANCHE_TOKENS.deUSDC, AVALANCHE_TOKENS.aDAI, AVALANCHE_TOKENS.aUSDC, AVALANCHE_TOKENS.aUSDT],
+        pool: CURVE_AVALANCHE_POOLS.deUSDC,
+        gasSchedule: 300e3,
+    }),
 };

 export const CURVE_V2_AVALANCHE_INFOS: { [name: string]: CurveInfo } = {
@@ -2234,10 +2237,6 @@ export const UNISWAPV3_CONFIG_BY_CHAIN_ID = valueByChainId(
            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
        },
-        [ChainId.ArbitrumRinkeby]: {
-            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
-            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
-        },
    },
    { quoter: NULL_ADDRESS, router: NULL_ADDRESS },
 );
@@ -2672,34 +2671,14 @@ export const DEFAULT_GAS_SCHEDULE: Required<GasSchedule> = {
    [ERC20BridgeSource.WOOFi]: (fillData?: FillData) => {
        const woofiFillData = fillData as WOOFiFillData;
        const quoteTokenAddresses = [BSC_TOKENS.USDT, AVALANCHE_TOKENS.nUSDC, FANTOM_TOKENS.USDC, POLYGON_TOKENS.USDC];
-        const hasQuoteToken =
+
+        if (
            quoteTokenAddresses.includes(woofiFillData.takerToken) ||
-            quoteTokenAddresses.includes(woofiFillData.makerToken);
-        if (woofiFillData.chainId === ChainId.BSC) {
-            if (hasQuoteToken) {
-                return 550e3;
-            } else {
-                return 100e4;
-            }
-        } else if (woofiFillData.chainId === ChainId.Avalanche) {
-            if (hasQuoteToken) {
-                return 300e3;
-            } else {
-                return 550e3;
-            }
-        } else if (woofiFillData.chainId === ChainId.Polygon) {
-            if (hasQuoteToken) {
-                return 500e3;
-            } else {
-                return 700e3;
-            }
+            quoteTokenAddresses.includes(woofiFillData.makerToken)
+        ) {
+            return 500e3;
        } else {
-            // Fantom
-            if (hasQuoteToken) {
-                return 400e3;
-            } else {
-                return 600e3;
-            }
+            return 100e4;
        }
    },
    //
--- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
@@ -1371,9 +1371,8 @@ export class SamplerOperations {
        makerToken: string,
        makerFillAmounts: BigNumber[],
    ): SourceQuoteOperation<WOOFiFillData> {
-        const chainId = this.chainId;
        return new SamplerContractOperation({
-            fillData: { poolAddress, takerToken, makerToken, chainId },
+            fillData: { poolAddress, takerToken, makerToken },
            source: ERC20BridgeSource.WOOFi,
            contract: this._samplerContract,
            function: this._samplerContract.sampleSellsFromWooPP,
@@ -1387,9 +1386,8 @@ export class SamplerOperations {
        makerToken: string,
        makerFillAmounts: BigNumber[],
    ): SourceQuoteOperation<WOOFiFillData> {
-        const chainId = this.chainId;
        return new SamplerContractOperation({
-            fillData: { poolAddress, takerToken, makerToken, chainId },
+            fillData: { poolAddress, takerToken, makerToken },
            source: ERC20BridgeSource.WOOFi,
            contract: this._samplerContract,
            function: this._samplerContract.sampleBuysFromWooPP,
--- a/packages/asset-swapper/src/utils/market_operation_utils/types.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/types.ts
@@ -377,8 +377,6 @@ export interface WOOFiFillData extends FillData {
    poolAddress: string;
    takerToken: string;
    makerToken: string;
-    // Only needed for gas estimation
-    chainId: ChainId;
 }

 export interface VelodromeFillData extends FillData {
--- a/packages/asset-swapper/test/contracts/balance_checker_test.ts
+++ b/packages/asset-swapper/test/contracts/balance_checker_test.ts
@@ -43,7 +43,7 @@ blockchainTests.resets('BalanceChecker contract', env => {

            const testResults = await contract.balances([owner, owner2], [makerToken.address, ETH_ADDRESS]).callAsync();

-            expect(testResults).to.eql([new BigNumber(100), new BigNumber(1000000000000000000000)]);
+            expect(testResults).to.eql([new BigNumber(100), new BigNumber(100000000000000000000)]);
        });
        it('it throws an error if the input arrays of different lengths', async () => {
            const accounts = await web3Wrapper.getAvailableAddressesAsync();
--- a/packages/asset-swapper/test/utils/test_helpers.ts
+++ b/packages/asset-swapper/test/utils/test_helpers.ts
@@ -68,7 +68,7 @@ export const testHelpers = {
                const { endpoint, mmApiKey, requestData, responseData, responseCode } = mockedResponse;
                const requestHeaders = {
                    Accept: 'application/json, text/plain, */*',
-                    'Content-Type': 'application/json',
+                    'Content-Type': 'application/json;charset=utf-8',
                    Authorization: `Bearer ${mmApiKey}`,
                };
                mockedAxios
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,65 +1,11 @@
 [
-    {
-        "version": "6.23.2",
-        "changes": [
-            {
-                "note": "New FQT for arbitrum again",
-                "pr": 574
-            }
-        ],
-        "timestamp": 1662559804
-    },
-    {
-        "version": "6.23.1",
-        "changes": [
-            {
-                "note": "New FQT for arbitrum",
-                "pr": 572
-            }
-        ],
-        "timestamp": 1662147076
-    },
-    {
-        "version": "6.23.0",
-        "changes": [
-            {
-                "note": "Remove contract addresses that are no longer needed",
-                "pr": 564
-            },
-            {
-                "note": "Change WETH address in contract-addresses",
-                "pr": 571
-            }
-        ],
-        "timestamp": 1662046042
-    },
-    {
-        "version": "6.22.0",
-        "changes": [
-            {
-                "note": "Arbitrum Rinkeby support",
-                "pr": 552
-            }
-        ],
-        "timestamp": 1661462289
-    },
-    {
-        "version": "6.21.0",
-        "changes": [
-            {
-                "note": "Arbitrum addresses: need to be updated when deployed"
-            }
-        ],
-        "timestamp": 1661459661
-    },
    {
        "version": "6.20.1",
        "changes": [
            {
                "note": "Revert: Remove contract addresses that are no longer needed"
            }
-        ],
-        "timestamp": 1661145612
+        ]
    },
    {
        "version": "6.20.0",
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -5,35 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v6.23.2 - _September 7, 2022_
-
-    * New FQT for arbitrum again (#574)
-
-## v6.23.1 - _September 2, 2022_
-
-    * New FQT for arbitrum (#572)
-
-## v6.23.0 - _September 1, 2022_
-
-    * Remove contract addresses that are no longer needed (#564)
-    * Change WETH address in contract-addresses (#571)
-
-## v6.22.0 - _August 25, 2022_
-
-    * Arbitrum Rinkeby support (#552)
-
-## v6.21.0 - _August 25, 2022_
-
-    * Arbitrum addresses: need to be updated when deployed
-
-## v6.20.1 - _August 22, 2022_
-
-    * Revert: Remove contract addresses that are no longer needed
-
-## v6.20.0 - _Invalid date_
-
-    * Remove contract addresses that are no longer needed (#548)
-
 ## v6.19.2 - _August 10, 2022_

    * Dependencies updated
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -1,13 +1,32 @@
 {
    "1": {
+        "exchangeV2": "0x080bf510fcbf18b91105470639e9561022937712",
+        "exchange": "0x61935cbdd02287b511119ddb11aeb42f1593b7ef",
+        "erc20Proxy": "0x95e6f48254609a6ee006f7d493c8e5fb97094cef",
+        "erc721Proxy": "0xefc70a1b18c432bdc64b596838b4d138f6bc6cad",
+        "forwarder": "0x6958f5e95332d93d21af0d7b9ca85b8212fee0a5",
        "zrxToken": "0xe41d2489571d322189246dafa5ebde1f4699f498",
        "etherToken": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+        "assetProxyOwner": "0xdffe798c7172dd6deb32baee68af322e8f495ce0",
        "zeroExGovernor": "0x7d3455421bbc5ed534a83c88fd80387dc8271392",
+        "coordinatorRegistry": "0x45797531b873fd5e519477a070a955764c1a5b07",
+        "coordinator": "0x38a795580d0f687e399913a00ddef6a17612c722",
+        "multiAssetProxy": "0xef701d5389ae74503d633396c4d654eabedc9d78",
+        "staticCallProxy": "0x3517b88c19508c08650616019062b898ab65ed29",
+        "erc1155Proxy": "0x7eefbd48fd63d441ec7435d024ec7c5131019add",
        "zrxVault": "0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf",
        "staking": "0x2a17c35ff147b32f13f19f2e311446eeb02503f3",
        "stakingProxy": "0xa26e80e7dea86279c6d778d702cc413e6cffa777",
+        "devUtils": "0x74134cf88b21383713e096a5ecf59e297dc7f547",
        "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
        "erc20BridgeSampler": "0xd8c38704c9937ea3312de29f824b4ad3450a5e61",
+        "chaiBridge": "0x77c31eba23043b9a72d13470f3a3a311344d7438",
+        "dydxBridge": "0x92af95e37afddac412e5688a9dcc1dd815d4ae53",
+        "godsUnchainedValidator": "0x09a379ef7218bcfd8913faa8b281ebc5a2e0bc04",
+        "broker": "0xd4690a51044db77d91d7aa8f7a3a5ad5da331af0",
+        "chainlinkStopLimit": "0xeb27220f95f364e1d9531992c48613f231839f53",
+        "maximumGasPrice": "0xe2bfd35306495d11e3c9db0d8de390cda24563cf",
+        "dexForwarderBridge": "0xc47b7094f378e54347e281aab170e8cca69d880a",
        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0x39dce47a67ad34344eab877eae3ef1fa2a1d50bb",
@@ -23,14 +42,33 @@
        }
    },
    "3": {
+        "erc20Proxy": "0xf1ec7d0ba42f15fb5c9e3adbe86431973e44764c",
+        "erc721Proxy": "0x070efeb7e5ffa3d1a59d03a219539551ae60ba43",
        "zrxToken": "0xff67881f8d12f372d91baae9752eb3631ff0ed00",
        "etherToken": "0xc778417e063141139fce010982780140aa0cd5ab",
+        "exchangeV2": "0xbff9493f92a3df4b0429b6d00743b3cfb4c85831",
+        "exchange": "0x5d8c9ba74607d2cbc4176882a42d4ace891c1c00",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x53993733d41a88ae86f77a18a024e5548ee26579",
+        "forwarder": "0xd5abddda4ba89c0120edc0ca8a95ed1ad0bf9fc3",
+        "coordinatorRegistry": "0xf8becacec90bfc361c0a2c720839e08405a72f6d",
+        "coordinator": "0xc2e2f8faf4bf649123b6f94103646cb4a0331006",
+        "multiAssetProxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0",
+        "staticCallProxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a",
+        "erc1155Proxy": "0x7f10d80f2659aaae790ab03da12be11c4e6008c3",
+        "devUtils": "0xc812af3f3fbc62f76ea4262576ec0f49db8b7f1c",
        "zrxVault": "0x38bbb9fb54a6b6d0376948bf3b2a7ed1e8aea6e8",
        "staking": "0x4af649ffde640ceb34b1afaba3e0bb8e9698cb01",
        "stakingProxy": "0x6acab4c9c4e3a0c78435fdb5ad1719c95460a668",
        "erc20BridgeProxy": "0xb344afed348de15eb4a9e180205a2b0739628339",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0xd4690a51044db77d91d7aa8f7a3a5ad5da331af0",
+        "broker": "0x4022e3982f326455f0905de3dbc4449999baf2dc",
+        "chainlinkStopLimit": "0x67a094cf028221ffdd93fc658f963151d05e2a74",
+        "maximumGasPrice": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a",
+        "dexForwarderBridge": "0x3261ea1411a1a840aed708896f779e1b837c917e",
        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0x1c9a27658dd303a31205a3b245e8993b92d4d502",
@@ -46,14 +84,33 @@
        }
    },
    "4": {
+        "exchangeV2": "0xbff9493f92a3df4b0429b6d00743b3cfb4c85831",
+        "exchange": "0xf8becacec90bfc361c0a2c720839e08405a72f6d",
+        "erc20Proxy": "0x070efeb7e5ffa3d1a59d03a219539551ae60ba43",
+        "erc721Proxy": "0x7f10d80f2659aaae790ab03da12be11c4e6008c3",
        "zrxToken": "0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa",
        "etherToken": "0xc778417e063141139fce010982780140aa0cd5ab",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x3f46b98061a3e1e1f41dff296ec19402c298f8a9",
+        "forwarder": "0xe30f6166fe1cd5f0048abeed3d20360feb4a1fd8",
+        "coordinatorRegistry": "0xc2e2f8faf4bf649123b6f94103646cb4a0331006",
+        "coordinator": "0xf1ec7d0ba42f15fb5c9e3adbe86431973e44764c",
+        "multiAssetProxy": "0xb344afed348de15eb4a9e180205a2b0739628339",
+        "staticCallProxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0",
+        "erc1155Proxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a",
+        "devUtils": "0x46b5bc959e8a754c0256fff73bf34a52ad5cdfa9",
        "zrxVault": "0x4af649ffde640ceb34b1afaba3e0bb8e9698cb01",
        "staking": "0x6acab4c9c4e3a0c78435fdb5ad1719c95460a668",
        "stakingProxy": "0x781ee6683595f823208be6540a279f940e6af196",
        "erc20BridgeProxy": "0xa2aa4befed748fba27a3be7dfd2c4b2c6db1f49b",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0dd2d6cabbd8ae7d2fe6840fa597a44b1a7e4747",
+        "chainlinkStopLimit": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a",
+        "maximumGasPrice": "0x47697b44bd89051e93b4d5857ba8e024800a74ac",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0x1c9a27658dd303a31205a3b245e8993b92d4d502",
@@ -69,14 +126,33 @@
        }
    },
    "5": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0xf289f8a9d26f9a32ecc8602e92e634d71a91d490",
        "exchangeProxy": "0xf91bb752490473b8342a3e964e855b9f9a2a668e",
        "exchangeProxyTransformerDeployer": "0x7b4f0063cc0097c19c6b8cc74ecaf630621e2be6",
@@ -92,14 +168,33 @@
        }
    },
    "42": {
+        "erc20Proxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a",
+        "erc721Proxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0",
        "zrxToken": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa",
        "etherToken": "0xd0a1e359811322d97991e03f863a0c30c2cf029c",
+        "exchangeV2": "0x30589010550762d2f0d06f650d8e8b6ade6dbf4b",
+        "exchange": "0xf1ec7d0ba42f15fb5c9e3adbe86431973e44764c",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x6ff734d96104965c9c1b0108f83abc46e6e501df",
+        "forwarder": "0x0f64646a5154ae5e58b6dd87ede7b04f508d76f8",
+        "coordinatorRegistry": "0x070efeb7e5ffa3d1a59d03a219539551ae60ba43",
+        "coordinator": "0x7f10d80f2659aaae790ab03da12be11c4e6008c3",
+        "multiAssetProxy": "0x58a01e826e60731247e7de8b446ed4c8535a099c",
+        "staticCallProxy": "0xa2aa4befed748fba27a3be7dfd2c4b2c6db1f49b",
+        "erc1155Proxy": "0xb344afed348de15eb4a9e180205a2b0739628339",
+        "devUtils": "0xc67ae71928568a180b3aad1339dedcf3076876fe",
        "zrxVault": "0x781ee6683595f823208be6540a279f940e6af196",
        "staking": "0x73ea24041e03a012c51a45c307e0ba376af0238c",
        "stakingProxy": "0xe94cb304b3f515be7c95fedcfa249a84995fd748",
        "erc20BridgeProxy": "0x3577552c1fb7a44ad76beeb7ab53251668a21f8d",
        "erc20BridgeSampler": "0x298a99d3a2b891df04019425542897ac1a867d9d",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0xc213707de0454008758071c2edc1365621b8a5c5",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0xcdeb6d90ee7c96b4c713f7bb4f8604981f7ebe9d",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x67a094cf028221ffdd93fc658f963151d05e2a74",
+        "dexForwarderBridge": "0x985d1a95c6a86a3bf85c4d425af984abceaf01de",
        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0x1b62de2dbb5e7aa519e9c442721ecef75702807f",
@@ -115,14 +210,33 @@
        }
    },
    "56": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0xccc9769c1a58766e79423a34b2cc5052d65c1983",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568",
@@ -138,14 +252,33 @@
        }
    },
    "1337": {
+        "erc20Proxy": "0x1dc4c1cefef38a777b15aa20260a54e584b16c48",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c",
        "etherToken": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0xf23276778860e420acfc18ebeebf7e829b06965c",
        "staking": "0x8a063452f7df2614db1bca3a85ef35da40cf0835",
        "stakingProxy": "0x59adefa01843c627ba5d6aa350292b4b7ccae67a",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0x0000000000000000000000000000000000000000",
        "exchangeProxy": "0x5315e44798395d4a952530d131249fe00f554565",
        "exchangeProxyTransformerDeployer": "0x5409ed021d9299bf6814279a6a1411a7e866a631",
@@ -161,14 +294,33 @@
        }
    },
    "137": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0x4d3e56c56a55d23fc7aa9a9ffad61631cf7d1ae6",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0xe6d9207df11c55bce2f7a189ae95e3222d5484d3",
@@ -184,14 +336,33 @@
        }
    },
    "80001": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0x9c3c9283d3e44854697cd22d3faa240cfb032889",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0x30186b2e187aeddabf019089f9375a8dc53138e4",
        "exchangeProxy": "0xf471d32cb40837bf24529fcf17418fc1a4807626",
        "exchangeProxyTransformerDeployer": "0x05481589f447a0767def2b0ed98a04ea5f5eba50",
@@ -207,14 +378,33 @@
        }
    },
    "43114": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7",
@@ -230,14 +420,33 @@
        }
    },
    "250": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0xf760c5b88d970d6f97e64e264dac5a3767dafd74",
        "exchangeProxy": "0xdef189deaef76e379df891899eb5a00a94cbc250",
        "exchangeProxyTransformerDeployer": "0x47f01db18a38261e4cb153bae6db7d3743acb33c",
@@ -253,14 +462,33 @@
        }
    },
    "42220": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0x471ece3750da237f93b8e339c536989b8978a438",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0x92115010fd9b170d4918b102efc86b1b7bebdc7f",
        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
        "exchangeProxyTransformerDeployer": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
@@ -276,14 +504,33 @@
        }
    },
    "10": {
+        "erc20Proxy": "0x0000000000000000000000000000000000000000",
+        "erc721Proxy": "0x0000000000000000000000000000000000000000",
        "zrxToken": "0x0000000000000000000000000000000000000000",
        "etherToken": "0x4200000000000000000000000000000000000006",
+        "exchangeV2": "0x0000000000000000000000000000000000000000",
+        "exchange": "0x0000000000000000000000000000000000000000",
+        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
+        "forwarder": "0x0000000000000000000000000000000000000000",
+        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
+        "coordinator": "0x0000000000000000000000000000000000000000",
+        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
+        "staticCallProxy": "0x0000000000000000000000000000000000000000",
+        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
+        "devUtils": "0x0000000000000000000000000000000000000000",
        "zrxVault": "0x0000000000000000000000000000000000000000",
        "staking": "0x0000000000000000000000000000000000000000",
        "stakingProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
+        "chaiBridge": "0x0000000000000000000000000000000000000000",
+        "dydxBridge": "0x0000000000000000000000000000000000000000",
+        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
+        "broker": "0x0000000000000000000000000000000000000000",
+        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
+        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
+        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
        "exchangeProxyGovernor": "0x6d506b2847df0c6f04d2628da1adaf4d8fb2e81b",
        "exchangeProxy": "0xdef1abe32c034e558cdd535791643c58a13acc10",
        "exchangeProxyTransformerDeployer": "0x3a539ed6bd42de8fbaf3899fb490c792e153d647",
@@ -297,51 +544,5 @@
            "fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
            "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
        }
-    },
-    "421611": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x4200000000000000000000000000000000000006",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0xf5e66206eb523988eae22dd7d4e06e36999fef94",
-        "exchangeProxy": "0x2c1994270ae589deae7b4bb6c2446c57d40b99d4",
-        "exchangeProxyTransformerDeployer": "0x42b43abe1358a7b2c00f8eb5b2668f821ee8edbf",
-        "exchangeProxyFlashWallet": "0xc1831049d451b69a9dccc391f8285eb83c94c940",
-        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "transformers": {
-            "wethTransformer": "0x7c0ef1020f9ee63bcf8248006174b9cbaa29af5a",
-            "payTakerTransformer": "0xb5c5ebd57ccf14480e30ce85f891f894cedbc694",
-            "affiliateFeeTransformer": "0xfa3d8ca1c877185af1ce2ec558e586e12cdbc50c",
-            "fillQuoteTransformer": "0xd6ddb08beb4c48e35352ee4df5ebc028e72f3c81",
-            "positiveSlippageFeeTransformer": "0x8830f7c5925b129efcc7831397f30c1c02953bac"
-        }
-    },
-    "42161": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0x29f80c1f685e19ae1807063eda432f431ac623d0",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "transformers": {
-            "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
-            "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
-            "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
-            "fillQuoteTransformer": "0x542c7dfc7959d8d03c5b738478213885ab3f214e",
-            "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
-        }
    }
 }
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "6.23.2",
+    "version": "6.19.2",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-addresses/src/index.ts
+++ b/packages/contract-addresses/src/index.ts
@@ -1,14 +1,33 @@
 import addresses from '../addresses.json';

 export interface ContractAddresses {
+    erc20Proxy: string;
+    erc721Proxy: string;
    zrxToken: string;
    etherToken: string;
+    exchangeV2: string;
+    exchange: string;
+    assetProxyOwner: string;
    zeroExGovernor: string;
+    forwarder: string;
+    coordinatorRegistry: string;
+    coordinator: string;
+    multiAssetProxy: string;
+    staticCallProxy: string;
+    erc1155Proxy: string;
+    devUtils: string;
    zrxVault: string;
    staking: string;
    stakingProxy: string;
    erc20BridgeProxy: string;
    erc20BridgeSampler: string;
+    chaiBridge: string;
+    dydxBridge: string;
+    godsUnchainedValidator: string;
+    broker: string;
+    chainlinkStopLimit: string;
+    maximumGasPrice: string;
+    dexForwarderBridge: string;
    exchangeProxyGovernor: string;
    exchangeProxy: string;
    exchangeProxyTransformerDeployer: string;
@@ -37,9 +56,8 @@ export enum ChainId {
    Avalanche = 43114,
    Fantom = 250,
    Celo = 42220,
+    // Arbitrum = 42161,
    Optimism = 10,
-    Arbitrum = 42161,
-    ArbitrumRinkeby = 421611,
 }

 /**
--- a/packages/contract-artifacts/CHANGELOG.json
+++ b/packages/contract-artifacts/CHANGELOG.json
@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1661145612,
-        "version": "3.18.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "version": "3.18.0",
        "changes": [
--- a/packages/contract-artifacts/CHANGELOG.md
+++ b/packages/contract-artifacts/CHANGELOG.md
@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v3.18.1 - _August 22, 2022_
-
-    * Dependencies updated
-
 ## v3.18.0 - _March 31, 2022_

    * Regenerate all artifacts (#449)
--- a/packages/contract-artifacts/package.json
+++ b/packages/contract-artifacts/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-artifacts",
-    "version": "3.18.1",
+    "version": "3.18.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -30,7 +30,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-artifacts",
    "devDependencies": {
-        "@0x/utils": "^7.0.0",
+        "@0x/utils": "^6.5.3",
        "@types/mocha": "^5.2.7",
        "chai": "^4.0.1",
        "lodash": "^4.17.11",
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,57 +1,11 @@
 [
-    {
-        "timestamp": 1662559804,
-        "version": "13.22.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "13.22.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "13.22.0",
-        "changes": [
-            {
-                "note": "Remove deprecated contracts"
-            }
-        ],
-        "timestamp": 1662046042
-    },
-    {
-        "timestamp": 1661462289,
-        "version": "13.21.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1661459661,
-        "version": "13.21.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "version": "13.21.1",
        "changes": [
            {
                "note": "Revert: Remove deprecated contracts"
            }
-        ],
-        "timestamp": 1661145612
+        ]
    },
    {
        "version": "13.21.0",
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -5,34 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v13.22.2 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v13.22.1 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v13.22.0 - _September 1, 2022_
-
-    * Remove deprecated contracts
-
-## v13.21.3 - _August 25, 2022_
-
-    * Dependencies updated
-
-## v13.21.2 - _August 25, 2022_
-
-    * Dependencies updated
-
-## v13.21.1 - _August 22, 2022_
-
-    * Revert: Remove deprecated contracts
-
-## v13.21.0 - _Invalid date_
-
-    * Remove deprecated contracts
-
 ## v13.20.8 - _August 10, 2022_

    * Dependencies updated
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-wrappers",
-    "version": "13.22.2",
+    "version": "13.20.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -55,14 +55,14 @@
        "typescript": "4.6.3"
    },
    "dependencies": {
-        "@0x/assert": "^3.0.35",
-        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.23.2",
+        "@0x/assert": "^3.0.34",
+        "@0x/base-contract": "^6.5.0",
+        "@0x/contract-addresses": "^6.19.2",
        "@0x/json-schemas": "^6.4.4",
        "@0x/types": "^3.3.6",
-        "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
-        "ethereum-types": "^3.7.1",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
+        "ethereum-types": "^3.7.0",
        "ethers": "~4.0.4"
    },
    "publishConfig": {
--- a/packages/contract-wrappers/src/contract_wrappers.ts
+++ b/packages/contract-wrappers/src/contract_wrappers.ts
@@ -6,6 +6,11 @@ import { SupportedProvider } from 'ethereum-types';

 import { ContractWrappersConfigSchema } from './contract_wrappers_config_schema';
 import { CoordinatorContract } from './generated-wrappers/coordinator';
+import { DevUtilsContract } from './generated-wrappers/dev_utils';
+import { ERC20TokenContract } from './generated-wrappers/erc20_token';
+import { ERC721TokenContract } from './generated-wrappers/erc721_token';
+import { ExchangeContract } from './generated-wrappers/exchange';
+import { ForwarderContract } from './generated-wrappers/forwarder';
 import { IZeroExContract } from './generated-wrappers/i_zero_ex';
 import { StakingContract } from './generated-wrappers/staking';
 import { WETH9Contract } from './generated-wrappers/weth9';
@@ -20,11 +25,27 @@ export class ContractWrappers {
     * An index of the default contract addresses for this chain.
     */
    public contractAddresses: ContractAddresses;
+    /**
+     * An instance of the ExchangeContract class containing methods for interacting with the 0x Exchange smart contract.
+     */
+    public exchange: ExchangeContract;
    /**
     * An instance of the WETH9Contract class containing methods for interacting with the
     * WETH9 smart contract.
     */
    public weth9: WETH9Contract;
+    /**
+     * An instance of the ForwarderContract class containing methods for interacting with any Forwarder smart contract.
+     */
+    public forwarder: ForwarderContract;
+    /**
+     * An instance of the DevUtilsContract class containing methods for interacting with the DevUtils smart contract.
+     */
+    public devUtils: DevUtilsContract;
+    /**
+     * An instance of the CoordinatorContract class containing methods for interacting with the Coordinator extension contract.
+     */
+    public coordinator: CoordinatorContract;
    /**
     * An instance of the StakingContract class containing methods for interacting with the Staking contracts.
     */
@@ -48,7 +69,17 @@ export class ContractWrappers {
            gasPrice: config.gasPrice,
        };
        this._web3Wrapper = new Web3Wrapper(supportedProvider, txDefaults);
-        const contractsArray = [CoordinatorContract, StakingContract, WETH9Contract, IZeroExContract];
+        const contractsArray = [
+            CoordinatorContract,
+            DevUtilsContract,
+            ERC20TokenContract,
+            ERC721TokenContract,
+            ExchangeContract,
+            ForwarderContract,
+            StakingContract,
+            WETH9Contract,
+            IZeroExContract,
+        ];
        contractsArray.forEach(contract => {
            this._web3Wrapper.abiDecoder.addABI(contract.ABI(), contract.contractName);
        });
@@ -57,7 +88,11 @@ export class ContractWrappers {
                ? _getDefaultContractAddresses(config.chainId)
                : config.contractAddresses;
        this.weth9 = new WETH9Contract(contractAddresses.etherToken, this.getProvider());
+        this.exchange = new ExchangeContract(contractAddresses.exchange, this.getProvider());
+        this.forwarder = new ForwarderContract(contractAddresses.forwarder, this.getProvider());
        this.staking = new StakingContract(contractAddresses.stakingProxy, this.getProvider());
+        this.devUtils = new DevUtilsContract(contractAddresses.devUtils, this.getProvider());
+        this.coordinator = new CoordinatorContract(contractAddresses.coordinator, this.getProvider());
        this.exchangeProxy = new IZeroExContract(contractAddresses.exchangeProxy, this.getProvider());
        this.contractAddresses = contractAddresses;
    }
@@ -65,6 +100,7 @@ export class ContractWrappers {
     * Unsubscribes from all subscriptions for all contracts.
     */
    public unsubscribeAll(): void {
+        this.exchange.unsubscribeAll();
        this.weth9.unsubscribeAll();
    }
    /**
--- a/packages/contract-wrappers/src/contract_wrappers_config_schema.ts
+++ b/packages/contract-wrappers/src/contract_wrappers_config_schema.ts
@@ -8,8 +8,13 @@ export const ContractWrappersConfigSchema = {
        contractAddresses: {
            type: 'object',
            properties: {
+                erc20Proxy: { $ref: '/addressSchema' },
+                erc721Proxy: { $ref: '/addressSchema' },
                zrxToken: { $ref: '/addressSchema' },
                etherToken: { $ref: '/addressSchema' },
+                exchange: { $ref: '/addressSchema' },
+                assetProxyOwner: { $ref: '/addressSchema' },
+                forwarder: { $ref: '/addressSchema' },
                staking: { $ref: '/addressSchema' },
            },
        },
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,59 +1,4 @@
 [
-    {
-        "timestamp": 1662559804,
-        "version": "11.16.9",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "11.16.8",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "11.16.7",
-        "changes": [
-            {
-                "note": "Add otc order info to transformer_utils",
-                "pr": "565"
-            }
-        ],
-        "timestamp": 1662046042
-    },
-    {
-        "timestamp": 1661462289,
-        "version": "11.16.6",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1661459661,
-        "version": "11.16.5",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1661145612,
-        "version": "11.16.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
    {
        "timestamp": 1660093941,
        "version": "11.16.3",
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -5,30 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v11.16.9 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v11.16.8 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v11.16.7 - _September 1, 2022_
-
-    * Add otc order info to transformer_utils (#565)
-
-## v11.16.6 - _August 25, 2022_
-
-    * Dependencies updated
-
-## v11.16.5 - _August 25, 2022_
-
-    * Dependencies updated
-
-## v11.16.4 - _August 22, 2022_
-
-    * Dependencies updated
-
 ## v11.16.3 - _August 10, 2022_

    * Dependencies updated
--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.16.9",
+    "version": "11.16.3",
    "engines": {
        "node": ">=6.12"
    },
@@ -41,7 +41,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils",
    "devDependencies": {
-        "@0x/dev-utils": "^5.0.0",
+        "@0x/dev-utils": "^4.2.14",
        "@0x/ts-doc-gen": "^0.0.28",
        "@0x/tslint-config": "^4.1.4",
        "@0x/types": "^3.3.6",
@@ -51,7 +51,7 @@
        "@types/mocha": "^5.2.7",
        "@types/node": "12.12.54",
        "@types/web3-provider-engine": "^14.0.0",
-        "ethereum-types": "^3.7.1",
+        "ethereum-types": "^3.7.0",
        "mocha": "^6.2.0",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
@@ -62,13 +62,13 @@
        "web3-provider-engine": "14.0.6"
    },
    "dependencies": {
-        "@0x/assert": "^3.0.35",
-        "@0x/contract-addresses": "^6.23.2",
-        "@0x/contract-wrappers": "^13.22.2",
+        "@0x/assert": "^3.0.34",
+        "@0x/contract-addresses": "^6.19.2",
+        "@0x/contract-wrappers": "^13.20.8",
        "@0x/json-schemas": "^6.4.4",
-        "@0x/subproviders": "^7.0.0",
-        "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.0",
+        "@0x/subproviders": "^6.6.5",
+        "@0x/utils": "^6.5.3",
+        "@0x/web3-wrapper": "^7.6.5",
        "chai": "^4.0.1",
        "ethereumjs-util": "^7.0.10",
        "ethers": "~4.0.4",
--- a/packages/protocol-utils/src/transformer_utils.ts
+++ b/packages/protocol-utils/src/transformer_utils.ts
@@ -1,7 +1,7 @@
 import { AbiEncoder, BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 import * as ethjs from 'ethereumjs-util';

-import { LimitOrder, LimitOrderFields, OtcOrder, OtcOrderFields, RfqOrder, RfqOrderFields } from './orders';
+import { LimitOrder, LimitOrderFields, RfqOrder, RfqOrderFields } from './orders';
 import { Signature, SIGNATURE_ABI } from './signature_utils';

 const BRIDGE_ORDER_ABI_COMPONENTS = [
@@ -39,20 +39,6 @@ const RFQ_ORDER_INFO_ABI_COMPONENTS = [
    { name: 'maxTakerTokenFillAmount', type: 'uint256' },
 ];

-const OTC_ORDER_INFO_ABI_COMPONENTS = [
-    {
-        name: 'order',
-        type: 'tuple',
-        components: OtcOrder.STRUCT_ABI,
-    },
-    {
-        name: 'signature',
-        type: 'tuple',
-        components: SIGNATURE_ABI,
-    },
-    { name: 'maxTakerTokenFillAmount', type: 'uint256' },
-];
-
 /**
 * ABI encoder for `FillQuoteTransformer.TransformData`
 */
@@ -74,11 +60,6 @@ export const fillQuoteTransformerDataEncoder = AbiEncoder.create([
                type: 'tuple[]',
                components: LIMIT_ORDER_INFO_ABI_COMPONENTS,
            },
-            {
-                name: 'otcOrders',
-                type: 'tuple[]',
-                components: OTC_ORDER_INFO_ABI_COMPONENTS,
-            },
            {
                name: 'rfqOrders',
                type: 'tuple[]',
@@ -105,7 +86,6 @@ export enum FillQuoteTransformerSide {
 export enum FillQuoteTransformerOrderType {
    Bridge,
    Limit,
-    Otc,
    Rfq,
 }

@@ -119,7 +99,6 @@ export interface FillQuoteTransformerData {
    bridgeOrders: FillQuoteTransformerBridgeOrder[];
    limitOrders: FillQuoteTransformerLimitOrderInfo[];
    rfqOrders: FillQuoteTransformerRfqOrderInfo[];
-    otcOrders: FillQuoteTransformerOtcOrderInfo[];
    fillSequence: FillQuoteTransformerOrderType[];
    fillAmount: BigNumber;
    refundReceiver: string;
@@ -199,11 +178,6 @@ export type FillQuoteTransformerLimitOrderInfo = FillQuoteTransformerNativeOrder
 */
 export type FillQuoteTransformerRfqOrderInfo = FillQuoteTransformerNativeOrderInfo<RfqOrderFields>;

-/**
- * `FillQuoteTransformer.OtcOrderInfo`
- */
-export type FillQuoteTransformerOtcOrderInfo = FillQuoteTransformerNativeOrderInfo<OtcOrderFields>;
-
 /**
 * ABI-encode a `FillQuoteTransformer.TransformData` type.
 */
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
eobbad	96df7e01d4	add debridge support	2022-08-16 11:07:09 -04:00
eobbad	2f82bf7b8e	add debridge support	2022-08-11 17:39:44 -04:00