Publish

- @0x/contracts-erc20@3.3.38
 - @0x/contracts-test-utils@5.4.29
 - @0x/contracts-treasury@1.4.21
 - @0x/contracts-utils@4.8.19
 - @0x/contracts-zero-ex@0.36.5
 - @0x/asset-swapper@16.66.5
 - @0x/contract-addresses@6.21.0
 - @0x/contract-wrappers@13.21.2
 - @0x/protocol-utils@11.16.5

.circleci/config.yml

@@ -1,5 +1,10 @@
 version: 2.1
 
+parameters:
+  cache_version:
+    type: string
+    default: v3
+
 jobs:
     build:
         resource_class: xlarge
@@ -12,6 +17,9 @@ jobs:
             - checkout
             - run: git submodule update --init --recursive
             - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
+            - restore_cache:
+                  keys:
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run:
                   name: install-yarn
                   command: npm install --force --global yarn@1.22.0
@@ -19,74 +27,102 @@ jobs:
                   name: yarn
                   command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
             - setup_remote_docker
-            - run: yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci
+            - run: yarn build:ci
             - save_cache:
-                  key: repo-{{ .Environment.CIRCLE_SHA1 }}
+                  key: repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
                   paths:
                       - ~/repo
+                      - ~/.cache/yarn
             - store_artifacts:
                   path: ~/repo/packages/abi-gen/test-cli/output
             - store_artifacts:
                   path: ~/repo/packages/contract-wrappers/generated_docs
     test-exchange-ganache:
-        resource_class: medium+
+        resource_class: xlarge
         docker:
             - image: node:16
         working_directory: ~/repo
         steps:
+            - checkout
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
     test-integrations-ganache:
-        resource_class: medium+
+        resource_class: xlarge
         docker:
             - image: node:16
         working_directory: ~/repo
         steps:
+            - checkout
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
     test-contracts-staking-ganache:
-        resource_class: medium+
+        resource_class: xlarge
         docker:
             - image: node:16
         working_directory: ~/repo
         steps:
+            - checkout
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
     test-contracts-extra-ganache:
-        resource_class: medium+
+        resource_class: xlarge
         docker:
             - image: node:16
         working_directory: ~/repo
         steps:
+            - checkout
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}
             - run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
     test-contracts-rest-ganache:
-        resource_class: medium+
+        resource_class: xlarge
         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:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - run: yarn wsrun -p @0x/contracts-multisig -p @0x/contracts-utils -p @0x/contracts-exchange-libs -p  @0x/contracts-erc20 -p @0x/contracts-erc721 -p @0x/contracts-erc1155 -p @0x/contracts-asset-proxy -p @0x/contracts-broker -p @0x/contracts-zero-ex -m --serial -c test:circleci
+            - 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: medium+
+        resource_class: xlarge
         docker:
             - image: ghcr.io/foundry-rs/foundry:latest
         working_directory: ~/repo/contracts/zero-ex
         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:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             # - run: forge install
             - run: forge test
     test-publish:
@@ -98,9 +134,15 @@ jobs:
             - image: 0xorg/verdaccio
         working_directory: ~/repo
         steps:
+            - checkout
+            - run: |
+                git diff --name-only development >> changed.txt
+                if ! grep -q packages/ changed.txt; then
+                  circleci-agent step halt
+                fi
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run:
                   command: yarn test:publish:circleci
                   no_output_timeout: 1800
@@ -111,9 +153,10 @@ jobs:
             - image: node:16
         working_directory: ~/repo
         steps:
+            - checkout
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run:
                   command: yarn test:generate_docs:circleci
                   no_output_timeout: 1200
@@ -124,40 +167,48 @@ jobs:
         environment:
             RUST_ROUTER: 'true'
         steps:
+            - checkout
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci
             - run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci
             - run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci
             - run: yarn wsrun -p @0x/contract-wrappers-test -m --serial -c test:circleci
             - run: yarn wsrun -p @0x/order-utils -m --serial -c test:circleci
-            - run: yarn wsrun -p @0x/asset-swapper -m --serial -c test:circleci
             - save_cache:
-                  key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
+                  key: coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
                   paths:
                       - ~/repo/packages/contract-wrappers-test/coverage/lcov.info
             - save_cache:
-                  key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+                  key: coverage-order-utils-{{ checksum "yarn.lock" }}
                   paths:
                       - ~/repo/packages/order-utils/coverage/lcov.info
             - save_cache:
-                  key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
+                  key: coverage-web3-wrapper-{{ checksum "yarn.lock" }}
                   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:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-            - run: yarn lerna run lint
+            - run:
-            - run: yarn prettier:ci
+                command: yarn lerna run lint
-            - run: yarn deps_versions:ci
+                working_directory: ~/repo
-            - run: yarn diff_md_docs:ci
+            - run:
+                command: yarn prettier:ci
+                working_directory: ~/repo
+            - run:
+                command: yarn deps_versions:ci
+                working_directory: ~/repo
+            - run:
+                command: yarn diff_md_docs:ci
+                working_directory: ~/repo
     submit-coverage:
         docker:
             - image: node:16
@@ -165,16 +216,16 @@ jobs:
         steps:
             - restore_cache:
                   keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                      - repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
+                      - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
             - restore_cache:
                   keys:
-                      - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+                      - coverage-order-utils-{{ checksum "yarn.lock" }}
             - restore_cache:
                   keys:
-                      - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
+                      - coverage-contracts-{{ checksum "yarn.lock" }}
             - run: yarn report_coverage
 workflows:
     version: 2

README.md

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

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "3.3.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1661145612,
         "version": "3.3.37",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.38 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v3.3.37 - _August 22, 2022_
 
     * Dependencies updated

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.37",
+    "version": "3.3.38",
     "engines": {
         "node": ">=6.12"
     },
@@ -53,8 +53,8 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.28",
+        "@0x/contracts-test-utils": "^5.4.29",
-        "@0x/contracts-utils": "^4.8.18",
+        "@0x/contracts-utils": "^4.8.19",
         "@0x/dev-utils": "^5.0.0",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "5.4.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1661145612,
         "version": "5.4.28",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.29 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v5.4.28 - _August 22, 2022_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.28",
+    "version": "5.4.29",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,7 +44,7 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.20.1",
+        "@0x/contract-addresses": "^6.21.0",
         "@0x/dev-utils": "^5.0.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",

contracts/treasury/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "1.4.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1661145612,
         "version": "1.4.20",

contracts/treasury/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.4.21 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v1.4.20 - _August 22, 2022_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.20",
+    "version": "1.4.21",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,12 +47,12 @@
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^6.20.1",
+        "@0x/contract-addresses": "^6.21.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.37",
+        "@0x/contracts-erc20": "^3.3.38",
         "@0x/contracts-gen": "^2.0.47",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.28",
+        "@0x/contracts-test-utils": "^5.4.29",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
         "@0x/tslint-config": "^4.1.4",
@@ -73,7 +73,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.4",
+        "@0x/protocol-utils": "^11.16.5",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "4.8.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1661145612,
         "version": "4.8.18",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.8.19 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v4.8.18 - _August 22, 2022_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.18",
+    "version": "4.8.19",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,7 +52,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.28",
+        "@0x/contracts-test-utils": "^5.4.29",
         "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",

contracts/zero-ex/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "0.36.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1661145612,
         "version": "0.36.4",

contracts/zero-ex/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.36.5 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v0.36.4 - _August 22, 2022_
 
     * Dependencies updated

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

@@ -0,0 +1,113 @@
+// 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
+        );
+    }
+}

contracts/zero-ex/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-zero-ex",
-    "version": "0.36.4",
+    "version": "0.36.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -57,10 +57,10 @@
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
-        "@0x/contract-addresses": "^6.20.1",
+        "@0x/contract-addresses": "^6.21.0",
-        "@0x/contracts-erc20": "^3.3.37",
+        "@0x/contracts-erc20": "^3.3.38",
         "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.28",
+        "@0x/contracts-test-utils": "^5.4.29",
         "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
@@ -86,7 +86,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.16.4",
+        "@0x/protocol-utils": "^11.16.5",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

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 @0x/asset-swapper",
+        "nonContractPackages": "@0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test",
         "ignoreTestsForPackages": "",
         "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
         "packagesWithDocPages": "@0x/contract-wrappers",

packages/asset-swapper/README.md

@@ -1,3 +1,5 @@
+> :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.

packages/asset-swapper/package.json

@@ -1,6 +1,7 @@
 {
     "name": "@0x/asset-swapper",
-    "version": "16.66.4",
+    "version": "16.66.5",
+    "private": true,
     "engines": {
         "node": ">=6.12"
     },
@@ -8,8 +9,8 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "build": "yarn pre_build && tsc -b",
+        "build": "#yarn pre_build && tsc -b",
-        "build:ts": "tsc -b",
+        "build:ts": "#tsc -b",
         "watch": "tsc -w -p tsconfig.json",
         "watch:contracts": "sol-compiler -w",
         "build:ci": "yarn build",
@@ -19,11 +20,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",
@@ -61,15 +62,15 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.20.1",
+        "@0x/contract-addresses": "^6.21.0",
-        "@0x/contract-wrappers": "^13.21.1",
+        "@0x/contract-wrappers": "^13.21.2",
-        "@0x/contracts-erc20": "^3.3.37",
+        "@0x/contracts-erc20": "^3.3.38",
-        "@0x/contracts-zero-ex": "^0.36.4",
+        "@0x/contracts-zero-ex": "^0.36.5",
         "@0x/dev-utils": "^5.0.0",
         "@0x/fast-abi": "^0.0.5",
         "@0x/json-schemas": "^6.4.4",
         "@0x/neon-router": "^0.3.5",
-        "@0x/protocol-utils": "^11.16.4",
+        "@0x/protocol-utils": "^11.16.5",
         "@0x/quote-server": "^8.0.0",
         "@0x/types": "^3.3.6",
         "@0x/utils": "^7.0.0",
@@ -94,7 +95,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.28",
+        "@0x/contracts-test-utils": "^5.4.29",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/subproviders": "^7.0.0",
         "@0x/ts-doc-gen": "^0.0.28",

packages/asset-swapper/src/utils/market_operation_utils/constants.ts

@@ -71,6 +71,8 @@ function valueByChainId<T>(rest: Partial<{ [key in ChainId]: T }>, defaultValue:
         [ChainId.Fantom]: defaultValue,
         [ChainId.Celo]: defaultValue,
         [ChainId.Optimism]: defaultValue,
+        [ChainId.Arbitrum]: defaultValue,
+
         ...(rest || {}),
     };
 }

packages/contract-addresses/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "6.21.0",
+        "changes": [
+            {
+                "note": "Arbitrum addresses: need to be updated when deployed"
+            }
+        ],
+        "timestamp": 1661459661
+    },
     {
         "version": "6.20.1",
         "changes": [

packages/contract-addresses/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## 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

packages/contract-addresses/addresses.json

@@ -544,5 +544,47 @@
             "fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
             "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
         }
+    },
+    "42161": {
+        "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": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyTransformerDeployer": "0x29f80c1f685e19ae1807063eda432f431ac623d0",
+        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
+        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
+        "zrxTreasury": "0x0000000000000000000000000000000000000000",
+        "transformers": {
+            "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
+            "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
+            "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
+            "fillQuoteTransformer": "0x24760a755a4ffe4e44f661336fd0dc646fd6f723",
+            "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
+        }
     }
 }

packages/contract-addresses/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-addresses",
-    "version": "6.20.1",
+    "version": "6.21.0",
     "engines": {
         "node": ">=6.12"
     },

packages/contract-addresses/src/index.ts

@@ -56,7 +56,7 @@ export enum ChainId {
     Avalanche = 43114,
     Fantom = 250,
     Celo = 42220,
-    // Arbitrum = 42161,
+    Arbitrum = 42161,
     Optimism = 10,
 }
 

packages/contract-wrappers/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "13.21.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "13.21.1",
         "changes": [

packages/contract-wrappers/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v13.21.2 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v13.21.1 - _August 22, 2022_
 
     * Revert: Remove deprecated contracts

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-wrappers",
-    "version": "13.21.1",
+    "version": "13.21.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -57,7 +57,7 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.20.1",
+        "@0x/contract-addresses": "^6.21.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/types": "^3.3.6",
         "@0x/utils": "^7.0.0",

packages/protocol-utils/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1661459661,
+        "version": "11.16.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1661145612,
         "version": "11.16.4",

packages/protocol-utils/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v11.16.5 - _August 25, 2022_
+
+    * Dependencies updated
+
 ## v11.16.4 - _August 22, 2022_
 
     * Dependencies updated

packages/protocol-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/protocol-utils",
-    "version": "11.16.4",
+    "version": "11.16.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -63,8 +63,8 @@
     },
     "dependencies": {
         "@0x/assert": "^3.0.35",
-        "@0x/contract-addresses": "^6.20.1",
+        "@0x/contract-addresses": "^6.21.0",
-        "@0x/contract-wrappers": "^13.21.1",
+        "@0x/contract-wrappers": "^13.21.2",
         "@0x/json-schemas": "^6.4.4",
         "@0x/subproviders": "^7.0.0",
         "@0x/utils": "^7.0.0",