Publish

- @0x/asset-swapper@16.50.1
Updated CHANGELOGS & MD docs
2022-03-03 13:04:04 +00:00 · 2022-03-03 13:04:00 +00:00 · 2022-03-03 13:45:20 +01:00 · 2022-03-02 21:18:40 -05:00 · 2022-03-02 10:46:00 -08:00 · 2022-03-02 12:55:58 +00:00
43 changed files with 647 additions and 268 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
    build:
        resource_class: xlarge
        docker:
-            - image: node:12
+            - image: node:16
        environment:
            NODE_OPTIONS: '--max-old-space-size=16384'
        working_directory: ~/repo
@@ -31,7 +31,7 @@ jobs:
    test-exchange-ganache:
        resource_class: medium+
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -41,7 +41,7 @@ jobs:
    test-integrations-ganache:
        resource_class: medium+
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -51,7 +51,7 @@ jobs:
    test-contracts-staking-ganache:
        resource_class: medium+
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -61,7 +61,7 @@ jobs:
    test-contracts-extra-ganache:
        resource_class: medium+
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -71,7 +71,7 @@ jobs:
    test-contracts-rest-ganache:
        resource_class: medium+
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -83,7 +83,7 @@ jobs:
        environment:
            NODE_OPTIONS: '--max-old-space-size=6442'
        docker:
-            - image: node:12
+            - image: node:16
            - image: 0xorg/verdaccio
        working_directory: ~/repo
        steps:
@@ -97,7 +97,7 @@ jobs:
                  path: ~/.npm/_logs
    test-doc-generation:
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -108,7 +108,7 @@ jobs:
                  no_output_timeout: 1200
    test-rest:
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
@@ -136,7 +136,7 @@ jobs:
        resource_class: large
        working_directory: ~/repo
        docker:
-            - image: node:12
+            - image: node:16
        steps:
            - restore_cache:
                  keys:
@@ -147,7 +147,7 @@ jobs:
            - run: yarn diff_md_docs:ci
    submit-coverage:
        docker:
-            - image: node:12
+            - image: node:16
        working_directory: ~/repo
        steps:
            - restore_cache:
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "3.3.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1645569128,
        "version": "3.3.26",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v3.3.27 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v3.3.26 - _February 22, 2022_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "3.3.26",
+    "version": "3.3.27",
    "engines": {
        "node": ">=6.12"
    },
@@ -53,8 +53,8 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.7.2",
        "@0x/contracts-gen": "^2.0.43",
-        "@0x/contracts-test-utils": "^5.4.17",
-        "@0x/contracts-utils": "^4.8.7",
+        "@0x/contracts-test-utils": "^5.4.18",
+        "@0x/contracts-utils": "^4.8.8",
        "@0x/dev-utils": "^4.2.11",
        "@0x/sol-compiler": "^4.7.8",
        "@0x/ts-doc-gen": "^0.0.28",
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "5.4.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1645569128,
        "version": "5.4.17",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v5.4.18 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v5.4.17 - _February 22, 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.17",
+    "version": "5.4.18",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,7 +44,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.31",
        "@0x/base-contract": "^6.4.5",
-        "@0x/contract-addresses": "^6.11.0",
+        "@0x/contract-addresses": "^6.12.0",
        "@0x/dev-utils": "^4.2.11",
        "@0x/json-schemas": "^6.4.1",
        "@0x/order-utils": "^10.4.28",
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "1.4.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1645569128,
        "version": "1.4.9",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.4.10 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v1.4.9 - _February 22, 2022_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.9",
+    "version": "1.4.10",
    "engines": {
        "node": ">=6.12"
    },
@@ -47,12 +47,12 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
    "devDependencies": {
        "@0x/abi-gen": "^5.7.2",
-        "@0x/contract-addresses": "^6.11.0",
+        "@0x/contract-addresses": "^6.12.0",
        "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.26",
+        "@0x/contracts-erc20": "^3.3.27",
        "@0x/contracts-gen": "^2.0.43",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.17",
+        "@0x/contracts-test-utils": "^5.4.18",
        "@0x/sol-compiler": "^4.7.8",
        "@0x/ts-doc-gen": "^0.0.28",
        "@0x/tslint-config": "^4.1.4",
@@ -73,7 +73,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^6.4.5",
-        "@0x/protocol-utils": "^1.11.0",
+        "@0x/protocol-utils": "^1.11.1",
        "@0x/subproviders": "^6.6.2",
        "@0x/types": "^3.3.4",
        "@0x/typescript-typings": "^5.2.1",
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "4.8.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1645569128,
        "version": "4.8.7",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.8.8 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v4.8.7 - _February 22, 2022_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.7",
+    "version": "4.8.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -52,7 +52,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.7.2",
        "@0x/contracts-gen": "^2.0.43",
-        "@0x/contracts-test-utils": "^5.4.17",
+        "@0x/contracts-test-utils": "^5.4.18",
        "@0x/dev-utils": "^4.2.11",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.7.8",
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "0.31.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "version": "0.31.0",
        "changes": [
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.31.1 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v0.31.0 - _February 22, 2022_

    * Add ERC721OrdersFeature, ERC1155OrdersFeature, and ERC165Feature (#429)
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.31.0",
+    "version": "0.31.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -56,10 +56,10 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
        "@0x/abi-gen": "^5.7.2",
-        "@0x/contract-addresses": "^6.11.0",
-        "@0x/contracts-erc20": "^3.3.26",
+        "@0x/contract-addresses": "^6.12.0",
+        "@0x/contracts-erc20": "^3.3.27",
        "@0x/contracts-gen": "^2.0.43",
-        "@0x/contracts-test-utils": "^5.4.17",
+        "@0x/contracts-test-utils": "^5.4.18",
        "@0x/dev-utils": "^4.2.11",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.7.8",
@@ -83,7 +83,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^6.4.5",
-        "@0x/protocol-utils": "^1.11.0",
+        "@0x/protocol-utils": "^1.11.1",
        "@0x/subproviders": "^6.6.2",
        "@0x/types": "^3.3.4",
        "@0x/typescript-typings": "^5.2.1",
--- a/docs/additional/audits.rst
+++ b/docs/additional/audits.rst
@@ -4,23 +4,28 @@ Audits

 Below are links to our third-party audit reports.

-+------------------+---------------------------------------------------------------------------------------------------------------+
-| **Release**      | **Reports**                                                                                                   |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| Exchange V4      | * `Consensys Diligence (December 2020) <https://consensys.net/diligence/audits/2020/12/0x-exchange-v4/>`__    |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| Exchange V3      | * `Trail of Bits <http://zeips.0x.org.s3-website.us-east-2.amazonaws.com/audits/56/trail-of-bits/audit.pdf>`_ |
-|                  | * `Consensys Diligence (Exchange) <https://diligence.consensys.net/audits/2019/09/0x-v3-exchange/>`__         |
-|                  | * `Consensys Diligence (Staking) <https://diligence.consensys.net/audits/2019/10/0x-v3-staking/>`__           |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| Exchange V2.1    | * `First <https://docs.google.com/document/d/1jYv6V21MfCSwCS5fxD6ZyaLWGzkpRSUO0lZpST94XsA/edit>`_             |
-|                  | * `Consensys Diligence <https://github.com/ConsenSys/0x_audit_report_2018-07-23>`_                            |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| MultiAssetProxy  | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2018-12>`__                              |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| ERC1155Proxy     | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2019-05>`__                              |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| StaticCallProxy  | * No third-party audit.                                                                                       |
-+------------------+---------------------------------------------------------------------------------------------------------------+
-| ERC20BridgeProxy | * No third-party audit.                                                                                       |
-+------------------+---------------------------------------------------------------------------------------------------------------+
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| **Release**          | **Reports**                                                                                                               |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| ERC721OrdersFeature  | * `ABDK Consulting <https://s3.us-east-2.amazonaws.com/zeips.0x.org/audits/abdk-consulting/ABDK_0x_Solidity_v_1_0.pdf>`__ |
+|                      |                                                                                                                           |
+|                      |                                                                                                                           |
+| ERC1155OrdersFeature |                                                                                                                           |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| Exchange V4          | * `Consensys Diligence (December 2020) <https://consensys.net/diligence/audits/2020/12/0x-exchange-v4/>`__                |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| Exchange V3          | * `Trail of Bits <http://zeips.0x.org.s3-website.us-east-2.amazonaws.com/audits/56/trail-of-bits/audit.pdf>`__            |
+|                      | * `Consensys Diligence (Exchange) <https://diligence.consensys.net/audits/2019/09/0x-v3-exchange/>`__                     |
+|                      | * `Consensys Diligence (Staking) <https://diligence.consensys.net/audits/2019/10/0x-v3-staking/>`__                       |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| Exchange V2.1        | * `First <https://docs.google.com/document/d/1jYv6V21MfCSwCS5fxD6ZyaLWGzkpRSUO0lZpST94XsA/edit>`_                         |
+|                      | * `Consensys Diligence <https://github.com/ConsenSys/0x_audit_report_2018-07-23>`_                                        |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| MultiAssetProxy      | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2018-12>`__                                          |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| ERC1155Proxy         | * `Consensys Diligence <https://github.com/ConsenSys/0x-audit-report-2019-05>`__                                          |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| StaticCallProxy      | * No third-party audit.                                                                                                   |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
+| ERC20BridgeProxy     | * No third-party audit.                                                                                                   |
+----------------------+---------------------------------------------------------------------------------------------------------------------------+
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
        "@0xproject/npm-cli-login": "^0.0.11",
        "async-child-process": "^1.1.1",
        "coveralls": "^3.0.0",
-        "ganache-cli": "6.8.0-istanbul.0",
+        "ganache-cli": "6.12.2",
        "lcov-result-merger": "^3.0.0",
        "lerna": "^3.0.0-beta.25",
        "npm-run-all": "^4.1.2",
@@ -75,6 +75,6 @@
        "wsrun": "^5.2.4"
    },
    "resolutions": {
-        "merkle-patricia-tree": "^2.3.2"
+        "merkle-patricia-tree": "3.0.0"
    }
 }
--- a/packages/asset-swapper/CHANGELOG.json
+++ b/packages/asset-swapper/CHANGELOG.json
@@ -1,4 +1,42 @@
 [
+    {
+        "version": "16.50.1",
+        "changes": [
+            {
+                "note": "Add BTRFLY/WETH Curve pool on mainnet",
+                "pr": 437
+            },
+            {
+                "note": "Lower Uniswap V3 Sampler gas allowance",
+                "pr": 438
+            }
+        ],
+        "timestamp": 1646312638
+    },
+    {
+        "version": "16.50.0",
+        "changes": [
+            {
+                "note": "Adding support for Geist on `Fantom`",
+                "pr": 398
+            },
+            {
+                "note": "Improve Uniswap V3 gas schedule",
+                "pr": 424
+            }
+        ],
+        "timestamp": 1646225739
+    },
+    {
+        "version": "16.49.9",
+        "changes": [
+            {
+                "note": "Fix native order scaling & filter out 1 wei quotes",
+                "pr": "430"
+            }
+        ],
+        "timestamp": 1645696356
+    },
    {
        "timestamp": 1645569128,
        "version": "16.49.8",
--- a/packages/asset-swapper/CHANGELOG.md
+++ b/packages/asset-swapper/CHANGELOG.md
@@ -5,6 +5,20 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v16.50.1 - _March 3, 2022_
+
+    * Add BTRFLY/WETH Curve pool on mainnet (#437)
+    * Lower Uniswap V3 Sampler gas allowance (#438)
+
+## v16.50.0 - _March 2, 2022_
+
+    * Adding support for Geist on `Fantom` (#398)
+    * Improve Uniswap V3 gas schedule (#424)
+
+## v16.49.9 - _February 24, 2022_
+
+    * Fix native order scaling & filter out 1 wei quotes (#430)
+
 ## v16.49.8 - _February 22, 2022_

    * Dependencies updated
--- a/packages/asset-swapper/contracts/src/UniswapV3Sampler.sol
+++ b/packages/asset-swapper/contracts/src/UniswapV3Sampler.sol
@@ -22,17 +22,43 @@ pragma experimental ABIEncoderV2;

 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";

-interface IUniswapV3Quoter {
+interface IUniswapV3QuoterV2 {
    function factory()
        external
        view
        returns (IUniswapV3Factory factory);
+
+    // @notice Returns the amount out received for a given exact input swap without executing the swap
+    // @param path The path of the swap, i.e. each token pair and the pool fee
+    // @param amountIn The amount of the first token to swap
+    // @return amountOut The amount of the last token that would be received
+    // @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
+    // @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
+    // @return gasEstimate The estimate of the gas that the swap consumes
    function quoteExactInput(bytes memory path, uint256 amountIn)
        external
-        returns (uint256 amountOut);
+        returns (
+            uint256 amountOut,
+            uint160[] memory sqrtPriceX96AfterList,
+            uint32[] memory initializedTicksCrossedList,
+            uint256 gasEstimate
+        );
+
+    // @notice Returns the amount in required for a given exact output swap without executing the swap
+    // @param path The path of the swap, i.e. each token pair and the pool fee. Path must be provided in reverse order
+    // @param amountOut The amount of the last token to receive
+    // @return amountIn The amount of first token required to be paid
+    // @return sqrtPriceX96AfterList List of the sqrt price after the swap for each pool in the path
+    // @return initializedTicksCrossedList List of the initialized ticks that the swap crossed for each pool in the path
+    // @return gasEstimate The estimate of the gas that the swap consumes
    function quoteExactOutput(bytes memory path, uint256 amountOut)
        external
-        returns (uint256 amountIn);
+        returns (
+            uint256 amountIn,
+            uint160[] memory sqrtPriceX96AfterList,
+            uint32[] memory initializedTicksCrossedList,
+            uint256 gasEstimate
+        );
 }

 interface IUniswapV3Factory {
@@ -51,23 +77,25 @@ interface IUniswapV3Pool {
 contract UniswapV3Sampler
 {
    /// @dev Gas limit for UniswapV3 calls. This is 100% a guess.
-    uint256 constant private QUOTE_GAS = 600e3;
+    uint256 constant private QUOTE_GAS = 700e3;

    /// @dev Sample sell quotes from UniswapV3.
    /// @param quoter UniswapV3 Quoter contract.
    /// @param path Token route. Should be takerToken -> makerToken
    /// @param takerTokenAmounts Taker token sell amount for each sample.
    /// @return uniswapPaths The encoded uniswap path for each sample.
+    /// @return uniswapGasUsed Estimated amount of gas used
    /// @return makerTokenAmounts Maker amounts bought at each taker token
    ///         amount.
    function sampleSellsFromUniswapV3(
-        IUniswapV3Quoter quoter,
+        IUniswapV3QuoterV2 quoter,
        IERC20TokenV06[] memory path,
        uint256[] memory takerTokenAmounts
    )
        public
        returns (
            bytes[] memory uniswapPaths,
+            uint256[] memory uniswapGasUsed,
            uint256[] memory makerTokenAmounts
        )
    {
@@ -76,31 +104,39 @@ contract UniswapV3Sampler

        makerTokenAmounts = new uint256[](takerTokenAmounts.length);
        uniswapPaths = new bytes[](takerTokenAmounts.length);
+        uniswapGasUsed = new uint256[](takerTokenAmounts.length);

        for (uint256 i = 0; i < takerTokenAmounts.length; ++i) {
            // Pick the best result from all the paths.
-            bytes memory topUniswapPath;
            uint256 topBuyAmount = 0;
            for (uint256 j = 0; j < poolPaths.length; ++j) {
                bytes memory uniswapPath = _toUniswapPath(path, poolPaths[j]);
-                try
-                    quoter.quoteExactInput
-                        { gas: QUOTE_GAS }
-                        (uniswapPath, takerTokenAmounts[i])
-                        returns (uint256 buyAmount)
+                try quoter.quoteExactInput
+                    { gas: QUOTE_GAS }
+                    (uniswapPath, takerTokenAmounts[i])
+                    returns (
+                        uint256 buyAmount,
+                        uint160[] memory, /* sqrtPriceX96AfterList */
+                        uint32[] memory, /* initializedTicksCrossedList */
+                        uint256 gasUsed
+                    )
                {
                    if (topBuyAmount <= buyAmount) {
                        topBuyAmount = buyAmount;
-                        topUniswapPath = uniswapPath;
+                        uniswapPaths[i] = uniswapPath;
+                        uniswapGasUsed[i] = gasUsed;
                    }
-                } catch { }
+                } catch {}
            }
-            // Break early if we can't complete the buys.
+            // Break early if we can't complete the sells.
            if (topBuyAmount == 0) {
+                // HACK(kimpers): To avoid too many local variables, paths and gas used is set directly in the loop
+                // then reset if no valid valid quote was found
+                uniswapPaths[i] = "";
+                uniswapGasUsed[i] = 0;
                break;
            }
            makerTokenAmounts[i] = topBuyAmount;
-            uniswapPaths[i] = topUniswapPath;
        }
    }

@@ -109,16 +145,18 @@ contract UniswapV3Sampler
    /// @param path Token route. Should be takerToken -> makerToken.
    /// @param makerTokenAmounts Maker token buy amount for each sample.
    /// @return uniswapPaths The encoded uniswap path for each sample.
+    /// @return uniswapGasUsed Estimated amount of gas used
    /// @return takerTokenAmounts Taker amounts sold at each maker token
    ///         amount.
    function sampleBuysFromUniswapV3(
-        IUniswapV3Quoter quoter,
+        IUniswapV3QuoterV2 quoter,
        IERC20TokenV06[] memory path,
        uint256[] memory makerTokenAmounts
    )
        public
        returns (
            bytes[] memory uniswapPaths,
+            uint256[] memory uniswapGasUsed,
            uint256[] memory takerTokenAmounts
        )
    {
@@ -128,10 +166,10 @@ contract UniswapV3Sampler

        takerTokenAmounts = new uint256[](makerTokenAmounts.length);
        uniswapPaths = new bytes[](makerTokenAmounts.length);
+        uniswapGasUsed = new uint256[](makerTokenAmounts.length);

        for (uint256 i = 0; i < makerTokenAmounts.length; ++i) {
            // Pick the best result from all the paths.
-            bytes memory topUniswapPath;
            uint256 topSellAmount = 0;
            for (uint256 j = 0; j < poolPaths.length; ++j) {
                // quoter requires path to be reversed for buys.
@@ -143,21 +181,30 @@ contract UniswapV3Sampler
                    quoter.quoteExactOutput
                        { gas: QUOTE_GAS }
                        (uniswapPath, makerTokenAmounts[i])
-                        returns (uint256 sellAmount)
+                        returns (
+                            uint256 sellAmount,
+                            uint160[] memory, /* sqrtPriceX96AfterList */
+                            uint32[] memory, /* initializedTicksCrossedList */
+                            uint256 gasUsed
+                        )
                {
                    if (topSellAmount == 0 || topSellAmount >= sellAmount) {
                        topSellAmount = sellAmount;
                        // But the output path should still be encoded for sells.
-                        topUniswapPath = _toUniswapPath(path, poolPaths[j]);
+                        uniswapPaths[i] = _toUniswapPath(path, poolPaths[j]);
+                        uniswapGasUsed[i] = gasUsed;
                    }
                } catch {}
            }
            // Break early if we can't complete the buys.
            if (topSellAmount == 0) {
+                // HACK(kimpers): To avoid too many local variables, paths and gas used is set directly in the loop
+                // then reset if no valid valid quote was found
+                uniswapPaths[i] = "";
+                uniswapGasUsed[i] = 0;
                break;
            }
            takerTokenAmounts[i] = topSellAmount;
-            uniswapPaths[i] = topUniswapPath;
        }
    }

@@ -236,6 +283,7 @@ contract UniswapV3Sampler

    function _reverseTokenPath(IERC20TokenV06[] memory tokenPath)
        private
+        pure
        returns (IERC20TokenV06[] memory reversed)
    {
        reversed = new IERC20TokenV06[](tokenPath.length);
@@ -246,6 +294,7 @@ contract UniswapV3Sampler

    function _reversePoolPath(IUniswapV3Pool[] memory poolPath)
        private
+        pure
        returns (IUniswapV3Pool[] memory reversed)
    {
        reversed = new IUniswapV3Pool[](poolPath.length);
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "16.49.8",
+    "version": "16.50.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -60,14 +60,14 @@
    "dependencies": {
        "@0x/assert": "^3.0.31",
        "@0x/base-contract": "^6.4.5",
-        "@0x/contract-addresses": "^6.11.0",
-        "@0x/contract-wrappers": "^13.19.0",
-        "@0x/contracts-erc20": "^3.3.26",
-        "@0x/contracts-zero-ex": "^0.31.0",
+        "@0x/contract-addresses": "^6.12.0",
+        "@0x/contract-wrappers": "^13.19.1",
+        "@0x/contracts-erc20": "^3.3.27",
+        "@0x/contracts-zero-ex": "^0.31.1",
        "@0x/dev-utils": "^4.2.11",
        "@0x/json-schemas": "^6.4.1",
-        "@0x/neon-router": "^0.3.2",
-        "@0x/protocol-utils": "^1.11.0",
+        "@0x/neon-router": "^0.3.3",
+        "@0x/protocol-utils": "^1.11.1",
        "@0x/quote-server": "^6.0.6",
        "@0x/types": "^3.3.4",
        "@0x/typescript-typings": "^5.2.1",
@@ -98,10 +98,10 @@
        "@0x/contracts-exchange": "^3.2.38",
        "@0x/contracts-exchange-libs": "^4.3.37",
        "@0x/contracts-gen": "^2.0.43",
-        "@0x/contracts-test-utils": "^5.4.17",
-        "@0x/contracts-utils": "^4.8.7",
+        "@0x/contracts-test-utils": "^5.4.18",
+        "@0x/contracts-utils": "^4.8.8",
        "@0x/mesh-rpc-client": "^9.4.2",
-        "@0x/migrations": "^8.1.15",
+        "@0x/migrations": "^8.1.16",
        "@0x/sol-compiler": "^4.7.8",
        "@0x/subproviders": "^6.6.2",
        "@0x/ts-doc-gen": "^0.0.28",
--- a/packages/asset-swapper/src/noop_samplers/GeistSampler.ts
+++ b/packages/asset-swapper/src/noop_samplers/GeistSampler.ts
@@ -0,0 +1,57 @@
+import { BigNumber } from '@0x/utils';
+
+import { ZERO_AMOUNT } from '../constants';
+export interface GeistInfo {
+    lendingPool: string;
+    gToken: string;
+    underlyingToken: string;
+}
+// tslint:disable-next-line:no-unnecessary-class
+export class GeistSampler {
+    public static sampleSellsFromGeist(
+        geistInfo: GeistInfo,
+        takerToken: string,
+        makerToken: string,
+        takerTokenAmounts: BigNumber[],
+    ): BigNumber[] {
+        // Deposit/Withdrawal underlying <-> gToken is always 1:1
+        if (
+            (takerToken.toLowerCase() === geistInfo.gToken.toLowerCase() &&
+                makerToken.toLowerCase() === geistInfo.underlyingToken.toLowerCase()) ||
+            (takerToken.toLowerCase() === geistInfo.underlyingToken.toLowerCase() &&
+                makerToken.toLowerCase() === geistInfo.gToken.toLowerCase())
+        ) {
+            return takerTokenAmounts;
+        }
+
+        // Not matching the reserve return 0 results
+        const numSamples = takerTokenAmounts.length;
+
+        const makerTokenAmounts = new Array(numSamples);
+        makerTokenAmounts.fill(ZERO_AMOUNT);
+        return makerTokenAmounts;
+    }
+
+    public static sampleBuysFromGeist(
+        geistInfo: GeistInfo,
+        takerToken: string,
+        makerToken: string,
+        makerTokenAmounts: BigNumber[],
+    ): BigNumber[] {
+        // Deposit/Withdrawal underlying <-> gToken is always 1:1
+        if (
+            (takerToken.toLowerCase() === geistInfo.gToken.toLowerCase() &&
+                makerToken.toLowerCase() === geistInfo.underlyingToken.toLowerCase()) ||
+            (takerToken.toLowerCase() === geistInfo.underlyingToken.toLowerCase() &&
+                makerToken.toLowerCase() === geistInfo.gToken.toLowerCase())
+        ) {
+            return makerTokenAmounts;
+        }
+
+        // Not matching the reserve return 0 results
+        const numSamples = makerTokenAmounts.length;
+        const takerTokenAmounts = new Array(numSamples);
+        takerTokenAmounts.fill(ZERO_AMOUNT);
+        return takerTokenAmounts;
+    }
+}
--- a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts
@@ -17,7 +17,10 @@ import {
    ERC20BridgeSource,
    FeeSchedule,
    FillData,
+    FinalUniswapV3FillData,
+    GeistFillData,
    GetMarketOrdersOpts,
+    isFinalUniswapV3FillData,
    KyberSamplerOpts,
    LidoInfo,
    LiquidityProviderFillData,
@@ -187,6 +190,7 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
            ERC20BridgeSource.Beethovenx,
            ERC20BridgeSource.Curve,
            ERC20BridgeSource.CurveV2,
+            ERC20BridgeSource.Geist,
            ERC20BridgeSource.JetSwap,
            ERC20BridgeSource.MorpheusSwap,
            ERC20BridgeSource.SpiritSwap,
@@ -331,6 +335,7 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
            ERC20BridgeSource.Beethovenx,
            ERC20BridgeSource.Curve,
            ERC20BridgeSource.CurveV2,
+            ERC20BridgeSource.Geist,
            ERC20BridgeSource.JetSwap,
            ERC20BridgeSource.MorpheusSwap,
            ERC20BridgeSource.SpiritSwap,
@@ -578,6 +583,7 @@ export const FANTOM_TOKENS = {
    DAI: '0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e',
    fUSDT: '0x049d68029688eabf473097a2fc38ef61633a3c7a',
    WBTC: '0x321162cd933e2be498cd2267a90534a804051b11',
+    WCRV: '0x1e4f97b9f9f913c46f1632781732927b9019c68b',
    renBTC: '0xdbf31df14b66535af65aac99c32e9ea844e14501',
    MIM: '0x82f0b8b456c1a451378467398982d4834b6829c1',
    nUSD: '0xed2a7edd7413021d440b09d654f3b87712abab66',
@@ -586,6 +592,15 @@ export const FANTOM_TOKENS = {
    gUSDC: '0xe578c856933d8e1082740bf7661e379aa2a30b26',
    gDAI: '0x07e6332dd090d287d3489245038daf987955dcfb',
    FRAX: '0xdc301622e621166bd8e82f2ca0a26c13ad0be355',
+    gFTM: '0x39b3bd37208cbade74d0fcbdbb12d606295b430a',
+    gETH: '0x25c130b2624cf12a4ea30143ef50c5d68cefa22f',
+    gWBTC: '0x38aca5484b8603373acc6961ecd57a6a594510a3',
+    gCRV: '0x690754a168b022331caa2467207c61919b3f8a98',
+    gMIM: '0xc664fc7b8487a3e10824cda768c1d239f2403bbe',
+};
+
+export const GEIST_FANTOM_POOLS = {
+    lendingPool: '0x9fad24f572045c7869117160a571b2e50b10d068',
 };

 export const OPTIMISM_TOKENS = {
@@ -631,6 +646,7 @@ export const CURVE_POOLS = {
    USDP: '0x42d7025938bec20b69cbae5a77421082407f053a', // usdp
    ib: '0x2dded6da1bf5dbdf597c45fcfaa3194e53ecfeaf', // iron bank
    link: '0xf178c0b5bb7e7abf4e12a4838c7b7c5ba2c623c0', // link
+    btrflyweth: '0xf43b15ab692fde1f9c24a9fce700adcc809d5391', // redacted cartel
    // StableSwap "open pools" (crv.finance)
    TUSD: '0xecd5e75afb02efa118af914515d6521aabd189f1',
    STABLEx: '0x3252efd4ea2d6c78091a1f43982ee2c3659cc3d1',
@@ -1004,6 +1020,16 @@ const createCurveV2MetaTriPool = (info: { tokens: string[]; pool: string; gasSch
    gasSchedule: info.gasSchedule,
 });

+const createCurveFactoryCryptoExchangePool = (info: { tokens: string[]; pool: string; gasSchedule: number }) => ({
+    exchangeFunctionSelector: CurveFunctionSelectors.exchange_underlying_uint256,
+    sellQuoteFunctionSelector: CurveFunctionSelectors.get_dy_uint256,
+    buyQuoteFunctionSelector: CurveFunctionSelectors.None,
+    tokens: info.tokens,
+    metaTokens: undefined,
+    poolAddress: info.pool,
+    gasSchedule: info.gasSchedule,
+});
+
 /**
 * Mainnet Curve configuration
 * The tokens are in order of their index, which each curve defines
@@ -1270,6 +1296,11 @@ export const CURVE_MAINNET_INFOS: { [name: string]: CurveInfo } = {
        pool: CURVE_POOLS.ibEURsEUR,
        gasSchedule: 176e3,
    }),
+    [CURVE_POOLS.btrflyweth]: createCurveFactoryCryptoExchangePool({
+        tokens: [MAINNET_TOKENS.WETH, MAINNET_TOKENS.BTRFLY],
+        pool: CURVE_POOLS.btrflyweth,
+        gasSchedule: 250e3,
+    }),
 };

 export const CURVE_V2_MAINNET_INFOS: { [name: string]: CurveInfo } = {
@@ -1996,6 +2027,13 @@ export const COMPONENT_POOLS_BY_CHAIN_ID = valueByChainId(
    },
 );

+export const GEIST_INFO_ADDRESS_BY_CHAIN_ID = valueByChainId<string>(
+    {
+        [ChainId.Fantom]: '0xd8321aa83fb0a4ecd6348d4577431310a6e0814d',
+    },
+    NULL_ADDRESS,
+);
+
 export const BALANCER_V2_VAULT_ADDRESS_BY_CHAIN = valueByChainId<string>(
    {
        [ChainId.Mainnet]: '0xba12222222228d8ba445958a75a0704d566bf2c8',
@@ -2045,19 +2083,19 @@ export const BEETHOVEN_X_SUBGRAPH_URL_BY_CHAIN = valueByChainId<string>(
 export const UNISWAPV3_CONFIG_BY_CHAIN_ID = valueByChainId(
    {
        [ChainId.Mainnet]: {
-            quoter: '0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6',
+            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
        },
        [ChainId.Ropsten]: {
-            quoter: '0x2f9e608fd881861b8916257b76613cb22ee0652c',
+            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
            router: '0x03782388516e94fcd4c18666303601a12aa729ea',
        },
        [ChainId.Polygon]: {
-            quoter: '0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6',
+            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
        },
        [ChainId.Optimism]: {
-            quoter: '0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6',
+            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
        },
    },
@@ -2349,11 +2387,34 @@ export const DEFAULT_GAS_SCHEDULE: Required<FeeSchedule> = {
        return gas;
    },
    [ERC20BridgeSource.UniswapV3]: (fillData?: FillData) => {
-        let gas = 100e3;
-        const path = (fillData as UniswapV3FillData).tokenAddressPath;
-        if (path.length > 2) {
-            gas += (path.length - 2) * 32e3; // +32k for each hop.
+        const uniFillData = fillData as UniswapV3FillData | FinalUniswapV3FillData;
+        // NOTE: This base value was heuristically chosen by looking at how much it generally
+        // underestimated gas usage
+        const base = 34e3; // 34k base
+        let gas = base;
+        if (isFinalUniswapV3FillData(uniFillData)) {
+            gas += uniFillData.gasUsed;
+        } else {
+            // NOTE: We don't actually know which of the paths would be used in the router
+            // therefore we estimate using the median of gas usage returned from UniswapV3
+            // For the best case scenario (least amount of hops & ticks) this will
+            // overestimate the gas usage
+            const pathAmountsWithGasUsed = uniFillData.pathAmounts.filter(p => p.gasUsed > 0);
+            const medianGasUsedForPath =
+                pathAmountsWithGasUsed[Math.floor(pathAmountsWithGasUsed.length / 2)]?.gasUsed ?? 0;
+            gas += medianGasUsedForPath;
        }
+
+        // If we for some reason could not read `gasUsed` when sampling
+        // fall back to legacy gas estimation
+        if (gas === base) {
+            gas = 100e3;
+            const path = uniFillData.tokenAddressPath;
+            if (path.length > 2) {
+                gas += (path.length - 2) * 32e3; // +32k for each hop.
+            }
+        }
+
        return gas;
    },
    [ERC20BridgeSource.Lido]: () => 226e3,
@@ -2362,6 +2423,10 @@ export const DEFAULT_GAS_SCHEDULE: Required<FeeSchedule> = {
        // NOTE: The Aave deposit method is more expensive than the withdraw
        return aaveFillData.takerToken === aaveFillData.underlyingToken ? 400e3 : 300e3;
    },
+    [ERC20BridgeSource.Geist]: (fillData?: FillData) => {
+        const geistFillData = fillData as GeistFillData;
+        return geistFillData.takerToken === geistFillData.underlyingToken ? 400e3 : 300e3;
+    },
    [ERC20BridgeSource.Compound]: (fillData?: FillData) => {
        // NOTE: cETH is handled differently than other cTokens
        const wethAddress = NATIVE_FEE_TOKEN_BY_CHAIN_ID[ChainId.Mainnet];
--- a/packages/asset-swapper/src/utils/market_operation_utils/geist_utils.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/geist_utils.ts
@@ -0,0 +1,36 @@
+import { FANTOM_TOKENS, GEIST_FANTOM_POOLS } from './constants';
+import { GeistInfo } from './types';
+
+const gTokenToUnderlyingToken = new Map<string, string>([
+    [FANTOM_TOKENS.gFTM, FANTOM_TOKENS.WFTM],
+    [FANTOM_TOKENS.gfUSDT, FANTOM_TOKENS.fUSDT],
+    [FANTOM_TOKENS.gDAI, FANTOM_TOKENS.DAI],
+    [FANTOM_TOKENS.gUSDC, FANTOM_TOKENS.USDC],
+    [FANTOM_TOKENS.gETH, FANTOM_TOKENS.WETH],
+    [FANTOM_TOKENS.gWBTC, FANTOM_TOKENS.WBTC],
+    [FANTOM_TOKENS.gCRV, FANTOM_TOKENS.WCRV],
+    [FANTOM_TOKENS.gMIM, FANTOM_TOKENS.MIM],
+]);
+
+/**
+ * Returns GeistInfo for a certain pair if that pair exists on Geist
+ */
+export function getGeistInfoForPair(takerToken: string, makerToken: string): GeistInfo | undefined {
+    let gToken;
+    let underlyingToken;
+    if (gTokenToUnderlyingToken.get(takerToken) === makerToken) {
+        gToken = takerToken;
+        underlyingToken = makerToken;
+    } else if (gTokenToUnderlyingToken.get(makerToken) === takerToken) {
+        gToken = makerToken;
+        underlyingToken = takerToken;
+    } else {
+        return undefined;
+    }
+
+    return {
+        lendingPool: GEIST_FANTOM_POOLS.lendingPool,
+        gToken,
+        underlyingToken,
+    };
+}
--- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
@@ -18,6 +18,7 @@ import {
    ERC20BridgeSource,
    FillData,
    FinalUniswapV3FillData,
+    GeistFillData,
    GenericRouterFillData,
    KyberDmmFillData,
    KyberFillData,
@@ -36,6 +37,7 @@ import {
    ShellFillData,
    UniswapV2FillData,
    UniswapV3FillData,
+    UniswapV3PathAmount,
 } from './types';

 // tslint:disable completed-docs
@@ -202,6 +204,8 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s
            return encodeBridgeSourceId(BridgeProtocol.AaveV2, 'AaveV2');
        case ERC20BridgeSource.Compound:
            return encodeBridgeSourceId(BridgeProtocol.Compound, 'Compound');
+        case ERC20BridgeSource.Geist:
+            return encodeBridgeSourceId(BridgeProtocol.AaveV2, 'Geist');
        default:
            throw new Error(AggregationError.NoBridgeForSource);
    }
@@ -356,6 +360,10 @@ export function createBridgeDataForBridgeOrder(order: OptimizedMarketBridgeOrder
            const compoundFillData = (order as OptimizedMarketBridgeOrder<CompoundFillData>).fillData;
            bridgeData = encoder.encode([compoundFillData.cToken]);
            break;
+        case ERC20BridgeSource.Geist:
+            const geistFillData = (order as OptimizedMarketBridgeOrder<GeistFillData>).fillData;
+            bridgeData = encoder.encode([geistFillData.lendingPool, geistFillData.gToken]);
+            break;

        default:
            throw new Error(AggregationError.NoBridgeForSource);
@@ -387,11 +395,14 @@ function createFinalBridgeOrderFillDataFromCollapsedFill(fill: CollapsedFill): F
    switch (fill.source) {
        case ERC20BridgeSource.UniswapV3: {
            const fd = fill.fillData as UniswapV3FillData;
-            return {
+            const { uniswapPath, gasUsed } = getBestUniswapV3PathAmountForInputAmount(fd, fill.input);
+            const finalFillData: FinalUniswapV3FillData = {
                router: fd.router,
                tokenAddressPath: fd.tokenAddressPath,
-                uniswapPath: getBestUniswapV3PathForInputAmount(fd, fill.input),
+                uniswapPath,
+                gasUsed,
            };
+            return finalFillData;
        }
        default:
            break;
@@ -399,18 +410,21 @@ function createFinalBridgeOrderFillDataFromCollapsedFill(fill: CollapsedFill): F
    return fill.fillData;
 }

-function getBestUniswapV3PathForInputAmount(fillData: UniswapV3FillData, inputAmount: BigNumber): string {
+function getBestUniswapV3PathAmountForInputAmount(
+    fillData: UniswapV3FillData,
+    inputAmount: BigNumber,
+): UniswapV3PathAmount {
    if (fillData.pathAmounts.length === 0) {
        throw new Error(`No Uniswap V3 paths`);
    }
    // Find the best path that can satisfy `inputAmount`.
    // Assumes `fillData.pathAmounts` is sorted ascending.
-    for (const { inputAmount: pathInputAmount, uniswapPath } of fillData.pathAmounts) {
-        if (pathInputAmount.gte(inputAmount)) {
-            return uniswapPath;
+    for (const pathAmount of fillData.pathAmounts) {
+        if (pathAmount.inputAmount.gte(inputAmount)) {
+            return pathAmount;
        }
    }
-    return fillData.pathAmounts[fillData.pathAmounts.length - 1].uniswapPath;
+    return fillData.pathAmounts[fillData.pathAmounts.length - 1];
 }

 export function getMakerTakerTokens(opts: CreateOrderFromPathOpts): [string, string] {
@@ -525,6 +539,7 @@ export const BRIDGE_ENCODERS: {
    [ERC20BridgeSource.Lido]: AbiEncoder.create('(address)'),
    [ERC20BridgeSource.AaveV2]: AbiEncoder.create('(address,address)'),
    [ERC20BridgeSource.Compound]: AbiEncoder.create('(address)'),
+    [ERC20BridgeSource.Geist]: AbiEncoder.create('(address,address)'),
 };

 function getFillTokenAmounts(fill: CollapsedFill, side: MarketOperation): [BigNumber, BigNumber] {
--- a/packages/asset-swapper/src/utils/market_operation_utils/path_optimizer.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/path_optimizer.ts
@@ -21,6 +21,8 @@ const MIN_NUM_SAMPLE_INPUTS = 3;

 const isDexSample = (obj: DexSample | NativeOrderWithFillableAmounts): obj is DexSample => !!(obj as DexSample).source;

+const ONE_BASE_UNIT = new BigNumber(1);
+
 function nativeOrderToNormalizedAmounts(
    side: MarketOperation,
    nativeOrder: NativeOrderWithFillableAmounts,
@@ -75,6 +77,13 @@ function findRoutesAndCreateOptimalPath(
    fees: FeeSchedule,
    neonRouterNumSamples: number,
 ): Path | undefined {
+    // Currently the rust router is unable to handle 1 base unit sized quotes and will error out
+    // To avoid flooding the logs with these errors we just return an insufficient liquidity error
+    // which is how the JS router handles these quotes today
+    if (input.isLessThanOrEqualTo(ONE_BASE_UNIT)) {
+        return undefined;
+    }
+
    const createFill = (sample: DexSample): Fill | undefined => {
        const fills = dexSamplesToFills(side, [sample], opts.outputAmountPerEth, opts.inputAmountPerEth, fees);
        // NOTE: If the sample has 0 output dexSamplesToFills will return [] because no fill can be created
@@ -155,12 +164,24 @@ function findRoutesAndCreateOptimalPath(
        const inputs = [];
        const outputs = [];
        const outputFees = [];
-        // NOTE: We start at 0 here because the native order might be much larger than the amount
-        // By starting at 0 we make sure we can always use a portion of the native order to fill/partial fill
-        for (let i = 0; i <= 12; i++) {
-            const fraction = i / 12;
-            const currentInput = BigNumber.min(normalizedOrderInput.times(fraction), normalizedOrderInput);
-            const currentOutput = BigNumber.min(normalizedOrderOutput.times(fraction), normalizedOrderOutput);
+
+        // NOTE: Limit orders can be both larger or smaller than the input amount
+        // If the order is larger than the input we can scale the order to the size of
+        // the quote input (order pricing is constant) and then create 13 "samples" up to
+        // and including the full quote input amount.
+        // If the order is smaller we don't need to scale anything, we will just end up
+        // with trailing duplicate samples for the order input as we cannot go higher
+        const scaleToInput = BigNumber.min(input.dividedBy(normalizedOrderInput), 1);
+        for (let i = 1; i <= 13; i++) {
+            const fraction = i / 13;
+            const currentInput = BigNumber.min(
+                normalizedOrderInput.times(scaleToInput).times(fraction),
+                normalizedOrderInput,
+            );
+            const currentOutput = BigNumber.min(
+                normalizedOrderOutput.times(scaleToInput).times(fraction),
+                normalizedOrderOutput,
+            );
            const id = `${ERC20BridgeSource.Native}-${serializedPaths.length}-${idx}-${i}`;
            inputs.push(currentInput.integerValue().toNumber());
            outputs.push(currentOutput.integerValue().toNumber());
--- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts
@@ -4,6 +4,7 @@ import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';

 import { AaveV2Sampler } from '../../noop_samplers/AaveV2Sampler';
+import { GeistSampler } from '../../noop_samplers/GeistSampler';
 import { SamplerCallResult, SignedNativeOrder } from '../../types';
 import { ERC20BridgeSamplerContract } from '../../wrappers';

@@ -46,6 +47,7 @@ import {
    UNISWAPV3_CONFIG_BY_CHAIN_ID,
    ZERO_AMOUNT,
 } from './constants';
+import { getGeistInfoForPair } from './geist_utils';
 import { getLiquidityProvidersForPair } from './liquidity_provider_utils';
 import { getIntermediateTokens } from './multihop_utils';
 import { BalancerPoolsCache, BalancerV2PoolsCache, CreamPoolsCache, PoolsCache } from './pools_cache';
@@ -66,6 +68,8 @@ import {
    DexSample,
    DODOFillData,
    ERC20BridgeSource,
+    GeistFillData,
+    GeistInfo,
    GenericRouterFillData,
    HopInfo,
    KyberDmmFillData,
@@ -767,16 +771,17 @@ export class SamplerOperations {
            function: this._samplerContract.sampleSellsFromUniswapV3,
            params: [quoter, tokenAddressPath, takerFillAmounts],
            callback: (callResults: string, fillData: UniswapV3FillData): BigNumber[] => {
-                const [paths, samples] = this._samplerContract.getABIDecodedReturnData<[string[], BigNumber[]]>(
-                    'sampleSellsFromUniswapV3',
-                    callResults,
-                );
+                const [paths, gasUsed, samples] = this._samplerContract.getABIDecodedReturnData<
+                    [string[], BigNumber[], BigNumber[]]
+                >('sampleSellsFromUniswapV3', callResults);
                fillData.router = router;
                fillData.tokenAddressPath = tokenAddressPath;
                fillData.pathAmounts = paths.map((uniswapPath, i) => ({
                    uniswapPath,
                    inputAmount: takerFillAmounts[i],
+                    gasUsed: gasUsed[i].toNumber(),
                }));
+
                return samples;
            },
        });
@@ -795,15 +800,15 @@ export class SamplerOperations {
            function: this._samplerContract.sampleBuysFromUniswapV3,
            params: [quoter, tokenAddressPath, makerFillAmounts],
            callback: (callResults: string, fillData: UniswapV3FillData): BigNumber[] => {
-                const [paths, samples] = this._samplerContract.getABIDecodedReturnData<[string[], BigNumber[]]>(
-                    'sampleBuysFromUniswapV3',
-                    callResults,
-                );
+                const [paths, gasUsed, samples] = this._samplerContract.getABIDecodedReturnData<
+                    [string[], BigNumber[], BigNumber[]]
+                >('sampleBuysFromUniswapV3', callResults);
                fillData.router = router;
                fillData.tokenAddressPath = tokenAddressPath;
                fillData.pathAmounts = paths.map((uniswapPath, i) => ({
                    uniswapPath,
                    inputAmount: makerFillAmounts[i],
+                    gasUsed: gasUsed[i].toNumber(),
                }));
                return samples;
            },
@@ -1151,6 +1156,34 @@ export class SamplerOperations {
        });
    }

+    // tslint:disable-next-line:prefer-function-over-method
+    public getGeistSellQuotes(
+        geistInfo: GeistInfo,
+        makerToken: string,
+        takerToken: string,
+        takerFillAmounts: BigNumber[],
+    ): SourceQuoteOperation<GeistFillData> {
+        return new SamplerNoOperation({
+            source: ERC20BridgeSource.Geist,
+            fillData: { ...geistInfo, takerToken },
+            callback: () => GeistSampler.sampleSellsFromGeist(geistInfo, takerToken, makerToken, takerFillAmounts),
+        });
+    }
+
+    // tslint:disable-next-line:prefer-function-over-method
+    public getGeistBuyQuotes(
+        geistInfo: GeistInfo,
+        makerToken: string,
+        takerToken: string,
+        makerFillAmounts: BigNumber[],
+    ): SourceQuoteOperation<GeistFillData> {
+        return new SamplerNoOperation({
+            source: ERC20BridgeSource.Geist,
+            fillData: { ...geistInfo, takerToken },
+            callback: () => GeistSampler.sampleBuysFromGeist(geistInfo, takerToken, makerToken, makerFillAmounts),
+        });
+    }
+
    public getCompoundSellQuotes(
        cToken: string,
        makerToken: string,
@@ -1548,6 +1581,13 @@ export class SamplerOperations {
                        };
                        return this.getAaveV2SellQuotes(info, makerToken, takerToken, takerFillAmounts);
                    }
+                    case ERC20BridgeSource.Geist: {
+                        const info: GeistInfo | undefined = getGeistInfoForPair(takerToken, makerToken);
+                        if (!info) {
+                            return [];
+                        }
+                        return this.getGeistSellQuotes(info, makerToken, takerToken, takerFillAmounts);
+                    }
                    case ERC20BridgeSource.Compound: {
                        if (!this.compoundCTokenCache) {
                            return [];
@@ -1578,7 +1618,7 @@ export class SamplerOperations {
        takerToken: string,
        makerFillAmounts: BigNumber[],
    ): SourceQuoteOperation[] {
-        // Find the adjacent tokens in the provided tooken adjacency graph,
+        // Find the adjacent tokens in the provided token adjacency graph,
        // e.g if this is DAI->USDC we may check for DAI->WETH->USDC
        const intermediateTokens = getIntermediateTokens(makerToken, takerToken, this.tokenAdjacencyGraph);
        const _sources = BATCH_SOURCE_FILTERS.getAllowed(sources);
@@ -1849,6 +1889,13 @@ export class SamplerOperations {
                        };
                        return this.getAaveV2BuyQuotes(info, makerToken, takerToken, makerFillAmounts);
                    }
+                    case ERC20BridgeSource.Geist: {
+                        const info: GeistInfo | undefined = getGeistInfoForPair(takerToken, makerToken);
+                        if (!info) {
+                            return [];
+                        }
+                        return this.getGeistBuyQuotes(info, makerToken, takerToken, makerFillAmounts);
+                    }
                    case ERC20BridgeSource.Compound: {
                        if (!this.compoundCTokenCache) {
                            return [];
--- a/packages/asset-swapper/src/utils/market_operation_utils/types.ts
+++ b/packages/asset-swapper/src/utils/market_operation_utils/types.ts
@@ -102,6 +102,7 @@ export enum ERC20BridgeSource {
    SpookySwap = 'SpookySwap',
    Beethovenx = 'Beethovenx',
    MorpheusSwap = 'MorpheusSwap',
+    Geist = 'Geist',
 }
 export type SourcesWithPoolsCache =
    | ERC20BridgeSource.Balancer
@@ -181,6 +182,12 @@ export interface AaveV2Info {
    underlyingToken: string;
 }

+export interface GeistInfo {
+    lendingPool: string;
+    gToken: string;
+    underlyingToken: string;
+}
+
 // Internal `fillData` field for `Fill` objects.
 export interface FillData {}

@@ -268,19 +275,34 @@ export interface HopInfo {
    returnData: string;
 }

+export interface UniswapV3PathAmount {
+    uniswapPath: string;
+    inputAmount: BigNumber;
+    gasUsed: number;
+}
 export interface UniswapV3FillData extends FillData {
    tokenAddressPath: string[];
    router: string;
-    pathAmounts: Array<{ uniswapPath: string; inputAmount: BigNumber }>;
+    pathAmounts: UniswapV3PathAmount[];
 }

 export interface KyberDmmFillData extends UniswapV2FillData {
    poolsPath: string[];
 }

-export interface FinalUniswapV3FillData extends Omit<UniswapV3FillData, 'uniswapPaths'> {
+/**
+ * Determines whether FillData is UniswapV3FillData or FinalUniswapV3FillData
+ */
+export function isFinalUniswapV3FillData(
+    data: UniswapV3FillData | FinalUniswapV3FillData,
+): data is FinalUniswapV3FillData {
+    return !!(data as FinalUniswapV3FillData).uniswapPath;
+}
+
+export interface FinalUniswapV3FillData extends Omit<UniswapV3FillData, 'pathAmounts'> {
    // The uniswap-encoded path that can fll the maximum input amount.
    uniswapPath: string;
+    gasUsed: number;
 }

 export interface LidoFillData extends FillData {
@@ -301,6 +323,13 @@ export interface CompoundFillData extends FillData {
    makerToken: string;
 }

+export interface GeistFillData extends FillData {
+    lendingPool: string;
+    gToken: string;
+    underlyingToken: string;
+    takerToken: string;
+}
+
 /**
 * Represents a node on a fill path.
 */
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,14 @@
 [
+    {
+        "version": "6.12.0",
+        "changes": [
+            {
+                "note": "Update fantom fillQuoteTransformer addresses",
+                "pr": 398
+            }
+        ],
+        "timestamp": 1646225739
+    },
    {
        "version": "6.11.0",
        "changes": [
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v6.12.0 - _March 2, 2022_
+
+    * Update fantom fillQuoteTransformer addresses (#398)
+
 ## v6.11.0 - _December 24, 2021_

    * Add Optimism addresses (#385)
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -415,7 +415,7 @@
            "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703",
            "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2",
            "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88",
-            "fillQuoteTransformer": "0x71de60a1b160094a3f6c7e1b883ff9337d639131",
+            "fillQuoteTransformer": "0x641efe8a57ad39353fe22f77d211ef6b17b0590b",
            "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600"
        }
    },
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "6.11.0",
+    "version": "6.12.0",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "13.19.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "version": "13.19.0",
        "changes": [
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v13.19.1 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v13.19.0 - _February 22, 2022_

    * Regenerate wrappers to add ContractTxFunctionObj.selector (#429)
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-wrappers",
-    "version": "13.19.0",
+    "version": "13.19.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -57,7 +57,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.31",
        "@0x/base-contract": "^6.4.5",
-        "@0x/contract-addresses": "^6.11.0",
+        "@0x/contract-addresses": "^6.12.0",
        "@0x/json-schemas": "^6.4.1",
        "@0x/types": "^3.3.4",
        "@0x/utils": "^6.5.0",
--- a/packages/migrations/CHANGELOG.json
+++ b/packages/migrations/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "8.1.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1645569128,
        "version": "8.1.15",
--- a/packages/migrations/CHANGELOG.md
+++ b/packages/migrations/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v8.1.16 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v8.1.15 - _February 22, 2022_

    * Dependencies updated
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/migrations",
-    "version": "8.1.15",
+    "version": "8.1.16",
    "engines": {
        "node": ">=6.12"
    },
@@ -68,20 +68,20 @@
    },
    "dependencies": {
        "@0x/base-contract": "^6.4.5",
-        "@0x/contract-addresses": "^6.11.0",
+        "@0x/contract-addresses": "^6.12.0",
        "@0x/contracts-asset-proxy": "^3.7.19",
        "@0x/contracts-coordinator": "^3.1.38",
        "@0x/contracts-dev-utils": "^1.3.36",
        "@0x/contracts-erc1155": "^2.1.37",
-        "@0x/contracts-erc20": "^3.3.26",
+        "@0x/contracts-erc20": "^3.3.27",
        "@0x/contracts-erc721": "^3.1.37",
        "@0x/contracts-exchange": "^3.2.38",
        "@0x/contracts-exchange-forwarder": "^4.2.38",
        "@0x/contracts-extensions": "^6.2.32",
        "@0x/contracts-multisig": "^4.1.38",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-utils": "^4.8.7",
-        "@0x/contracts-zero-ex": "^0.31.0",
+        "@0x/contracts-utils": "^4.8.8",
+        "@0x/contracts-zero-ex": "^0.31.1",
        "@0x/sol-compiler": "^4.7.8",
        "@0x/subproviders": "^6.6.2",
        "@0x/typescript-typings": "^5.2.1",
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1646225739,
+        "version": "1.11.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "version": "1.11.0",
        "changes": [
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.11.1 - _March 2, 2022_
+
+    * Dependencies updated
+
 ## v1.11.0 - _February 22, 2022_

    * Add utils and errors for NFT orders (#429)
--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "1.11.0",
+    "version": "1.11.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -63,8 +63,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.31",
-        "@0x/contract-addresses": "^6.11.0",
-        "@0x/contract-wrappers": "^13.19.0",
+        "@0x/contract-addresses": "^6.12.0",
+        "@0x/contract-wrappers": "^13.19.1",
        "@0x/json-schemas": "^6.4.1",
        "@0x/subproviders": "^6.6.2",
        "@0x/utils": "^6.5.0",
--- a/yarn.lock
+++ b/yarn.lock
@@ -646,7 +646,6 @@
 "@0x/abi-gen@^5.7.2":
  version "5.7.2"
  resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.7.2.tgz#c40eb225aab9ee04d331e72af887237dd1967fc0"
-  integrity sha512-jaFpJqb9hu0kY0yocjmQ0S5suDOBPJYIU3ZuSTZKwnmeOQj4Jl4LzzOTrNWjyqX6+wylW1o4K2/c3e4ZDF+2EA==
  dependencies:
    "@0x/types" "^3.3.4"
    "@0x/typescript-typings" "^5.2.1"
@@ -680,7 +679,6 @@
 "@0x/assert@^3.0.31":
  version "3.0.31"
  resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.31.tgz#2c9e7e0ff9cc7bae8cd0380022e1723ee505a82e"
-  integrity sha512-ZzlnldKNvhA78IOcH6KCH3kb65XB7fI3wyuocjL72Es3eGTmyVg1KNK7eJnmV+RHSGDTYLwhvmb5hfIvFHMArg==
  dependencies:
    "@0x/json-schemas" "^6.4.1"
    "@0x/typescript-typings" "^5.2.1"
@@ -720,7 +718,6 @@
 "@0x/base-contract@^6.4.5":
  version "6.4.5"
  resolved "https://registry.yarnpkg.com/@0x/base-contract/-/base-contract-6.4.5.tgz#f241f5b2c17b3e90e7ead8dec19840ee54ab29bf"
-  integrity sha512-eYSDhXJxiRrCGWiU6z0P5fPzao4FX1+mujsviXK4a1wp7YvNIYDJ1pEa6C3vCSPJrCHf3EBJT9pwOsNphlyyTg==
  dependencies:
    "@0x/assert" "^3.0.31"
    "@0x/json-schemas" "^6.4.1"
@@ -838,7 +835,6 @@
 "@0x/contracts-gen@^2.0.43":
  version "2.0.43"
  resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.43.tgz#42abf96961d3afa70112ca4f4dc3f129328f1993"
-  integrity sha512-yVdvx4ihxOZ4fZVE01xxFTylC4cZ+O781cg1A0bWwgAL6GzjzjbDXULfsl0FKfN/4rh+rnwdGrN9Ns5QvB7+xQ==
  dependencies:
    "@0x/sol-compiler" "^4.7.8"
    "@0x/sol-resolver" "^3.1.9"
@@ -874,7 +870,6 @@
 "@0x/dev-utils@^4.2.11":
  version "4.2.11"
  resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-4.2.11.tgz#017dcc50a91eb75c6ac3d6fe77021e4f4330bbe7"
-  integrity sha512-8T6803s1GCEdKegjoktMkhp3SVFsKA/m8nDwXy3DiijPGbQejLHxsD0CsR8Uhf/RUP84MMqA0bHYaonb8H4Mag==
  dependencies:
    "@0x/subproviders" "^6.6.2"
    "@0x/types" "^3.3.4"
@@ -912,7 +907,6 @@
 "@0x/json-schemas@^6.4.1":
  version "6.4.1"
  resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.1.tgz#2db8f6056af7a4d198ae9f56b568473447908d6e"
-  integrity sha512-4LGe7/QNKAdfxBNu5e5w24JKUqEHGg08TgKhyotStW5m0TJNBGoyGavip1FJeI3KRqNilRN22lgo9HsCBnF5Qg==
  dependencies:
    "@0x/typescript-typings" "^5.2.1"
    "@types/node" "12.12.54"
@@ -934,7 +928,6 @@
 "@0x/monorepo-scripts@^3.2.1":
  version "3.2.1"
  resolved "https://registry.yarnpkg.com/@0x/monorepo-scripts/-/monorepo-scripts-3.2.1.tgz#24e90e835427b199474cc70458d1b3fd52349541"
-  integrity sha512-PMCKWK/y6aC+HxWk7jbchcAuJ7eMERfH6Ox8op7833MsxNArSp6Fv3XJKU58PWjLVQHpVf51/Cz7E238QAibDg==
  dependencies:
    "@0x/types" "^3.3.4"
    "@0x/utils" "^6.5.0"
@@ -959,10 +952,9 @@
    typedoc "~0.16.11"
    yargs "^10.0.3"

-"@0x/neon-router@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@0x/neon-router/-/neon-router-0.3.2.tgz#dc68d0a108060d607b48e3d32ce0ff46f8dc0cc2"
-  integrity sha512-AdSPeCxRcjdpmWDkJI1wg+X4q14tmLE21vM0AixtMQQI5+f22sIeUCrPqU9FFKqMQTOW0/3d8tVXzxdollahbA==
+"@0x/neon-router@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@0x/neon-router/-/neon-router-0.3.3.tgz#dab540f4cd2aea6441ba29cbc35c28ca3f7a2b4f"
  dependencies:
    "@mapbox/node-pre-gyp" "^1.0.5"

@@ -983,7 +975,6 @@
 "@0x/quote-server@^6.0.6":
  version "6.0.6"
  resolved "https://registry.yarnpkg.com/@0x/quote-server/-/quote-server-6.0.6.tgz#0f0bf50647efc4bff039a491689974af7e8c5776"
-  integrity sha512-ubugDwCFDhOv8R8LWO4Z9BmWfm/KjbB92bg1nEHw2HzosOk1rLkQWnPCJGqbMzxHlt3EtLxXPrrZE2IxWBKgwQ==
  dependencies:
    "@0x/json-schemas" "^6.0.1"
    "@0x/order-utils" "^10.2.4"
@@ -997,7 +988,6 @@
 "@0x/sol-compiler@^4.7.8":
  version "4.7.8"
  resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.7.8.tgz#31bd4f21bbb045d19e2e500282258d6526b5a837"
-  integrity sha512-0lHaoSDRlPzWCf4o8aEaMoQUnZmeiUreWSNNyPbCO/nF+siPqMPQw6W7ATei/XhVb3UKHZto1ScsyAar/8pIWQ==
  dependencies:
    "@0x/assert" "^3.0.31"
    "@0x/json-schemas" "^6.4.1"
@@ -1026,7 +1016,6 @@
 "@0x/sol-coverage@^4.0.42":
  version "4.0.42"
  resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.42.tgz#632c504ec060534d83d19bf9b3f812f271d47a61"
-  integrity sha512-6R53Kpn1If4D3BI3Pz4qa7AoVLaF7jg6cNNLvqHROW1+chwMGmtPKj2t/R1mKiljTU1lUL1bebfhIJUfYA7IAQ==
  dependencies:
    "@0x/sol-tracing-utils" "^7.2.8"
    "@0x/subproviders" "^6.6.2"
@@ -1041,7 +1030,6 @@
 "@0x/sol-profiler@^4.1.32":
  version "4.1.32"
  resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.32.tgz#93f09264ab414f8e83324d8369a3e6cb2dc8b531"
-  integrity sha512-FqrP/lAgQCvj5qcr/77leTqgGa2xwYSEIq6/FN5NAE6YYb0JrjJmkwTpxd1fB6xo+T11ESH4+7l5UxjPseuo9w==
  dependencies:
    "@0x/sol-tracing-utils" "^7.2.8"
    "@0x/subproviders" "^6.6.2"
@@ -1056,7 +1044,6 @@
 "@0x/sol-resolver@^3.1.9":
  version "3.1.9"
  resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-3.1.9.tgz#525c545c4ff4d0ff2ff99e433b2405778abe0693"
-  integrity sha512-N+GxAqtHzEgVsnj9k4yeE7xRqE2ymR+yo98j0s2VC8icjecVqm6LtqQpEpdPULEg20vA0aPdU/XY2q0xiCDpLg==
  dependencies:
    "@0x/types" "^3.3.4"
    "@0x/typescript-typings" "^5.2.1"
@@ -1066,7 +1053,6 @@
 "@0x/sol-trace@^3.0.42":
  version "3.0.42"
  resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.42.tgz#5a1cb6d4213bbf6746bf393858019fb7b3586916"
-  integrity sha512-8Elq5aFgMvmUNi3rvDTSA84VMtiyCBNFDaIiKQZ9YtZbgOJnyfxBbelV0sXggnmoochpQ72yX0Cxe3WEdR+5JQ==
  dependencies:
    "@0x/sol-tracing-utils" "^7.2.8"
    "@0x/subproviders" "^6.6.2"
@@ -1082,7 +1068,6 @@
 "@0x/sol-tracing-utils@^7.2.8":
  version "7.2.8"
  resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.2.8.tgz#c365931d9f290738fa67d29ae5443d26acf3122c"
-  integrity sha512-OP9v3bilfvx7JtDQmp4iIE0dZ7Zq0/S9xWP+WLhx2KMKQ1jF9fK3WnsMHea7KtmQnmEBv0naFnEOqedxmus66g==
  dependencies:
    "@0x/dev-utils" "^4.2.11"
    "@0x/sol-compiler" "^4.7.8"
@@ -1110,7 +1095,6 @@
 "@0x/subproviders@^6.6.2":
  version "6.6.2"
  resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-6.6.2.tgz#c51b3167fcd3b58f5522305864bd4896455ee697"
-  integrity sha512-/SB6BurdYbGXvIa3rmQdaUYPk7D+BFiAAkvQbsA4s//51eVLLQG+QdgDT1RUKGJbhX11ff31jc7dEu/wh6nQhg==
  dependencies:
    "@0x/assert" "^3.0.31"
    "@0x/types" "^3.3.4"
@@ -1188,7 +1172,6 @@
 "@0x/types@^3.3.4":
  version "3.3.4"
  resolved "https://registry.yarnpkg.com/@0x/types/-/types-3.3.4.tgz#184946b1674f7f5b4cfb73105952b499a67fc23e"
-  integrity sha512-lB6maU/D1TEBrJXQcbwzGilmugX9qrfhxbyPr8r89TinSHe2SS694tTKIyI+ijnTbhyVjWzEnA95iuWxhPmP5g==
  dependencies:
    "@types/node" "12.12.54"
    bignumber.js "~9.0.0"
@@ -1230,7 +1213,6 @@
 "@0x/typescript-typings@^5.2.1":
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-5.2.1.tgz#bc82d0f39688b174142ebb5b2fd6a01c1d2f0163"
-  integrity sha512-2yswstFMy/cpF+MrJclEZc8BNceBAVovwzRYdz1CyGPfzMT1Kh8jVGeexx0KvVw58KrhxMgcRD4mzCSHNqzjPA==
  dependencies:
    "@types/bn.js" "^4.11.0"
    "@types/node" "12.12.54"
@@ -1297,7 +1279,6 @@
 "@0x/utils@^6.5.0":
  version "6.5.0"
  resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-6.5.0.tgz#a75eda9a1cdc7cd2520056dbaec678f20f7f16c4"
-  integrity sha512-1+9nIagW9OQG0rcUaBvIOMolWgZHqSjNADQIJk+GmEMYnt7wUpokSkHPHxmw+/xVQs/da5dh1U0/nWsW+A1Nuw==
  dependencies:
    "@0x/types" "^3.3.4"
    "@0x/typescript-typings" "^5.2.1"
@@ -1331,7 +1312,6 @@
 "@0x/web3-wrapper@^7.6.2":
  version "7.6.2"
  resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-7.6.2.tgz#fd6c50f67ce21191feabea1f59e1467ea5d89dae"
-  integrity sha512-o3TjgpJWAInFqkFVaeaGlRDXF53NNgO/M3CfUbC+X8p4ReQm4J81BxEf6yxeDzsPt5qLKzrRzhkRiIWeDIlNQw==
  dependencies:
    "@0x/assert" "^3.0.31"
    "@0x/json-schemas" "^6.4.1"
@@ -1408,7 +1388,6 @@
 "@ethereumjs/common@^2.4.0":
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.4.0.tgz#2d67f6e6ba22246c5c89104e6b9a119fb3039766"
-  integrity sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==
  dependencies:
    crc-32 "^1.2.0"
    ethereumjs-util "^7.1.0"
@@ -1416,7 +1395,6 @@
 "@ethereumjs/tx@^3.3.0":
  version "3.3.0"
  resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
-  integrity sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==
  dependencies:
    "@ethereumjs/common" "^2.4.0"
    ethereumjs-util "^7.1.0"
@@ -2483,7 +2461,6 @@
 "@mapbox/node-pre-gyp@^1.0.5":
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz#2a0b32fcb416fb3f2250fd24cb2a81421a4f5950"
-  integrity sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA==
  dependencies:
    detect-libc "^1.0.3"
    https-proxy-agent "^5.0.0"
@@ -2903,7 +2880,7 @@ abstract-leveldown@3.0.0:
  dependencies:
    xtend "~4.0.0"

-abstract-leveldown@^2.4.1, abstract-leveldown@~2.7.1:
+abstract-leveldown@^2.4.1:
  version "2.7.2"
  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.7.2.tgz#87a44d7ebebc341d59665204834c8b7e0932cc93"
  dependencies:
@@ -2915,12 +2892,6 @@ abstract-leveldown@^5.0.0, abstract-leveldown@~5.0.0:
  dependencies:
    xtend "~4.0.0"

-abstract-leveldown@~2.6.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.6.3.tgz#1c5e8c6a5ef965ae8c35dfb3a8770c476b82c4b8"
-  dependencies:
-    xtend "~4.0.0"
-
 accepts@~1.3.7:
  version "1.3.7"
  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -3205,7 +3176,7 @@ async-limiter@~1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"

-async@1.x, async@^1.4.2:
+async@1.x:
  version "1.5.2"
  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"

@@ -3799,7 +3770,7 @@ binary-extensions@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"

-bindings@^1.2.1, bindings@^1.4.0, bindings@^1.5.0:
+bindings@^1.4.0, bindings@^1.5.0:
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
  dependencies:
@@ -4250,7 +4221,6 @@ 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"
@@ -5126,12 +5096,6 @@ defer-to-connect@^1.0.1:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"

-deferred-leveldown@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz#3acd2e0b75d1669924bc0a4b642851131173e1eb"
-  dependencies:
-    abstract-leveldown "~2.6.0"
-
 deferred-leveldown@~4.0.0:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz#0b0570087827bf480a23494b398f04c128c19a20"
@@ -5876,7 +5840,6 @@ ethereum-types@^3.5.0:
 ethereum-types@^3.6.0:
  version "3.6.0"
  resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-3.6.0.tgz#7cf0a7258537b1f8d113dd51d050189a742a9a6e"
-  integrity sha512-iJX96C9W1elWhCZKUiSQfWn9fC+EO+xU2TvAE/p7QhMwcGibihKsxcG27B/4WZAudd8jNoeIhY4PH2qQPLuUfw==
  dependencies:
    "@types/node" "12.12.54"
    bignumber.js "~9.0.0"
@@ -5976,18 +5939,6 @@ ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@
    ethereum-common "^0.0.18"
    ethereumjs-util "^5.0.0"

-ethereumjs-util@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz#e9c51e5549e8ebd757a339cc00f5380507e799c8"
-  dependencies:
-    bn.js "^4.11.0"
-    create-hash "^1.1.2"
-    ethjs-util "0.1.6"
-    keccak "^1.0.2"
-    rlp "^2.0.0"
-    safe-buffer "^5.1.1"
-    secp256k1 "^3.0.1"
-
 ethereumjs-util@6.2.1, ethereumjs-util@^6.0.0, ethereumjs-util@^6.1.0, ethereumjs-util@^6.2.0:
  version "6.2.1"
  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz#fcb4e4dd5ceacb9d2305426ab1a5cd93e3163b69"
@@ -6010,7 +5961,7 @@ ethereumjs-util@^4.3.0:
    ethereum-cryptography "^0.1.3"
    rlp "^2.0.0"

-ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
+ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5, ethereumjs-util@^5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz#a833f0e5fca7e5b361384dc76301a721f537bf65"
  dependencies:
@@ -6352,7 +6303,6 @@ fake-merkle-patricia-tree@^1.0.1:
 fast-abi@^0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/fast-abi/-/fast-abi-0.0.4.tgz#c6a547d0fe75862a9eea6fe5aa7ab135e6ab62a0"
-  integrity sha512-BM/x54z6i5L+VnHk1c1xt4sSlx4SCIZNQJ3tNBrM88ytOSd/JY/2pRVkx/RxY3sdF6X5exgB6YVemCqVLzQzUA==
  dependencies:
    "@mapbox/node-pre-gyp" "^1.0.4"
    cargo-cp-artifact "^0.1.6"
@@ -6697,11 +6647,11 @@ functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"

-ganache-cli@6.8.0-istanbul.0:
-  version "6.8.0-istanbul.0"
-  resolved "https://registry.yarnpkg.com/ganache-cli/-/ganache-cli-6.8.0-istanbul.0.tgz#ec19bc08ff30d250ae13c6f57c16069ecf583fa6"
+ganache-cli@6.12.2:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ganache-cli/-/ganache-cli-6.12.2.tgz#c0920f7db0d4ac062ffe2375cb004089806f627a"
  dependencies:
-    ethereumjs-util "6.1.0"
+    ethereumjs-util "6.2.1"
    source-map-support "0.5.12"
    yargs "13.2.4"

@@ -7364,10 +7314,6 @@ ignore@^4.0.3, ignore@^4.0.6:
  version "4.0.6"
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"

-immediate@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
-
 immediate@~3.2.3:
  version "3.2.3"
  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
@@ -8133,15 +8079,6 @@ keccak@3.0.1, keccak@^3.0.0:
    node-addon-api "^2.0.0"
    node-gyp-build "^4.2.0"

-keccak@^1.0.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/keccak/-/keccak-1.4.0.tgz#572f8a6dbee8e7b3aa421550f9e6408ca2186f80"
-  dependencies:
-    bindings "^1.2.1"
-    inherits "^2.0.3"
-    nan "^2.2.1"
-    safe-buffer "^5.1.0"
-
 keyv@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -8249,28 +8186,12 @@ level-codec@^9.0.0:
  dependencies:
    buffer "^5.6.0"

-level-codec@~7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-7.0.1.tgz#341f22f907ce0f16763f24bddd681e395a0fb8a7"
-
-level-errors@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-1.1.2.tgz#4399c2f3d3ab87d0625f7e3676e2d807deff404d"
-  dependencies:
-    errno "~0.1.1"
-
 level-errors@^2.0.0, level-errors@~2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-2.0.1.tgz#2132a677bf4e679ce029f517c2f17432800c05c8"
  dependencies:
    errno "~0.1.1"

-level-errors@~1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-1.0.5.tgz#83dbfb12f0b8a2516bdc9a31c4876038e227b859"
-  dependencies:
-    errno "~0.1.1"
-
 level-iterator-stream@^2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz#ccfff7c046dcf47955ae9a86f46dfa06a31688b4"
@@ -8279,15 +8200,6 @@ level-iterator-stream@^2.0.3:
    readable-stream "^2.0.5"
    xtend "^4.0.0"

-level-iterator-stream@~1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-1.3.1.tgz#e43b78b1a8143e6fa97a4f485eb8ea530352f2ed"
-  dependencies:
-    inherits "^2.0.1"
-    level-errors "^1.0.3"
-    readable-stream "^1.0.33"
-    xtend "^4.0.0"
-
 level-iterator-stream@~3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz#2c98a4f8820d87cdacab3132506815419077c730"
@@ -8331,12 +8243,13 @@ level-sublevel@6.6.4:
    typewiselite "~1.0.0"
    xtend "~4.0.0"

-level-ws@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/level-ws/-/level-ws-0.0.0.tgz#372e512177924a00424b0b43aef2bb42496d228b"
+level-ws@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/level-ws/-/level-ws-1.0.0.tgz#19a22d2d4ac57b18cc7c6ecc4bd23d899d8f603b"
  dependencies:
-    readable-stream "~1.0.15"
-    xtend "~2.1.1"
+    inherits "^2.0.3"
+    readable-stream "^2.2.8"
+    xtend "^4.0.1"

 levelup@3.1.1, levelup@^3.0.0:
  version "3.1.1"
@@ -8347,18 +8260,6 @@ levelup@3.1.1, levelup@^3.0.0:
    level-iterator-stream "~3.0.0"
    xtend "~4.0.0"

-levelup@^1.2.1:
-  version "1.3.9"
-  resolved "https://registry.yarnpkg.com/levelup/-/levelup-1.3.9.tgz#2dbcae845b2bb2b6bea84df334c475533bbd82ab"
-  dependencies:
-    deferred-leveldown "~1.2.1"
-    level-codec "~7.0.0"
-    level-errors "~1.0.3"
-    level-iterator-stream "~1.3.0"
-    prr "~1.0.1"
-    semver "~5.4.1"
-    xtend "~4.0.0"
-
 levn@^0.3.0, levn@~0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -8720,17 +8621,6 @@ mem@^4.0.0:
    mimic-fn "^2.0.0"
    p-is-promise "^2.0.0"

-memdown@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215"
-  dependencies:
-    abstract-leveldown "~2.7.1"
-    functional-red-black-tree "^1.0.1"
-    immediate "^3.2.3"
-    inherits "~2.0.1"
-    ltgt "~2.2.0"
-    safe-buffer "~5.1.1"
-
 memdown@~3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/memdown/-/memdown-3.0.0.tgz#93aca055d743b20efc37492e9e399784f2958309"
@@ -8806,15 +8696,14 @@ merge2@^1.2.3:
  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"

 merkle-patricia-tree@3.0.0, merkle-patricia-tree@^2.1.2, merkle-patricia-tree@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz#982ca1b5a0fde00eed2f6aeed1f9152860b8208a"
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-3.0.0.tgz#448d85415565df72febc33ca362b8b614f5a58f8"
  dependencies:
-    async "^1.4.2"
-    ethereumjs-util "^5.0.0"
-    level-ws "0.0.0"
-    levelup "^1.2.1"
-    memdown "^1.0.0"
-    readable-stream "^2.0.0"
+    async "^2.6.1"
+    ethereumjs-util "^5.2.0"
+    level-mem "^3.0.1"
+    level-ws "^1.0.0"
+    readable-stream "^3.0.6"
    rlp "^2.0.0"
    semaphore ">=1.0.1"

@@ -9169,7 +9058,7 @@ nan@2.13.2:
  version "2.13.2"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"

-nan@^2.13.2, nan@^2.14.0, nan@^2.2.1:
+nan@^2.13.2, nan@^2.14.0:
  version "2.14.2"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"

@@ -10566,7 +10455,7 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.5:
  dependencies:
    mute-stream "~0.0.4"

-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.8, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
  version "2.3.7"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
  dependencies:
@@ -10578,7 +10467,7 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.5:
    string_decoder "~1.1.1"
    util-deprecate "~1.0.1"

-"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
  version "3.6.0"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
  dependencies:
@@ -10586,7 +10475,7 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.5:
    string_decoder "^1.1.1"
    util-deprecate "^1.0.1"

-"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15, readable-stream@~1.0.26:
+"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26:
  version "1.0.34"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
  dependencies:
@@ -10595,7 +10484,7 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.5:
    isarray "0.0.1"
    string_decoder "~0.10.x"

-readable-stream@^1.0.33, readable-stream@~1.1.9:
+readable-stream@~1.1.9:
  version "1.1.14"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
  dependencies:
@@ -11059,10 +10948,6 @@ semver@^7.3.4:
  dependencies:
    lru-cache "^6.0.0"

-semver@~5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
 send@0.17.1:
  version "0.17.1"
  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
Author	SHA1	Message	Date
Github Actions	f86d555e49	Publish - @0x/asset-swapper@16.50.1	2022-03-03 13:04:04 +00:00
Github Actions	b0f2c40463	Updated CHANGELOGS & MD docs	2022-03-03 13:04:00 +00:00
Kim Persson	87be6fbb8a	fix: lower UniswapV3Sampler quote gas allowance to 700k (#438 ) * fix: lower UniswapV3Sampler quote gas allowance to 700k * chore: add asset-swapper changelog entry	2022-03-03 13:45:20 +01:00
Noah Khamliche	9141a9d2c8	feat: BTRFLY/WETH factory pool (#437 ) * added curve support for BTRFLY/WETH factory pool * prettier and lint * remove timestamp * fixed gas schedule for btrflyweth pool * chore: update Node16 (#384) * Node 16 * update yarn.lock * Update ganache-cli and merkle-patricia-tree * [TKR-275] Add Geist on Fantom (#398) * Add Geist on Fantom * nvm there is not subgraph for it * finish giest utils * Address pr comments * lowercase gtoken addresses * return undefined instead of error for unsupported pairs * another lower case * Update fantom fillQuoteTransformer address * more const clean up * feat: Improve Uniswap V3 gas schedule redux (#424) * Revert "fix: Revert Improve Uniswap V3 gas schedule (#397) (#419)" This reverts commit `df0e0866e4`. * fix: UniswapV3Sampler return token amounts as the last value in return tuple * fix: bump Uniswap V3 quote max gas because QuoterV2 is more expensive * fix: don't try to rout 0 sellAmount/buyAmount quotes * fix: Linting issue * fix: use median gas usage instead of mean in UniV3 gas schedule * chore: add asset-swapper changelog entry * fix: remove contract-addresses changelog empty row failing linting * Updated CHANGELOGS & MD docs * Publish - @0x/contracts-erc20@3.3.27 - @0x/contracts-test-utils@5.4.18 - @0x/contracts-treasury@1.4.10 - @0x/contracts-utils@4.8.8 - @0x/contracts-zero-ex@0.31.1 - @0x/asset-swapper@16.50.0 - @0x/contract-addresses@6.12.0 - @0x/contract-wrappers@13.19.1 - @0x/migrations@8.1.16 - @0x/protocol-utils@1.11.1 * Add v4 NFT Audits (#435) * prettier and lint Co-authored-by: Jacob Evans <jacob@dekz.net> Co-authored-by: Cece Z <cece@0xproject.com> Co-authored-by: Kim Persson <kimpers@users.noreply.github.com> Co-authored-by: Github Actions <github-actions@github.com> Co-authored-by: Jessica Lin <jlin2700@gmail.com>	2022-03-02 21:18:40 -05:00
Jessica Lin	7f75de347e	Add v4 NFT Audits (#435 )	2022-03-02 10:46:00 -08:00
Github Actions	329f7761c3	Publish - @0x/contracts-erc20@3.3.27 - @0x/contracts-test-utils@5.4.18 - @0x/contracts-treasury@1.4.10 - @0x/contracts-utils@4.8.8 - @0x/contracts-zero-ex@0.31.1 - @0x/asset-swapper@16.50.0 - @0x/contract-addresses@6.12.0 - @0x/contract-wrappers@13.19.1 - @0x/migrations@8.1.16 - @0x/protocol-utils@1.11.1	2022-03-02 12:55:58 +00:00
Github Actions	0d8e83cd75	Updated CHANGELOGS & MD docs	2022-03-02 12:55:55 +00:00
Kim Persson	e5d60b8077	feat: Improve Uniswap V3 gas schedule redux (#424 ) * Revert "fix: Revert Improve Uniswap V3 gas schedule (#397) (#419)" This reverts commit `df0e0866e4`. * fix: UniswapV3Sampler return token amounts as the last value in return tuple * fix: bump Uniswap V3 quote max gas because QuoterV2 is more expensive * fix: don't try to rout 0 sellAmount/buyAmount quotes * fix: Linting issue * fix: use median gas usage instead of mean in UniV3 gas schedule * chore: add asset-swapper changelog entry * fix: remove contract-addresses changelog empty row failing linting	2022-03-02 13:36:12 +01:00
Cece Z	ae2fe55efa	[TKR-275] Add Geist on Fantom (#398 ) * Add Geist on Fantom * nvm there is not subgraph for it * finish giest utils * Address pr comments * lowercase gtoken addresses * return undefined instead of error for unsupported pairs * another lower case * Update fantom fillQuoteTransformer address * more const clean up	2022-03-02 01:34:30 -05:00
Jacob Evans	6073607d3e	chore: update Node16 (#384 ) * Node 16 * update yarn.lock * Update ganache-cli and merkle-patricia-tree	2022-03-02 11:50:35 +10:00
Github Actions	389ebb5df8	Publish - @0x/asset-swapper@16.49.9	2022-02-24 09:52:41 +00:00
Github Actions	fd9655e9d4	Updated CHANGELOGS & MD docs	2022-02-24 09:52:38 +00:00
Kim Persson	6480aaa189	fix: native order scaling & don't try to route 1 wei trades (it will fail) (#430 ) * feat: scale oversized native orders to quote amount for fake samples * chore: temporarily use private publish neon-router version * fix: short circuit 1 base unit trades to avoid router error * chore: use published version of `neon-router` * chore: add changelog entry for asset-swapper	2022-02-24 10:34:17 +01:00