simulate maker and taker balances of erc20

adding the rest of the changes
otc order implementation added to FQT with failing tests
2022-08-19 15:13:38 -04:00 · 2022-08-19 14:27:00 -04:00 · 2022-08-19 14:25:34 -04:00 · 2022-08-16 14:10:53 -04:00 · 2022-08-11 13:31:47 -07:00 · 2022-08-10 08:42:43 -04:00
58 changed files with 1330 additions and 269 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,6 +10,7 @@ jobs:
        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
            - run:
                  name: install-yarn
@@ -77,6 +78,17 @@ jobs:
                  keys:
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn wsrun -p @0x/contracts-multisig -p @0x/contracts-utils -p @0x/contracts-exchange-libs -p  @0x/contracts-erc20 -p @0x/contracts-erc721 -p @0x/contracts-erc1155 -p @0x/contracts-asset-proxy -p @0x/contracts-broker -p @0x/contracts-zero-ex -m --serial -c test:circleci
+    test-foundry:
+        resource_class: medium+
+        docker:
+            - image: ghcr.io/foundry-rs/foundry:latest
+        working_directory: ~/repo/contracts/zero-ex
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            # - run: forge install
+            - run: forge test
    test-publish:
        resource_class: large
        environment:
@@ -116,6 +128,7 @@ jobs:
                  keys:
                      - 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
@@ -181,6 +194,9 @@ workflows:
            # - test-contracts-extra-ganache:
            #       requires:
            #           - build
+            - test-foundry:
+                  requires:
+                      - build
            - test-contracts-rest-ganache:
                  requires:
                      - build
--- a/.gitignore
+++ b/.gitignore
@@ -173,6 +173,15 @@ contracts/zero-ex/test/generated-wrappers/
 contracts/treasury/generated-wrappers/
 contracts/treasury/test/generated-wrappers/

+# foundry artifacts
+contracts/zero-ex/foundry-artifacts/
+
+# foundry cache 
+contracts/zero-ex/foundry-cache/
+
+# typechain wrappers
+contracts/zero-ex/typechain-wrappers/
+
 # Doc README copy
 packages/*/docs/README.md

--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "contracts/zero-ex/contracts/deps/forge-std"]
+	path = contracts/zero-ex/contracts/deps/forge-std
+	url = https://github.com/foundry-rs/forge-std
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1660093941,
+        "version": "3.3.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "3.3.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1659750766,
        "version": "3.3.34",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v3.3.36 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v3.3.35 - _August 9, 2022_
+
+    * Dependencies updated
+
 ## v3.3.34 - _August 6, 2022_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "3.3.34",
+    "version": "3.3.36",
    "engines": {
        "node": ">=6.12"
    },
@@ -53,8 +53,8 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.0",
        "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.25",
-        "@0x/contracts-utils": "^4.8.15",
+        "@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",
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1660093941,
+        "version": "5.4.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "5.4.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1659750766,
        "version": "5.4.25",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v5.4.27 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v5.4.26 - _August 9, 2022_
+
+    * Dependencies updated
+
 ## v5.4.25 - _August 6, 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.25",
+    "version": "5.4.27",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,7 +44,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.34",
        "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.19.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",
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1660093941,
+        "version": "1.4.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "1.4.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1659750766,
        "version": "1.4.17",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.4.19 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v1.4.18 - _August 9, 2022_
+
+    * Dependencies updated
+
 ## v1.4.17 - _August 6, 2022_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.17",
+    "version": "1.4.19",
    "engines": {
        "node": ">=6.12"
    },
@@ -47,12 +47,12 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.0",
-        "@0x/contract-addresses": "^6.19.0",
+        "@0x/contract-addresses": "^6.19.2",
        "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.34",
+        "@0x/contracts-erc20": "^3.3.36",
        "@0x/contracts-gen": "^2.0.46",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.25",
+        "@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",
@@ -73,7 +73,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^6.5.0",
-        "@0x/protocol-utils": "^11.16.1",
+        "@0x/protocol-utils": "^11.16.3",
        "@0x/subproviders": "^6.6.5",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1660093941,
+        "version": "4.8.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "4.8.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1659750766,
        "version": "4.8.15",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.8.17 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v4.8.16 - _August 9, 2022_
+
+    * Dependencies updated
+
 ## v4.8.15 - _August 6, 2022_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.15",
+    "version": "4.8.17",
    "engines": {
        "node": ">=6.12"
    },
@@ -52,7 +52,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.0",
        "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.25",
+        "@0x/contracts-test-utils": "^5.4.27",
        "@0x/dev-utils": "^4.2.14",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.8.1",
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+    {
+        "version": "0.37.0",
+        "changes": [
+            {
+                "note": "Add support for OTC orders in the FillQuoteTransformer"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "0.36.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.36.2",
+        "changes": [
+            {
+                "note": "Add Foundry support",
+                "pr": 534
+            }
+        ],
+        "timestamp": 1659976271
+    },
    {
        "timestamp": 1659750766,
        "version": "0.36.1",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.36.3 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v0.36.2 - _August 8, 2022_
+
+    * Add Foundry support (#534)
+
 ## v0.36.1 - _August 6, 2022_

    * Dependencies updated
--- a/contracts/zero-ex/README.md
+++ b/contracts/zero-ex/README.md
@@ -2,6 +2,10 @@

 This package contains contracts for the ZeroEx extensible contract architecture.

+> **_NOTE:_**  This repo is undergoing a tooling change. If adding a contract, you will need to
+> add it to `compiler.json`. You can generate the entire list by running the following:
+> `find . -type f -name "*.sol" | grep -v foundry | grep -v "contracts/dep" | grep -v "node_modules"`
+
 ## Installation

 **Install**
--- a/contracts/zero-ex/compiler.json
+++ b/contracts/zero-ex/compiler.json
@@ -1,6 +1,212 @@
 {
    "artifactsDir": "./test/generated-artifacts",
    "contractsDir": "./contracts",
+    "contracts": [
+        "./contracts/src/IZeroEx.sol",
+        "./contracts/src/ZeroEx.sol",
+        "./contracts/src/ZeroExOptimized.sol",
+        "./contracts/src/errors/LibCommonRichErrors.sol",
+        "./contracts/src/errors/LibLiquidityProviderRichErrors.sol",
+        "./contracts/src/errors/LibMetaTransactionsRichErrors.sol",
+        "./contracts/src/errors/LibNFTOrdersRichErrors.sol",
+        "./contracts/src/errors/LibNativeOrdersRichErrors.sol",
+        "./contracts/src/errors/LibOwnableRichErrors.sol",
+        "./contracts/src/errors/LibProxyRichErrors.sol",
+        "./contracts/src/errors/LibSignatureRichErrors.sol",
+        "./contracts/src/errors/LibSimpleFunctionRegistryRichErrors.sol",
+        "./contracts/src/errors/LibTransformERC20RichErrors.sol",
+        "./contracts/src/errors/LibWalletRichErrors.sol",
+        "./contracts/src/external/FeeCollector.sol",
+        "./contracts/src/external/FeeCollectorController.sol",
+        "./contracts/src/external/FlashWallet.sol",
+        "./contracts/src/external/IFlashWallet.sol",
+        "./contracts/src/external/ILiquidityProviderSandbox.sol",
+        "./contracts/src/external/LibFeeCollector.sol",
+        "./contracts/src/external/LiquidityProviderSandbox.sol",
+        "./contracts/src/external/PermissionlessTransformerDeployer.sol",
+        "./contracts/src/external/TransformerDeployer.sol",
+        "./contracts/src/features/BatchFillNativeOrdersFeature.sol",
+        "./contracts/src/features/BootstrapFeature.sol",
+        "./contracts/src/features/ERC165Feature.sol",
+        "./contracts/src/features/FundRecoveryFeature.sol",
+        "./contracts/src/features/LiquidityProviderFeature.sol",
+        "./contracts/src/features/MetaTransactionsFeature.sol",
+        "./contracts/src/features/NativeOrdersFeature.sol",
+        "./contracts/src/features/OtcOrdersFeature.sol",
+        "./contracts/src/features/OwnableFeature.sol",
+        "./contracts/src/features/PancakeSwapFeature.sol",
+        "./contracts/src/features/SimpleFunctionRegistryFeature.sol",
+        "./contracts/src/features/TransformERC20Feature.sol",
+        "./contracts/src/features/UniswapFeature.sol",
+        "./contracts/src/features/UniswapV3Feature.sol",
+        "./contracts/src/features/interfaces/IBatchFillNativeOrdersFeature.sol",
+        "./contracts/src/features/interfaces/IBootstrapFeature.sol",
+        "./contracts/src/features/interfaces/IERC1155OrdersFeature.sol",
+        "./contracts/src/features/interfaces/IERC165Feature.sol",
+        "./contracts/src/features/interfaces/IERC721OrdersFeature.sol",
+        "./contracts/src/features/interfaces/IFeature.sol",
+        "./contracts/src/features/interfaces/IFundRecoveryFeature.sol",
+        "./contracts/src/features/interfaces/ILiquidityProviderFeature.sol",
+        "./contracts/src/features/interfaces/IMetaTransactionsFeature.sol",
+        "./contracts/src/features/interfaces/IMultiplexFeature.sol",
+        "./contracts/src/features/interfaces/INativeOrdersEvents.sol",
+        "./contracts/src/features/interfaces/INativeOrdersFeature.sol",
+        "./contracts/src/features/interfaces/IOtcOrdersFeature.sol",
+        "./contracts/src/features/interfaces/IOwnableFeature.sol",
+        "./contracts/src/features/interfaces/IPancakeSwapFeature.sol",
+        "./contracts/src/features/interfaces/ISimpleFunctionRegistryFeature.sol",
+        "./contracts/src/features/interfaces/ITokenSpenderFeature.sol",
+        "./contracts/src/features/interfaces/ITransformERC20Feature.sol",
+        "./contracts/src/features/interfaces/IUniswapFeature.sol",
+        "./contracts/src/features/interfaces/IUniswapV3Feature.sol",
+        "./contracts/src/features/libs/LibNFTOrder.sol",
+        "./contracts/src/features/libs/LibNativeOrder.sol",
+        "./contracts/src/features/libs/LibSignature.sol",
+        "./contracts/src/features/multiplex/MultiplexFeature.sol",
+        "./contracts/src/features/multiplex/MultiplexLiquidityProvider.sol",
+        "./contracts/src/features/multiplex/MultiplexOtc.sol",
+        "./contracts/src/features/multiplex/MultiplexRfq.sol",
+        "./contracts/src/features/multiplex/MultiplexTransformERC20.sol",
+        "./contracts/src/features/multiplex/MultiplexUniswapV2.sol",
+        "./contracts/src/features/multiplex/MultiplexUniswapV3.sol",
+        "./contracts/src/features/native_orders/NativeOrdersCancellation.sol",
+        "./contracts/src/features/native_orders/NativeOrdersInfo.sol",
+        "./contracts/src/features/native_orders/NativeOrdersProtocolFees.sol",
+        "./contracts/src/features/native_orders/NativeOrdersSettlement.sol",
+        "./contracts/src/features/nft_orders/ERC1155OrdersFeature.sol",
+        "./contracts/src/features/nft_orders/ERC721OrdersFeature.sol",
+        "./contracts/src/features/nft_orders/NFTOrders.sol",
+        "./contracts/src/fixins/FixinCommon.sol",
+        "./contracts/src/fixins/FixinEIP712.sol",
+        "./contracts/src/fixins/FixinERC1155Spender.sol",
+        "./contracts/src/fixins/FixinERC721Spender.sol",
+        "./contracts/src/fixins/FixinProtocolFees.sol",
+        "./contracts/src/fixins/FixinReentrancyGuard.sol",
+        "./contracts/src/fixins/FixinTokenSpender.sol",
+        "./contracts/src/liquidity-providers/CurveLiquidityProvider.sol",
+        "./contracts/src/liquidity-providers/MooniswapLiquidityProvider.sol",
+        "./contracts/src/migrations/FullMigration.sol",
+        "./contracts/src/migrations/InitialMigration.sol",
+        "./contracts/src/migrations/LibBootstrap.sol",
+        "./contracts/src/migrations/LibMigrate.sol",
+        "./contracts/src/storage/LibERC1155OrdersStorage.sol",
+        "./contracts/src/storage/LibERC721OrdersStorage.sol",
+        "./contracts/src/storage/LibMetaTransactionsStorage.sol",
+        "./contracts/src/storage/LibNativeOrdersStorage.sol",
+        "./contracts/src/storage/LibOtcOrdersStorage.sol",
+        "./contracts/src/storage/LibOwnableStorage.sol",
+        "./contracts/src/storage/LibProxyStorage.sol",
+        "./contracts/src/storage/LibReentrancyGuardStorage.sol",
+        "./contracts/src/storage/LibSimpleFunctionRegistryStorage.sol",
+        "./contracts/src/storage/LibStorage.sol",
+        "./contracts/src/storage/LibTransformERC20Storage.sol",
+        "./contracts/src/transformers/AffiliateFeeTransformer.sol",
+        "./contracts/src/transformers/FillQuoteTransformer.sol",
+        "./contracts/src/transformers/IERC20Transformer.sol",
+        "./contracts/src/transformers/LibERC20Transformer.sol",
+        "./contracts/src/transformers/LogMetadataTransformer.sol",
+        "./contracts/src/transformers/PayTakerTransformer.sol",
+        "./contracts/src/transformers/PositiveSlippageFeeTransformer.sol",
+        "./contracts/src/transformers/Transformer.sol",
+        "./contracts/src/transformers/WethTransformer.sol",
+        "./contracts/src/transformers/bridges/AbstractBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/AvalancheBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/BSCBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/BridgeProtocols.sol",
+        "./contracts/src/transformers/bridges/CeloBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/EthereumBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/FantomBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/IBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/OptimismBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/PolygonBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinAaveV2.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinBalancer.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinBancor.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinBancorV3.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinCompound.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinCryptoCom.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinCurve.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinCurveV2.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinDodo.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinDodoV2.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinGMX.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinLido.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinMStable.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinMakerPSM.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinMooniswap.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinNerve.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinPlatypus.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinShell.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinSynthetix.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinUniswap.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinUniswapV2.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinUniswapV3.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinVelodrome.sol",
+        "./contracts/src/transformers/bridges/mixins/MixinZeroExBridge.sol",
+        "./contracts/src/vendor/IERC1155Token.sol",
+        "./contracts/src/vendor/IERC721Token.sol",
+        "./contracts/src/vendor/IFeeRecipient.sol",
+        "./contracts/src/vendor/ILiquidityProvider.sol",
+        "./contracts/src/vendor/IMooniswapPool.sol",
+        "./contracts/src/vendor/IPropertyValidator.sol",
+        "./contracts/src/vendor/ITakerCallback.sol",
+        "./contracts/src/vendor/IUniswapV2Pair.sol",
+        "./contracts/src/vendor/IUniswapV3Pool.sol",
+        "./contracts/src/vendor/v3/IERC20Bridge.sol",
+        "./contracts/src/vendor/v3/IStaking.sol",
+        "./contracts/test/ITestSimpleFunctionRegistryFeature.sol",
+        "./contracts/test/TestBridge.sol",
+        "./contracts/test/TestCallTarget.sol",
+        "./contracts/test/TestDelegateCaller.sol",
+        "./contracts/test/TestFeeCollectorController.sol",
+        "./contracts/test/TestFeeRecipient.sol",
+        "./contracts/test/TestFillQuoteTransformerBridge.sol",
+        "./contracts/test/TestFillQuoteTransformerExchange.sol",
+        "./contracts/test/TestFillQuoteTransformerHost.sol",
+        "./contracts/test/TestFixinProtocolFees.sol",
+        "./contracts/test/TestFixinTokenSpender.sol",
+        "./contracts/test/TestFullMigration.sol",
+        "./contracts/test/TestInitialMigration.sol",
+        "./contracts/test/TestLibNativeOrder.sol",
+        "./contracts/test/TestLibSignature.sol",
+        "./contracts/test/TestMetaTransactionsNativeOrdersFeature.sol",
+        "./contracts/test/TestMetaTransactionsTransformERC20Feature.sol",
+        "./contracts/test/TestMigrator.sol",
+        "./contracts/test/TestMintTokenERC20Transformer.sol",
+        "./contracts/test/TestNFTOrderPresigner.sol",
+        "./contracts/test/TestNativeOrdersFeature.sol",
+        "./contracts/test/TestNoEthRecipient.sol",
+        "./contracts/test/TestOrderSignerRegistryWithContractWallet.sol",
+        "./contracts/test/TestPermissionlessTransformerDeployerSuicidal.sol",
+        "./contracts/test/TestPermissionlessTransformerDeployerTransformer.sol",
+        "./contracts/test/TestPropertyValidator.sol",
+        "./contracts/test/TestRfqOriginRegistration.sol",
+        "./contracts/test/TestSimpleFunctionRegistryFeatureImpl1.sol",
+        "./contracts/test/TestSimpleFunctionRegistryFeatureImpl2.sol",
+        "./contracts/test/TestStaking.sol",
+        "./contracts/test/TestTransformERC20.sol",
+        "./contracts/test/TestTransformerBase.sol",
+        "./contracts/test/TestTransformerDeployerTransformer.sol",
+        "./contracts/test/TestTransformerHost.sol",
+        "./contracts/test/TestUniswapV3Feature.sol",
+        "./contracts/test/TestWethTransformerHost.sol",
+        "./contracts/test/TestZeroExFeature.sol",
+        "./contracts/test/integration/TestCurve.sol",
+        "./contracts/test/integration/TestLiquidityProvider.sol",
+        "./contracts/test/integration/TestMooniswap.sol",
+        "./contracts/test/integration/TestUniswapV2Factory.sol",
+        "./contracts/test/integration/TestUniswapV2Pool.sol",
+        "./contracts/test/integration/TestUniswapV3Factory.sol",
+        "./contracts/test/integration/TestUniswapV3Pool.sol",
+        "./contracts/test/tokens/TestMintableERC1155Token.sol",
+        "./contracts/test/tokens/TestMintableERC20Token.sol",
+        "./contracts/test/tokens/TestMintableERC721Token.sol",
+        "./contracts/test/tokens/TestTokenSpenderERC20Token.sol",
+        "./contracts/test/tokens/TestWeth.sol"
+    ],
    "useDockerisedSolc": false,
    "isOfflineMode": false,
    "shouldSaveStandardInput": true,
--- a/contracts/zero-ex/contracts/deps/forge-std
+++ b/contracts/zero-ex/contracts/deps/forge-std
--- a/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol
@@ -31,6 +31,7 @@ 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
@@ -52,7 +53,8 @@ contract FillQuoteTransformer is
    enum OrderType {
        Bridge,
        Limit,
-        Rfq
+        Rfq,
+        Otc
    }

    struct LimitOrderInfo {
@@ -62,6 +64,13 @@ 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;
+    }
+
    struct RfqOrderInfo {
        LibNativeOrder.RfqOrder order;
        LibSignature.Signature signature;
@@ -84,6 +93,8 @@ 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;

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

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

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

    /// @dev Create this contract.
    /// @param bridgeAdapter_ The bridge adapter contract.
    /// @param zeroEx_ The Exchange Proxy contract.
-    constructor(IBridgeAdapter bridgeAdapter_, INativeOrdersFeature zeroEx_)
+    constructor(IBridgeAdapter bridgeAdapter_, IZeroEx zeroEx_)
        public
        Transformer()
    {
@@ -172,7 +183,6 @@ contract FillQuoteTransformer is
    {
        TransformData memory data = abi.decode(context.data, (TransformData));
        FillState memory state;
-
        // Validate data fields.
        if (data.sellToken.isTokenETH() || data.buyToken.isTokenETH()) {
            LibTransformERC20RichErrors.InvalidTransformDataError(
@@ -183,6 +193,7 @@ contract FillQuoteTransformer is

        if (data.bridgeOrders.length
                + data.limitOrders.length
+                + data.otcOrders.length
                + data.rfqOrders.length != data.fillSequence.length
        ) {
            LibTransformERC20RichErrors.InvalidTransformDataError(
@@ -198,7 +209,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 != 0) {
+        if (data.limitOrders.length + data.rfqOrders.length + data.otcOrders.length != 0) {
            data.sellToken.approveIfBelow(address(zeroEx), data.fillAmount);
            // Compute the protocol fee if a limit order is present.
            if (data.limitOrders.length != 0) {
@@ -222,6 +233,7 @@ contract FillQuoteTransformer is

            state.currentOrderType = OrderType(data.fillSequence[i]);
            uint256 orderIndex = state.currentIndices[uint256(state.currentOrderType)];
+            
            // Fill the order.
            FillOrderResults memory results;
            if (state.currentOrderType == OrderType.Bridge) {
@@ -230,6 +242,8 @@ 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");
            }
@@ -402,6 +416,42 @@ 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/test/foundry/ContractTest.sol
+++ b/contracts/zero-ex/contracts/test/foundry/ContractTest.sol
@@ -0,0 +1,30 @@
+// 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;
+
+import "forge-std/Test.sol";
+
+contract ContractTest is Test {
+    function setUp() public {}
+
+    function testExample() public {
+      assertTrue(true);
+    }
+}
--- a/contracts/zero-ex/foundry.toml
+++ b/contracts/zero-ex/foundry.toml
@@ -0,0 +1,8 @@
+[default]
+src = 'contracts/src'
+out = 'foundry-artifacts'
+test = 'contracts/test/foundry'
+libs = ["contracts/deps/", "../utils/contracts/src/"]
+remappings = ['@0x/contracts-utils/=../utils/', '@0x/contracts-erc20/=../erc20/', 'src/=./contracts/src']
+cache_path = 'foundry-cache'
+optimizer_runs = 1000000
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.36.1",
+    "version": "0.36.3",
    "engines": {
        "node": ">=6.12"
    },
@@ -20,6 +20,7 @@
        "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
        "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
+        "fqt": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' -g 'sell quotes' --timeout 100000 --bail --exit",
        "compile": "sol-compiler",
        "watch": "sol-compiler -w",
        "clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
@@ -38,12 +39,13 @@
        "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
        "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES",
        "publish:private": "yarn build && gitpkg publish",
-        "rollback": "node ./lib/scripts/rollback.js"
+        "rollback": "node ./lib/scripts/rollback.js",
+        "typechain": "typechain --target=ethers-v5 --out-dir='typechain-wrappers'  './foundry-artifacts/**/*.json'"
    },
    "config": {
        "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,PositiveSlippageFeeTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,AffiliateFeeTransformer,MetaTransactionsFeature,LogMetadataTransformer,LiquidityProviderFeature,ILiquidityProviderFeature,NativeOrdersFeature,INativeOrdersFeature,FeeCollectorController,FeeCollector,CurveLiquidityProvider,BatchFillNativeOrdersFeature,IBatchFillNativeOrdersFeature,MultiplexFeature,IMultiplexFeature,OtcOrdersFeature,IOtcOrdersFeature,AvalancheBridgeAdapter,BSCBridgeAdapter,CeloBridgeAdapter,EthereumBridgeAdapter,FantomBridgeAdapter,OptimismBridgeAdapter,PolygonBridgeAdapter",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MixinAaveV2|MixinBalancer|MixinBalancerV2|MixinBalancerV2Batch|MixinBancor|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinShell|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinVelodrome|MixinWOOFi|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
+        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MixinAaveV2|MixinBalancer|MixinBalancerV2|MixinBalancerV2Batch|MixinBancor|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinShell|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinVelodrome|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
    },
    "repository": {
        "type": "git",
@@ -56,15 +58,16 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.0",
-        "@0x/contract-addresses": "^6.19.0",
-        "@0x/contracts-erc20": "^3.3.34",
+        "@0x/contract-addresses": "^6.19.2",
+        "@0x/contracts-erc20": "^3.3.36",
        "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.25",
+        "@0x/contracts-test-utils": "^5.4.27",
        "@0x/dev-utils": "^4.2.14",
        "@0x/order-utils": "^10.4.28",
        "@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",
        "@types/isomorphic-fetch": "^0.0.35",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
@@ -78,12 +81,13 @@
        "solhint": "^1.4.1",
        "truffle": "^5.0.32",
        "tslint": "5.11.0",
+        "typechain": "^8.0.0",
        "typedoc": "~0.16.11",
        "typescript": "4.6.3"
    },
    "dependencies": {
        "@0x/base-contract": "^6.5.0",
-        "@0x/protocol-utils": "^11.16.1",
+        "@0x/protocol-utils": "^11.16.3",
        "@0x/subproviders": "^6.6.5",
        "@0x/types": "^3.3.6",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/zero-ex/test/artifacts.ts
+++ b/contracts/zero-ex/test/artifacts.ts
@@ -129,7 +129,6 @@ import * as MixinUniswap from '../test/generated-artifacts/MixinUniswap.json';
 import * as MixinUniswapV2 from '../test/generated-artifacts/MixinUniswapV2.json';
 import * as MixinUniswapV3 from '../test/generated-artifacts/MixinUniswapV3.json';
 import * as MixinVelodrome from '../test/generated-artifacts/MixinVelodrome.json';
-import * as MixinWOOFi from '../test/generated-artifacts/MixinWOOFi.json';
 import * as MixinZeroExBridge from '../test/generated-artifacts/MixinZeroExBridge.json';
 import * as MooniswapLiquidityProvider from '../test/generated-artifacts/MooniswapLiquidityProvider.json';
 import * as MultiplexFeature from '../test/generated-artifacts/MultiplexFeature.json';
@@ -354,7 +353,6 @@ export const artifacts = {
    MixinUniswapV2: MixinUniswapV2 as ContractArtifact,
    MixinUniswapV3: MixinUniswapV3 as ContractArtifact,
    MixinVelodrome: MixinVelodrome as ContractArtifact,
-    MixinWOOFi: MixinWOOFi as ContractArtifact,
    MixinZeroExBridge: MixinZeroExBridge as ContractArtifact,
    IERC1155Token: IERC1155Token as ContractArtifact,
    IERC721Token: IERC721Token as ContractArtifact,
--- a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
+++ b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
@@ -12,21 +12,26 @@ import {
    FillQuoteTransformerData,
    FillQuoteTransformerLimitOrderInfo,
    FillQuoteTransformerOrderType as OrderType,
+    FillQuoteTransformerOtcOrderInfo,
    FillQuoteTransformerRfqOrderInfo,
    FillQuoteTransformerSide as Side,
    LimitOrder,
    LimitOrderFields,
+    OtcOrder,
+    OtcOrderFields,
    RfqOrder,
    RfqOrderFields,
    Signature,
 } from '@0x/protocol-utils';
 import { BigNumber, hexUtils, ZeroExRevertErrors } from '@0x/utils';
+import { assert } from 'chai';
 import { TransactionReceiptWithDecodedLogs as TxReceipt } from 'ethereum-types';
+import { ethers } from 'ethers';
 import * as _ from 'lodash';

 import { artifacts } from '../artifacts';
 import { TestFillQuoteTransformerBridgeContract } from '../generated-wrappers/test_fill_quote_transformer_bridge';
-import { getRandomLimitOrder, getRandomRfqOrder } from '../utils/orders';
+import { getRandomLimitOrder, getRandomOtcOrder, getRandomRfqOrder } from '../utils/orders';
 import {
    EthereumBridgeAdapterContract,
    FillQuoteTransformerContract,
@@ -132,6 +137,18 @@ blockchainTests.resets('FillQuoteTransformer', env => {
        });
    }

+    function createOtcOrder(fields: Partial<OtcOrderFields> = {}): OtcOrder {
+        return getRandomOtcOrder({
+            makerToken: makerToken.address,
+            takerToken: takerToken.address,
+            makerAmount: getRandomInteger('0.1e18', '1e18'),
+            takerAmount: getRandomInteger('0.1e18', '1e18'),
+            maker,
+            taker,
+            ...fields,
+        });
+    }
+
    function createBridgeOrder(fillRatio: Numberish = 1.0): BridgeOrder {
        const makerTokenAmount = getRandomInteger('0.1e18', '1e18');
        return {
@@ -191,7 +208,7 @@ blockchainTests.resets('FillQuoteTransformer', env => {
        let soldAmount = ZERO_AMOUNT;
        let boughtAmount = ZERO_AMOUNT;
        const fillAmount = normalizeFillAmount(data.fillAmount, state.takerTokenBalance);
-        const orderIndices = [0, 0, 0];
+        const orderIndices = [0, 0, 0, 0];

        function computeTakerTokenFillAmount(
            orderTakerTokenAmount: BigNumber,
@@ -272,6 +289,24 @@ blockchainTests.resets('FillQuoteTransformer', env => {
            };
        }

+        function fillOtcOrder(oi: FillQuoteTransformerOtcOrderInfo): FillOrderResults {
+            const preFilledTakerAmount = orderSignatureToPreFilledTakerAmount(oi.signature);
+            if (preFilledTakerAmount.gte(oi.order.takerAmount) || preFilledTakerAmount.eq(REVERT_AMOUNT)) {
+                return EMPTY_FILL_ORDER_RESULTS;
+            }
+            const takerTokenFillAmount = BigNumber.min(
+                computeTakerTokenFillAmount(oi.order.takerAmount, oi.order.makerAmount),
+                oi.order.takerAmount.minus(preFilledTakerAmount),
+                oi.maxTakerTokenFillAmount,
+            );
+            const fillRatio = takerTokenFillAmount.div(oi.order.takerAmount);
+            return {
+                ...EMPTY_FILL_ORDER_RESULTS,
+                takerTokenSoldAmount: takerTokenFillAmount,
+                makerTokenBoughtAmount: fillRatio.times(oi.order.makerAmount).integerValue(BigNumber.ROUND_DOWN),
+            };
+        }
+
        // tslint:disable-next-line: prefer-for-of
        for (let i = 0; i < data.fillSequence.length; ++i) {
            const orderType = data.fillSequence[i];
@@ -301,6 +336,11 @@ blockchainTests.resets('FillQuoteTransformer', env => {
                        results = fillRfqOrder(data.rfqOrders[orderIndices[orderType]]);
                    }
                    break;
+                case OrderType.Otc:
+                    {
+                        results = fillOtcOrder(data.otcOrders[orderIndices[orderType]]);
+                    }
+                    break;
                default:
                    throw new Error('Unknown order type');
            }
@@ -393,6 +433,7 @@ blockchainTests.resets('FillQuoteTransformer', env => {
            buyToken: makerToken.address,
            bridgeOrders: [],
            limitOrders: [],
+            otcOrders: [],
            rfqOrders: [],
            fillSequence: [],
            fillAmount: MAX_UINT256,
@@ -446,7 +487,7 @@ blockchainTests.resets('FillQuoteTransformer', env => {
        await assertCurrentBalancesAsync(exchange.address, { ...ZERO_BALANCES, ethBalance: qfr.protocolFeePaid });
    }

-    describe('sell quotes', () => {
+    describe.only('sell quotes', () => {
        it('can fully sell to a single bridge order with -1 fillAmount', async () => {
            const bridgeOrders = [createBridgeOrder()];
            const data = createTransformData({
@@ -662,6 +703,44 @@ blockchainTests.resets('FillQuoteTransformer', env => {
            return assertFinalBalancesAsync(qfr);
        });

+        it.only('can fully buy to a single OTC order', async () => {
+            const ethersMakerWallet = ethers.Wallet.createRandom();
+            const _otcOrder = createOtcOrder({maker: ethersMakerWallet.address});
+            await makerToken.mint(ethersMakerWallet.address, MAX_UINT256).awaitTransactionSuccessAsync();
+            await takerToken.mint(taker, MAX_UINT256).awaitTransactionSuccessAsync();
+            let balMaker = await makerToken.balanceOf(ethersMakerWallet.address).callAsync();
+            let balTaker = await takerToken.balanceOf(taker).callAsync();
+            const otcOrders = [_otcOrder];
+            const totalTakerTokens = BigNumber.sum(...otcOrders.map(o => o.takerAmount));
+            const _otcOrderSignature = await ethersMakerWallet.signMessage(ethers.utils.arrayify(_otcOrder.getHash()));
+            const { v, r, s } = ethers.utils.splitSignature(_otcOrderSignature);
+            const _orderSignature : Signature = { 
+                v : v!,
+                r, 
+                s,
+                signatureType: 3
+            };
+            const data = createTransformData({
+                side: Side.Buy,
+                otcOrders: otcOrders.map(o => ({
+                    order: o,
+                    maxTakerTokenFillAmount: MAX_UINT256,
+                    signature: _orderSignature,
+                })),
+                fillAmount: BigNumber.sum(...otcOrders.map(o => o.makerAmount)),
+                fillSequence: otcOrders.map(() => OrderType.Otc),
+            });
+            const qfr = getExpectedQuoteFillResults(
+                data,
+                createSimulationState({ takerTokenBalance: totalTakerTokens }),
+            );
+            await executeTransformAsync({
+                data,
+                takerTokenBalance: qfr.takerTokensSpent,
+            });
+            return assertFinalBalancesAsync(qfr);
+        });
+
        it('can fully sell to one of each order type', async () => {
            const rfqOrders = [createRfqOrder()];
            const limitOrders = [createLimitOrder()];
@@ -1117,6 +1196,30 @@ blockchainTests.resets('FillQuoteTransformer', env => {
            return assertFinalBalancesAsync(qfr);
        });

+        it('can fully buy to a single OTC order', async () => {
+            const otcOrders = [createOtcOrder()];
+            const totalTakerTokens = BigNumber.sum(...otcOrders.map(o => o.takerAmount));
+            const data = createTransformData({
+                side: Side.Buy,
+                otcOrders: otcOrders.map(o => ({
+                    order: o,
+                    maxTakerTokenFillAmount: MAX_UINT256,
+                    signature: createOrderSignature(),
+                })),
+                fillAmount: BigNumber.sum(...otcOrders.map(o => o.makerAmount)),
+                fillSequence: otcOrders.map(() => OrderType.Rfq),
+            });
+            const qfr = getExpectedQuoteFillResults(
+                data,
+                createSimulationState({ takerTokenBalance: totalTakerTokens }),
+            );
+            await executeTransformAsync({
+                data,
+                takerTokenBalance: qfr.takerTokensSpent,
+            });
+            return assertFinalBalancesAsync(qfr);
+        });
+
        it('can fully buy to a single RFQ order', async () => {
            const rfqOrders = [createRfqOrder()];
            const totalTakerTokens = BigNumber.sum(...rfqOrders.map(o => o.takerAmount));
--- a/contracts/zero-ex/test/wrappers.ts
+++ b/contracts/zero-ex/test/wrappers.ts
@@ -127,7 +127,6 @@ export * from '../test/generated-wrappers/mixin_uniswap';
 export * from '../test/generated-wrappers/mixin_uniswap_v2';
 export * from '../test/generated-wrappers/mixin_uniswap_v3';
 export * from '../test/generated-wrappers/mixin_velodrome';
-export * from '../test/generated-wrappers/mixin_w_o_o_fi';
 export * from '../test/generated-wrappers/mixin_zero_ex_bridge';
 export * from '../test/generated-wrappers/mooniswap_liquidity_provider';
 export * from '../test/generated-wrappers/multiplex_feature';
--- a/contracts/zero-ex/tsconfig.json
+++ b/contracts/zero-ex/tsconfig.json
@@ -166,7 +166,6 @@
        "test/generated-artifacts/MixinUniswapV2.json",
        "test/generated-artifacts/MixinUniswapV3.json",
        "test/generated-artifacts/MixinVelodrome.json",
-        "test/generated-artifacts/MixinWOOFi.json",
        "test/generated-artifacts/MixinZeroExBridge.json",
        "test/generated-artifacts/MooniswapLiquidityProvider.json",
        "test/generated-artifacts/MultiplexFeature.json",
--- a/packages/asset-swapper/CHANGELOG.json
+++ b/packages/asset-swapper/CHANGELOG.json
@@ -1,4 +1,54 @@
 [
+    {
+        "version": "16.67.0",
+        "changes": [
+            {
+                "note": "Add Otc order support to the fillQuoteTransformer"
+            }
+        ]
+    },
+    {
+        "version": "16.66.4",
+        "changes": [
+            {
+                "note": "Offboard Cream",
+                "pr": 546
+            },
+            {
+                "note": "Change WooFi gas estimates",
+                "pr": 551
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "16.66.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "16.66.2",
+        "changes": [
+            {
+                "note": "Upgrade dependency",
+                "pr": 543
+            }
+        ],
+        "timestamp": 1660073235
+    },
+    {
+        "version": "16.66.1",
+        "changes": [
+            {
+                "note": "Upgrade dependency",
+                "pr": 538
+            }
+        ],
+        "timestamp": 1659926840
+    },
    {
        "version": "16.66.0",
        "changes": [
--- a/packages/asset-swapper/CHANGELOG.md
+++ b/packages/asset-swapper/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v16.66.3 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v16.66.2 - _August 9, 2022_
+
+    * Upgrade dependency (#543)
+
+## v16.66.1 - _August 8, 2022_
+
+    * Upgrade dependency (#538)
+
 ## v16.66.0 - _August 6, 2022_

    * Add WOOFi support (#513)
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "16.66.0",
+    "version": "16.66.3",
    "engines": {
        "node": ">=6.12"
    },
@@ -61,14 +61,15 @@
    "dependencies": {
        "@0x/assert": "^3.0.34",
        "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.19.0",
-        "@0x/contract-wrappers": "^13.20.6",
-        "@0x/contracts-erc20": "^3.3.34",
-        "@0x/contracts-zero-ex": "^0.36.1",
+        "@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.1",
+        "@0x/protocol-utils": "^11.16.3",
        "@0x/quote-server": "^8.0.0",
        "@0x/types": "^3.3.6",
        "@0x/utils": "^6.5.3",
@@ -83,9 +84,7 @@
        "axios": "^0.21.1",
        "axios-mock-adapter": "^1.19.0",
        "balancer-labs-sor-v1": "npm:@balancer-labs/sor@0.3.2",
-        "cream-sor": "^0.3.3",
        "ethereum-types": "^3.7.0",
-        "fast-abi": "^0.0.4",
        "graphql": "^15.4.0",
        "graphql-request": "^3.4.0",
        "heartbeats": "^5.0.1",
@@ -95,7 +94,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.0",
        "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.25",
+        "@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",
--- a/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts
+++ b/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts
@@ -40,12 +40,14 @@ import {
    FinalUniswapV3FillData,
    LiquidityProviderFillData,
    NativeRfqOrderFillData,
+    NativeOtcOrderFillData,
    OptimizedMarketBridgeOrder,
    OptimizedMarketOrder,
    UniswapV2FillData,
 } from '../utils/market_operation_utils/types';

 import {
+    multiplexOtcOrder,
    multiplexPlpEncoder,
    multiplexRfqEncoder,
    MultiplexSubcall,
@@ -312,18 +314,7 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
            !requiresTransformERC20(optsWithDefaults)
        ) {
            const rfqOrdersData = quote.orders.map(o => o.fillData as NativeRfqOrderFillData);
-            const fillAmountPerOrder = (() => {
-                // Don't think order taker amounts are clipped to actual sell amount
-                // (the last one might be too large) so figure them out manually.
-                let remaining = sellAmount;
-                const fillAmounts = [];
-                for (const o of quote.orders) {
-                    const fillAmount = BigNumber.min(o.takerAmount, remaining);
-                    fillAmounts.push(fillAmount);
-                    remaining = remaining.minus(fillAmount);
-                }
-                return fillAmounts;
-            })();
+            const fillAmountPerOrder = generateFillAmounts(sellAmount, quote);
            const callData =
                quote.orders.length === 1
                    ? this._exchangeProxy
@@ -346,6 +337,46 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
            };
        }

+        // OTC orders
+        if (
+            [ChainId.Mainnet, ChainId.Ropsten].includes(this.chainId) && // @todo goerli and polygon?
+            quote.orders.every(o => o.type === FillQuoteTransformerOrderType.Otc) &&
+            !requiresTransformERC20(optsWithDefaults)
+        ) {
+            const otcOrdersData = quote.orders.map(o => o.fillData as NativeOtcOrderFillData);
+            const fillAmountPerOrder = generateFillAmounts(sellAmount, quote);
+            // grab the amount to fill on each OtcOrder (if more than 1, fallback to multiplexBatchFill)
+
+            let callData;
+            // if we have more than one otc order we want to batch fill them,
+            if (quote.orders.length === 1) {
+                // if the otc orders takerToken is the native asset
+                if (isFromETH) {
+                    callData = this._exchangeProxy
+                        .fillOtcOrderWithEth(otcOrdersData[0].order, otcOrdersData[0].signature)
+                        .getABIEncodedTransactionData();
+                }
+                // if the otc orders makerToken is the native asset
+                if (isToETH) {
+                    callData = this._exchangeProxy
+                        .fillOtcOrderForEth(otcOrdersData[0].order, otcOrdersData[0].signature, fillAmountPerOrder[0])
+                        .getABIEncodedTransactionData();
+                } else {
+                    // if the otc order contains 2 erc20 tokens
+                    callData = this._exchangeProxy
+                        .fillOtcOrder(otcOrdersData[0].order, otcOrdersData[0].signature, fillAmountPerOrder[0])
+                        .getABIEncodedTransactionData();
+                }
+                return {
+                    calldataHexString: callData,
+                    ethAmount: isFromETH ? sellAmount : ZERO_AMOUNT,
+                    toAddress: this._exchangeProxy.address,
+                    allowanceTarget: this._exchangeProxy.address,
+                    gasOverhead: ZERO_AMOUNT,
+                };
+            }
+        }
+
        if (this.chainId === ChainId.Mainnet && isMultiplexBatchFillCompatible(quote, optsWithDefaults)) {
            return {
                calldataHexString: this._encodeMultiplexBatchFillCalldata(
@@ -539,19 +570,30 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
        for_loop: for (const [i, order] of quote.orders.entries()) {
            switch_statement: switch (order.source) {
                case ERC20BridgeSource.Native:
-                    if (order.type !== FillQuoteTransformerOrderType.Rfq) {
+                    if (order.type !== FillQuoteTransformerOrderType.Rfq && order.type !== FillQuoteTransformerOrderType.Otc) {
                        // Should never happen because we check `isMultiplexBatchFillCompatible`
                        // before calling this function.
-                        throw new Error('Multiplex batch fill only supported for RFQ native orders');
+                        throw new Error('Multiplex batch fill only supported for RFQ native orders and OTC Orders');
+                    }
+                    if (order.type !== FillQuoteTransformerOrderType.Otc) {
+                        subcalls.push({
+                            id: MultiplexSubcall.Rfq,
+                            sellAmount: order.takerAmount,
+                            data: multiplexRfqEncoder.encode({
+                                order: order.fillData.order,
+                                signature: order.fillData.signature,
+                            }),
+                        });
+                    } else {
+                        subcalls.push({
+                            id: MultiplexSubcall.Otc,
+                            sellAmount: order.takerAmount,
+                            data: multiplexOtcOrder.encode({
+                                order: order.fillData.order,
+                                signature: order.fillData.signature,
+                            }),
+                        });
                    }
-                    subcalls.push({
-                        id: MultiplexSubcall.Rfq,
-                        sellAmount: order.takerAmount,
-                        data: multiplexRfqEncoder.encode({
-                            order: order.fillData.order,
-                            signature: order.fillData.signature,
-                        }),
-                    });
                    break switch_statement;
                case ERC20BridgeSource.UniswapV2:
                case ERC20BridgeSource.SushiSwap:
@@ -702,6 +744,17 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
    }
 }

+function generateFillAmounts(sellAmount: BigNumber, quote: MarketBuySwapQuote | MarketSellSwapQuote): BigNumber[] {
+    let remaining = sellAmount;
+    const fillAmounts = [];
+    for (const o of quote.orders) {
+        const fillAmount = BigNumber.min(o.takerAmount, remaining);
+        fillAmounts.push(fillAmount);
+        remaining = remaining.minus(fillAmount);
+    }
+    return fillAmounts;
+}
+
 function slipNonNativeOrders(quote: MarketSellSwapQuote | MarketBuySwapQuote): OptimizedMarketOrder[] {
    const slippage = getMaxQuoteSlippageRate(quote);
    if (slippage === 0) {
--- a/packages/asset-swapper/src/quote_consumers/multiplex_encoders.ts
+++ b/packages/asset-swapper/src/quote_consumers/multiplex_encoders.ts
@@ -1,4 +1,4 @@
-import { RfqOrder, SIGNATURE_ABI } from '@0x/protocol-utils';
+import { OtcOrder, RfqOrder, SIGNATURE_ABI } from '@0x/protocol-utils';
 import { AbiEncoder } from '@0x/utils';

 export enum MultiplexSubcall {
@@ -26,6 +26,10 @@ export const multiplexRfqEncoder = AbiEncoder.create([
    { name: 'order', type: 'tuple', components: RfqOrder.STRUCT_ABI },
    { name: 'signature', type: 'tuple', components: SIGNATURE_ABI },
 ]);
+export const multiplexOtcOrder = AbiEncoder.create([
+    { name: 'order', type: 'tuple', components: OtcOrder.STRUCT_ABI },
+    { name: 'signature', type: 'tuple', components: SIGNATURE_ABI },
+]);
 export const multiplexUniswapEncoder = AbiEncoder.create([
    { name: 'tokens', type: 'address[]' },
    { name: 'isSushi', type: 'bool' },
--- a/packages/asset-swapper/src/quote_consumers/quote_consumer_utils.ts
+++ b/packages/asset-swapper/src/quote_consumers/quote_consumer_utils.ts
@@ -8,6 +8,7 @@ import {
 import {
    ERC20BridgeSource,
    NativeLimitOrderFillData,
+    NativeOtcOrderFillData,
    NativeRfqOrderFillData,
    OptimizedMarketBridgeOrder,
    OptimizedMarketOrder,
@@ -107,19 +108,27 @@ function isOptimizedRfqOrder(x: OptimizedMarketOrder): x is OptimizedMarketOrder
    return x.type === FillQuoteTransformerOrderType.Rfq;
 }

+function isOptimizedOtcOrder(x: OptimizedMarketOrder): x is OptimizedMarketOrderBase<NativeOtcOrderFillData> {
+    return x.type === FillQuoteTransformerOrderType.Otc;
+}
+
 /**
 * Converts the given `OptimizedMarketOrder`s into bridge, limit, and RFQ orders for
 * FillQuoteTransformer.
 */
 export function getFQTTransformerDataFromOptimizedOrders(
    orders: OptimizedMarketOrder[],
-): Pick<FillQuoteTransformerData, 'bridgeOrders' | 'limitOrders' | 'rfqOrders' | 'fillSequence'> {
-    const fqtData: Pick<FillQuoteTransformerData, 'bridgeOrders' | 'limitOrders' | 'rfqOrders' | 'fillSequence'> = {
-        bridgeOrders: [],
-        limitOrders: [],
-        rfqOrders: [],
-        fillSequence: [],
-    };
+): Pick<FillQuoteTransformerData, 'bridgeOrders' | 'limitOrders' | 'rfqOrders' | 'otcOrders' | 'fillSequence'> {
+        const fqtData: Pick<
+            FillQuoteTransformerData,
+            'bridgeOrders' | 'limitOrders' | 'rfqOrders' | 'otcOrders' | 'fillSequence'
+        > = {
+            bridgeOrders: [],
+            limitOrders: [],
+            rfqOrders: [],
+            otcOrders: [],
+            fillSequence: [],
+        };

    for (const order of orders) {
        if (isOptimizedBridgeOrder(order)) {
@@ -141,6 +150,12 @@ export function getFQTTransformerDataFromOptimizedOrders(
                signature: order.fillData.signature,
                maxTakerTokenFillAmount: order.takerAmount,
            });
+        } else if (isOptimizedOtcOrder(order)) {
+            fqtData.otcOrders.push({
+                order: order.fillData.order,
+                signature: order.fillData.signature,
+                maxTakerTokenFillAmount: order.takerAmount,
+            });
        } else {
            // Should never happen
            throw new Error('Unknown Order type');
--- a/packages/asset-swapper/src/swap_quoter.ts
+++ b/packages/asset-swapper/src/swap_quoter.ts
@@ -1,9 +1,9 @@
 import { ChainId, getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
+import { FastABI } from '@0x/fast-abi';
 import { FillQuoteTransformerOrderType, LimitOrder } from '@0x/protocol-utils';
 import { BigNumber, providerUtils } from '@0x/utils';
 import Axios, { AxiosInstance } from 'axios';
 import { BlockParamLiteral, MethodAbi, SupportedProvider, ZeroExProvider } from 'ethereum-types';
-import { FastABI } from 'fast-abi';
 import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent } from 'https';
 import * as _ from 'lodash';
@@ -144,7 +144,7 @@ export class SwapQuoter {
                this.chainId,
                samplerContract,
                samplerOverrides,
-                undefined, // pools caches for balancer and cream
+                undefined, // pools caches for balancer
                tokenAdjacencyGraph,
                liquidityProviderRegistry,
                this.chainId === ChainId.Mainnet // Enable Bancor only on Mainnet
--- a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts
@@ -95,7 +95,6 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
            ERC20BridgeSource.MultiHop,
            ERC20BridgeSource.Dodo,
            ERC20BridgeSource.DodoV2,
-            ERC20BridgeSource.Cream,
            ERC20BridgeSource.LiquidityProvider,
            ERC20BridgeSource.CryptoCom,
            ERC20BridgeSource.Lido,
@@ -247,7 +246,6 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
            ERC20BridgeSource.MultiHop,
            ERC20BridgeSource.Dodo,
            ERC20BridgeSource.DodoV2,
-            ERC20BridgeSource.Cream,
            ERC20BridgeSource.Lido,
            ERC20BridgeSource.LiquidityProvider,
            ERC20BridgeSource.CryptoCom,
@@ -415,23 +413,6 @@ export const SOURCE_FLAGS: { [key in ERC20BridgeSource]: bigint } & {
    })),
 );

-const MIRROR_WRAPPED_TOKENS = {
-    mAAPL: '0xd36932143f6ebdedd872d5fb0651f4b72fd15a84',
-    mSLV: '0x9d1555d8cb3c846bb4f7d5b1b1080872c3166676',
-    mIAU: '0x1d350417d9787e000cc1b95d70e9536dcd91f373',
-    mAMZN: '0x0cae9e4d663793c2a2a0b211c1cf4bbca2b9caa7',
-    mGOOGL: '0x4b70ccd1cf9905be1faed025eadbd3ab124efe9a',
-    mTSLA: '0x21ca39943e91d704678f5d00b6616650f066fd63',
-    mQQQ: '0x13b02c8de71680e71f0820c996e4be43c2f57d15',
-    mTWTR: '0xedb0414627e6f1e3f082de65cd4f9c693d78cca9',
-    mMSFT: '0x41bbedd7286daab5910a1f15d12cbda839852bd7',
-    mNFLX: '0xc8d674114bac90148d11d3c1d33c61835a0f9dcd',
-    mBABA: '0x676ce85f66adb8d7b8323aeefe17087a3b8cb363',
-    mUSO: '0x31c63146a635eb7465e5853020b39713ac356991',
-    mVIXY: '0xf72fcd9dcf0190923fadd44811e240ef4533fc86',
-    mLUNA: '0xd2877702675e6ceb975b4a1dff9fb7baf4c91ea9',
-};
-
 // Mainnet tokens
 // Not an exhaustive list, just enough so we don't repeat ourselves
 export const MAINNET_TOKENS = {
@@ -495,10 +476,7 @@ export const MAINNET_TOKENS = {
    vETH: '0x898bad2774eb97cf6b94605677f43b41871410b1',
    alETH: '0x0100546f2cd4c9d97f798ffc9755e47865ff7ee6',
    HT: '0x6f259637dcD74C767781E37Bc6133cd6A68aa161',
-    // Mirror Protocol
    UST: '0xa47c8bf37f92abed4a126bda807a7b7498661acd',
-    MIR: '0x09a3ecafa817268f77be1283176b946c4ff2e608',
-    ...MIRROR_WRAPPED_TOKENS,
    // StableSwap "open pools" (crv.finance)
    STABLEx: '0xcd91538b91b4ba7797d39a2f66e63810b50a33d0',
    alUSD: '0xbc6da0fe9ad5f3b0d58160288917aa56653660e9',
@@ -735,8 +713,6 @@ export const CURVE_POOLS = {
    eurt: '0xfd5db7463a3ab53fd211b4af195c5bccc1a03890',
    ethcrv: '0x8301ae4fc9c624d1d396cbdaa1ed877821d7c511',
    ethcvx: '0xb576491f1e6e5e62f1d8f26062ee822b40b0e0d4',
-    mimust: '0x55a8a39bc9694714e2874c1ce77aa1e599461e18',
-    usttri_wormhole: '0xceaf7747579696a2f0bb206a14210e3c9e6fb269',
    fei_tri: '0x06cb22615ba53e60d67bf6c341a0fd5e718e1655',
    rai_tri: '0x618788357d0ebd8a37e763adab3bc575d54c2c7d',
    DOLA_tri: '0xaa5a67c256e27a5d80712c51971408db3370927d',
@@ -887,6 +863,29 @@ export const WOOFI_POOL_BY_CHAIN_ID = valueByChainId<string>(
    NULL_ADDRESS,
 );

+export const WOOFI_SUPPORTED_TOKENS = new Set([
+    BSC_TOKENS.USDT,
+    BSC_TOKENS.WBNB,
+    BSC_TOKENS.WOO,
+    BSC_TOKENS.WETH,
+    BSC_TOKENS.BTCB,
+    AVALANCHE_TOKENS.nUSDC,
+    AVALANCHE_TOKENS.WAVAX,
+    AVALANCHE_TOKENS.WBTC,
+    AVALANCHE_TOKENS.WETH,
+    AVALANCHE_TOKENS.WOO,
+    FANTOM_TOKENS.USDC,
+    FANTOM_TOKENS.WFTM,
+    FANTOM_TOKENS.WETH,
+    FANTOM_TOKENS.WBTC,
+    FANTOM_TOKENS.WOO,
+    POLYGON_TOKENS.USDC,
+    POLYGON_TOKENS.WMATIC,
+    POLYGON_TOKENS.WBTC,
+    POLYGON_TOKENS.WETH,
+    POLYGON_TOKENS.WOO,
+]);
+
 export const DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID = valueByChainId<string[]>(
    {
        [ChainId.Mainnet]: [
@@ -972,8 +971,6 @@ export const DEFAULT_TOKEN_ADJACENCY_GRAPH_BY_CHAIN_ID = valueByChainId<TokenAdj
    {
        [ChainId.Mainnet]: new TokenAdjacencyGraphBuilder(DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.Mainnet])
            .tap(builder => {
-                // Mirror Protocol
-                builder.add(MAINNET_TOKENS.MIR, MAINNET_TOKENS.UST);
                // Convex and Curve
                builder.addBidirectional(MAINNET_TOKENS.cvxCRV, MAINNET_TOKENS.CRV);
                // Convex and FXS
@@ -1381,16 +1378,6 @@ export const CURVE_MAINNET_INFOS: { [name: string]: CurveInfo } = {
        sellQuoteFunctionSelector: CurveFunctionSelectors.get_dy_uint256,
        exchangeFunctionSelector: CurveFunctionSelectors.exchange_underlying_uint256,
    },
-    [CURVE_POOLS.mimust]: createCurveExchangePool({
-        tokens: [MAINNET_TOKENS.MIM, MAINNET_TOKENS.UST],
-        pool: CURVE_POOLS.mimust,
-        gasSchedule: 105e3,
-    }),
-    [CURVE_POOLS.usttri_wormhole]: createCurveMetaTriPool({
-        tokens: [MAINNET_TOKENS.UST_WORMHOLE],
-        pool: CURVE_POOLS.usttri_wormhole,
-        gasSchedule: 340e3,
-    }),
    [CURVE_POOLS.fei_tri]: createCurveMetaTriPool({
        tokens: [MAINNET_TOKENS.FEI],
        pool: CURVE_POOLS.fei_tri,
@@ -2531,7 +2518,6 @@ export const DEFAULT_GAS_SCHEDULE: Required<GasSchedule> = {
    [ERC20BridgeSource.BalancerV2]: (fillData?: FillData) => {
        return 100e3 + ((fillData as BalancerV2BatchSwapFillData).swapSteps.length - 1) * 50e3;
    },
-    [ERC20BridgeSource.Cream]: () => 120e3,
    [ERC20BridgeSource.MStable]: () => 200e3,
    [ERC20BridgeSource.MakerPsm]: (fillData?: FillData) => {
        const psmFillData = fillData as MakerPsmFillData;
@@ -2671,14 +2657,34 @@ 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];
-
-        if (
+        const hasQuoteToken =
            quoteTokenAddresses.includes(woofiFillData.takerToken) ||
-            quoteTokenAddresses.includes(woofiFillData.makerToken)
-        ) {
-            return 500e3;
+            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;
+            }
        } else {
-            return 100e4;
+            // Fantom
+            if (hasQuoteToken) {
+                return 400e3;
+            } else {
+                return 600e3;
+            }
        }
    },
    //
--- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
@@ -8,7 +8,6 @@ import { MAX_UINT256, ZERO_AMOUNT } from './constants';
 import {
    AaveV2FillData,
    AggregationError,
-    BalancerFillData,
    BalancerV2BatchSwapFillData,
    BalancerV2FillData,
    BancorFillData,
@@ -101,8 +100,6 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s
            return encodeBridgeSourceId(BridgeProtocol.Bancor, 'Bancor');
        case ERC20BridgeSource.Curve:
            return encodeBridgeSourceId(BridgeProtocol.Curve, 'Curve');
-        case ERC20BridgeSource.Cream:
-            return encodeBridgeSourceId(BridgeProtocol.Balancer, 'Cream');
        case ERC20BridgeSource.CryptoCom:
            return encodeBridgeSourceId(BridgeProtocol.CryptoCom, 'CryptoCom');
        case ERC20BridgeSource.Dodo:
@@ -258,10 +255,6 @@ export function createBridgeDataForBridgeOrder(order: OptimizedMarketBridgeOrder
            ]);
            break;
        case ERC20BridgeSource.Balancer:
-        case ERC20BridgeSource.Cream:
-            const balancerFillData = (order as OptimizedMarketBridgeOrder<BalancerFillData>).fillData;
-            bridgeData = encoder.encode([balancerFillData.poolAddress]);
-            break;
        case ERC20BridgeSource.BalancerV2:
            {
                const balancerV2FillData = (order as OptimizedMarketBridgeOrder<BalancerV2BatchSwapFillData>).fillData;
@@ -505,7 +498,6 @@ export const BRIDGE_ENCODERS: {
    [ERC20BridgeSource.Mooniswap]: poolEncoder,
    [ERC20BridgeSource.MStable]: poolEncoder,
    [ERC20BridgeSource.Balancer]: poolEncoder,
-    [ERC20BridgeSource.Cream]: poolEncoder,
    [ERC20BridgeSource.Uniswap]: poolEncoder,
    // Custom integrations
    [ERC20BridgeSource.MakerPsm]: makerPsmEncoder,
--- a/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/cream_pools_cache.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/cream_pools_cache.ts
@@ -1,36 +0,0 @@
-import { ChainId } from '@0x/contract-addresses';
-import { Pool } from 'balancer-labs-sor-v1/dist/types';
-import { getPoolsWithTokens, parsePoolData } from 'cream-sor';
-
-import { BALANCER_MAX_POOLS_FETCHED } from '../constants';
-
-import { NoOpPoolsCache } from './no_op_pools_cache';
-import { AbstractPoolsCache, CacheValue, PoolsCache } from './pools_cache';
-
-export class CreamPoolsCache extends AbstractPoolsCache {
-    public static create(chainId: ChainId): PoolsCache {
-        if (chainId !== ChainId.Mainnet) {
-            return new NoOpPoolsCache();
-        }
-
-        return new CreamPoolsCache();
-    }
-    protected async _fetchPoolsForPairAsync(takerToken: string, makerToken: string): Promise<Pool[]> {
-        try {
-            const poolData = (await getPoolsWithTokens(takerToken, makerToken)).pools;
-            // Sort by maker token balance (descending)
-            const pools = parsePoolData(poolData, takerToken, makerToken).sort((a, b) =>
-                b.balanceOut.minus(a.balanceOut).toNumber(),
-            );
-            return pools.slice(0, this.maxPoolsFetched);
-        } catch (err) {
-            return [];
-        }
-    }
-    private constructor(
-        _cache: Map<string, CacheValue> = new Map(),
-        private readonly maxPoolsFetched: number = BALANCER_MAX_POOLS_FETCHED,
-    ) {
-        super(_cache);
-    }
-}
--- a/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/index.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/index.ts
@@ -1,4 +1,3 @@
 export { BalancerPoolsCache } from './balancer_pools_cache';
 export { BalancerV2PoolsCache } from './balancer_v2_pools_cache';
-export { CreamPoolsCache } from './cream_pools_cache';
 export { AbstractPoolsCache, PoolsCache } from './pools_cache';
--- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
@@ -53,11 +53,12 @@ import {
    UNISWAPV3_CONFIG_BY_CHAIN_ID,
    VELODROME_ROUTER_BY_CHAIN_ID,
    WOOFI_POOL_BY_CHAIN_ID,
+    WOOFI_SUPPORTED_TOKENS,
    ZERO_AMOUNT,
 } from './constants';
 import { getGeistInfoForPair } from './geist_utils';
 import { getLiquidityProvidersForPair } from './liquidity_provider_utils';
-import { BalancerPoolsCache, BalancerV2PoolsCache, CreamPoolsCache, PoolsCache } from './pools_cache';
+import { BalancerPoolsCache, BalancerV2PoolsCache, PoolsCache } from './pools_cache';
 import { BalancerV2SwapInfoCache } from './pools_cache/balancer_v2_swap_info_cache';
 import { SamplerContractOperation } from './sampler_contract_operation';
 import { SamplerNoOperation } from './sampler_no_operation';
@@ -119,7 +120,6 @@ export interface PoolsCacheMap {
    [ERC20BridgeSource.Balancer]: PoolsCache;
    [ERC20BridgeSource.BalancerV2]: BalancerV2SwapInfoCache | undefined;
    [ERC20BridgeSource.Beethovenx]: PoolsCache;
-    [ERC20BridgeSource.Cream]: PoolsCache;
 }

 // tslint:disable:no-inferred-empty-object-type no-unbound-method
@@ -159,7 +159,6 @@ export class SamplerOperations {
            : {
                  [ERC20BridgeSource.Beethovenx]: BalancerV2PoolsCache.createBeethovenXPoolCache(chainId),
                  [ERC20BridgeSource.Balancer]: BalancerPoolsCache.create(chainId),
-                  [ERC20BridgeSource.Cream]: CreamPoolsCache.create(chainId),
                  [ERC20BridgeSource.BalancerV2]:
                      BALANCER_V2_VAULT_ADDRESS_BY_CHAIN[chainId] === NULL_ADDRESS
                          ? undefined
@@ -1372,8 +1371,9 @@ export class SamplerOperations {
        makerToken: string,
        makerFillAmounts: BigNumber[],
    ): SourceQuoteOperation<WOOFiFillData> {
+        const chainId = this.chainId;
        return new SamplerContractOperation({
-            fillData: { poolAddress, takerToken, makerToken },
+            fillData: { poolAddress, takerToken, makerToken, chainId },
            source: ERC20BridgeSource.WOOFi,
            contract: this._samplerContract,
            function: this._samplerContract.sampleSellsFromWooPP,
@@ -1387,8 +1387,9 @@ export class SamplerOperations {
        makerToken: string,
        makerFillAmounts: BigNumber[],
    ): SourceQuoteOperation<WOOFiFillData> {
+        const chainId = this.chainId;
        return new SamplerContractOperation({
-            fillData: { poolAddress, takerToken, makerToken },
+            fillData: { poolAddress, takerToken, makerToken, chainId },
            source: ERC20BridgeSource.WOOFi,
            contract: this._samplerContract,
            function: this._samplerContract.sampleBuysFromWooPP,
@@ -1667,18 +1668,6 @@ export class SamplerOperations {
                            ),
                        );
                    }
-                    case ERC20BridgeSource.Cream:
-                        return this.poolsCaches[ERC20BridgeSource.Cream]
-                            .getPoolAddressesForPair(takerToken, makerToken)
-                            .map(creamPool =>
-                                this.getBalancerSellQuotes(
-                                    creamPool,
-                                    makerToken,
-                                    takerToken,
-                                    takerFillAmounts,
-                                    ERC20BridgeSource.Cream,
-                                ),
-                            );
                    case ERC20BridgeSource.Dodo:
                        if (!isValidAddress(DODOV1_CONFIG_BY_CHAIN_ID[this.chainId].registry)) {
                            return [];
@@ -1832,6 +1821,9 @@ export class SamplerOperations {
                        );
                    }
                    case ERC20BridgeSource.WOOFi: {
+                        if (!(WOOFI_SUPPORTED_TOKENS.has(takerToken) && WOOFI_SUPPORTED_TOKENS.has(makerToken))) {
+                            return [];
+                        }
                        return this.getWOOFiSellQuotes(
                            WOOFI_POOL_BY_CHAIN_ID[this.chainId],
                            takerToken,
@@ -2027,18 +2019,6 @@ export class SamplerOperations {
                            ),
                        );
                    }
-                    case ERC20BridgeSource.Cream:
-                        return this.poolsCaches[ERC20BridgeSource.Cream]
-                            .getPoolAddressesForPair(takerToken, makerToken)
-                            .map(poolAddress =>
-                                this.getBalancerBuyQuotes(
-                                    poolAddress,
-                                    makerToken,
-                                    takerToken,
-                                    makerFillAmounts,
-                                    ERC20BridgeSource.Cream,
-                                ),
-                            );
                    case ERC20BridgeSource.Dodo:
                        if (!isValidAddress(DODOV1_CONFIG_BY_CHAIN_ID[this.chainId].registry)) {
                            return [];
@@ -2180,6 +2160,9 @@ export class SamplerOperations {
                        );
                    }
                    case ERC20BridgeSource.WOOFi: {
+                        if (!(WOOFI_SUPPORTED_TOKENS.has(takerToken) && WOOFI_SUPPORTED_TOKENS.has(makerToken))) {
+                            return [];
+                        }
                        return this.getWOOFiBuyQuotes(
                            WOOFI_POOL_BY_CHAIN_ID[this.chainId],
                            takerToken,
--- a/packages/asset-swapper/src/utils/market_operation_utils/types.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/types.ts
@@ -2,6 +2,7 @@ import { ChainId } from '@0x/contract-addresses';
 import {
    FillQuoteTransformerLimitOrderInfo,
    FillQuoteTransformerOrderType,
+    FillQuoteTransformerOtcOrderInfo,
    FillQuoteTransformerRfqOrderInfo,
 } from '@0x/protocol-utils';
 import { MarketOperation } from '@0x/types';
@@ -45,7 +46,6 @@ export enum ERC20BridgeSource {
    MultiBridge = 'MultiBridge',
    Balancer = 'Balancer',
    BalancerV2 = 'Balancer_V2',
-    Cream = 'CREAM',
    Bancor = 'Bancor',
    MakerPsm = 'MakerPsm',
    MStable = 'mStable',
@@ -195,7 +195,8 @@ export interface FillData {}
 // `FillData` for native fills. Represents a single native order
 export type NativeRfqOrderFillData = FillQuoteTransformerRfqOrderInfo;
 export type NativeLimitOrderFillData = FillQuoteTransformerLimitOrderInfo;
-export type NativeFillData = NativeRfqOrderFillData | NativeLimitOrderFillData;
+export type NativeOtcOrderFillData = FillQuoteTransformerOtcOrderInfo;
+export type NativeFillData = NativeRfqOrderFillData | NativeLimitOrderFillData | NativeOtcOrderFillData;

 // Represents an individual DEX sample from the sampler contract
 export interface DexSample<TFillData extends FillData = FillData> {
@@ -378,6 +379,8 @@ export interface WOOFiFillData extends FillData {
    poolAddress: string;
    takerToken: string;
    makerToken: string;
+    // Only needed for gas estimation
+    chainId: ChainId;
 }

 export interface VelodromeFillData extends FillData {
@@ -449,7 +452,8 @@ export interface OptimizedRfqOrder extends OptimizedMarketOrderBase<NativeRfqOrd
 export type OptimizedMarketOrder =
    | OptimizedMarketBridgeOrder<FillData>
    | OptimizedMarketOrderBase<NativeLimitOrderFillData>
-    | OptimizedMarketOrderBase<NativeRfqOrderFillData>;
+    | OptimizedMarketOrderBase<NativeRfqOrderFillData>
+    | OptimizedMarketOrderBase<NativeOtcOrderFillData>;

 export interface GetMarketOrdersRfqOpts extends RfqRequestOpts {
    rfqClient?: IRfqClient;
--- a/packages/asset-swapper/src/utils/quote_report_generator.ts
+++ b/packages/asset-swapper/src/utils/quote_report_generator.ts
@@ -353,7 +353,7 @@ function _isNativeOrderFromCollapsedFill(cf: Fill): cf is Fill<NativeFillData> {
 */
 export function nativeOrderToReportEntry(
    type: FillQuoteTransformerOrderType,
-    fillData: NativeLimitOrderFillData | NativeRfqOrderFillData,
+    fillData: NativeFillData,
    fillableAmount: BigNumber,
    comparisonPrice?: BigNumber | undefined,
    quoteRequestor?: QuoteRequestor,
--- a/packages/asset-swapper/test/market_operation_utils_test.ts
+++ b/packages/asset-swapper/test/market_operation_utils_test.ts
@@ -107,7 +107,7 @@ class MockPoolsCache extends AbstractPoolsCache {
    }
 }

-// Return some pool so that sampling functions are called for Balancer, BalancerV2, and Cream
+// Return some pool so that sampling functions are called for Balancer and BalancerV2
 // tslint:disable:custom-no-magic-numbers
 const mockPoolsCache = new MockPoolsCache((_takerToken: string, _makerToken: string) => {
    return [
@@ -362,7 +362,6 @@ describe('MarketOperationUtils tests', () => {
        [ERC20BridgeSource.MultiHop]: {},
        [ERC20BridgeSource.Shell]: { poolAddress: randomAddress() },
        [ERC20BridgeSource.Component]: { poolAddress: randomAddress() },
-        [ERC20BridgeSource.Cream]: { poolAddress: randomAddress() },
        [ERC20BridgeSource.Dodo]: {},
        [ERC20BridgeSource.DodoV2]: {},
        [ERC20BridgeSource.CryptoCom]: { tokenAddressPath: [] },
@@ -402,7 +401,6 @@ describe('MarketOperationUtils tests', () => {
        poolsCaches: {
            [ERC20BridgeSource.BalancerV2]: mockPoolsCache,
            [ERC20BridgeSource.Balancer]: mockPoolsCache,
-            [ERC20BridgeSource.Cream]: mockPoolsCache,
        },
        liquidityProviderRegistry: {},
        chainId: CHAIN_ID,
--- a/packages/asset-swapper/test/pools_cache_test.ts
+++ b/packages/asset-swapper/test/pools_cache_test.ts
@@ -2,12 +2,7 @@ import { ChainId } from '@0x/contract-addresses';
 import * as chai from 'chai';
 import 'mocha';

-import {
-    BalancerPoolsCache,
-    BalancerV2PoolsCache,
-    CreamPoolsCache,
-    PoolsCache,
-} from '../src/utils/market_operation_utils/pools_cache';
+import { BalancerPoolsCache, BalancerV2PoolsCache, PoolsCache } from '../src/utils/market_operation_utils/pools_cache';

 import { chaiSetup } from './utils/chai_setup';

@@ -17,7 +12,6 @@ const expect = chai.expect;
 const usdcAddress = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
 const daiAddress = '0x6b175474e89094c44da98b954eedeac495271d0f';
 const wethAddress = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
-const creamAddress = '0x2ba592f78db6436527729929aaf6c908497cb200';

 const timeoutMs = 5000;
 const poolKeys: string[] = ['id', 'balanceIn', 'balanceOut', 'weightIn', 'weightOut', 'swapFee'];
@@ -63,17 +57,4 @@ describe('Pools Caches for Balancer-based sampling', () => {
            );
        });
    });
-
-    describe('CreamPoolsCache', () => {
-        const cache = CreamPoolsCache.create(ChainId.Mainnet);
-        it('fetches pools', async () => {
-            const pairs = [
-                [usdcAddress, creamAddress],
-                [creamAddress, wethAddress],
-            ];
-            await Promise.all(
-                pairs.map(async ([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache, takerToken, makerToken)),
-            );
-        });
-    });
 });
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,40 @@
 [
+    {
+        "version": "6.20.1",
+        "changes": [
+            {
+                "note": "Revert: Remove contract addresses that are no longer needed"
+            }
+        ]
+    },
+    {
+        "version": "6.20.0",
+        "changes": [
+            {
+                "note": "Remove contract addresses that are no longer needed",
+                "pr": 548
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "6.19.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "6.19.1",
+        "changes": [
+            {
+                "note": "Fix lowercase addresses",
+                "pr": 543
+            }
+        ],
+        "timestamp": 1660073235
+    },
    {
        "version": "6.19.0",
        "changes": [
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v6.19.2 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v6.19.1 - _August 9, 2022_
+
+    * Fix lowercase addresses (#543)
+
 ## v6.19.0 - _August 6, 2022_

    * Goerli and Mumbai updated verified contracts addresses (#537)
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -247,7 +247,7 @@
            "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f",
            "payTakerTransformer": "0x4f5e8ca2cadecd4a467ae441e4b03de4278a4574",
            "affiliateFeeTransformer": "0x1be34ab9b2acb5c4ddd89454bdce637967e65230",
-            "fillQuoteTransformer": "0x0b72d55485e8d877f73cc8b14ea3e010b3e804fd",
+            "fillQuoteTransformer": "0xbd7fd6e116fc8589bb658fba3a2cc6273050bcf2",
            "positiveSlippageFeeTransformer": "0x7f5c79ad1788573b1145f4651a248523c54f5d1f"
        }
    },
@@ -331,7 +331,7 @@
            "wethTransformer": "0xe309d011cc6f189a3e8dcba85922715a019fed38",
            "payTakerTransformer": "0x5ba7b9be86cda01cfbf56e0fb97184783be9dda1",
            "affiliateFeeTransformer": "0xbed27284b42e5684e987169cf1da09c5d6c49fa8",
-            "fillQuoteTransformer": "0xd4a518760030dae1adbde9496f8a3b478e83932a",
+            "fillQuoteTransformer": "0x01c082e47c8dc6dedd01e3fcb07bfd3eb72e044d",
            "positiveSlippageFeeTransformer": "0x4cd8f1c0df4d40fcc1e073845d5f6f4ed5cc8dab"
        }
    },
@@ -415,7 +415,7 @@
            "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c",
            "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3",
            "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c",
-            "fillQuoteTransformer": "0xb6c9c52ce7094fc96d8bd5d3ecd0c6feeafe3457",
+            "fillQuoteTransformer": "0xcee9118bc14e1fe740c54c754b901629b322ee4f",
            "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857"
        }
    },
@@ -457,7 +457,7 @@
            "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703",
            "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2",
            "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88",
-            "fillQuoteTransformer": "0x641efe8a57ad39353fe22f77d211ef6b17b0590b",
+            "fillQuoteTransformer": "0xe40f81ef6e9c95ba04c659b8d032eab73152aafd",
            "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600"
        }
    },
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "6.19.0",
+    "version": "6.19.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -12,6 +12,8 @@
    "scripts": {
        "build": "yarn tsc -b",
        "build:ci": "yarn build",
+        "test": "mocha --require source-map-support/register  'lib/test/**/*_test.js' --timeout 10000 --bail --exit",
+        "test:circleci": "yarn test",
        "clean": "shx rm -rf lib",
        "publish:private": "yarn build && gitpkg publish"
    },
@@ -28,7 +30,11 @@
    },
    "homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-addresses",
    "devDependencies": {
+        "@types/mocha": "^5.2.7",
+        "chai": "^4.0.1",
+        "ethereumjs-util": "^7.1.5",
        "gitpkg": "https://github.com/0xProject/gitpkg.git",
+        "mocha": "^6.2.0",
        "shx": "^0.2.2",
        "typescript": "4.6.3"
    },
--- a/packages/contract-addresses/test/addresses_test.ts
+++ b/packages/contract-addresses/test/addresses_test.ts
@@ -0,0 +1,70 @@
+import * as chai from 'chai';
+import 'mocha';
+
+import { ChainId, getContractAddressesForChainOrThrow } from '../src';
+import { bufferToHex, rlphash } from 'ethereumjs-util';
+
+const expect = chai.expect;
+
+function toDeployedAddress(deployerAddress: string, nonce: number): string {
+    return bufferToHex(rlphash([deployerAddress, nonce]).slice(12));
+}
+
+function isValidDeployedAddress(deployerAddress: string, deployedAddress: string): boolean {
+    for (let i = 0; i < 256; i++) {
+        const address = toDeployedAddress(deployerAddress, i);
+        if (address.toLowerCase() === deployedAddress.toLowerCase()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+describe('addresses.json sanity test', () => {
+    const allChainIds = Object.values(ChainId).filter(chainId => !isNaN(Number(chainId))) as ChainId[];
+    allChainIds.forEach(chainId => {
+        describe(`addresses of chain id ${chainId}`, () => {
+            const contractAddresses = getContractAddressesForChainOrThrow(chainId);
+            it('all addresses are lowercased', async () => {
+                const addresses = [
+                    contractAddresses.zrxToken,
+                    contractAddresses.etherToken,
+                    contractAddresses.zeroExGovernor,
+                    contractAddresses.zrxVault,
+                    contractAddresses.staking,
+                    contractAddresses.erc20BridgeProxy,
+                    contractAddresses.erc20BridgeSampler,
+                    contractAddresses.exchangeProxyGovernor,
+                    contractAddresses.exchangeProxy,
+                    contractAddresses.exchangeProxyTransformerDeployer,
+                    contractAddresses.exchangeProxyFlashWallet,
+                    contractAddresses.exchangeProxyLiquidityProviderSandbox,
+                    contractAddresses.zrxTreasury,
+                    contractAddresses.transformers.wethTransformer,
+                    contractAddresses.transformers.payTakerTransformer,
+                    contractAddresses.transformers.fillQuoteTransformer,
+                    contractAddresses.transformers.affiliateFeeTransformer,
+                    contractAddresses.transformers.positiveSlippageFeeTransformer,
+                ];
+                addresses.forEach(address => {
+                    expect(address).to.eq(address.toLowerCase());
+                });
+            });
+
+            it('all transformer addresses are valid', async () => {
+                const transformerAddresses = [
+                    contractAddresses.transformers.wethTransformer,
+                    contractAddresses.transformers.payTakerTransformer,
+                    contractAddresses.transformers.fillQuoteTransformer,
+                    contractAddresses.transformers.affiliateFeeTransformer,
+                    contractAddresses.transformers.positiveSlippageFeeTransformer,
+                ].filter(address => address !== '0x0000000000000000000000000000000000000000');
+                transformerAddresses.forEach(transformerAddress => {
+                    expect(
+                        isValidDeployedAddress(contractAddresses.exchangeProxyTransformerDeployer, transformerAddress),
+                    ).to.true;
+                });
+            });
+        });
+    });
+});
--- a/packages/contract-addresses/tsconfig.json
+++ b/packages/contract-addresses/tsconfig.json
@@ -6,6 +6,6 @@
        "resolveJsonModule": true,
        "esModuleInterop": true
    },
-    "include": ["./src/**/*"],
+    "include": ["./src/**/*", "./test/**/*"],
    "files": ["./addresses.json"]
 }
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,4 +1,38 @@
 [
+    {
+        "version": "13.21.1",
+        "changes": [
+            {
+                "note": "Revert: Remove deprecated contracts"
+            }
+        ]
+    },
+    {
+        "version": "13.21.0",
+        "changes": [
+            {
+                "note": "Remove deprecated contracts"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660093941,
+        "version": "13.20.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "13.20.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1659750766,
        "version": "13.20.6",
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v13.20.8 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v13.20.7 - _August 9, 2022_
+
+    * Dependencies updated
+
 ## v13.20.6 - _August 6, 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.20.6",
+    "version": "13.20.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -57,7 +57,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.34",
        "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.19.0",
+        "@0x/contract-addresses": "^6.19.2",
        "@0x/json-schemas": "^6.4.4",
        "@0x/types": "^3.3.6",
        "@0x/utils": "^6.5.3",
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1660093941,
+        "version": "11.16.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1660073235,
+        "version": "11.16.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1659750766,
        "version": "11.16.1",
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v11.16.3 - _August 10, 2022_
+
+    * Dependencies updated
+
+## v11.16.2 - _August 9, 2022_
+
+    * Dependencies updated
+
 ## v11.16.1 - _August 6, 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.1",
+    "version": "11.16.3",
    "engines": {
        "node": ">=6.12"
    },
@@ -63,8 +63,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.34",
-        "@0x/contract-addresses": "^6.19.0",
-        "@0x/contract-wrappers": "^13.20.6",
+        "@0x/contract-addresses": "^6.19.2",
+        "@0x/contract-wrappers": "^13.20.8",
        "@0x/json-schemas": "^6.4.4",
        "@0x/subproviders": "^6.6.5",
        "@0x/utils": "^6.5.3",
--- 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, RfqOrder, RfqOrderFields } from './orders';
+import { LimitOrder, LimitOrderFields, RfqOrder, RfqOrderFields, OtcOrder, OtcOrderFields } from './orders';
 import { Signature, SIGNATURE_ABI } from './signature_utils';

 const BRIDGE_ORDER_ABI_COMPONENTS = [
@@ -39,6 +39,20 @@ 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`
 */
@@ -60,6 +74,11 @@ 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[]',
@@ -87,6 +106,7 @@ export enum FillQuoteTransformerOrderType {
    Bridge,
    Limit,
    Rfq,
+    Otc
 }

 /**
@@ -99,6 +119,7 @@ export interface FillQuoteTransformerData {
    bridgeOrders: FillQuoteTransformerBridgeOrder[];
    limitOrders: FillQuoteTransformerLimitOrderInfo[];
    rfqOrders: FillQuoteTransformerRfqOrderInfo[];
+    otcOrders: FillQuoteTransformerOtcOrderInfo[];
    fillSequence: FillQuoteTransformerOrderType[];
    fillAmount: BigNumber;
    refundReceiver: string;
@@ -178,6 +199,11 @@ 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
@@ -813,6 +813,15 @@
    lodash "^4.17.11"
    web3-provider-engine "14.0.6"

+"@0x/fast-abi@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@0x/fast-abi/-/fast-abi-0.0.5.tgz#f87265c8293df7930c94e0d65c0f98a583bf9901"
+  integrity sha512-mb+CSeLi73N98sCS/Wn250emgt1VeON91NFlI0oVakHuzzvWWfvn83294wPRYAmoin0IHFXkBsj3OwQA9hCLqw==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.4"
+    cargo-cp-artifact "^0.1.6"
+    uuid "^8.3.2"
+
 "@0x/json-schemas@^6.1.3":
  version "6.1.3"
  resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.1.3.tgz#da71ed2e50ae6813a6d4d0fe5f8ad69b8e6a7435"
@@ -2334,18 +2343,19 @@
    write-file-atomic "^2.3.0"

 "@mapbox/node-pre-gyp@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.4.tgz#6c76e7a40138eac39e1a4dc869a083e43e236c00"
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz#09a8781a3a036151cdebbe8719d6f8b25d4058bc"
+  integrity sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==
  dependencies:
-    detect-libc "^1.0.3"
+    detect-libc "^2.0.0"
    https-proxy-agent "^5.0.0"
    make-dir "^3.1.0"
-    node-fetch "^2.6.1"
+    node-fetch "^2.6.7"
    nopt "^5.0.0"
-    npmlog "^4.1.2"
+    npmlog "^5.0.1"
    rimraf "^3.0.2"
-    semver "^7.3.4"
-    tar "^6.1.0"
+    semver "^7.3.5"
+    tar "^6.1.11"

 "@mapbox/node-pre-gyp@^1.0.5":
  version "1.0.5"
@@ -2545,6 +2555,14 @@
  dependencies:
    defer-to-connect "^1.0.1"

+"@typechain/ethers-v5@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@typechain/ethers-v5/-/ethers-v5-10.0.0.tgz#1b6e292d2ed9afb0d2f7a4674cc199bb95bad714"
+  integrity sha512-Kot7fwAqnH96ZbI8xrRgj5Kpv9yCEdjo7mxRqrH7bYpEgijT5MmuOo8IVsdhOu7Uog4ONg7k/d5UdbAtTKUgsA==
+  dependencies:
+    lodash "^4.17.15"
+    ts-essentials "^7.0.1"
+
 "@types/bn.js@^4.11.0", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.5":
  version "4.11.6"
  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c"
@@ -2708,6 +2726,11 @@
  dependencies:
    "@types/node" "*"

+"@types/prettier@^2.1.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.1.tgz#76e72d8a775eef7ce649c63c8acae1a0824bbaed"
+  integrity sha512-XFjFHmaLVifrAKaZ+EKghFHtHSUonyw8P2Qmy2/+osBnrKbH9UYtlK10zg8/kCt47MFilll/DEDKy3DHfJ0URw==
+
 "@types/prompts@^2.0.9":
  version "2.0.9"
  resolved "https://registry.yarnpkg.com/@types/prompts/-/prompts-2.0.9.tgz#19f419310eaa224a520476b19d4183f6a2b3bd8f"
@@ -3007,7 +3030,7 @@ aproba@^1.0.3, aproba@^1.1.1:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"

-aproba@^2.0.0:
+"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"

@@ -3015,6 +3038,14 @@ archy@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"

+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 are-we-there-yet@~1.1.2:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -3046,6 +3077,16 @@ arr-union@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"

+array-back@^3.0.1, array-back@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
+  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
+
+array-back@^4.0.1, array-back@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e"
+  integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==
+
 array-differ@^2.0.3:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1"
@@ -3747,9 +3788,9 @@ bigi@1.4.2, bigi@^1.1.0:
  resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825"

 bignumber.js@7.2.1, bignumber.js@^9.0.0, bignumber.js@^9.0.2, bignumber.js@~4.1.0, bignumber.js@~9.0.0, bignumber.js@~9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
-  integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62"
+  integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==

 binary-extensions@^2.0.0:
  version "2.1.0"
@@ -4223,6 +4264,7 @@ caniuse-lite@^1.0.30000844:
 cargo-cp-artifact@^0.1.6:
  version "0.1.6"
  resolved "https://registry.yarnpkg.com/cargo-cp-artifact/-/cargo-cp-artifact-0.1.6.tgz#df1bc9dad036ae0f4230639a869182e1d5850f89"
+  integrity sha512-CQw0doK/aaF7j041666XzuilHxqMxaKkn+I5vmBsd8SAwS0cO5CqVEVp0xJwOKstyqWZ6WK4Ww3O6p26x/Goyg==

 caseless@~0.12.0:
  version "0.12.0"
@@ -4569,6 +4611,11 @@ color-name@~1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"

+color-support@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colors@1.0.x:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -4594,6 +4641,26 @@ command-exists@^1.2.8:
  version "1.2.9"
  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69"

+command-line-args@^5.1.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
+  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
+  dependencies:
+    array-back "^3.1.0"
+    find-replace "^3.0.0"
+    lodash.camelcase "^4.3.0"
+    typical "^4.0.0"
+
+command-line-usage@^6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.3.tgz#428fa5acde6a838779dfa30e44686f4b6761d957"
+  integrity sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==
+  dependencies:
+    array-back "^4.0.2"
+    chalk "^2.4.2"
+    table-layout "^1.0.2"
+    typical "^5.2.0"
+
 commander@2.18.0:
  version "2.18.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
@@ -4650,7 +4717,7 @@ config-chain@^1.1.11:
    ini "^1.3.4"
    proto-list "~1.2.1"

-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"

@@ -4838,13 +4905,6 @@ crc-32@^1.2.0:
    exit-on-epipe "~1.0.1"
    printj "~1.1.0"

-cream-sor@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/cream-sor/-/cream-sor-0.3.3.tgz#ae7ab50c68cfd36a89e2101187ceebbb79e1b14c"
-  dependencies:
-    bignumber.js "^9.0.0"
-    isomorphic-fetch "^2.2.1"
-
 create-ecdh@^4.0.0:
  version "4.0.4"
  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -5028,7 +5088,7 @@ debug@^4.0.1:
  dependencies:
    ms "2.1.2"

-debug@^4.3.3:
+debug@^4.3.1, debug@^4.3.3:
  version "4.3.4"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -5143,7 +5203,7 @@ deep-equal@~1.1.1:
    object-keys "^1.1.1"
    regexp.prototype.flags "^1.2.0"

-deep-extend@^0.6.0:
+deep-extend@^0.6.0, deep-extend@~0.6.0:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"

@@ -5263,6 +5323,11 @@ detect-libc@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"

+detect-libc@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
+  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+
 detect-node@2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
@@ -6112,6 +6177,17 @@ ethereumjs-util@^7.1.0:
    ethjs-util "0.1.6"
    rlp "^2.2.4"

+ethereumjs-util@^7.1.5:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181"
+  integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==
+  dependencies:
+    "@types/bn.js" "^5.1.0"
+    bn.js "^5.1.2"
+    create-hash "^1.1.2"
+    ethereum-cryptography "^0.1.3"
+    rlp "^2.2.4"
+
 ethereumjs-vm@4.2.0, ethereumjs-vm@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-4.2.0.tgz#e885e861424e373dbc556278f7259ff3fca5edab"
@@ -6403,14 +6479,6 @@ fake-merkle-patricia-tree@^1.0.1:
  dependencies:
    checkpoint-store "^1.1.0"

-fast-abi@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/fast-abi/-/fast-abi-0.0.4.tgz#c6a547d0fe75862a9eea6fe5aa7ab135e6ab62a0"
-  dependencies:
-    "@mapbox/node-pre-gyp" "^1.0.4"
-    cargo-cp-artifact "^0.1.6"
-    uuid "^8.3.2"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
  version "3.1.3"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -6538,6 +6606,13 @@ find-cache-dir@^0.1.1:
    mkdirp "^0.5.1"
    pkg-dir "^1.0.0"

+find-replace@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
+  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
+  dependencies:
+    array-back "^3.0.1"
+
 find-up@3.0.0, find-up@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -6691,7 +6766,7 @@ fs-extra@^4.0.2, fs-extra@^4.0.3:
    jsonfile "^4.0.0"
    universalify "^0.1.0"

-fs-extra@^7.0.1:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
  dependencies:
@@ -6815,6 +6890,21 @@ ganache-core@^2.13.2:
    ethereumjs-wallet "0.6.5"
    web3 "1.2.11"

+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.1"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.2"
+
 gauge@~1.2.5:
  version "1.2.7"
  resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
@@ -7075,6 +7165,18 @@ glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glo
    once "^1.3.0"
    path-is-absolute "^1.0.0"

+glob@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^5.0.15:
  version "5.0.15"
  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -8653,6 +8755,11 @@ lodash._reinterpolate@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"

+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
 lodash.clonedeep@^4.5.0:
  version "4.5.0"
  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -9216,7 +9323,7 @@ mkdirp-promise@^5.0.1:
  dependencies:
    mkdirp "*"

-mkdirp@*, mkdirp@^1.0.3:
+mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"

@@ -9728,6 +9835,16 @@ npmlog@^4.0.1, npmlog@^4.1.2:
    gauge "~2.7.3"
    set-blocking "~2.0.0"

+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+  dependencies:
+    are-we-there-yet "^2.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^3.0.0"
+    set-blocking "^2.0.0"
+
 npmlog@~2.0.0:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
@@ -10461,6 +10578,11 @@ prettier@^2.0.5:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"

+prettier@^2.3.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
+  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
+
 pretty-bytes@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"
@@ -10962,6 +11084,11 @@ redent@^3.0.0:
    indent-string "^4.0.0"
    strip-indent "^3.0.0"

+reduce-flatten@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
+  integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
+
 regenerate@^1.2.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
@@ -11389,6 +11516,13 @@ semver@^7.3.4:
  dependencies:
    lru-cache "^6.0.0"

+semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.1:
  version "0.17.1"
  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -11875,6 +12009,11 @@ string-editor@^0.1.0:
  dependencies:
    editor "^1.0.0"

+string-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b"
+  integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==
+
 string-width@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -11890,15 +12029,7 @@ string-width@^1.0.1:
    is-fullwidth-code-point "^2.0.0"
    strip-ansi "^4.0.0"

-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11907,6 +12038,14 @@ string-width@^4.1.0, string-width@^4.2.3:
    is-fullwidth-code-point "^3.0.0"
    strip-ansi "^6.0.1"

+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string-width@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
@@ -12144,6 +12283,16 @@ swarm-js@^0.1.40:
    tar "^4.0.2"
    xhr-request "^1.0.1"

+table-layout@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04"
+  integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==
+  dependencies:
+    array-back "^4.0.1"
+    deep-extend "~0.6.0"
+    typical "^5.2.0"
+    wordwrapjs "^4.0.0"
+
 table@^5.2.3:
  version "5.4.6"
  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -12236,6 +12385,18 @@ tar@^6.1.0:
    mkdirp "^1.0.3"
    yallist "^4.0.0"

+tar@^6.1.11:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 temp-dir@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
@@ -12474,6 +12635,21 @@ truffle@^5.0.32:
    mocha "8.1.2"
    original-require "1.0.1"

+ts-command-line-args@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/ts-command-line-args/-/ts-command-line-args-2.3.1.tgz#b6188e42efc6cf7a8898e438a873fbb15505ddd6"
+  integrity sha512-FR3y7pLl/fuUNSmnPhfLArGqRrpojQgIEEOVzYx9DhTmfIN7C9RWSfpkJEF4J+Gk7aVx5pak8I7vWZsaN4N84g==
+  dependencies:
+    chalk "^4.1.0"
+    command-line-args "^5.1.1"
+    command-line-usage "^6.1.0"
+    string-format "^2.0.0"
+
+ts-essentials@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38"
+  integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==
+
 tslib@1.9.0:
  version "1.9.0"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
@@ -12624,6 +12800,22 @@ type@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"

+typechain@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/typechain/-/typechain-8.0.0.tgz#a5dbe754717a7e16247df52b5285903de600e8ff"
+  integrity sha512-rqDfDYc9voVAhmfVfAwzg3VYFvhvs5ck1X9T/iWkX745Cul4t+V/smjnyqrbDzWDbzD93xfld1epg7Y/uFAesQ==
+  dependencies:
+    "@types/prettier" "^2.1.1"
+    debug "^4.3.1"
+    fs-extra "^7.0.0"
+    glob "7.1.7"
+    js-sha3 "^0.8.0"
+    lodash "^4.17.15"
+    mkdirp "^1.0.4"
+    prettier "^2.3.1"
+    ts-command-line-args "^2.2.0"
+    ts-essentials "^7.0.1"
+
 typedarray-to-buffer@^3.1.5:
  version "3.1.5"
  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -12700,6 +12892,16 @@ typewiselite@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/typewiselite/-/typewiselite-1.0.0.tgz#c8882fa1bb1092c06005a97f34ef5c8508e3664e"

+typical@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
+  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
+
+typical@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"
+  integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
+
 u2f-api@0.2.7:
  version "0.2.7"
  resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.2.7.tgz#17bf196b242f6bf72353d9858e6a7566cc192720"
@@ -12937,6 +13139,7 @@ uuid@^3.0.1, uuid@^3.3.2:
 uuid@^8.3.2:
  version "8.3.2"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==

 valid-url@^1.0.9:
  version "1.0.9"
@@ -13647,6 +13850,13 @@ wide-align@1.1.3, wide-align@^1.1.0:
  dependencies:
    string-width "^1.0.2 || 2"

+wide-align@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
 windows-release@^3.1.0:
  version "3.3.3"
  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.3.tgz#1c10027c7225743eec6b89df160d64c2e0293999"
@@ -13673,6 +13883,14 @@ wordwrap@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"

+wordwrapjs@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f"
+  integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==
+  dependencies:
+    reduce-flatten "^2.0.0"
+    typical "^5.2.0"
+
 workerpool@6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58"
Author	SHA1	Message	Date
Noah Khamliche	c82ce2bdf9	simulate maker and taker balances of erc20	2022-08-19 15:13:38 -04:00
Noah Khamliche	1170c90141	adding the rest of the changes	2022-08-19 14:27:00 -04:00
Noah Khamliche	cb7916789b	otc order implementation added to FQT with failing tests	2022-08-19 14:25:34 -04:00
eobbad	9058839645	WooFi Gas Estimates (#551 ) * change gas estimates * changelog * remove comments * fix lerna run lint error	2022-08-16 14:10:53 -04:00
Ido Kleinman	46a7a2e620	Revert "chore: Remove unused addresses in addresses.json [TKR-519] (#548 )" This reverts commit `8aa313a437`.	2022-08-11 13:31:47 -07:00
eobbad	b35dccd43d	Offboard Cream (#546 ) * offboard cream * changelog * remove BalancerFillData (unused)	2022-08-10 08:42:43 -04:00
Kyu	08e0c2ebb9	chore: Add checks for `addresses.json` [TKR-519] (#549 )	2022-08-10 17:35:38 +09:00
Kyu	8aa313a437	chore: Remove unused addresses in addresses.json [TKR-519] (#548 ) * Delete unused addresses in addresses.json and update index.ts * Update contract wrappers * Remove outdated references to `exchange` contract in `asset-swapper` * Update CHANGELOG.json	2022-08-10 16:59:21 +09:00
Github Actions	8e9699c340	Publish - @0x/contracts-erc20@3.3.36 - @0x/contracts-test-utils@5.4.27 - @0x/contracts-treasury@1.4.19 - @0x/contracts-utils@4.8.17 - @0x/contracts-zero-ex@0.36.3 - @0x/asset-swapper@16.66.3 - @0x/contract-addresses@6.19.2 - @0x/contract-wrappers@13.20.8 - @0x/protocol-utils@11.16.3	2022-08-10 01:12:34 +00:00
Github Actions	939b708e63	Updated CHANGELOGS & MD docs	2022-08-10 01:12:31 +00:00
Kyu	1617e3fc44	Fix Polygon and Ganache FillQuoteTransformer addresses (#547 ) * Revert Ganache (1337) FQT address as it was mistakenly updated. * Update Polygon (137) FQT address with the new one.	2022-08-10 09:43:42 +09:00
Github Actions	e0d705703d	Publish - @0x/contracts-erc20@3.3.35 - @0x/contracts-test-utils@5.4.26 - @0x/contracts-treasury@1.4.18 - @0x/contracts-utils@4.8.16 - @0x/contracts-zero-ex@0.36.2 - @0x/asset-swapper@16.66.2 - @0x/contract-addresses@6.19.1 - @0x/contract-wrappers@13.20.7 - @0x/protocol-utils@11.16.2	2022-08-09 19:27:28 +00:00
Github Actions	01a6d933ca	Updated CHANGELOGS & MD docs	2022-08-09 19:27:24 +00:00
Kyu	9b9f0b91d7	Move woofi tokens to constant.ts and run prettier (#544 )	2022-08-09 13:31:37 +09:00
Ido Kleinman	0d0fef841d	PR #	2022-08-08 19:04:04 -05:00
Ido Kleinman	17adfbea32	changelogs	2022-08-08 19:04:04 -05:00
Noah Khamliche	80594622b2	empty commit to run workflow	2022-08-08 18:55:39 -05:00
Ido Kleinman	0dba5a5a3a	lowercase addresses (#542 )	2022-08-08 16:40:31 -07:00
phil-ociraptor	4dae8de1b6	feat: add Foundry support to contracts/zero-ex (#534 ) Co-authored-by: Michael Zhu <mchl.zhu.96@gmail.com>	2022-08-08 11:46:50 -05:00
eobbad	0046bb26d8	Update WooFi sampler logicand addresses.json w/ new FQT's	2022-08-08 12:27:45 -04:00
Kyu	fe935f787c	Use @0x/fast-abi instead of deprecated fast-abi (#540 )	2022-08-08 14:34:48 +09:00
Kyu	1b527ffcd8	Clean up Mirror and UST related stuff (#539 )	2022-08-08 12:29:33 +09:00
Github Actions	9f5324d9c3	Publish - @0x/asset-swapper@16.66.1	2022-08-08 02:47:26 +00:00
Github Actions	3647392a04	Updated CHANGELOGS & MD docs	2022-08-08 02:47:21 +00:00
Kyu	1d49662c58	Upgrade `fast-abi` (#538 )	2022-08-08 11:27:44 +09:00