WIP

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 parameters:
     cache_version:
         type: string
-        default: v5
+        default: v4
 
 jobs:
     build:
@@ -18,7 +18,7 @@ jobs:
             - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-feat/NerveMixinArbitrum
+                      - lib-{{ .Environment.CIRCLE_BRANCH }}
             - restore_cache:
                   keys:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
@@ -33,46 +33,30 @@ jobs:
             - save_cache:
                   key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
                   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 }}-<< pipeline.parameters.cache_version >>
+                  key: lib-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
-                      - ~/project/contracts/erc20/generated-artifacts/
-                      - ~/project/contracts/erc20/generated-wrappers/
                       - ~/project/contracts/erc20/lib/
-                      - ~/project/contracts/erc20/node_modules
-                      - ~/project/contracts/erc20/test/generated-artifacts/
-                      - ~/project/contracts/erc20/test/generated-wrappers/
                       - ~/project/contracts/test-utils/lib/
-                      - ~/project/contracts/test-utils/node_modules
-                      - ~/project/contracts/treasury/generated-artifacts/
-                      - ~/project/contracts/treasury/generated-wrappers/
                       - ~/project/contracts/treasury/lib/
-                      - ~/project/contracts/treasury/node_modules
-                      - ~/project/contracts/treasury/test/generated-artifacts/
-                      - ~/project/contracts/treasury/test/generated-wrappers/
-                      - ~/project/contracts/utils/generated-artifacts/
-                      - ~/project/contracts/utils/generated-wrappers/
                       - ~/project/contracts/utils/lib/
-                      - ~/project/contracts/utils/node_modules
-                      - ~/project/contracts/utils/test/generated-artifacts/
-                      - ~/project/contracts/utils/test/generated-wrappers/
-                      - ~/project/contracts/zero-ex/generated-artifacts/
-                      - ~/project/contracts/zero-ex/generated-wrappers/
                       - ~/project/contracts/zero-ex/lib/
-                      - ~/project/contracts/zero-ex/node_modules
-                      - ~/project/contracts/zero-ex/test/generated-artifacts/
-                      - ~/project/contracts/zero-ex/test/generated-wrappers/
-                      - ~/project/packages/asset-swapper/node_modules
                       - ~/project/packages/contract-addresses/lib/
-                      - ~/project/packages/contract-addresses/node_modules
                       - ~/project/packages/contract-artifacts/lib/
-                      - ~/project/packages/contract-artifacts/node_modules
                       - ~/project/packages/contract-wrappers/lib/
-                      - ~/project/packages/contract-wrappers/node_modules
                       - ~/project/packages/protocol-utils/lib/
-                      - ~/project/packages/protocol-utils/node_modules
             - store_artifacts:
                   path: ~/repo/packages/abi-gen/test-cli/output
             - store_artifacts:
@@ -88,7 +72,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
     test-integrations-ganache:
         resource_class: xlarge
@@ -101,7 +85,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
     test-contracts-staking-ganache:
         resource_class: xlarge
@@ -112,7 +96,7 @@ jobs:
             - restore_cache:
                   keys:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
     test-contracts-extra-ganache:
         resource_class: xlarge
@@ -125,7 +109,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .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
@@ -143,7 +127,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - run: |
                   yarn wsrun \
                     -p @0x/contracts-multisig \
@@ -173,8 +157,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
-            - run: git submodule update --init --recursive
             - run:
                 command: forge test
                 working_directory: ~/project/contracts/zero-ex
@@ -198,7 +181,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - run:
                   command: yarn test:publish:circleci
                   no_output_timeout: 1800
@@ -214,7 +197,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - run:
                   command: yarn test:generate_docs:circleci
                   no_output_timeout: 1200
@@ -230,7 +213,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .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
@@ -257,10 +240,7 @@ jobs:
             - restore_cache:
                   keys:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
             - run:
                   command: yarn lerna run lint
             - run:
@@ -278,7 +258,7 @@ jobs:
                       - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
             - restore_cache:
                   keys:
-                      - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
+                      - lib-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}

contracts/erc20/CHANGELOG.json

@@ -1,49 +1,4 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "3.3.44",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "3.3.43",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662559804,
-        "version": "3.3.42",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "3.3.41",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662046042,
-        "version": "3.3.40",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1661462289,
         "version": "3.3.39",

contracts/erc20/CHANGELOG.md

@@ -5,26 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v3.3.44 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v3.3.43 - _September 12, 2022_
-
-    * Dependencies updated
-
-## v3.3.42 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v3.3.41 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v3.3.40 - _September 1, 2022_
-
-    * Dependencies updated
-
 ## v3.3.39 - _August 25, 2022_
 
     * Dependencies updated

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.44",
+    "version": "3.3.39",
     "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.35",
+        "@0x/contracts-test-utils": "^5.4.30",
-        "@0x/contracts-utils": "^4.8.25",
+        "@0x/contracts-utils": "^4.8.20",
         "@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,49 +1,4 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "5.4.35",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "5.4.34",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662559804,
-        "version": "5.4.33",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "5.4.32",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662046042,
-        "version": "5.4.31",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1661462289,
         "version": "5.4.30",

contracts/test-utils/CHANGELOG.md

@@ -5,26 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v5.4.35 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v5.4.34 - _September 12, 2022_
-
-    * Dependencies updated
-
-## v5.4.33 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v5.4.32 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v5.4.31 - _September 1, 2022_
-
-    * Dependencies updated
-
 ## v5.4.30 - _August 25, 2022_
 
     * Dependencies updated

contracts/test-utils/package.json

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

contracts/treasury/CHANGELOG.json

@@ -1,49 +1,4 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "1.4.27",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "1.4.26",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662559804,
-        "version": "1.4.25",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "1.4.24",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662046042,
-        "version": "1.4.23",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1661462289,
         "version": "1.4.22",

contracts/treasury/CHANGELOG.md

@@ -5,26 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.4.27 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v1.4.26 - _September 12, 2022_
-
-    * Dependencies updated
-
-## v1.4.25 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v1.4.24 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v1.4.23 - _September 1, 2022_
-
-    * Dependencies updated
-
 ## v1.4.22 - _August 25, 2022_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.27",
+    "version": "1.4.22",
     "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.23.4",
+        "@0x/contract-addresses": "^6.22.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.44",
+        "@0x/contracts-erc20": "^3.3.39",
         "@0x/contracts-gen": "^2.0.47",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.35",
+        "@0x/contracts-test-utils": "^5.4.30",
         "@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.11",
+        "@0x/protocol-utils": "^11.16.6",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

@@ -1,49 +1,4 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "4.8.25",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "4.8.24",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662559804,
-        "version": "4.8.23",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662147076,
-        "version": "4.8.22",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662046042,
-        "version": "4.8.21",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1661462289,
         "version": "4.8.20",

contracts/utils/CHANGELOG.md

@@ -5,26 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v4.8.25 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v4.8.24 - _September 12, 2022_
-
-    * Dependencies updated
-
-## v4.8.23 - _September 7, 2022_
-
-    * Dependencies updated
-
-## v4.8.22 - _September 2, 2022_
-
-    * Dependencies updated
-
-## v4.8.21 - _September 1, 2022_
-
-    * Dependencies updated
-
 ## v4.8.20 - _August 25, 2022_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.25",
+    "version": "4.8.20",
     "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.35",
+        "@0x/contracts-test-utils": "^5.4.30",
         "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",

contracts/zero-ex/CHANGELOG.json

@@ -1,54 +1,4 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "0.37.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "0.37.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "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",

contracts/zero-ex/CHANGELOG.md

@@ -5,27 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v0.37.4 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v0.37.3 - _September 12, 2022_
-
-    * Dependencies updated
-
-## 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

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

@@ -20,6 +20,8 @@
 pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
+
+
 import "./features/interfaces/IOwnableFeature.sol";
 import "./features/interfaces/ISimpleFunctionRegistryFeature.sol";
 import "./features/interfaces/ITokenSpenderFeature.sol";

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,
+        Rfq
-        Otc
     }
 
     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.rfqOrders.length != data.fillSequence.length
-                + data.otcOrders.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,

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

@@ -23,29 +23,19 @@ pragma experimental ABIEncoderV2;
 import "./AbstractBridgeAdapter.sol";
 import "./BridgeProtocols.sol";
 import "./mixins/MixinBalancerV2.sol";
-import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
-import "./mixins/MixinCurveV2.sol";
 import "./mixins/MixinDodoV2.sol";
-import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinGMX.sol";
-import "./mixins/MixinNerve.sol";
 import "./mixins/MixinUniswapV3.sol";
-import "./mixins/MixinUniswapV2.sol";
 import "./mixins/MixinZeroExBridge.sol";
 
 contract ArbitrumBridgeAdapter is
     AbstractBridgeAdapter(42161, "Arbitrum"),
     MixinBalancerV2,
-    MixinBalancerV2Batch,
     MixinCurve,
-    MixinCurveV2,
     MixinDodoV2,
-    MixinKyberDmm,
     MixinGMX,
-    MixinNerve,
     MixinUniswapV3,
-    MixinUniswapV2,
     MixinZeroExBridge
 {
     constructor(IEtherTokenV06 weth)
@@ -73,12 +63,6 @@ contract ArbitrumBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
-        } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeBalancerV2Batch(
-                sellAmount,
-                order.bridgeData
-            );
         } else if (protocolId == BridgeProtocols.CURVE) {
             if (dryRun) { return (0, true); }
             boughtAmount = _tradeCurve(
@@ -87,14 +71,6 @@ contract ArbitrumBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
-        } else if (protocolId == BridgeProtocols.CURVEV2) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeCurveV2(
-                sellToken,
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
         } else if (protocolId == BridgeProtocols.DODOV2) {
             if (dryRun) { return (0, true); }
             boughtAmount = _tradeDodoV2(
@@ -102,13 +78,6 @@ contract ArbitrumBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
-        } else if (protocolId == BridgeProtocols.KYBERDMM) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeKyberDmm(
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
         } else if (protocolId == BridgeProtocols.UNISWAPV3) {
             if (dryRun) { return (0, true); }
             boughtAmount = _tradeUniswapV3(
@@ -116,23 +85,9 @@ contract ArbitrumBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
-        } else if (protocolId == BridgeProtocols.UNISWAPV2) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeUniswapV2(
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
         } else if (protocolId == BridgeProtocols.GMX) {
             if (dryRun) { return (0, true); }
             boughtAmount = _tradeGMX(
-                buyToken,
-                sellAmount,
-                order.bridgeData
-            );
-        } else if (protocolId == BridgeProtocols.NERVE) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeNerve(
                 sellToken,
                 sellAmount,
                 order.bridgeData

contracts/zero-ex/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-zero-ex",
-    "version": "0.37.4",
+    "version": "0.36.6",
     "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.23.4",
+        "@0x/contract-addresses": "^6.22.0",
-        "@0x/contracts-erc20": "^3.3.44",
+        "@0x/contracts-erc20": "^3.3.39",
         "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.35",
+        "@0x/contracts-test-utils": "^5.4.30",
         "@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.11",
+        "@0x/protocol-utils": "^11.16.6",
         "@0x/subproviders": "^7.0.0",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

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,

packages/asset-swapper/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/asset-swapper",
-    "version": "16.66.11",
+    "version": "16.66.6",
     "private": true,
     "engines": {
         "node": ">=6.12"
@@ -62,15 +62,15 @@
     "dependencies": {
         "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^6.23.4",
+        "@0x/contract-addresses": "^6.22.0",
-        "@0x/contract-wrappers": "^13.22.4",
+        "@0x/contract-wrappers": "^13.21.3",
-        "@0x/contracts-erc20": "^3.3.44",
+        "@0x/contracts-erc20": "^3.3.39",
-        "@0x/contracts-zero-ex": "^0.37.4",
+        "@0x/contracts-zero-ex": "^0.36.6",
         "@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.11",
+        "@0x/protocol-utils": "^11.16.6",
         "@0x/quote-server": "^8.0.0",
         "@0x/types": "^3.3.6",
         "@0x/utils": "^7.0.0",
@@ -95,7 +95,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.1",
         "@0x/contracts-gen": "^2.0.47",
-        "@0x/contracts-test-utils": "^5.4.35",
+        "@0x/contracts-test-utils": "^5.4.30",
         "@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

@@ -224,7 +224,10 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.Velodrome,
             ERC20BridgeSource.Synthetix,
         ]),
-        [ChainId.ArbitrumRinkeby]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
+        [ChainId.ArbitrumRinkeby]: new SourceFilters([
+            ERC20BridgeSource.Native,
+            ERC20BridgeSource.UniswapV3,
+        ]),
     },
     new SourceFilters([]),
 );
@@ -376,7 +379,10 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.Velodrome,
             ERC20BridgeSource.Synthetix,
         ]),
-        [ChainId.ArbitrumRinkeby]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
+        [ChainId.ArbitrumRinkeby]: new SourceFilters([
+            ERC20BridgeSource.Native,
+            ERC20BridgeSource.UniswapV3,
+        ]),
     },
     new SourceFilters([]),
 );

packages/contract-addresses/CHANGELOG.json

@@ -1,57 +1,12 @@
 [
-    {
-        "version": "6.23.4",
-        "changes": [
-            {
-                "note": "New FQT for Arbitrum with Nerve",
-                "pr": 581
-            }
-        ],
-        "timestamp": 1663786955
-    },
-    {
-        "version": "6.23.3",
-        "changes": [
-            {
-                "note": "New FQT for Optimism with BalV2",
-                "pr": 577
-            }
-        ],
-        "timestamp": 1662998180
-    },
-    {
-        "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",

packages/contract-addresses/CHANGELOG.md

@@ -5,27 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v6.23.4 - _September 21, 2022_
-
-    * New FQT for Arbitrum with Nerve (#581)
-
-## v6.23.3 - _September 12, 2022_
-
-    * New FQT for Optimism with BalV2 (#577)
-
-## 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)

packages/contract-addresses/addresses.json

@@ -294,7 +294,7 @@
             "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
             "payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11",
             "affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553",
-            "fillQuoteTransformer": "0x845c75a791cceb1a451f4ca5778c011226dda95c",
+            "fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
             "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
         }
     },
@@ -323,7 +323,7 @@
     },
     "42161": {
         "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
+        "etherToken": "0x4200000000000000000000000000000000000006",
         "zeroExGovernor": "0x0000000000000000000000000000000000000000",
         "zrxVault": "0x0000000000000000000000000000000000000000",
         "staking": "0x0000000000000000000000000000000000000000",
@@ -340,8 +340,9 @@
             "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
             "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
             "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
-            "fillQuoteTransformer": "0x466b00a77662245c2cc7b093a7102a687afc16f3",
+            "fillQuoteTransformer": "0x24760a755a4ffe4e44f661336fd0dc646fd6f723",
             "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
         }
     }
+    
 }

packages/contract-addresses/package.json

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

packages/contract-addresses/src/index.ts

@@ -39,7 +39,7 @@ export enum ChainId {
     Celo = 42220,
     Optimism = 10,
     Arbitrum = 42161,
-    ArbitrumRinkeby = 421611,
+    ArbitrumRinkeby = 421611
 }
 
 /**

packages/contract-wrappers/CHANGELOG.json

@@ -1,48 +1,11 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "13.22.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "13.22.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "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,

packages/contract-wrappers/CHANGELOG.md

@@ -5,26 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v13.22.4 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v13.22.3 - _September 12, 2022_
-
-    * Dependencies updated
-
-## 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

packages/contract-wrappers/package.json

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

packages/contract-wrappers/src/types.ts

@@ -1,9 +1,8 @@
 import { ContractAddresses } from '@0x/contract-addresses';
 import { BigNumber } from '@0x/utils';
 
-export enum ForwarderError {
+// not formatted
-    CompleteFillFailed = 'COMPLETE_FILL_FAILED',
+export enum ForwarderError { CompleteFillFailed   = 'COMPLETE_FILL_FAILED',          }
-}
 
 export enum ContractError {
     ContractNotDeployedOnChain = 'CONTRACT_NOT_DEPLOYED_ON_CHAIN',

packages/protocol-utils/CHANGELOG.json

@@ -1,50 +1,4 @@
 [
-    {
-        "timestamp": 1663786955,
-        "version": "11.16.11",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1662998180,
-        "version": "11.16.10",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "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",

packages/protocol-utils/CHANGELOG.md

@@ -5,26 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v11.16.11 - _September 21, 2022_
-
-    * Dependencies updated
-
-## v11.16.10 - _September 12, 2022_
-
-    * Dependencies updated
-
-## 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

packages/protocol-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/protocol-utils",
-    "version": "11.16.11",
+    "version": "11.16.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -63,8 +63,8 @@
     },
     "dependencies": {
         "@0x/assert": "^3.0.35",
-        "@0x/contract-addresses": "^6.23.4",
+        "@0x/contract-addresses": "^6.22.0",
-        "@0x/contract-wrappers": "^13.22.4",
+        "@0x/contract-wrappers": "^13.21.3",
         "@0x/json-schemas": "^6.4.4",
         "@0x/subproviders": "^7.0.0",
         "@0x/utils": "^7.0.0",

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[]',
@@ -106,7 +87,6 @@ export enum FillQuoteTransformerOrderType {
     Bridge,
     Limit,
     Rfq,
-    Otc,
 }
 
 /**
@@ -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.
  */