Publish

- @0x/contracts-asset-proxy@3.7.12
 - @0x/contracts-broker@1.1.30
 - @0x/contracts-coordinator@3.1.31
 - @0x/contracts-dev-utils@1.3.29
 - @0x/contracts-erc1155@2.1.30
 - @0x/contracts-erc20@3.3.9
 - @0x/contracts-erc721@3.1.30
 - @0x/contracts-exchange-forwarder@4.2.31
 - @0x/contracts-exchange-libs@4.3.30
 - @0x/contracts-exchange@3.2.31
 - @0x/contracts-extensions@6.2.25
 - @0x/contracts-integrations@2.7.45
 - @0x/contracts-multisig@4.1.31
 - @0x/contracts-staking@2.0.38
 - @0x/contracts-test-utils@5.4.1
 - @0x/contracts-treasury@1.1.7
 - @0x/contracts-utils@4.7.9
 - @0x/contracts-zero-ex@0.24.0
 - @0x/asset-swapper@6.15.0
 - @0x/contract-addresses@6.2.0
 - @0x/contract-wrappers-test@12.2.46
 - @0x/contract-wrappers@13.16.2
 - @0x/migrations@8.0.7
 - @0x/order-utils@10.4.22
 - @0x/protocol-utils@1.6.1

.circleci/config.yml

@@ -1,25 +1,25 @@
-version: 2
+version: 2.1
 
 jobs:
     build:
-        resource_class: medium+
+        resource_class: xlarge
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         environment:
-            CONTRACTS_COMMIT_HASH: '9ed05f5'
+            NODE_OPTIONS: '--max-old-space-size=16384'
         working_directory: ~/repo
         steps:
             - checkout
             - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
             - run:
                   name: install-yarn
-                  command: npm install --force --global yarn@1.17.0
+                  command: npm install --force --global yarn@1.22.0
             - run:
                   name: yarn
                   command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
             - setup_remote_docker
-            - run: yarn build:ci
-            - run: yarn build:ts
+            - run: yarn build:ci || yarn build:ci || yarn build:ci
+            - run: yarn build:ts || yarn build:ts || yarn build:ts
             - save_cache:
                   key: repo-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -31,57 +31,59 @@ jobs:
     test-exchange-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-exchange
+            - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
     test-integrations-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-integrations
+            - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
     test-contracts-staking-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-staking
+            - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
     test-contracts-extra-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder @0x/contracts-coordinator
+            - run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
     test-contracts-rest-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-asset-proxy @0x/contracts-broker @0x/contracts-zero-ex
+            - 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-publish:
-        resource_class: medium+
+        resource_class: large
+        environment:
+            NODE_OPTIONS: '--max-old-space-size=6442'
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
             - image: 0xorg/verdaccio
         working_directory: ~/repo
         steps:
@@ -95,7 +97,7 @@ jobs:
                   path: ~/.npm/_logs
     test-doc-generation:
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -106,18 +108,18 @@ jobs:
                   no_output_timeout: 1200
     test-rest:
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-test-utils
-            - run: yarn wsrun test:circleci @0x/contract-artifacts
-            - run: yarn wsrun test:circleci @0x/contract-wrappers-test
-            - run: yarn wsrun test:circleci @0x/migrations
-            - run: yarn wsrun test:circleci @0x/order-utils
-            - run: yarn wsrun test:circleci @0x/asset-swapper
+            - run: yarn wsrun -p @0x/contracts-test-utils -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/migrations -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/order-utils -m --serial -c test:circleci
+            - run: yarn wsrun -p @0x/asset-swapper -m --serial -c test:circleci
             - save_cache:
                   key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -134,7 +136,7 @@ jobs:
         resource_class: large
         working_directory: ~/repo
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         steps:
             - restore_cache:
                   keys:
@@ -145,7 +147,7 @@ jobs:
             - run: yarn diff_md_docs:ci
     submit-coverage:
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs10
+            - image: node:12
         working_directory: ~/repo
         steps:
             - restore_cache:

.github/workflows/publish.yml

@@ -7,6 +7,9 @@ on:
               description: 'required CI status'
               default: 'success'
               required: true
+          prerelease:
+              description: 'prerelease name'
+              required: false
 
 jobs:
     publish:
@@ -21,7 +24,7 @@ jobs:
                   (echo "::error ::${{ github.ref }} does not have a successful CI status" && false)
             - uses: actions/checkout@v2
               with:
-                ref: 'development'
+                ref: ${{ github.ref }}
                 fetch-depth: 0
             - uses: actions/setup-node@v1
               with:
@@ -41,7 +44,9 @@ jobs:
               env:
                   NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
                   GITHUB_TOKEN: ${{ github.token }}
+                  PUBLISH_PRERELEASE: ${{ github.event.inputs.prerelease }}
             - name: 'merge into main branch'
+              if: github.event.inputs.prerelease == '' # unless it's a prerelease
               run: |
                   git checkout main && \
                   git merge ${{ github.ref }} && \

.gitignore

@@ -113,6 +113,8 @@ contracts/dev-utils/generated-artifacts/
 contracts/dev-utils/test/generated-artifacts/
 contracts/zero-ex/generated-artifacts/
 contracts/zero-ex/test/generated-artifacts/
+contracts/treasury/generated-artifacts/
+contracts/treasury/test/generated-artifacts/
 
 # generated truffle contract artifacts/
 contracts/broker/build/
@@ -167,6 +169,8 @@ contracts/dev-utils/generated-wrappers/
 contracts/dev-utils/test/generated-wrappers/
 contracts/zero-ex/generated-wrappers/
 contracts/zero-ex/test/generated-wrappers/
+contracts/treasury/generated-wrappers/
+contracts/treasury/test/generated-wrappers/
 
 # Doc README copy
 packages/*/docs/README.md

.prettierignore

@@ -64,6 +64,10 @@ lib
 /contracts/zero-ex/test/generated-wrappers
 /contracts/zero-ex/generated-artifacts
 /contracts/zero-ex/test/generated-artifacts
+/contracts/treasury/generated-wrappers
+/contracts/treasury/test/generated-wrappers
+/contracts/treasury/generated-artifacts
+/contracts/treasury/test/generated-artifacts
 /contracts/staking/build/
 /contracts/coordinator/build/
 /contracts/exchange/build/
@@ -82,4 +86,5 @@ lib
 /packages/asset-swapper/test/generated-wrappers
 package.json
 packages/*/docs
+docs/
 *.sol

.readthedocs.yaml

@@ -0,0 +1,23 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF
+#formats:
+#  - pdf
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt

README.md

@@ -8,7 +8,7 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 [website-url]: https://0x.org
 
-[![CircleCI](https://circleci.com/gh/0xProject/0x-monorepo.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x-monorepo)
+[![CircleCI](https://circleci.com/gh/0xProject/protocol.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/protocool)
 [![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
 [![Discord](https://img.shields.io/badge/chat-discord.chat-yellow.svg?style=flat)](https://discordapp.com/invite/d3FTX3M)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
@@ -92,7 +92,7 @@ yarn build
 To build a specific package:
 
 ```bash
-PKG=@0x/web3-wrapper yarn build
+PKG=@0x/contract-wrappers yarn build
 ```
 
 To build all contracts packages:
@@ -115,7 +115,7 @@ To watch a specific package and all it's dependent packages:
 PKG=[NPM_PACKAGE_NAME] yarn watch
 
 e.g
-PKG=@0x/web3-wrapper yarn watch
+PKG=@0x/contract-wrappers yarn watch
 ```
 
 ### Clean
@@ -143,7 +143,7 @@ yarn rebuild
 To re-build (clean & build) a specific package & it's deps:
 
 ```bash
-PKG=0x.js yarn rebuild
+PKG=@0x/contract-wrappers yarn rebuild
 ```
 
 ### Lint
@@ -157,7 +157,7 @@ yarn lint
 Lint a specific package:
 
 ```bash
-PKG=0x.js yarn lint
+PKG=@0x/contract-wrappers yarn lint
 ```
 
 ### Run Tests
@@ -171,7 +171,7 @@ yarn test
 Run a specific package's test:
 
 ```bash
-PKG=@0x/web3-wrapper yarn test
+PKG=@0x/contract-wrappers yarn test
 ```
 
 Run all contracts packages tests:

contracts/.solhint.json

@@ -16,6 +16,7 @@
         "quotes": ["error", "double"],
         "separate-by-one-line-in-contract": "error",
         "space-after-comma": "error",
-        "statement-indent": "error"
+        "statement-indent": "error",
+        "no-empty-blocks": false
     }
 }

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,203 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "3.7.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "3.7.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "3.7.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "3.7.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "3.7.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "3.7.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "3.7.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "3.7.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "3.7.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "3.7.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "3.7.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "3.7.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "3.7.0",
+        "changes": [
+            {
+                "note": "Fix Bancor support of ETH",
+                "pr": 88
+            }
+        ],
+        "timestamp": 1608105788
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "3.6.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "3.6.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "3.6.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "3.6.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.6.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.6.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.6.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.6.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.6.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "3.6.0",
         "changes": [

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.7.12 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v3.7.11 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v3.7.10 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v3.7.9 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v3.7.8 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v3.7.7 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v3.7.6 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v3.7.5 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v3.7.4 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v3.7.3 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v3.7.2 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v3.7.1 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v3.7.0 - _December 16, 2020_
+
+    * Fix Bancor support of ETH (#88)
+
+## v3.6.9 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v3.6.8 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v3.6.7 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v3.6.6 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.6.5 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.6.4 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.6.3 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.6.2 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.6.1 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v3.6.0 - _October 27, 2020_
 
     * Add `SwerveBridge` and `SnowSwapBridge` (duplicate of `CurveBridge`) (#2707)

contracts/asset-proxy/contracts/src/bridges/BancorBridge.sol

@@ -21,6 +21,7 @@ pragma solidity ^0.5.9;
 pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
 import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
 import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
 import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
@@ -36,6 +37,20 @@ contract BancorBridge is
     struct TransferState {
         address bancorNetworkAddress;
         address[] path;
+        IEtherToken weth;
+    }
+
+    /// @dev Bancor ETH pseudo-address.
+    address constant public BANCOR_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+
+    // solhint-disable no-empty-blocks
+    /// @dev Payable fallback to receive ETH from Bancor/WETH.
+    function ()
+        external
+        payable
+    {
+        // Poor man's receive in 0.5.9
+        require(msg.data.length == 0);
     }
 
     /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
@@ -60,7 +75,6 @@ contract BancorBridge is
     {
         // hold variables to get around stack depth limitations
         TransferState memory state;
-
         // Decode the bridge data.
         (
             state.path,
@@ -68,34 +82,42 @@ contract BancorBridge is
         // solhint-disable indent
         ) = abi.decode(bridgeData, (address[], address));
         // solhint-enable indent
+        state.weth = IEtherToken(_getWethAddress());
 
-        require(state.path.length > 0, "BancorBridge/PATH_MUST_EXIST");
-        // Just transfer the tokens if they're the same.
-        if (state.path[0] == toTokenAddress) {
-            LibERC20Token.transfer(state.path[0], to, amount);
-            return BRIDGE_SUCCESS;
+        require(state.path.length >= 2, "BancorBridge/PATH_LENGTH_MUST_BE_GREATER_THAN_TWO");
+
+        // Grant an allowance to the Bancor Network to spend `fromTokenAddress` token.
+        uint256 fromTokenBalance;
+        uint256 payableAmount = 0;
+        // If it's ETH in the path then withdraw from WETH
+        // The Bancor path will have ETH as the 0xeee address
+        // Bancor expects to be paid in ETH not WETH
+        if (state.path[0] == BANCOR_ETH_ADDRESS) {
+            fromTokenBalance = state.weth.balanceOf(address(this));
+            state.weth.withdraw(fromTokenBalance);
+            payableAmount = fromTokenBalance;
+        } else {
+            fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
+            LibERC20Token.approveIfBelow(state.path[0], state.bancorNetworkAddress, fromTokenBalance);
         }
 
-        // Otherwise use Bancor to convert
-        require(state.path.length > 2, "BancorBridge/PATH_LENGTH_MUST_BE_GREATER_THAN_TWO");
-        require(state.path[state.path.length - 1] == toTokenAddress, "BancorBridge/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN");
-        
-        // // Grant an allowance to the Bancor Network to spend `fromTokenAddress` token.
-        uint256 fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
-        LibERC20Token.approveIfBelow(state.path[0], state.bancorNetworkAddress, fromTokenBalance);
-
         // Convert the tokens
-        uint256 boughtAmount = IBancorNetwork(state.bancorNetworkAddress).convertByPath(
+        uint256 boughtAmount = IBancorNetwork(state.bancorNetworkAddress).convertByPath.value(payableAmount)(
             state.path, // path originating with source token and terminating in destination token
             fromTokenBalance, // amount of source token to trade
             amount, // minimum amount of destination token expected to receive
-            to, // beneficiary
+            state.path[state.path.length-1] == BANCOR_ETH_ADDRESS ? address(this) : to, // beneficiary
             address(0), // affiliateAccount; no fee paid
             0 // affiliateFee; no fee paid
         );
 
+        if (state.path[state.path.length-1] == BANCOR_ETH_ADDRESS) {
+            state.weth.deposit.value(boughtAmount)();
+            state.weth.transfer(to, boughtAmount);
+        }
+
         emit ERC20BridgeTransfer(
-            state.path[0], // fromTokenAddress
+            state.path[0] == BANCOR_ETH_ADDRESS ? address(state.weth) : state.path[0],
             toTokenAddress,
             fromTokenBalance,
             boughtAmount,
@@ -118,5 +140,5 @@ contract BancorBridge is
     {
         return LEGACY_WALLET_MAGIC_VALUE;
     }
-    
+
 }

contracts/asset-proxy/contracts/src/bridges/CryptoComBridge.sol

@@ -0,0 +1,136 @@
+/*
+
+  Copyright 2020 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.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IUniswapV2Router01.sol";
+import "../interfaces/IERC20Bridge.sol";
+
+
+// solhint-disable space-after-comma
+// solhint-disable not-rely-on-time
+contract CryptoComBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct TransferState {
+        address[] path;
+        address router;
+        uint256 fromTokenBalance;
+    }
+
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // hold variables to get around stack depth limitations
+        TransferState memory state;
+
+        // Decode the bridge data to get the `fromTokenAddress`.
+        // solhint-disable indent
+        (state.path, state.router) = abi.decode(bridgeData, (address[], address));
+        // solhint-enable indent
+
+        require(state.path.length >= 2, "CryptoComBridge/PATH_LENGTH_MUST_BE_AT_LEAST_TWO");
+        require(state.path[state.path.length - 1] == toTokenAddress, "CryptoComBridge/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN");
+
+        // Just transfer the tokens if they're the same.
+        if (state.path[0] == toTokenAddress) {
+            LibERC20Token.transfer(state.path[0], to, amount);
+            return BRIDGE_SUCCESS;
+        }
+
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
+
+        // Grant the SushiSwap router an allowance.
+        LibERC20Token.approveIfBelow(
+            state.path[0],
+            state.router,
+            state.fromTokenBalance
+        );
+
+        // Buy as much `toTokenAddress` token with `fromTokenAddress` token
+        // and transfer it to `to`.
+        IUniswapV2Router01 router = IUniswapV2Router01(state.router);
+        uint[] memory amounts = router.swapExactTokensForTokens(
+             // Sell all tokens we hold.
+            state.fromTokenBalance,
+             // Minimum buy amount.
+            amount,
+            // Convert `fromTokenAddress` to `toTokenAddress`.
+            state.path,
+            // Recipient is `to`.
+            to,
+            // Expires after this block.
+            block.timestamp
+        );
+
+        emit ERC20BridgeTransfer(
+            // input token
+            state.path[0],
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            amounts[amounts.length - 1],
+            from,
+            to
+        );
+
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

contracts/asset-proxy/contracts/src/bridges/KyberBridge.sol

@@ -56,11 +56,14 @@ contract KyberBridge is
     uint256 constant private KYBER_RATE_BASE = 10 ** 18;
 
     // solhint-disable no-empty-blocks
-    /// @dev Payable fallback to receive ETH from Kyber.
+    /// @dev Payable fallback to receive ETH from Kyber/WETH.
     function ()
         external
         payable
-    {}
+    {
+        // Poor man's receive in 0.5.9
+        require(msg.data.length == 0);
+    }
 
     /// @dev Callback for `IKyberBridge`. Tries to buy `amount` of
     ///      `toTokenAddress` tokens by selling the entirety of the opposing asset

contracts/asset-proxy/contracts/src/bridges/ShellBridge.sol

@@ -51,16 +51,15 @@ contract ShellBridge is
         external
         returns (bytes4 success)
     {
-        // Decode the bridge data to get the `fromTokenAddress`.
-        (address fromTokenAddress) = abi.decode(bridgeData, (address));
+        // Decode the bridge data to get the `fromTokenAddress` and `pool`.
+        (address fromTokenAddress, address pool) = abi.decode(bridgeData, (address, address));
 
         uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
-        IShell exchange = IShell(_getShellAddress());
         // Grant an allowance to the exchange to spend `fromTokenAddress` token.
-        LibERC20Token.approveIfBelow(fromTokenAddress, address(exchange), fromTokenBalance);
+        LibERC20Token.approveIfBelow(fromTokenAddress, pool, fromTokenBalance);
 
         // Try to sell all of this contract's `fromTokenAddress` token balance.
-        uint256 boughtAmount = exchange.originSwap(
+        uint256 boughtAmount = IShell(pool).originSwap(
             fromTokenAddress,
             toTokenAddress,
             fromTokenBalance,

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "3.6.0",
+    "version": "3.7.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -38,7 +38,7 @@
         "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "config": {
-        "abis": "./test/generated-artifacts/@(BalancerBridge|BancorBridge|ChaiBridge|CreamBridge|CurveBridge|DODOBridge|DexForwarderBridge|DydxBridge|ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IBalancerPool|IBancorNetwork|IChai|ICurve|IDydx|IDydxBridge|IERC20Bridge|IEth2Dai|IGasToken|IKyberNetworkProxy|IMStable|IMooniswap|IShell|IUniswapExchange|IUniswapExchangeFactory|IUniswapV2Router01|KyberBridge|MStableBridge|MixinAssetProxyDispatcher|MixinAuthorizable|MixinGasToken|MooniswapBridge|MultiAssetProxy|Ownable|ShellBridge|SnowSwapBridge|StaticCallProxy|SushiSwapBridge|SwerveBridge|TestBancorBridge|TestChaiBridge|TestDexForwarderBridge|TestDydxBridge|TestERC20Bridge|TestEth2DaiBridge|TestKyberBridge|TestStaticCallTarget|TestUniswapBridge|TestUniswapV2Bridge|UniswapBridge|UniswapV2Bridge).json",
+        "abis": "./test/generated-artifacts/@(BalancerBridge|BancorBridge|ChaiBridge|CreamBridge|CryptoComBridge|CurveBridge|DODOBridge|DexForwarderBridge|DydxBridge|ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IBalancerPool|IBancorNetwork|IChai|ICurve|IDydx|IDydxBridge|IERC20Bridge|IEth2Dai|IGasToken|IKyberNetworkProxy|IMStable|IMooniswap|IShell|IUniswapExchange|IUniswapExchangeFactory|IUniswapV2Router01|KyberBridge|MStableBridge|MixinAssetProxyDispatcher|MixinAuthorizable|MixinGasToken|MooniswapBridge|MultiAssetProxy|Ownable|ShellBridge|SnowSwapBridge|StaticCallProxy|SushiSwapBridge|SwerveBridge|TestBancorBridge|TestChaiBridge|TestDexForwarderBridge|TestDydxBridge|TestERC20Bridge|TestEth2DaiBridge|TestKyberBridge|TestStaticCallTarget|TestUniswapBridge|TestUniswapV2Bridge|UniswapBridge|UniswapV2Bridge).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -51,15 +51,15 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contract-wrappers": "^13.9.1",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contract-wrappers": "^13.16.2",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
+        "@0x/tslint-config": "^4.1.4",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -67,7 +67,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereumjs-util": "^5.1.1",
+        "ethereumjs-util": "^7.0.10",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
@@ -76,20 +76,20 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-erc1155": "^2.1.9",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-erc721": "^3.1.9",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
-        "ethereum-types": "^3.3.3",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-erc1155": "^2.1.30",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-erc721": "^3.1.30",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
+        "ethereum-types": "^3.5.0",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/asset-proxy/src/artifacts.ts

@@ -9,6 +9,7 @@ import * as BalancerBridge from '../generated-artifacts/BalancerBridge.json';
 import * as BancorBridge from '../generated-artifacts/BancorBridge.json';
 import * as ChaiBridge from '../generated-artifacts/ChaiBridge.json';
 import * as CreamBridge from '../generated-artifacts/CreamBridge.json';
+import * as CryptoComBridge from '../generated-artifacts/CryptoComBridge.json';
 import * as CurveBridge from '../generated-artifacts/CurveBridge.json';
 import * as DexForwarderBridge from '../generated-artifacts/DexForwarderBridge.json';
 import * as DODOBridge from '../generated-artifacts/DODOBridge.json';
@@ -77,6 +78,7 @@ export const artifacts = {
     BancorBridge: BancorBridge as ContractArtifact,
     ChaiBridge: ChaiBridge as ContractArtifact,
     CreamBridge: CreamBridge as ContractArtifact,
+    CryptoComBridge: CryptoComBridge as ContractArtifact,
     CurveBridge: CurveBridge as ContractArtifact,
     DODOBridge: DODOBridge as ContractArtifact,
     DexForwarderBridge: DexForwarderBridge as ContractArtifact,

contracts/asset-proxy/src/wrappers.ts

@@ -7,6 +7,7 @@ export * from '../generated-wrappers/balancer_bridge';
 export * from '../generated-wrappers/bancor_bridge';
 export * from '../generated-wrappers/chai_bridge';
 export * from '../generated-wrappers/cream_bridge';
+export * from '../generated-wrappers/crypto_com_bridge';
 export * from '../generated-wrappers/curve_bridge';
 export * from '../generated-wrappers/d_o_d_o_bridge';
 export * from '../generated-wrappers/dex_forwarder_bridge';

contracts/asset-proxy/test/artifacts.ts

@@ -9,6 +9,7 @@ import * as BalancerBridge from '../test/generated-artifacts/BalancerBridge.json
 import * as BancorBridge from '../test/generated-artifacts/BancorBridge.json';
 import * as ChaiBridge from '../test/generated-artifacts/ChaiBridge.json';
 import * as CreamBridge from '../test/generated-artifacts/CreamBridge.json';
+import * as CryptoComBridge from '../test/generated-artifacts/CryptoComBridge.json';
 import * as CurveBridge from '../test/generated-artifacts/CurveBridge.json';
 import * as DexForwarderBridge from '../test/generated-artifacts/DexForwarderBridge.json';
 import * as DODOBridge from '../test/generated-artifacts/DODOBridge.json';
@@ -77,6 +78,7 @@ export const artifacts = {
     BancorBridge: BancorBridge as ContractArtifact,
     ChaiBridge: ChaiBridge as ContractArtifact,
     CreamBridge: CreamBridge as ContractArtifact,
+    CryptoComBridge: CryptoComBridge as ContractArtifact,
     CurveBridge: CurveBridge as ContractArtifact,
     DODOBridge: DODOBridge as ContractArtifact,
     DexForwarderBridge: DexForwarderBridge as ContractArtifact,

contracts/asset-proxy/test/bancor_bridge.ts

@@ -12,13 +12,11 @@ import { DecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { artifacts } from './artifacts';
-
 import { TestBancorBridgeContract } from './generated-wrappers/test_bancor_bridge';
 import {
     TestBancorBridgeConvertByPathInputEventArgs as ConvertByPathArgs,
     TestBancorBridgeEvents as ContractEvents,
     TestBancorBridgeTokenApproveEventArgs as TokenApproveArgs,
-    TestBancorBridgeTokenTransferEventArgs as TokenTransferArgs,
 } from './wrappers';
 
 blockchainTests.resets('Bancor unit tests', env => {
@@ -128,24 +126,6 @@ blockchainTests.resets('Bancor unit tests', env => {
             expect(result).to.eq(AssetProxyId.ERC20Bridge);
         });
 
-        it('performs transfer when both tokens are the same', async () => {
-            const createTokenFn = testContract.createToken(constants.NULL_ADDRESS);
-            const tokenAddress = await createTokenFn.callAsync();
-            await createTokenFn.awaitTransactionSuccessAsync();
-
-            const { opts, result, logs } = await transferFromAsync({
-                tokenAddressesPath: [tokenAddress, tokenAddress],
-            });
-            expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
-            const transfers = filterLogsToArguments<TokenTransferArgs>(logs, ContractEvents.TokenTransfer);
-
-            expect(transfers.length).to.eq(1);
-            expect(transfers[0].token).to.eq(tokenAddress, 'input token address');
-            expect(transfers[0].from).to.eq(testContract.address);
-            expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
-            expect(transfers[0].amount).to.bignumber.eq(opts.amount, 'amount');
-        });
-
         describe('token -> token', async () => {
             it('calls BancorNetwork.convertByPath()', async () => {
                 const { opts, result, logs } = await transferFromAsync();

contracts/asset-proxy/test/dex_forwarder_bridge.ts

@@ -1,354 +0,0 @@
-import { ContractTxFunctionObj } from '@0x/contract-wrappers';
-import {
-    blockchainTests,
-    constants,
-    expect,
-    filterLogsToArguments,
-    getRandomInteger,
-    randomAddress,
-    shortZip,
-} from '@0x/contracts-test-utils';
-import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
-import { DecodedLogs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { DexForwarderBridgeCall, dexForwarderBridgeDataEncoder } from '../src/dex_forwarder_bridge';
-
-import { artifacts } from './artifacts';
-import {
-    TestDexForwarderBridgeBridgeTransferFromCalledEventArgs as BtfCalledEventArgs,
-    TestDexForwarderBridgeContract,
-    TestDexForwarderBridgeEvents as TestEvents,
-} from './wrappers';
-
-const { ZERO_AMOUNT } = constants;
-
-blockchainTests.resets('DexForwarderBridge unit tests', env => {
-    let testContract: TestDexForwarderBridgeContract;
-    let inputToken: string;
-    let outputToken: string;
-    const BRIDGE_SUCCESS = '0xdc1600f3';
-    const BRIDGE_FAILURE = '0xffffffff';
-    const BRIDGE_REVERT_ERROR = 'oopsie';
-    const NOT_AUTHORIZED_REVERT = 'DexForwarderBridge/SENDER_NOT_AUTHORIZED';
-    const DEFAULTS = {
-        toAddress: randomAddress(),
-    };
-
-    before(async () => {
-        testContract = await TestDexForwarderBridgeContract.deployFrom0xArtifactAsync(
-            artifacts.TestDexForwarderBridge,
-            env.provider,
-            env.txDefaults,
-            artifacts,
-        );
-        // Create test tokens.
-        [inputToken, outputToken] = [
-            await callAndTransactAsync(testContract.createToken()),
-            await callAndTransactAsync(testContract.createToken()),
-        ];
-        await callAndTransactAsync(testContract.setAuthorized(env.txDefaults.from as string));
-    });
-
-    async function callAndTransactAsync<TResult>(fnCall: ContractTxFunctionObj<TResult>): Promise<TResult> {
-        const result = await fnCall.callAsync();
-        await fnCall.awaitTransactionSuccessAsync({}, { shouldValidate: false });
-        return result;
-    }
-
-    function getRandomBridgeCall(
-        bridgeAddress: string,
-        fields: Partial<DexForwarderBridgeCall> = {},
-    ): DexForwarderBridgeCall {
-        return {
-            target: bridgeAddress,
-            inputTokenAmount: getRandomInteger(1, '100e18'),
-            outputTokenAmount: getRandomInteger(1, '100e18'),
-            bridgeData: hexUtils.leftPad(inputToken),
-            ...fields,
-        };
-    }
-
-    describe('bridgeTransferFrom()', () => {
-        let goodBridgeCalls: DexForwarderBridgeCall[];
-        let revertingBridgeCall: DexForwarderBridgeCall;
-        let failingBridgeCall: DexForwarderBridgeCall;
-        let allBridgeCalls: DexForwarderBridgeCall[];
-        let totalFillableOutputAmount: BigNumber;
-        let totalFillableInputAmount: BigNumber;
-        let recipientOutputBalance: BigNumber;
-
-        beforeEach(async () => {
-            goodBridgeCalls = [];
-            for (let i = 0; i < 4; ++i) {
-                goodBridgeCalls.push(await createBridgeCallAsync({ returnCode: BRIDGE_SUCCESS }));
-            }
-            revertingBridgeCall = await createBridgeCallAsync({ revertError: BRIDGE_REVERT_ERROR });
-            failingBridgeCall = await createBridgeCallAsync({ returnCode: BRIDGE_FAILURE });
-            allBridgeCalls = _.shuffle([failingBridgeCall, revertingBridgeCall, ...goodBridgeCalls]);
-
-            totalFillableInputAmount = BigNumber.sum(...goodBridgeCalls.map(c => c.inputTokenAmount));
-            totalFillableOutputAmount = BigNumber.sum(...goodBridgeCalls.map(c => c.outputTokenAmount));
-
-            // Grant the taker some output tokens.
-            await testContract.setTokenBalance(
-                outputToken,
-                DEFAULTS.toAddress,
-                (recipientOutputBalance = getRandomInteger(1, '100e18')),
-            );
-        });
-
-        async function setForwarderInputBalanceAsync(amount: BigNumber): Promise<void> {
-            await testContract
-                .setTokenBalance(inputToken, testContract.address, amount)
-                .awaitTransactionSuccessAsync({}, { shouldValidate: false });
-        }
-
-        async function createBridgeCallAsync(
-            opts: Partial<{
-                returnCode: string;
-                revertError: string;
-                callFields: Partial<DexForwarderBridgeCall>;
-                outputFillAmount: BigNumber;
-            }>,
-        ): Promise<DexForwarderBridgeCall> {
-            const { returnCode, revertError, callFields, outputFillAmount } = {
-                returnCode: BRIDGE_SUCCESS,
-                revertError: '',
-                ...opts,
-            };
-            const bridge = await callAndTransactAsync(testContract.createBridge(returnCode, revertError));
-            const call = getRandomBridgeCall(bridge, callFields);
-            await testContract
-                .setBridgeTransferAmount(call.target, outputFillAmount || call.outputTokenAmount)
-                .awaitTransactionSuccessAsync({}, { shouldValidate: false });
-            return call;
-        }
-
-        async function callBridgeTransferFromAsync(opts: {
-            bridgeData: string;
-            sellAmount?: BigNumber;
-            buyAmount?: BigNumber;
-        }): Promise<DecodedLogs> {
-            // Fund the forwarder with input tokens to sell.
-            await setForwarderInputBalanceAsync(opts.sellAmount || totalFillableInputAmount);
-            const call = testContract.bridgeTransferFrom(
-                outputToken,
-                testContract.address,
-                DEFAULTS.toAddress,
-                opts.buyAmount || totalFillableOutputAmount,
-                opts.bridgeData,
-            );
-            const returnCode = await call.callAsync();
-            if (returnCode !== BRIDGE_SUCCESS) {
-                throw new Error('Expected BRIDGE_SUCCESS');
-            }
-            const receipt = await call.awaitTransactionSuccessAsync({}, { shouldValidate: false });
-            // tslint:disable-next-line: no-unnecessary-type-assertion
-            return receipt.logs as DecodedLogs;
-        }
-
-        it('succeeds with no bridge calls and no input balance', async () => {
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls: [],
-            });
-            await callBridgeTransferFromAsync({ bridgeData, sellAmount: ZERO_AMOUNT });
-        });
-
-        it('succeeds with bridge calls and no input balance', async () => {
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls: allBridgeCalls,
-            });
-            await callBridgeTransferFromAsync({ bridgeData, sellAmount: ZERO_AMOUNT });
-        });
-
-        it('succeeds with no bridge calls and an input balance', async () => {
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls: [],
-            });
-            await callBridgeTransferFromAsync({
-                bridgeData,
-                sellAmount: new BigNumber(1),
-            });
-        });
-
-        it('succeeds if entire input token balance is not consumed', async () => {
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls: allBridgeCalls,
-            });
-            await callBridgeTransferFromAsync({
-                bridgeData,
-                sellAmount: totalFillableInputAmount.plus(1),
-            });
-        });
-
-        it('fails if not authorized', async () => {
-            const calls = goodBridgeCalls.slice(0, 1);
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            await callAndTransactAsync(testContract.setAuthorized(NULL_ADDRESS));
-            return expect(callBridgeTransferFromAsync({ bridgeData, sellAmount: new BigNumber(1) })).to.revertWith(
-                NOT_AUTHORIZED_REVERT,
-            );
-        });
-
-        it('succeeds with one bridge call', async () => {
-            const calls = goodBridgeCalls.slice(0, 1);
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            await callBridgeTransferFromAsync({ bridgeData, sellAmount: calls[0].inputTokenAmount });
-        });
-
-        it('succeeds with many bridge calls', async () => {
-            const calls = goodBridgeCalls;
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            await callBridgeTransferFromAsync({ bridgeData });
-        });
-
-        it('swallows a failing bridge call', async () => {
-            const calls = _.shuffle([...goodBridgeCalls, failingBridgeCall]);
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            await callBridgeTransferFromAsync({ bridgeData });
-        });
-
-        it('consumes input tokens for output tokens', async () => {
-            const calls = allBridgeCalls;
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            await callBridgeTransferFromAsync({ bridgeData });
-            const currentBridgeInputBalance = await testContract
-                .balanceOf(inputToken, testContract.address)
-                .callAsync();
-            expect(currentBridgeInputBalance).to.bignumber.eq(0);
-            const currentRecipientOutputBalance = await testContract
-                .balanceOf(outputToken, DEFAULTS.toAddress)
-                .callAsync();
-            expect(currentRecipientOutputBalance).to.bignumber.eq(totalFillableOutputAmount);
-        });
-
-        it("transfers only up to each call's input amount to each bridge", async () => {
-            const calls = goodBridgeCalls;
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            const logs = await callBridgeTransferFromAsync({ bridgeData });
-            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
-            for (const [call, btf] of shortZip(goodBridgeCalls, btfs)) {
-                expect(btf.inputTokenBalance).to.bignumber.eq(call.inputTokenAmount);
-            }
-        });
-
-        it('transfers only up to outstanding sell amount to each bridge', async () => {
-            // Prepend an extra bridge call.
-            const calls = [
-                await createBridgeCallAsync({
-                    callFields: {
-                        inputTokenAmount: new BigNumber(1),
-                        outputTokenAmount: new BigNumber(1),
-                    },
-                }),
-                ...goodBridgeCalls,
-            ];
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            const logs = await callBridgeTransferFromAsync({ bridgeData });
-            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
-            expect(btfs).to.be.length(goodBridgeCalls.length + 1);
-            // The last call will receive 1 less token.
-            const lastCall = calls.slice(-1)[0];
-            const lastBtf = btfs.slice(-1)[0];
-            expect(lastBtf.inputTokenBalance).to.bignumber.eq(lastCall.inputTokenAmount.minus(1));
-        });
-
-        it('recoups funds from a bridge that fails', async () => {
-            // Prepend a call that will take the whole input amount but will
-            // fail.
-            const badCall = await createBridgeCallAsync({
-                callFields: { inputTokenAmount: totalFillableInputAmount },
-                returnCode: BRIDGE_FAILURE,
-            });
-            const calls = [badCall, ...goodBridgeCalls];
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            const logs = await callBridgeTransferFromAsync({ bridgeData });
-            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
-            expect(btfs).to.be.length(goodBridgeCalls.length);
-        });
-
-        it('recoups funds from a bridge that reverts', async () => {
-            // Prepend a call that will take the whole input amount but will
-            // revert.
-            const badCall = await createBridgeCallAsync({
-                callFields: { inputTokenAmount: totalFillableInputAmount },
-                revertError: BRIDGE_REVERT_ERROR,
-            });
-            const calls = [badCall, ...goodBridgeCalls];
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            const logs = await callBridgeTransferFromAsync({ bridgeData });
-            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
-            expect(btfs).to.be.length(goodBridgeCalls.length);
-        });
-
-        it('recoups funds from a bridge that under-pays', async () => {
-            // Prepend a call that will take the whole input amount but will
-            // underpay the output amount..
-            const badCall = await createBridgeCallAsync({
-                callFields: {
-                    inputTokenAmount: totalFillableInputAmount,
-                    outputTokenAmount: new BigNumber(2),
-                },
-                outputFillAmount: new BigNumber(1),
-            });
-            const calls = [badCall, ...goodBridgeCalls];
-            const bridgeData = dexForwarderBridgeDataEncoder.encode({
-                inputToken,
-                calls,
-            });
-            const logs = await callBridgeTransferFromAsync({ bridgeData });
-            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
-            expect(btfs).to.be.length(goodBridgeCalls.length);
-        });
-    });
-
-    describe('executeBridgeCall()', () => {
-        it('cannot be called externally', async () => {
-            return expect(
-                testContract
-                    .executeBridgeCall(
-                        randomAddress(),
-                        randomAddress(),
-                        randomAddress(),
-                        randomAddress(),
-                        new BigNumber(1),
-                        new BigNumber(1),
-                        constants.NULL_BYTES,
-                    )
-                    .callAsync(),
-            ).to.revertWith('DexForwarderBridge/ONLY_SELF');
-        });
-    });
-});

contracts/asset-proxy/test/static_call_proxy.ts

@@ -168,7 +168,7 @@ describe('StaticCallProxy', () => {
         it('should revert if the hash of the output is different than expected expected', async () => {
             const staticCallData = staticCallTarget.isOddNumber(new BigNumber(0)).getABIEncodedTransactionData();
             const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
-            const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
+            const expectedResultHash = ethUtil.bufferToHex(ethUtil.keccak256(trueAsBuffer));
             const assetData = assetDataInterface
                 .StaticCall(staticCallTarget.address, staticCallData, expectedResultHash)
                 .getABIEncodedTransactionData();
@@ -199,7 +199,7 @@ describe('StaticCallProxy', () => {
         it('should be successful if a function call with one static input returns the correct value', async () => {
             const staticCallData = staticCallTarget.isOddNumber(new BigNumber(1)).getABIEncodedTransactionData();
             const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
-            const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
+            const expectedResultHash = ethUtil.bufferToHex(ethUtil.keccak256(trueAsBuffer));
             const assetData = assetDataInterface
                 .StaticCall(staticCallTarget.address, staticCallData, expectedResultHash)
                 .getABIEncodedTransactionData();
@@ -232,7 +232,7 @@ describe('StaticCallProxy', () => {
             const offset = '0000000000000000000000000000000000000000000000000000000000000020';
             const encodedExpectedResultWithOffset = `0x${offset}${abiEncoder.encode(expectedResults).slice(2)}`;
             const expectedResultHash = ethUtil.bufferToHex(
-                ethUtil.sha3(ethUtil.toBuffer(encodedExpectedResultWithOffset)),
+                ethUtil.keccak256(ethUtil.toBuffer(encodedExpectedResultWithOffset)),
             );
             const assetData = assetDataInterface
                 .StaticCall(staticCallTarget.address, staticCallData, expectedResultHash)

contracts/asset-proxy/test/wrappers.ts

@@ -7,6 +7,7 @@ export * from '../test/generated-wrappers/balancer_bridge';
 export * from '../test/generated-wrappers/bancor_bridge';
 export * from '../test/generated-wrappers/chai_bridge';
 export * from '../test/generated-wrappers/cream_bridge';
+export * from '../test/generated-wrappers/crypto_com_bridge';
 export * from '../test/generated-wrappers/curve_bridge';
 export * from '../test/generated-wrappers/d_o_d_o_bridge';
 export * from '../test/generated-wrappers/dex_forwarder_bridge';

contracts/asset-proxy/tsconfig.json

@@ -7,6 +7,7 @@
         "generated-artifacts/BancorBridge.json",
         "generated-artifacts/ChaiBridge.json",
         "generated-artifacts/CreamBridge.json",
+        "generated-artifacts/CryptoComBridge.json",
         "generated-artifacts/CurveBridge.json",
         "generated-artifacts/DODOBridge.json",
         "generated-artifacts/DexForwarderBridge.json",
@@ -65,6 +66,7 @@
         "test/generated-artifacts/BancorBridge.json",
         "test/generated-artifacts/ChaiBridge.json",
         "test/generated-artifacts/CreamBridge.json",
+        "test/generated-artifacts/CryptoComBridge.json",
         "test/generated-artifacts/CurveBridge.json",
         "test/generated-artifacts/DODOBridge.json",
         "test/generated-artifacts/DexForwarderBridge.json",

contracts/broker/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "1.1.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "1.1.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "1.1.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "1.1.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "1.1.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "1.1.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "1.1.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "1.1.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "1.1.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "1.1.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "1.1.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "1.1.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "1.1.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "1.1.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "1.1.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "1.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "1.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "1.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "1.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "1.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "1.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "1.1.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "1.1.8",

contracts/broker/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.30 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v1.1.29 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v1.1.28 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v1.1.27 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v1.1.26 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v1.1.25 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v1.1.24 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v1.1.23 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v1.1.22 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v1.1.21 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v1.1.20 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v1.1.19 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v1.1.18 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v1.1.17 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v1.1.16 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v1.1.15 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v1.1.14 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v1.1.13 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v1.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.1.11 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.1.10 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v1.1.9 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v1.1.8 - _October 27, 2020_
 
     * Dependencies updated

contracts/broker/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-broker",
-    "version": "1.1.8",
+    "version": "1.1.30",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,20 +51,20 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-erc721": "^3.1.9",
-        "@0x/contracts-exchange": "^3.2.9",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-erc721": "^3.1.30",
+        "@0x/contracts-exchange": "^3.2.31",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -81,14 +81,14 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "ethereum-types": "^3.3.3"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/coordinator/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "3.1.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "3.1.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "3.1.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "3.1.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "3.1.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "3.1.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "3.1.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "3.1.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "3.1.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "3.1.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "3.1.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "3.1.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "3.1.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "3.1.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "3.1.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "3.1.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "3.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "3.1.9",

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.31 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v3.1.30 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v3.1.29 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v3.1.28 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v3.1.27 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v3.1.26 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v3.1.25 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v3.1.24 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v3.1.23 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v3.1.22 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v3.1.21 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v3.1.20 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v3.1.19 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v3.1.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v3.1.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v3.1.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v3.1.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "3.1.9",
+    "version": "3.1.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,17 +52,17 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-dev-utils": "^1.3.7",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-dev-utils": "^1.3.29",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -79,20 +79,20 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.13",
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contract-addresses": "^5.0.0",
-        "@0x/contracts-exchange": "^3.2.9",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/json-schemas": "^5.2.3",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "ethereum-types": "^3.3.3",
+        "@0x/assert": "^3.0.27",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contract-addresses": "^6.2.0",
+        "@0x/contracts-exchange": "^3.2.31",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/json-schemas": "^6.1.3",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "ethereum-types": "^3.5.0",
         "http-status-codes": "^1.3.2"
     },
     "publishConfig": {

contracts/coordinator/src/client/utils/assert.ts

@@ -1,8 +1,4 @@
 import { assert as sharedAssert } from '@0x/assert';
-// HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here
-import { Schema } from '@0x/json-schemas'; // tslint:disable-line:no-unused-variable
-import { Order } from '@0x/types'; // tslint:disable-line:no-unused-variable
-import { BigNumber } from '@0x/utils'; // tslint:disable-line:no-unused-variable
 import { Web3Wrapper } from '@0x/web3-wrapper';
 
 export const assert = {

contracts/dev-utils/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "1.3.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "1.3.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "1.3.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "1.3.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "1.3.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "1.3.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "1.3.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "1.3.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "1.3.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "1.3.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "1.3.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "1.3.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "1.3.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "1.3.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "1.3.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "1.3.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "1.3.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "1.3.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "1.3.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "1.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "1.3.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "1.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "1.3.7",

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.3.29 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v1.3.28 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v1.3.27 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v1.3.26 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v1.3.25 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v1.3.24 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v1.3.23 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v1.3.22 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v1.3.21 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v1.3.20 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v1.3.19 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v1.3.18 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v1.3.17 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v1.3.16 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v1.3.15 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v1.3.14 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v1.3.13 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v1.3.12 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v1.3.11 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.3.10 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.3.9 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v1.3.8 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v1.3.7 - _October 27, 2020_
 
     * Dependencies updated

contracts/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-dev-utils",
-    "version": "1.3.7",
+    "version": "1.3.29",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,18 +41,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/dev-utils",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/assert": "^3.0.13",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/assert": "^3.0.27",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/utils": "^5.6.3",
-        "ethereum-types": "^3.3.3",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/utils": "^6.4.3",
+        "ethereum-types": "^3.5.0",
         "ethers": "~4.0.4",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
@@ -60,10 +60,10 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
+        "@0x/base-contract": "^6.4.0",
         "@types/node": "12.12.54"
     },
     "publishConfig": {

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,193 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "2.1.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "2.1.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "2.1.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "2.1.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "2.1.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "2.1.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "2.1.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "2.1.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "2.1.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "2.1.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "2.1.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "2.1.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "2.1.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "2.1.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "2.1.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "2.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "2.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "2.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "2.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "2.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "2.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "2.1.9",

contracts/erc1155/CHANGELOG.md

@@ -5,6 +5,90 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.30 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v2.1.29 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v2.1.28 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v2.1.27 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v2.1.26 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v2.1.25 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v2.1.24 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v2.1.23 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v2.1.22 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v2.1.21 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v2.1.20 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v2.1.19 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v2.1.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v2.1.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v2.1.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v2.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v2.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v2.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v2.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v2.1.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/erc1155/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc1155",
-    "version": "2.1.9",
+    "version": "2.1.30",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,15 +52,15 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -68,7 +68,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.3.3",
+        "ethereum-types": "^3.5.0",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
@@ -77,13 +77,13 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,198 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "3.3.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "3.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "3.3.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "3.3.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "3.3.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "3.3.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "3.3.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "3.3.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "3.3.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "3.3.0",
+        "changes": [
+            {
+                "note": "Add SPDX license identifiers to solidity files",
+                "pr": 105
+            },
+            {
+                "note": "Allow for excess return data in `LibERC20TokenV06` compat* functions",
+                "pr": 97
+            }
+        ],
+        "timestamp": 1609802516
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "3.2.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "3.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "3.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "3.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "3.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "3.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.2.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "3.2.3",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,91 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.9 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v3.3.8 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v3.3.7 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v3.3.6 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v3.3.5 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v3.3.4 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v3.3.3 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v3.3.2 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v3.3.1 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v3.3.0 - _January 4, 2021_
+
+    * Add SPDX license identifiers to solidity files (#105)
+    * Allow for excess return data in `LibERC20TokenV06` compat* functions (#97)
+
+## v3.2.14 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v3.2.13 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v3.2.12 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v3.2.11 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v3.2.10 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.9 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.2.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.2.7 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.5 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.2.4 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v3.2.3 - _October 27, 2020_
 
     * Dependencies updated

contracts/erc20/contracts/src/v06/IERC20TokenV06.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0
 /*
 
   Copyright 2020 ZeroEx Intl.

contracts/erc20/contracts/src/v06/IEtherTokenV06.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0
 /*
 
   Copyright 2020 ZeroEx Intl.

contracts/erc20/contracts/src/v06/LibERC20TokenV06.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0
 /*
 
   Copyright 2020 ZeroEx Intl.
@@ -118,7 +119,7 @@ library LibERC20TokenV06 {
     {
         tokenDecimals = 18;
         (bool didSucceed, bytes memory resultData) = address(token).staticcall(DECIMALS_CALL_DATA);
-        if (didSucceed && resultData.length == 32) {
+        if (didSucceed && resultData.length >= 32) {
             tokenDecimals = uint8(LibBytesV06.readUint256(resultData, 0));
         }
     }
@@ -141,7 +142,7 @@ library LibERC20TokenV06 {
                 spender
             )
         );
-        if (didSucceed && resultData.length == 32) {
+        if (didSucceed && resultData.length >= 32) {
             allowance_ = LibBytesV06.readUint256(resultData, 0);
         }
     }
@@ -162,7 +163,7 @@ library LibERC20TokenV06 {
                 owner
             )
         );
-        if (didSucceed && resultData.length == 32) {
+        if (didSucceed && resultData.length >= 32) {
             balance = LibBytesV06.readUint256(resultData, 0);
         }
     }
@@ -180,7 +181,7 @@ library LibERC20TokenV06 {
         if (resultData.length == 0) {
             return true;
         }
-        if (resultData.length == 32) {
+        if (resultData.length >= 32) {
             uint256 result = LibBytesV06.readUint256(resultData, 0);
             if (result == 1) {
                 return true;

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.2.3",
+    "version": "3.3.9",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,18 +51,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -70,7 +70,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.3.3",
+        "ethereum-types": "^3.5.0",
         "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
@@ -79,10 +79,10 @@
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7"
+        "@0x/base-contract": "^6.4.0"
     },
     "publishConfig": {
         "access": "public"

contracts/erc20/src/index.ts

@@ -6,6 +6,7 @@ export {
     WETH9Events,
     WETH9DepositEventArgs,
     WETH9TransferEventArgs,
+    WETH9WithdrawalEventArgs,
     ZRXTokenContract,
     DummyERC20TokenTransferEventArgs,
     ERC20TokenEventArgs,

contracts/erc20/test/weth9.ts

@@ -39,8 +39,8 @@ describe('EtherToken', () => {
             artifacts.WETH9,
             provider,
             {
-                gasPrice,
                 ...txDefaults,
+                gasPrice,
             },
             artifacts,
         );

contracts/erc721/CHANGELOG.json

@@ -1,4 +1,193 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "3.1.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "3.1.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "3.1.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "3.1.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "3.1.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "3.1.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "3.1.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "3.1.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "3.1.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "3.1.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "3.1.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "3.1.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "3.1.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "3.1.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "3.1.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "3.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "3.1.9",

contracts/erc721/CHANGELOG.md

@@ -5,6 +5,90 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.30 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v3.1.29 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v3.1.28 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v3.1.27 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v3.1.26 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v3.1.25 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v3.1.24 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v3.1.23 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v3.1.22 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v3.1.21 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v3.1.20 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v3.1.19 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v3.1.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v3.1.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v3.1.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v3.1.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/erc721/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc721",
-    "version": "3.1.9",
+    "version": "3.1.30",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,18 +52,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -71,7 +71,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.3.3",
+        "ethereum-types": "^3.5.0",
         "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
@@ -81,10 +81,10 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7"
+        "@0x/base-contract": "^6.4.0"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-forwarder/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "4.2.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "4.2.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "4.2.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "4.2.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "4.2.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "4.2.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "4.2.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "4.2.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "4.2.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "4.2.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "4.2.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "4.2.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "4.2.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "4.2.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "4.2.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "4.2.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "4.2.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.2.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "4.2.9",

contracts/exchange-forwarder/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.2.31 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v4.2.30 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v4.2.29 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v4.2.28 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v4.2.27 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v4.2.26 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v4.2.25 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v4.2.24 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v4.2.23 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v4.2.22 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v4.2.21 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v4.2.20 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v4.2.19 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v4.2.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v4.2.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v4.2.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v4.2.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v4.2.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.2.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.2.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.2.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.2.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v4.2.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/exchange-forwarder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-forwarder",
-    "version": "4.2.9",
+    "version": "4.2.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,25 +52,25 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-dev-utils": "^1.3.7",
-        "@0x/contracts-erc1155": "^2.1.9",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-erc721": "^3.1.9",
-        "@0x/contracts-exchange": "^3.2.9",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-dev-utils": "^1.3.29",
+        "@0x/contracts-erc1155": "^2.1.30",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-erc721": "^3.1.30",
+        "@0x/contracts-exchange": "^3.2.31",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -87,12 +87,12 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/typescript-typings": "^5.1.5",
-        "ethereum-types": "^3.3.3"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/typescript-typings": "^5.2.0",
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-libs/CHANGELOG.json

@@ -1,4 +1,193 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "4.3.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "4.3.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "4.3.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "4.3.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "4.3.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "4.3.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "4.3.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "4.3.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "4.3.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "4.3.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "4.3.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "4.3.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "4.3.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "4.3.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "4.3.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "4.3.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.3.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.3.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.3.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.3.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "4.3.9",

contracts/exchange-libs/CHANGELOG.md

@@ -5,6 +5,90 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.3.30 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v4.3.29 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v4.3.28 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v4.3.27 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v4.3.26 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v4.3.25 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v4.3.24 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v4.3.23 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v4.3.22 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v4.3.21 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v4.3.20 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v4.3.19 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v4.3.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v4.3.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v4.3.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v4.3.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v4.3.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.3.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.3.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.3.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.3.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v4.3.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/exchange-libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-libs",
-    "version": "4.3.9",
+    "version": "4.3.30",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,14 +52,14 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/libs",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
-        "@0x/subproviders": "^6.1.5",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
+        "@0x/subproviders": "^6.5.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -67,7 +67,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereumjs-util": "^5.1.1",
+        "ethereumjs-util": "^7.0.10",
         "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
@@ -77,17 +77,17 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "ethereum-types": "^3.3.3"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "3.2.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "3.2.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "3.2.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "3.2.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "3.2.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "3.2.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "3.2.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "3.2.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "3.2.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "3.2.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "3.2.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "3.2.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "3.2.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "3.2.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "3.2.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "3.2.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "3.2.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.2.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "3.2.9",

contracts/exchange/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.2.31 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v3.2.30 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v3.2.29 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v3.2.28 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v3.2.27 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v3.2.26 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v3.2.25 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v3.2.24 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v3.2.23 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v3.2.22 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v3.2.21 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v3.2.20 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v3.2.19 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v3.2.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v3.2.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v3.2.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.2.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.2.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.2.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v3.2.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/exchange/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "3.2.9",
+    "version": "3.2.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,21 +52,21 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-multisig": "^4.1.9",
-        "@0x/contracts-staking": "^2.0.16",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-multisig": "^4.1.31",
+        "@0x/contracts-staking": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -74,8 +74,8 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.3.3",
-        "ethereumjs-util": "^5.1.1",
+        "ethereum-types": "^3.5.0",
+        "ethereumjs-util": "^7.0.10",
         "js-combinatorics": "^0.5.3",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
@@ -85,16 +85,16 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-dev-utils": "^1.3.7",
-        "@0x/contracts-erc1155": "^2.1.9",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-erc721": "^3.1.9",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/utils": "^5.6.3",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-dev-utils": "^1.3.29",
+        "@0x/contracts-erc1155": "^2.1.30",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-erc721": "^3.1.30",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/utils": "^6.4.3",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/exchange/test/signature_validator.ts

@@ -86,7 +86,7 @@ blockchainTests.resets('MixinSignatureValidator', env => {
 
     const SIGNATURE_LENGTH = 65;
     const generateRandomSignature = (): string => hexUtils.random(SIGNATURE_LENGTH);
-    const hashBytes = (bytesHex: string): string => ethUtil.bufferToHex(ethUtil.sha3(ethUtil.toBuffer(bytesHex)));
+    const hashBytes = (bytesHex: string): string => hexUtils.hash(bytesHex);
     const signDataHex = (dataHex: string, privateKey: Buffer): string => {
         const ecSignature = ethUtil.ecsign(ethUtil.toBuffer(dataHex), privateKey);
         return hexUtils.concat(ecSignature.v, ecSignature.r, ecSignature.s);

contracts/exchange/test/utils/abstract/abstract_balance_and_proxy_allowance_fetcher.ts

@@ -12,12 +12,12 @@ export abstract class AbstractBalanceAndProxyAllowanceFetcher {
      * @param userAddress Ethereum address for which to fetch the balance
      * @return Balance amount in base units
      */
-    public abstract async getBalanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
+    public abstract getBalanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
     /**
      * Get the 0x asset proxy allowance of assetData for userAddress
      * @param assetData AssetData for which to fetch the allowance
      * @param userAddress Ethereum address for which to fetch the allowance
      * @return Allowance amount in base units
      */
-    public abstract async getProxyAllowanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
+    public abstract getProxyAllowanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
 }

contracts/exchange/test/utils/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts

@@ -1,8 +1,8 @@
 import { BigNumber } from '@0x/utils';
 
 export abstract class AbstractBalanceAndProxyAllowanceLazyStore {
-    public abstract async getBalanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
-    public abstract async getProxyAllowanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
+    public abstract getBalanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
+    public abstract getProxyAllowanceAsync(assetData: string, userAddress: string): Promise<BigNumber>;
     public abstract setBalance(assetData: string, userAddress: string, balance: BigNumber): void;
     public abstract deleteBalance(assetData: string, userAddress: string): void;
     public abstract setProxyAllowance(assetData: string, userAddress: string, proxyAllowance: BigNumber): void;

contracts/exchange/test/utils/abstract/abstract_order_filled_cancelled_fetcher.ts

@@ -11,5 +11,5 @@ export abstract class AbstractOrderFilledCancelledFetcher {
      * @param orderHash OrderHash of order we are interested in
      * @return FilledTakerAmount
      */
-    public abstract async getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber>;
+    public abstract getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber>;
 }

contracts/exchange/test/utils/abstract/abstract_order_filled_cancelled_lazy_store.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from '@0x/utils';
 
 export abstract class AbstractOrderFilledCancelledLazyStore {
-    public abstract async getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber>;
+    public abstract getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber>;
     public abstract setFilledTakerAmount(orderHash: string, balance: BigNumber): void;
     public abstract deleteFilledTakerAmount(orderHash: string): void;
     public abstract setIsCancelled(orderHash: string, isCancelled: boolean): void;

contracts/exchange/test/utils/isolated_exchange_wrapper.ts

@@ -18,6 +18,7 @@ import {
     IsolatedExchangeFillEventArgs as FillEventArgs,
 } from '../wrappers';
 
+export { Order } from '@0x/types';
 export interface AssetBalances {
     [assetData: string]: { [address: string]: BigNumber };
 }
@@ -27,7 +28,6 @@ export interface IsolatedExchangeEvents {
     transferFromCalls: DispatchTransferFromCallArgs[];
 }
 
-export type Order = Order;
 export type Numberish = string | number | BigNumber;
 
 export const DEFAULT_GOOD_SIGNATURE = createGoodSignature();

contracts/exchange/test/wrapper_unit_tests.ts

@@ -12,7 +12,6 @@ import { ReferenceFunctions as UtilReferenceFunctions, SafeMathRevertErrors } fr
 import { FillResults, Order } from '@0x/types';
 import { AnyRevertError, BigNumber, ExchangeRevertErrors, hexUtils, StringRevertError } from '@0x/utils';
 import { LogEntry, LogWithDecodedArgs } from 'ethereum-types';
-import * as ethjs from 'ethereumjs-util';
 import * as _ from 'lodash';
 
 import { artifacts } from './artifacts';
@@ -104,7 +103,7 @@ blockchainTests('Exchange wrapper functions unit tests.', env => {
     // Creates a deterministic order signature, even though no signature validation
     // actually occurs in the test contract.
     function createOrderSignature(order: Order): string {
-        return ethjs.bufferToHex(ethjs.sha3(ethjs.toBuffer(orderHashUtils.getOrderHashHex(order))));
+        return hexUtils.hash(orderHashUtils.getOrderHashHex(order));
     }
 
     // Asserts that `_fillOrder()` was called in the same order and with the same

contracts/extensions/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "6.2.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "6.2.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "6.2.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "6.2.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "6.2.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "6.2.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "6.2.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "6.2.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "6.2.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "6.2.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "6.2.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "6.2.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "6.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "6.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "6.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "6.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "6.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "6.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "6.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "6.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "6.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "6.2.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "6.2.3",

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v6.2.25 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v6.2.24 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v6.2.23 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v6.2.22 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v6.2.21 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v6.2.20 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v6.2.19 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v6.2.18 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v6.2.17 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v6.2.16 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v6.2.15 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v6.2.14 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v6.2.13 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v6.2.12 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v6.2.11 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v6.2.10 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v6.2.9 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v6.2.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v6.2.7 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v6.2.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v6.2.5 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v6.2.4 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v6.2.3 - _October 27, 2020_
 
     * Dependencies updated

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "6.2.3",
+    "version": "6.2.25",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,23 +52,23 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-dev-utils": "^1.3.7",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-erc721": "^3.1.9",
-        "@0x/contracts-exchange": "^3.2.9",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-dev-utils": "^1.3.29",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-erc721": "^3.1.30",
+        "@0x/contracts-exchange": "^3.2.31",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -77,7 +77,7 @@
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "ethereumjs-abi": "0.6.5",
-        "ethereumjs-util": "^5.1.1",
+        "ethereumjs-util": "^7.0.10",
         "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
@@ -87,13 +87,13 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/typescript-typings": "^5.1.5",
-        "ethereum-types": "^3.3.3"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/typescript-typings": "^5.2.0",
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/integrations/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "2.7.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605320370,
+        "version": "2.7.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "2.7.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604620645,
+        "version": "2.7.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "2.7.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "2.7.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "2.7.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "2.7.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "2.7.2",

contracts/integrations/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.7.10 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v2.7.9 - _November 14, 2020_
+
+    * Dependencies updated
+
+## v2.7.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v2.7.7 - _November 5, 2020_
+
+    * Dependencies updated
+
+## v2.7.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.7.5 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.7.4 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v2.7.3 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v2.7.2 - _October 27, 2020_
 
     * Dependencies updated

contracts/integrations/contracts/test/TestFixinProtocolFeesIntegration.sol

@@ -0,0 +1,39 @@
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+
+import "@0x/contracts-zero-ex/contracts/test/TestFixinProtocolFees.sol";
+import "@0x/contracts-zero-ex/contracts/src/external/FeeCollectorController.sol";
+
+
+contract TestFixinProtocolFeesIntegration is TestFixinProtocolFees {
+    constructor(
+        IEtherTokenV06 weth,
+        IStaking staking,
+        uint32 protocolFeeMultiplier
+    )
+        public
+        TestFixinProtocolFees(
+            weth,
+            staking,
+            new FeeCollectorController(weth, staking),
+            protocolFeeMultiplier
+        )
+    {}
+}

contracts/integrations/contracts/test/TestStaking.sol

@@ -0,0 +1,110 @@
+/*
+
+  Copyright 2019 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.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-staking/contracts/src/Staking.sol";
+
+
+contract TestStaking is
+    Staking
+{
+    IEtherToken public testWeth;
+
+    struct TestPool {
+        uint96 operatorStake;
+        uint96 membersStake;
+    }
+
+    mapping(bytes32 => TestPool) private _testPools;
+
+    constructor(address exchangeAddress, IEtherToken _testWeth) public {
+        testWeth = _testWeth;
+
+        _addAuthorizedAddress(msg.sender);
+        init();
+        validExchanges[exchangeAddress] = true;
+        _removeAuthorizedAddressAtIndex(msg.sender, 0);
+    }
+
+    function advanceEpoch()
+        external
+    {
+        currentEpoch += 1;
+    }
+
+    /// @dev Create a test pool.
+    function createTestPool(
+        bytes32 poolId,
+        uint96 operatorStake,
+        uint96 membersStake
+    )
+        external
+    {
+        TestPool storage pool = _testPools[poolId];
+        pool.operatorStake = operatorStake;
+        pool.membersStake = membersStake;
+    }
+
+    function getAggregatedStatsForCurrentEpoch()
+        external
+        view
+        returns (IStructs.AggregatedStats memory)
+    {
+        return aggregatedStatsByEpoch[currentEpoch];
+    }
+
+    /// @dev Overridden to use test pools.
+    function getTotalStakeDelegatedToPool(bytes32 poolId)
+        public
+        view
+        returns (IStructs.StoredBalance memory balance)
+    {
+        TestPool memory pool = _testPools[poolId];
+        uint96 stake = pool.operatorStake + pool.membersStake;
+        return IStructs.StoredBalance({
+            currentEpoch: currentEpoch.downcastToUint64(),
+            currentEpochBalance: stake,
+            nextEpochBalance: stake
+        });
+    }
+
+    /// @dev Overridden to use test pools.
+    function getStakeDelegatedToPoolByOwner(address, bytes32 poolId)
+        public
+        view
+        returns (IStructs.StoredBalance memory balance)
+    {
+        TestPool memory pool = _testPools[poolId];
+        return IStructs.StoredBalance({
+            currentEpoch: currentEpoch.downcastToUint64(),
+            currentEpochBalance: pool.operatorStake,
+            nextEpochBalance: pool.operatorStake
+        });
+    }
+
+    function getWethContract()
+        public
+        view
+        returns (IEtherToken wethContract)
+    {
+        return testWeth;
+    }
+}
+

contracts/integrations/contracts/test/TestWethIntegration.sol

@@ -0,0 +1,24 @@
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+
+import "@0x/contracts-zero-ex/contracts/test/TestWeth.sol";
+
+
+contract TestWethIntegration is TestWeth {}

contracts/integrations/package.json

@@ -1,6 +1,7 @@
 {
     "name": "@0x/contracts-integrations",
-    "version": "2.7.2",
+    "version": "2.7.45",
+    "private": true,
     "engines": {
         "node": ">=6.12"
     },
@@ -38,7 +39,7 @@
     },
     "config": {
         "publicInterfaceContracts": "TestFramework",
-        "abis": "./test/generated-artifacts/@(ChainlinkStopLimit|IChainlinkAggregator|TestChainlinkAggregator|TestContractWrapper|TestDydxUser|TestEth2Dai|TestEth2DaiBridge|TestFramework|TestMainnetAggregatorFills|TestSignatureValidationWallet|TestUniswapBridge|TestUniswapExchange|TestUniswapExchangeFactory).json",
+        "abis": "./test/generated-artifacts/@(ChainlinkStopLimit|IChainlinkAggregator|TestChainlinkAggregator|TestContractWrapper|TestDydxUser|TestEth2Dai|TestEth2DaiBridge|TestFixinProtocolFeesIntegration|TestFramework|TestMainnetAggregatorFills|TestSignatureValidationWallet|TestStaking|TestUniswapBridge|TestUniswapExchange|TestUniswapExchangeFactory|TestWethIntegration).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -51,24 +52,25 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contract-addresses": "^5.0.0",
-        "@0x/contract-wrappers": "^13.9.1",
-        "@0x/contracts-broker": "^1.1.8",
-        "@0x/contracts-coordinator": "^3.1.9",
-        "@0x/contracts-dev-utils": "^1.3.7",
-        "@0x/contracts-exchange-forwarder": "^4.2.9",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/contracts-extensions": "^6.2.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-utils": "^4.5.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contract-addresses": "^6.2.0",
+        "@0x/contract-wrappers": "^13.16.2",
+        "@0x/contracts-broker": "^1.1.30",
+        "@0x/contracts-coordinator": "^3.1.31",
+        "@0x/contracts-dev-utils": "^1.3.29",
+        "@0x/contracts-exchange-forwarder": "^4.2.31",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/contracts-extensions": "^6.2.25",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.9",
         "@0x/coordinator-server": "^1.0.5",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/migrations": "^6.4.3",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/sol-compiler": "^4.2.3",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/migrations": "^8.0.7",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/protocol-utils": "^1.6.1",
+        "@0x/sol-compiler": "^4.7.3",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/web3-wrapper": "^7.5.3",
         "@azure/core-asynciterator-polyfill": "^1.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -88,26 +90,26 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/asset-swapper": "^4.8.0",
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-erc1155": "^2.1.9",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-erc721": "^3.1.9",
-        "@0x/contracts-exchange": "^3.2.9",
-        "@0x/contracts-multisig": "^4.1.9",
-        "@0x/contracts-staking": "^2.0.16",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-zero-ex": "^0.5.0",
-        "@0x/subproviders": "^6.1.5",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "ethereum-types": "^3.3.3",
-        "ethereumjs-util": "^6.2.0",
+        "@0x/asset-swapper": "^6.15.0",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-erc1155": "^2.1.30",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-erc721": "^3.1.30",
+        "@0x/contracts-exchange": "^3.2.31",
+        "@0x/contracts-multisig": "^4.1.31",
+        "@0x/contracts-staking": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-zero-ex": "^0.24.0",
+        "@0x/subproviders": "^6.5.3",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "ethereum-types": "^3.5.0",
+        "ethereumjs-util": "^7.0.10",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/integrations/test/aggregation/fill_test.ts

@@ -1,239 +0,0 @@
-import { MarketBuySwapQuote, MarketSellSwapQuote, Orderbook, SwapQuoter } from '@0x/asset-swapper';
-import { blockchainTests, expect, Numberish } from '@0x/contracts-test-utils';
-import { assetDataUtils } from '@0x/order-utils';
-import { FillResults, SignedOrder } from '@0x/types';
-import { BigNumber, logUtils } from '@0x/utils';
-import * as _ from 'lodash';
-
-import { TestMainnetAggregatorFillsContract } from '../wrappers';
-
-import { tokens } from './tokens';
-
-blockchainTests.live('Aggregator Mainnet Tests', env => {
-    // Mainnet address of the `TestMainnetAggregatorFills` contract.
-    const TEST_CONTRACT_ADDRESS = '0x37Ca306F42748b7fe105F89FCBb2CD03D27c8146';
-    const TAKER_ADDRESS = '0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B'; // Vitalik
-    const ORDERBOOK_POLLING_MS = 1000;
-    const GAS_PRICE = new BigNumber(1);
-    const TAKER_ASSET_ETH_VALUE = 500e18;
-    const MIN_BALANCE = 500.1e18;
-    const SYMBOLS = ['ETH', 'DAI', 'USDC', 'FOAM'];
-    const TEST_PAIRS = _.flatten(SYMBOLS.map(m => SYMBOLS.filter(t => t !== m).map(t => [m, t])));
-    const FILL_VALUES = [1, 10, 1e2, 1e3, 1e4, 2.5e4, 5e4];
-
-    let testContract: TestMainnetAggregatorFillsContract;
-    let swapQuoter: SwapQuoter;
-    let takerEthBalance: BigNumber;
-    const orderbooks: { [name: string]: Orderbook } = {};
-
-    async function getTakerOrdersAsync(takerAssetSymbol: string): Promise<SignedOrder[]> {
-        if (takerAssetSymbol === 'ETH') {
-            return [];
-        }
-        return getOrdersAsync(takerAssetSymbol, 'ETH');
-    }
-
-    // Fetches ETH -> taker asset orders for the forwarder contract.
-    async function getOrdersAsync(makerAssetSymbol: string, takerAssetSymbol: string): Promise<SignedOrder[]> {
-        const takerTokenAddress = tokens[takerAssetSymbol].address;
-        const makerTokenAddress = tokens[makerAssetSymbol].address;
-        const makerAssetData = assetDataUtils.encodeERC20AssetData(makerTokenAddress);
-        const takerAssetData = assetDataUtils.encodeERC20AssetData(takerTokenAddress);
-        const orders = _.flatten(
-            await Promise.all(
-                Object.keys(orderbooks).map(async name =>
-                    getOrdersFromOrderBookAsync(name, makerAssetData, takerAssetData),
-                ),
-            ),
-        );
-        const uniqueOrders: SignedOrder[] = [];
-        for (const order of orders) {
-            if (!order.makerFee.eq(0) || !order.takerFee.eq(0)) {
-                continue;
-            }
-            if (uniqueOrders.findIndex(o => isSameOrder(order, o)) === -1) {
-                uniqueOrders.push(order);
-            }
-        }
-        return uniqueOrders;
-    }
-
-    async function getOrdersFromOrderBookAsync(
-        name: string,
-        makerAssetData: string,
-        takerAssetData: string,
-    ): Promise<SignedOrder[]> {
-        try {
-            return (await orderbooks[name].getOrdersAsync(makerAssetData, takerAssetData)).map(r => r.order);
-        } catch (err) {
-            logUtils.warn(`Failed to retrieve orders from orderbook "${name}".`);
-        }
-        return [];
-    }
-
-    function isSameOrder(a: SignedOrder, b: SignedOrder): boolean {
-        for (const [k, v] of Object.entries(a)) {
-            if (k in (b as any)) {
-                if (BigNumber.isBigNumber(v) && !v.eq((b as any)[k])) {
-                    return false;
-                }
-                if (v !== (b as any)[k]) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    function toTokenUnits(symbol: string, weis: Numberish): BigNumber {
-        return new BigNumber(weis).div(new BigNumber(10).pow(tokens[symbol].decimals));
-    }
-
-    function fromTokenUnits(symbol: string, units: Numberish): BigNumber {
-        return new BigNumber(units)
-            .times(new BigNumber(10).pow(tokens[symbol].decimals))
-            .integerValue(BigNumber.ROUND_DOWN);
-    }
-
-    interface MarketOperationResult {
-        makerAssetBalanceBefore: BigNumber;
-        takerAssetBalanceBefore: BigNumber;
-        makerAssetBalanceAfter: BigNumber;
-        takerAssetBalanceAfter: BigNumber;
-        fillResults: FillResults;
-    }
-
-    // Liquidity is low right now so it's possible we didn't have
-    // enough taker assets to cover the orders, so occasionally we'll get incomplete
-    // fills. This function will catch those cases.
-    // TODO(dorothy-zbornak): Remove this special case when liquidity is up.
-    function checkHadEnoughTakerAsset(
-        quote: MarketBuySwapQuote | MarketSellSwapQuote,
-        result: MarketOperationResult,
-    ): boolean {
-        if (result.takerAssetBalanceBefore.gte(quote.worstCaseQuoteInfo.takerAssetAmount)) {
-            return true;
-        }
-        const takerAssetPct = result.takerAssetBalanceBefore
-            .div(quote.worstCaseQuoteInfo.takerAssetAmount)
-            .times(100)
-            .toNumber()
-            .toFixed(1);
-        logUtils.warn(`Could not acquire enough taker asset to complete the fill: ${takerAssetPct}%`);
-        expect(result.fillResults.makerAssetFilledAmount).to.bignumber.lt(quote.worstCaseQuoteInfo.makerAssetAmount);
-        return false;
-    }
-
-    before(async () => {
-        testContract = new TestMainnetAggregatorFillsContract(TEST_CONTRACT_ADDRESS, env.provider, {
-            ...env.txDefaults,
-            gasPrice: GAS_PRICE,
-            gas: 10e6,
-        });
-        swapQuoter = SwapQuoter.getSwapQuoterForStandardRelayerAPIUrl(env.provider, 'https://api.0x.org/sra');
-        // Pool orderbooks because we're desperate for liquidity.
-        orderbooks.swapQuoter = swapQuoter.orderbook;
-        orderbooks.bamboo = Orderbook.getOrderbookForPollingProvider({
-            httpEndpoint: 'https://sra.bamboorelay.com/0x/v3',
-            pollingIntervalMs: ORDERBOOK_POLLING_MS,
-        });
-        // TODO(dorothy-zbornak): Uncomment when radar's SRA is up.
-        // orderbooks.radar = Orderbook.getOrderbookForPollingProvider({
-        //     httpEndpoint: 'https://api-v3.radarrelay.com/v3',
-        //     pollingIntervalMs: ORDERBOOK_POLLING_MS,
-        // });
-        takerEthBalance = await env.web3Wrapper.getBalanceInWeiAsync(TAKER_ADDRESS);
-    });
-
-    it('taker has minimum ETH', async () => {
-        expect(takerEthBalance).to.bignumber.gte(MIN_BALANCE);
-    });
-
-    describe('market sells', () => {
-        for (const [makerSymbol, takerSymbol] of TEST_PAIRS) {
-            for (const fillValue of FILL_VALUES) {
-                const fillAmount = fromTokenUnits(takerSymbol, new BigNumber(fillValue).div(tokens[takerSymbol].price));
-                it(`sell ${toTokenUnits(takerSymbol, fillAmount)} ${takerSymbol} for ${makerSymbol}`, async () => {
-                    const [quote, takerOrders] = await Promise.all([
-                        swapQuoter.getMarketSellSwapQuoteAsync(
-                            tokens[makerSymbol].address,
-                            tokens[takerSymbol].address,
-                            fillAmount,
-                            { gasPrice: GAS_PRICE },
-                        ),
-                        getTakerOrdersAsync(takerSymbol),
-                    ]);
-                    // Buy taker assets from `takerOrders` and and perform a
-                    // market sell on the bridge orders.
-                    const fill = await testContract
-                        .marketSell(
-                            tokens[makerSymbol].address,
-                            tokens[takerSymbol].address,
-                            quote.orders,
-                            takerOrders,
-                            quote.orders.map(o => o.signature),
-                            takerOrders.map(o => o.signature),
-                            quote.takerAssetFillAmount,
-                        )
-                        .callAsync({
-                            value: quote.worstCaseQuoteInfo.protocolFeeInWeiAmount.plus(TAKER_ASSET_ETH_VALUE),
-                            from: TAKER_ADDRESS,
-                            gasPrice: quote.gasPrice,
-                        });
-                    if (checkHadEnoughTakerAsset(quote, fill)) {
-                        expect(fill.fillResults.makerAssetFilledAmount, 'makerAssetFilledAmount').to.bignumber.gte(
-                            quote.worstCaseQuoteInfo.makerAssetAmount,
-                        );
-                        expect(fill.fillResults.takerAssetFilledAmount, 'takerAssetFilledAmount').to.bignumber.lte(
-                            quote.takerAssetFillAmount,
-                        );
-                    }
-                });
-            }
-        }
-    });
-
-    describe('market buys', () => {
-        for (const [makerSymbol, takerSymbol] of TEST_PAIRS) {
-            for (const fillValue of FILL_VALUES) {
-                const fillAmount = fromTokenUnits(makerSymbol, new BigNumber(fillValue).div(tokens[makerSymbol].price));
-                it(`buy ${toTokenUnits(makerSymbol, fillAmount)} ${makerSymbol} with ${takerSymbol}`, async () => {
-                    const [quote, takerOrders] = await Promise.all([
-                        swapQuoter.getMarketBuySwapQuoteAsync(
-                            tokens[makerSymbol].address,
-                            tokens[takerSymbol].address,
-                            fillAmount,
-                            { gasPrice: GAS_PRICE },
-                        ),
-                        getTakerOrdersAsync(takerSymbol),
-                    ]);
-                    // Buy taker assets from `takerOrders` and and perform a
-                    // market buy on the bridge orders.
-                    const fill = await testContract
-                        .marketBuy(
-                            tokens[makerSymbol].address,
-                            tokens[takerSymbol].address,
-                            quote.orders,
-                            takerOrders,
-                            quote.orders.map(o => o.signature),
-                            takerOrders.map(o => o.signature),
-                            quote.makerAssetFillAmount,
-                        )
-                        .callAsync({
-                            value: quote.worstCaseQuoteInfo.protocolFeeInWeiAmount.plus(TAKER_ASSET_ETH_VALUE),
-                            from: TAKER_ADDRESS,
-                            gasPrice: quote.gasPrice,
-                        });
-                    if (checkHadEnoughTakerAsset(quote, fill)) {
-                        expect(fill.fillResults.takerAssetFilledAmount, 'takerAssetFilledAmount').to.bignumber.lte(
-                            quote.worstCaseQuoteInfo.takerAssetAmount,
-                        );
-                        expect(fill.fillResults.makerAssetFilledAmount, 'makerAssetFilledAmount').to.bignumber.gte(
-                            quote.makerAssetFillAmount,
-                        );
-                    }
-                });
-            }
-        }
-    });
-});

contracts/integrations/test/aggregation/tokens.ts

@@ -1,77 +0,0 @@
-export const tokens: { [symbol: string]: { address: string; decimals: number; price: number } } = {
-    ETH: {
-        address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-        decimals: 18,
-        price: 133,
-    },
-    SAI: {
-        address: '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359',
-        decimals: 18,
-        price: 1,
-    },
-    DAI: {
-        address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-        decimals: 18,
-        price: 1,
-    },
-    USDC: {
-        address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-        decimals: 6,
-        price: 1,
-    },
-    WBTC: {
-        address: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-        decimals: 8,
-        price: 6900,
-    },
-    MKR: {
-        address: '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2',
-        decimals: 18,
-        price: 454,
-    },
-    BAT: {
-        address: '0x0D8775F648430679A709E98d2b0Cb6250d2887EF',
-        decimals: 18,
-        price: 0.17,
-    },
-    OMG: {
-        address: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07',
-        decimals: 18,
-        price: 0.65,
-    },
-    ZRX: {
-        address: '0xE41d2489571d322189246DaFA5ebDe1F4699F498',
-        decimals: 18,
-        price: 0.19,
-    },
-    ZIL: {
-        address: '0x05f4a42e251f2d52b8ed15E9FEdAacFcEF1FAD27',
-        decimals: 12,
-        price: 0.004,
-    },
-    FOAM: {
-        address: '0x4946Fcea7C692606e8908002e55A582af44AC121',
-        decimals: 18,
-        price: 0.004,
-    },
-    USDT: {
-        address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-        decimals: 6,
-        price: 0.019,
-    },
-    REP: {
-        address: '0x1985365e9f78359a9B6AD760e32412f4a445E862',
-        decimals: 18,
-        price: 8.9,
-    },
-    MANA: {
-        address: '0x0F5D2fB29fb7d3CFeE444a200298f468908cC942',
-        decimals: 18,
-        price: 0.025,
-    },
-    LINK: {
-        address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
-        decimals: 18,
-        price: 1.8,
-    },
-};

contracts/integrations/test/artifacts.ts

@@ -12,12 +12,15 @@ import * as TestContractWrapper from '../test/generated-artifacts/TestContractWr
 import * as TestDydxUser from '../test/generated-artifacts/TestDydxUser.json';
 import * as TestEth2Dai from '../test/generated-artifacts/TestEth2Dai.json';
 import * as TestEth2DaiBridge from '../test/generated-artifacts/TestEth2DaiBridge.json';
+import * as TestFixinProtocolFeesIntegration from '../test/generated-artifacts/TestFixinProtocolFeesIntegration.json';
 import * as TestFramework from '../test/generated-artifacts/TestFramework.json';
 import * as TestMainnetAggregatorFills from '../test/generated-artifacts/TestMainnetAggregatorFills.json';
 import * as TestSignatureValidationWallet from '../test/generated-artifacts/TestSignatureValidationWallet.json';
+import * as TestStaking from '../test/generated-artifacts/TestStaking.json';
 import * as TestUniswapBridge from '../test/generated-artifacts/TestUniswapBridge.json';
 import * as TestUniswapExchange from '../test/generated-artifacts/TestUniswapExchange.json';
 import * as TestUniswapExchangeFactory from '../test/generated-artifacts/TestUniswapExchangeFactory.json';
+import * as TestWethIntegration from '../test/generated-artifacts/TestWethIntegration.json';
 export const artifacts = {
     ChainlinkStopLimit: ChainlinkStopLimit as ContractArtifact,
     IChainlinkAggregator: IChainlinkAggregator as ContractArtifact,
@@ -26,10 +29,13 @@ export const artifacts = {
     TestDydxUser: TestDydxUser as ContractArtifact,
     TestEth2Dai: TestEth2Dai as ContractArtifact,
     TestEth2DaiBridge: TestEth2DaiBridge as ContractArtifact,
+    TestFixinProtocolFeesIntegration: TestFixinProtocolFeesIntegration as ContractArtifact,
     TestFramework: TestFramework as ContractArtifact,
     TestMainnetAggregatorFills: TestMainnetAggregatorFills as ContractArtifact,
     TestSignatureValidationWallet: TestSignatureValidationWallet as ContractArtifact,
+    TestStaking: TestStaking as ContractArtifact,
     TestUniswapBridge: TestUniswapBridge as ContractArtifact,
     TestUniswapExchange: TestUniswapExchange as ContractArtifact,
     TestUniswapExchangeFactory: TestUniswapExchangeFactory as ContractArtifact,
+    TestWethIntegration: TestWethIntegration as ContractArtifact,
 };

contracts/integrations/test/dev-utils/dydx_order_validation_test.ts

@@ -63,11 +63,9 @@ blockchainTests.fork('DevUtils dydx order validation tests', env => {
     let dai: ERC20TokenContract;
     let usdc: ERC20TokenContract;
     let devUtils: DevUtilsContract;
-    let accountOwner: string;
     let minMarginRatio: number;
 
     before(async () => {
-        [accountOwner] = await env.getAccountAddressesAsync();
         dydx = new IDydxContract(DYDX_ADDRESS, env.provider, env.txDefaults);
         dai = new ERC20TokenContract(DAI_ADDRESS, env.provider, env.txDefaults);
         usdc = new ERC20TokenContract(USDC_ADDRESS, env.provider, env.txDefaults);

contracts/integrations/test/exchange-proxy/mtx_test.ts

@@ -1,426 +0,0 @@
-import { ContractAddresses } from '@0x/contract-addresses';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
-import { IExchangeContract } from '@0x/contracts-exchange';
-import { blockchainTests, constants, expect, getRandomPortion, verifyEventsFromLogs } from '@0x/contracts-test-utils';
-import {
-    artifacts as exchangeProxyArtifacts,
-    IZeroExContract,
-    LogMetadataTransformerContract,
-    signCallData,
-} from '@0x/contracts-zero-ex';
-import { migrateOnceAsync } from '@0x/migrations';
-import {
-    assetDataUtils,
-    encodeFillQuoteTransformerData,
-    encodePayTakerTransformerData,
-    ETH_TOKEN_ADDRESS,
-    FillQuoteTransformerSide,
-    findTransformerNonce,
-    signatureUtils,
-    SignedExchangeProxyMetaTransaction,
-} from '@0x/order-utils';
-import { AssetProxyId, Order, SignedOrder } from '@0x/types';
-import { BigNumber, hexUtils, ZeroExRevertErrors } from '@0x/utils';
-import * as ethjs from 'ethereumjs-util';
-
-const { MAX_UINT256, NULL_ADDRESS, NULL_BYTES, NULL_BYTES32, ZERO_AMOUNT } = constants;
-
-blockchainTests.resets('exchange proxy - meta-transactions', env => {
-    const quoteSignerKey = hexUtils.random();
-    const quoteSigner = hexUtils.toHex(ethjs.privateToAddress(ethjs.toBuffer(quoteSignerKey)));
-    let owner: string;
-    let relayer: string;
-    let maker: string;
-    let taker: string;
-    let flashWalletAddress: string;
-    let zeroEx: IZeroExContract;
-    let exchange: IExchangeContract;
-    let inputToken: DummyERC20TokenContract;
-    let outputToken: DummyERC20TokenContract;
-    let feeToken: DummyERC20TokenContract;
-    let addresses: ContractAddresses;
-    let protocolFee: BigNumber;
-    let metadataTransformer: LogMetadataTransformerContract;
-    const GAS_PRICE = new BigNumber('1e9');
-    const MAKER_BALANCE = new BigNumber('100e18');
-    const TAKER_BALANCE = new BigNumber('100e18');
-    const TAKER_FEE_BALANCE = new BigNumber('100e18');
-
-    before(async () => {
-        [, relayer, maker, taker] = await env.getAccountAddressesAsync();
-        addresses = await migrateOnceAsync(env.provider);
-        zeroEx = new IZeroExContract(addresses.exchangeProxy, env.provider, env.txDefaults, {
-            LogMetadataTransformer: LogMetadataTransformerContract.ABI(),
-            DummyERC20Token: DummyERC20TokenContract.ABI(),
-        });
-        exchange = new IExchangeContract(addresses.exchange, env.provider, env.txDefaults);
-        [inputToken, outputToken, feeToken] = await Promise.all(
-            [...new Array(3)].map(i =>
-                DummyERC20TokenContract.deployFrom0xArtifactAsync(
-                    erc20Artifacts.DummyERC20Token,
-                    env.provider,
-                    env.txDefaults,
-                    {},
-                    `DummyToken-${i}`,
-                    `TOK${i}`,
-                    new BigNumber(18),
-                    BigNumber.max(MAKER_BALANCE, TAKER_BALANCE),
-                ),
-            ),
-        );
-        // LogMetadataTransformer is not deployed in migrations.
-        metadataTransformer = await LogMetadataTransformerContract.deployFrom0xArtifactAsync(
-            exchangeProxyArtifacts.LogMetadataTransformer,
-            env.provider,
-            {
-                ...env.txDefaults,
-                from: addresses.exchangeProxyTransformerDeployer,
-            },
-            {},
-        );
-        owner = await zeroEx.owner().callAsync();
-        protocolFee = await exchange.protocolFeeMultiplier().callAsync();
-        flashWalletAddress = await zeroEx.getTransformWallet().callAsync();
-        const erc20Proxy = await exchange.getAssetProxy(AssetProxyId.ERC20).callAsync();
-        const allowanceTarget = await zeroEx.getAllowanceTarget().callAsync();
-        await outputToken.mint(MAKER_BALANCE).awaitTransactionSuccessAsync({ from: maker });
-        await inputToken.mint(TAKER_BALANCE).awaitTransactionSuccessAsync({ from: taker });
-        await feeToken.mint(TAKER_FEE_BALANCE).awaitTransactionSuccessAsync({ from: taker });
-        await outputToken.approve(erc20Proxy, MAX_UINT256).awaitTransactionSuccessAsync({ from: maker });
-        await inputToken.approve(allowanceTarget, MAX_UINT256).awaitTransactionSuccessAsync({ from: taker });
-        await feeToken.approve(allowanceTarget, MAX_UINT256).awaitTransactionSuccessAsync({ from: taker });
-        await zeroEx.setQuoteSigner(quoteSigner).awaitTransactionSuccessAsync({ from: owner });
-    });
-
-    interface Transformation {
-        deploymentNonce: number;
-        data: string;
-    }
-
-    interface SwapInfo {
-        inputTokenAddress: string;
-        outputTokenAddress: string;
-        inputTokenAmount: BigNumber;
-        minOutputTokenAmount: BigNumber;
-        transformations: Transformation[];
-        orders: SignedOrder[];
-    }
-
-    async function generateSwapAsync(orderFields: Partial<Order> = {}, isRfqt: boolean = false): Promise<SwapInfo> {
-        const order = await signatureUtils.ecSignTypedDataOrderAsync(
-            env.provider,
-            {
-                chainId: 1337,
-                exchangeAddress: exchange.address,
-                expirationTimeSeconds: new BigNumber(Date.now()),
-                salt: new BigNumber(hexUtils.random()),
-                feeRecipientAddress: NULL_ADDRESS,
-                senderAddress: NULL_ADDRESS,
-                takerAddress: isRfqt ? flashWalletAddress : NULL_ADDRESS,
-                makerAddress: maker,
-                makerAssetData: assetDataUtils.encodeERC20AssetData(outputToken.address),
-                takerAssetData: assetDataUtils.encodeERC20AssetData(inputToken.address),
-                makerFeeAssetData: NULL_BYTES,
-                takerFeeAssetData: NULL_BYTES,
-                takerAssetAmount: getRandomPortion(TAKER_BALANCE),
-                makerAssetAmount: getRandomPortion(MAKER_BALANCE),
-                makerFee: ZERO_AMOUNT,
-                takerFee: ZERO_AMOUNT,
-                ...orderFields,
-            },
-            maker,
-        );
-        const transformations = [
-            {
-                deploymentNonce: findTransformerNonce(
-                    addresses.transformers.fillQuoteTransformer,
-                    addresses.exchangeProxyTransformerDeployer,
-                ),
-                data: encodeFillQuoteTransformerData({
-                    orders: [order],
-                    signatures: [order.signature],
-                    buyToken: outputToken.address,
-                    sellToken: inputToken.address,
-                    fillAmount: order.takerAssetAmount,
-                    maxOrderFillAmounts: [],
-                    refundReceiver: hexUtils.leftPad(2, 20), // Send refund to sender.
-                    rfqtTakerAddress: isRfqt ? taker : NULL_ADDRESS,
-                    side: FillQuoteTransformerSide.Sell,
-                }),
-            },
-            {
-                deploymentNonce: findTransformerNonce(
-                    addresses.transformers.payTakerTransformer,
-                    addresses.exchangeProxyTransformerDeployer,
-                ),
-                data: encodePayTakerTransformerData({
-                    tokens: [inputToken.address, outputToken.address, ETH_TOKEN_ADDRESS],
-                    amounts: [MAX_UINT256, MAX_UINT256, MAX_UINT256],
-                }),
-            },
-            {
-                deploymentNonce: findTransformerNonce(
-                    metadataTransformer.address,
-                    addresses.exchangeProxyTransformerDeployer,
-                ),
-                data: NULL_BYTES,
-            },
-        ];
-        return {
-            transformations,
-            orders: [order],
-            inputTokenAddress: inputToken.address,
-            outputTokenAddress: outputToken.address,
-            inputTokenAmount: order.takerAssetAmount,
-            minOutputTokenAmount: order.makerAssetAmount,
-        };
-    }
-
-    function getSwapData(swap: SwapInfo): string {
-        return zeroEx
-            .transformERC20(
-                swap.inputTokenAddress,
-                swap.outputTokenAddress,
-                swap.inputTokenAmount,
-                swap.minOutputTokenAmount,
-                swap.transformations,
-            )
-            .getABIEncodedTransactionData();
-    }
-
-    function getSignedSwapData(swap: SwapInfo, signerKey?: string): string {
-        return signCallData(
-            zeroEx
-                .transformERC20(
-                    swap.inputTokenAddress,
-                    swap.outputTokenAddress,
-                    swap.inputTokenAmount,
-                    swap.minOutputTokenAmount,
-                    swap.transformations,
-                )
-                .getABIEncodedTransactionData(),
-            signerKey ? signerKey : quoteSignerKey,
-        );
-    }
-
-    async function createMetaTransactionAsync(
-        data: string,
-        value: BigNumber,
-        fee?: BigNumber | number,
-    ): Promise<SignedExchangeProxyMetaTransaction> {
-        return signatureUtils.ecSignTypedDataExchangeProxyMetaTransactionAsync(
-            env.provider,
-            {
-                value,
-                signer: taker,
-                sender: relayer,
-                minGasPrice: GAS_PRICE,
-                maxGasPrice: GAS_PRICE,
-                expirationTimeSeconds: new BigNumber(Math.floor(Date.now() / 1000) + 60),
-                salt: new BigNumber(hexUtils.random()),
-                callData: data,
-                feeToken: feeToken.address,
-                feeAmount: fee !== undefined ? new BigNumber(fee) : getRandomPortion(TAKER_FEE_BALANCE),
-                domain: {
-                    chainId: 1,
-                    name: 'ZeroEx',
-                    version: '1.0.0',
-                    verifyingContract: zeroEx.address,
-                },
-            },
-            taker,
-        );
-    }
-
-    it('can call `transformERC20()` with signed calldata and no relayer fee', async () => {
-        const swap = await generateSwapAsync();
-        const callDataHash = hexUtils.hash(getSwapData(swap));
-        const signedSwapData = getSignedSwapData(swap);
-        const _protocolFee = protocolFee.times(GAS_PRICE).times(swap.orders.length + 1); // Pay a little more fee than needed.
-        const mtx = await createMetaTransactionAsync(signedSwapData, _protocolFee, 0);
-        const relayerEthBalanceBefore = await env.web3Wrapper.getBalanceInWeiAsync(relayer);
-        const receipt = await zeroEx
-            .executeMetaTransaction(mtx, mtx.signature)
-            .awaitTransactionSuccessAsync({ from: relayer, value: mtx.value, gasPrice: GAS_PRICE });
-        const relayerEthRefund = relayerEthBalanceBefore
-            .minus(await env.web3Wrapper.getBalanceInWeiAsync(relayer))
-            .minus(GAS_PRICE.times(receipt.gasUsed));
-        // Ensure the relayer got back the unused protocol fees.
-        expect(relayerEthRefund).to.bignumber.eq(protocolFee.times(GAS_PRICE));
-        // Ensure the relayer got paid no mtx fees.
-        expect(await feeToken.balanceOf(relayer).callAsync()).to.bignumber.eq(0);
-        // Ensure the taker got output tokens.
-        expect(await outputToken.balanceOf(taker).callAsync()).to.bignumber.eq(swap.minOutputTokenAmount);
-        // Ensure the maker got input tokens.
-        expect(await inputToken.balanceOf(maker).callAsync()).to.bignumber.eq(swap.inputTokenAmount);
-        // Check events.
-        verifyEventsFromLogs(
-            receipt.logs,
-            [
-                {
-                    taker,
-                    callDataHash,
-                    sender: zeroEx.address,
-                    data: NULL_BYTES,
-                },
-            ],
-            'TransformerMetadata',
-        );
-    });
-
-    it('can call `transformERC20()` with signed calldata and a relayer fee', async () => {
-        const swap = await generateSwapAsync();
-        const callDataHash = hexUtils.hash(getSwapData(swap));
-        const signedSwapData = getSignedSwapData(swap);
-        const _protocolFee = protocolFee.times(GAS_PRICE).times(swap.orders.length + 1); // Pay a little more fee than needed.
-        const mtx = await createMetaTransactionAsync(signedSwapData, _protocolFee);
-        const relayerEthBalanceBefore = await env.web3Wrapper.getBalanceInWeiAsync(relayer);
-        const receipt = await zeroEx
-            .executeMetaTransaction(mtx, mtx.signature)
-            .awaitTransactionSuccessAsync({ from: relayer, value: mtx.value, gasPrice: GAS_PRICE });
-        const relayerEthRefund = relayerEthBalanceBefore
-            .minus(await env.web3Wrapper.getBalanceInWeiAsync(relayer))
-            .minus(GAS_PRICE.times(receipt.gasUsed));
-        // Ensure the relayer got back the unused protocol fees.
-        expect(relayerEthRefund).to.bignumber.eq(protocolFee.times(GAS_PRICE));
-        // Ensure the relayer got paid mtx fees.
-        expect(await feeToken.balanceOf(relayer).callAsync()).to.bignumber.eq(mtx.feeAmount);
-        // Ensure the taker got output tokens.
-        expect(await outputToken.balanceOf(taker).callAsync()).to.bignumber.eq(swap.minOutputTokenAmount);
-        // Ensure the maker got input tokens.
-        expect(await inputToken.balanceOf(maker).callAsync()).to.bignumber.eq(swap.inputTokenAmount);
-        // Check events.
-        verifyEventsFromLogs(
-            receipt.logs,
-            [
-                {
-                    taker,
-                    callDataHash,
-                    sender: zeroEx.address,
-                    data: NULL_BYTES,
-                },
-            ],
-            'TransformerMetadata',
-        );
-    });
-
-    it('can call `transformERC20()` with wrongly signed calldata and a relayer fee', async () => {
-        const swap = await generateSwapAsync();
-        const signedSwapData = getSignedSwapData(swap, hexUtils.random());
-        const _protocolFee = protocolFee.times(GAS_PRICE).times(swap.orders.length + 1); // Pay a little more fee than needed.
-        const mtx = await createMetaTransactionAsync(signedSwapData, _protocolFee);
-        const relayerEthBalanceBefore = await env.web3Wrapper.getBalanceInWeiAsync(relayer);
-        const receipt = await zeroEx
-            .executeMetaTransaction(mtx, mtx.signature)
-            .awaitTransactionSuccessAsync({ from: relayer, value: mtx.value, gasPrice: GAS_PRICE });
-        const relayerEthRefund = relayerEthBalanceBefore
-            .minus(await env.web3Wrapper.getBalanceInWeiAsync(relayer))
-            .minus(GAS_PRICE.times(receipt.gasUsed));
-        // Ensure the relayer got back the unused protocol fees.
-        expect(relayerEthRefund).to.bignumber.eq(protocolFee.times(GAS_PRICE));
-        // Ensure the relayer got paid mtx fees.
-        expect(await feeToken.balanceOf(relayer).callAsync()).to.bignumber.eq(mtx.feeAmount);
-        // Ensure the taker got output tokens.
-        expect(await outputToken.balanceOf(taker).callAsync()).to.bignumber.eq(swap.minOutputTokenAmount);
-        // Ensure the maker got input tokens.
-        expect(await inputToken.balanceOf(maker).callAsync()).to.bignumber.eq(swap.inputTokenAmount);
-        // Check events.
-        verifyEventsFromLogs(
-            receipt.logs,
-            [
-                {
-                    taker,
-                    // Only signed calldata should have a nonzero hash.
-                    callDataHash: NULL_BYTES32,
-                    sender: zeroEx.address,
-                    data: NULL_BYTES,
-                },
-            ],
-            'TransformerMetadata',
-        );
-    });
-
-    it('`transformERC20()` can fill RFQT order if calldata is signed', async () => {
-        const swap = await generateSwapAsync({}, true);
-        const callDataHash = hexUtils.hash(getSwapData(swap));
-        const signedSwapData = getSignedSwapData(swap);
-        const _protocolFee = protocolFee.times(GAS_PRICE).times(swap.orders.length + 1); // Pay a little more fee than needed.
-        const mtx = await createMetaTransactionAsync(signedSwapData, _protocolFee, 0);
-        const relayerEthBalanceBefore = await env.web3Wrapper.getBalanceInWeiAsync(relayer);
-        const receipt = await zeroEx
-            .executeMetaTransaction(mtx, mtx.signature)
-            .awaitTransactionSuccessAsync({ from: relayer, value: mtx.value, gasPrice: GAS_PRICE });
-        const relayerEthRefund = relayerEthBalanceBefore
-            .minus(await env.web3Wrapper.getBalanceInWeiAsync(relayer))
-            .minus(GAS_PRICE.times(receipt.gasUsed));
-        // Ensure the relayer got back the unused protocol fees.
-        expect(relayerEthRefund).to.bignumber.eq(protocolFee.times(GAS_PRICE));
-        // Ensure the relayer got paid no mtx fees.
-        expect(await feeToken.balanceOf(relayer).callAsync()).to.bignumber.eq(0);
-        // Ensure the taker got output tokens.
-        expect(await outputToken.balanceOf(taker).callAsync()).to.bignumber.eq(swap.minOutputTokenAmount);
-        // Ensure the maker got input tokens.
-        expect(await inputToken.balanceOf(maker).callAsync()).to.bignumber.eq(swap.inputTokenAmount);
-        // Check events.
-        verifyEventsFromLogs(
-            receipt.logs,
-            [
-                {
-                    taker,
-                    callDataHash,
-                    sender: zeroEx.address,
-                    data: NULL_BYTES,
-                },
-            ],
-            'TransformerMetadata',
-        );
-    });
-
-    it('`transformERC20()` can fill RFQT order if calldata is not signed but no quote signer configured', async () => {
-        const swap = await generateSwapAsync({}, true);
-        const callData = getSwapData(swap);
-        const callDataHash = hexUtils.hash(callData);
-        const _protocolFee = protocolFee.times(GAS_PRICE).times(swap.orders.length + 1); // Pay a little more fee than needed.
-        const mtx = await createMetaTransactionAsync(callData, _protocolFee, 0);
-        const relayerEthBalanceBefore = await env.web3Wrapper.getBalanceInWeiAsync(relayer);
-        await zeroEx.setQuoteSigner(NULL_ADDRESS).awaitTransactionSuccessAsync({ from: owner });
-        const receipt = await zeroEx
-            .executeMetaTransaction(mtx, mtx.signature)
-            .awaitTransactionSuccessAsync({ from: relayer, value: mtx.value, gasPrice: GAS_PRICE });
-        const relayerEthRefund = relayerEthBalanceBefore
-            .minus(await env.web3Wrapper.getBalanceInWeiAsync(relayer))
-            .minus(GAS_PRICE.times(receipt.gasUsed));
-        // Ensure the relayer got back the unused protocol fees.
-        expect(relayerEthRefund).to.bignumber.eq(protocolFee.times(GAS_PRICE));
-        // Ensure the relayer got paid no mtx fees.
-        expect(await feeToken.balanceOf(relayer).callAsync()).to.bignumber.eq(0);
-        // Ensure the taker got output tokens.
-        expect(await outputToken.balanceOf(taker).callAsync()).to.bignumber.eq(swap.minOutputTokenAmount);
-        // Ensure the maker got input tokens.
-        expect(await inputToken.balanceOf(maker).callAsync()).to.bignumber.eq(swap.inputTokenAmount);
-        // Check events.
-        verifyEventsFromLogs(
-            receipt.logs,
-            [
-                {
-                    taker,
-                    callDataHash,
-                    sender: zeroEx.address,
-                    data: NULL_BYTES,
-                },
-            ],
-            'TransformerMetadata',
-        );
-    });
-
-    it('`transformERC20()` cannot fill RFQT order if calldata is not signed', async () => {
-        const swap = await generateSwapAsync({}, true);
-        const callData = getSwapData(swap);
-        const _protocolFee = protocolFee.times(GAS_PRICE).times(swap.orders.length + 1); // Pay a little more fee than needed.
-        const mtx = await createMetaTransactionAsync(callData, _protocolFee, 0);
-        const tx = zeroEx
-            .executeMetaTransaction(mtx, mtx.signature)
-            .awaitTransactionSuccessAsync({ from: relayer, value: mtx.value, gasPrice: GAS_PRICE });
-        return expect(tx).to.revertWith(new ZeroExRevertErrors.MetaTransactions.MetaTransactionCallFailedError());
-    });
-});

contracts/integrations/test/framework/actors/utils.ts

@@ -19,5 +19,5 @@ export function filterActorsByRole<TClass extends Constructor>(
     actors: Actor[],
     role: TClass,
 ): Array<InstanceType<typeof role>> {
-    return actors.filter(actor => actor.mixins.includes(role.name)) as InstanceType<typeof role>;
+    return actors.filter(actor => actor.mixins.includes(role.name)) as Array<InstanceType<typeof role>>;
 }

contracts/integrations/test/wrappers.ts

@@ -10,9 +10,12 @@ export * from '../test/generated-wrappers/test_contract_wrapper';
 export * from '../test/generated-wrappers/test_dydx_user';
 export * from '../test/generated-wrappers/test_eth2_dai';
 export * from '../test/generated-wrappers/test_eth2_dai_bridge';
+export * from '../test/generated-wrappers/test_fixin_protocol_fees_integration';
 export * from '../test/generated-wrappers/test_framework';
 export * from '../test/generated-wrappers/test_mainnet_aggregator_fills';
 export * from '../test/generated-wrappers/test_signature_validation_wallet';
+export * from '../test/generated-wrappers/test_staking';
 export * from '../test/generated-wrappers/test_uniswap_bridge';
 export * from '../test/generated-wrappers/test_uniswap_exchange';
 export * from '../test/generated-wrappers/test_uniswap_exchange_factory';
+export * from '../test/generated-wrappers/test_weth_integration';

contracts/integrations/test/zero-ex/protocol_fees_staking_test.ts

@@ -0,0 +1,85 @@
+import { blockchainTests, constants, expect } from '@0x/contracts-test-utils';
+import { BigNumber, hexUtils } from '@0x/utils';
+
+import { artifacts } from '../artifacts';
+import {
+    TestFixinProtocolFeesIntegrationContract,
+    TestStakingContract,
+    TestWethIntegrationContract,
+} from '../wrappers';
+
+blockchainTests.resets('ProtocolFeeIntegration', env => {
+    const FEE_MULTIPLIER = 70e3;
+    let owner: string;
+    let taker: string;
+    let protocolFees: TestFixinProtocolFeesIntegrationContract;
+    let staking: TestStakingContract;
+    let weth: TestWethIntegrationContract;
+    let singleFeeAmount: BigNumber;
+
+    before(async () => {
+        [owner, taker] = await env.getAccountAddressesAsync();
+        weth = await TestWethIntegrationContract.deployFrom0xArtifactAsync(
+            artifacts.TestWethIntegration,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+        staking = await TestStakingContract.deployFrom0xArtifactAsync(
+            artifacts.TestStaking,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+            constants.NULL_ADDRESS, // exchange address, which we don't know yet
+            weth.address,
+        );
+        protocolFees = await TestFixinProtocolFeesIntegrationContract.deployFrom0xArtifactAsync(
+            artifacts.TestFixinProtocolFeesIntegration,
+            env.provider,
+            { ...env.txDefaults, from: taker },
+            artifacts,
+            weth.address,
+            staking.address,
+            FEE_MULTIPLIER,
+        );
+        await staking.addAuthorizedAddress(owner).awaitTransactionSuccessAsync();
+        await staking.addExchangeAddress(protocolFees.address).awaitTransactionSuccessAsync({ from: owner });
+        await weth.mint(taker, constants.ONE_ETHER).awaitTransactionSuccessAsync();
+        await weth.approve(protocolFees.address, constants.ONE_ETHER).awaitTransactionSuccessAsync({ from: taker });
+
+        singleFeeAmount = await protocolFees.getSingleProtocolFee().callAsync();
+    });
+
+    describe('fee collection integration', () => {
+        const pool0 = constants.NULL_BYTES32;
+        const poolId = hexUtils.random();
+
+        it('should collect fees for pool 0', async () => {
+            await protocolFees.collectProtocolFee(pool0).awaitTransactionSuccessAsync({ value: singleFeeAmount });
+            await protocolFees.transferFeesForPool(pool0).awaitTransactionSuccessAsync();
+
+            // Fees in the pool bytes32(0) don't get attributed to a pool.
+            await expect(
+                (await staking.getStakingPoolStatsThisEpoch(pool0).callAsync()).feesCollected,
+            ).to.bignumber.equal(constants.ZERO_AMOUNT);
+
+            // Expected amount is singleFeeAmount - 1 because we leave 1 wei of WETH behind for future gas savings.
+            return expect(await weth.balanceOf(staking.address).callAsync()).to.bignumber.equal(
+                singleFeeAmount.minus(1),
+            );
+        });
+
+        it('should collect fees for non-zero pool', async () => {
+            const eth100 = constants.ONE_ETHER.multipliedBy(100);
+            await staking.createTestPool(poolId, eth100, eth100).awaitTransactionSuccessAsync();
+
+            await protocolFees.collectProtocolFee(poolId).awaitTransactionSuccessAsync({ value: singleFeeAmount });
+            await protocolFees.transferFeesForPool(poolId).awaitTransactionSuccessAsync();
+
+            // Expected amount is singleFeeAmount - 1 because we leave 1 wei of WETH behind for future gas savings.
+            return expect(
+                (await staking.getStakingPoolStatsThisEpoch(poolId).callAsync()).feesCollected,
+            ).to.bignumber.equal(singleFeeAmount.minus(1));
+        });
+    });
+});

contracts/integrations/tsconfig.json

@@ -11,11 +11,14 @@
         "test/generated-artifacts/TestDydxUser.json",
         "test/generated-artifacts/TestEth2Dai.json",
         "test/generated-artifacts/TestEth2DaiBridge.json",
+        "test/generated-artifacts/TestFixinProtocolFeesIntegration.json",
         "test/generated-artifacts/TestFramework.json",
         "test/generated-artifacts/TestMainnetAggregatorFills.json",
         "test/generated-artifacts/TestSignatureValidationWallet.json",
+        "test/generated-artifacts/TestStaking.json",
         "test/generated-artifacts/TestUniswapBridge.json",
         "test/generated-artifacts/TestUniswapExchange.json",
-        "test/generated-artifacts/TestUniswapExchangeFactory.json"
+        "test/generated-artifacts/TestUniswapExchangeFactory.json",
+        "test/generated-artifacts/TestWethIntegration.json"
     ]
 }

contracts/multisig/CHANGELOG.json

@@ -1,4 +1,202 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "4.1.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "4.1.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "4.1.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "4.1.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "4.1.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "4.1.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "4.1.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "4.1.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "4.1.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "4.1.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "4.1.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "4.1.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "4.1.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "4.1.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "4.1.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "4.1.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "4.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "4.1.9",

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.1.31 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v4.1.30 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v4.1.29 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v4.1.28 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v4.1.27 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v4.1.26 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v4.1.25 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v4.1.24 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v4.1.23 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v4.1.22 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v4.1.21 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v4.1.20 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v4.1.19 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v4.1.18 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v4.1.17 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v4.1.16 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v4.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v4.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v4.1.9 - _October 27, 2020_
 
     * Dependencies updated

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "4.1.9",
+    "version": "4.1.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -49,18 +49,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/multisig",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/sol-compiler": "^4.2.3",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/sol-compiler": "^4.7.3",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "12.12.54",
@@ -75,12 +75,12 @@
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/typescript-typings": "^5.1.5",
-        "ethereum-types": "^3.3.3"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/typescript-typings": "^5.2.0",
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/staking/CHANGELOG.json

@@ -1,4 +1,203 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "2.0.38",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.0.37",
+        "changes": [
+            {
+                "note": "Patch epoch finalization issue",
+                "pr": 221
+            }
+        ],
+        "timestamp": 1620214333
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "2.0.36",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "2.0.35",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "2.0.34",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "2.0.33",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "2.0.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "2.0.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "2.0.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "2.0.29",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "2.0.28",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "2.0.27",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608105788,
+        "version": "2.0.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "2.0.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "2.0.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "2.0.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "2.0.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "2.0.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "2.0.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "2.0.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "2.0.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "2.0.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "2.0.16",

contracts/staking/CHANGELOG.md

@@ -5,6 +5,94 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.38 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v2.0.37 - _May 5, 2021_
+
+    * Patch epoch finalization issue (#221)
+
+## v2.0.36 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v2.0.35 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v2.0.34 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v2.0.33 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v2.0.32 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v2.0.31 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v2.0.30 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v2.0.29 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v2.0.28 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v2.0.27 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v2.0.26 - _December 16, 2020_
+
+    * Dependencies updated
+
+## v2.0.25 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v2.0.24 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v2.0.23 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v2.0.22 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v2.0.21 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v2.0.20 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.0.19 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.0.18 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v2.0.17 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v2.0.16 - _October 27, 2020_
 
     * Dependencies updated

contracts/staking/compiler.json

@@ -2,7 +2,7 @@
     "artifactsDir": "./test/generated-artifacts",
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
-    "isOfflineMode": true,
+    "isOfflineMode": false,
     "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",

contracts/staking/contracts/src/StakingPatch.sol

@@ -0,0 +1,55 @@
+/*
+
+  Copyright 2019 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.5.9;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IStaking.sol";
+import "./sys/MixinParams.sol";
+import "./stake/MixinStake.sol";
+import "./fees/MixinExchangeFees.sol";
+
+
+contract StakingPatch is
+    IStaking,
+    MixinParams,
+    MixinStake,
+    MixinExchangeFees
+{
+    /// @dev Initialize storage owned by this contract.
+    ///      This function should not be called directly.
+    ///      The StakingProxy contract will call it in `attachStakingContract()`.
+    function init()
+        public
+        onlyAuthorized
+    {
+        uint256 currentEpoch_ = currentEpoch;
+        uint256 prevEpoch = currentEpoch_.safeSub(1);
+
+        // Patch corrupted state
+        aggregatedStatsByEpoch[prevEpoch].numPoolsToFinalize = 0;
+        this.endEpoch();
+
+        uint256 lastPoolId_ = 57;
+        for (uint256 i = 1; i <= lastPoolId_; i++) {
+            this.finalizePool(bytes32(i));
+        }
+        // Ensure that current epoch's state is not corrupted
+        aggregatedStatsByEpoch[currentEpoch_].numPoolsToFinalize = 0;
+    }
+}

contracts/staking/contracts/src/fees/MixinExchangeFees.sol

@@ -53,6 +53,10 @@ contract MixinExchangeFees is
     {
         _assertValidProtocolFee(protocolFee);
 
+        if (protocolFee == 0) {
+            return;
+        }
+
         // Transfer the protocol fee to this address if it should be paid in
         // WETH.
         if (msg.value == 0) {

contracts/staking/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-staking",
-    "version": "2.0.16",
+    "version": "2.0.38",
     "engines": {
         "node": ">=6.12"
     },
@@ -41,7 +41,7 @@
     "config": {
         "publicInterfaceContracts": "IStaking,IStakingEvents,IStakingProxy,IZrxVault,LibStakingRichErrors,Staking,StakingProxy,ZrxVault,TestStaking",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(IStaking|IStakingEvents|IStakingProxy|IStorage|IStorageInit|IStructs|IZrxVault|LibCobbDouglas|LibFixedMath|LibFixedMathRichErrors|LibSafeDowncast|LibStakingRichErrors|MixinAbstract|MixinConstants|MixinCumulativeRewards|MixinDeploymentConstants|MixinExchangeFees|MixinExchangeManager|MixinFinalizer|MixinParams|MixinScheduler|MixinStake|MixinStakeBalances|MixinStakeStorage|MixinStakingPool|MixinStakingPoolRewards|MixinStorage|Staking|StakingProxy|TestAssertStorageParams|TestCobbDouglas|TestCumulativeRewardTracking|TestDelegatorRewards|TestExchangeManager|TestFinalizer|TestInitTarget|TestLibFixedMath|TestLibSafeDowncast|TestMixinCumulativeRewards|TestMixinParams|TestMixinScheduler|TestMixinStake|TestMixinStakeBalances|TestMixinStakeStorage|TestMixinStakingPool|TestMixinStakingPoolRewards|TestProtocolFees|TestProxyDestination|TestStaking|TestStakingNoWETH|TestStakingProxy|TestStakingProxyUnit|TestStorageLayoutAndConstants|ZrxVault).json"
+        "abis": "./test/generated-artifacts/@(IStaking|IStakingEvents|IStakingProxy|IStorage|IStorageInit|IStructs|IZrxVault|LibCobbDouglas|LibFixedMath|LibFixedMathRichErrors|LibSafeDowncast|LibStakingRichErrors|MixinAbstract|MixinConstants|MixinCumulativeRewards|MixinDeploymentConstants|MixinExchangeFees|MixinExchangeManager|MixinFinalizer|MixinParams|MixinScheduler|MixinStake|MixinStakeBalances|MixinStakeStorage|MixinStakingPool|MixinStakingPoolRewards|MixinStorage|Staking|StakingPatch|StakingProxy|TestAssertStorageParams|TestCobbDouglas|TestCumulativeRewardTracking|TestDelegatorRewards|TestExchangeManager|TestFinalizer|TestInitTarget|TestLibFixedMath|TestLibSafeDowncast|TestMixinCumulativeRewards|TestMixinParams|TestMixinScheduler|TestMixinStake|TestMixinStakeBalances|TestMixinStakeStorage|TestMixinStakingPool|TestMixinStakingPoolRewards|TestProtocolFees|TestProxyDestination|TestStaking|TestStakingNoWETH|TestStakingProxy|TestStakingProxyUnit|TestStorageLayoutAndConstants|ZrxVault).json"
     },
     "repository": {
         "type": "git",
@@ -53,20 +53,20 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.3",
-        "@0x/contracts-asset-proxy": "^3.6.0",
-        "@0x/contracts-dev-utils": "^1.3.7",
-        "@0x/contracts-erc20": "^3.2.3",
-        "@0x/contracts-exchange-libs": "^4.3.9",
-        "@0x/contracts-gen": "2.0.13",
-        "@0x/contracts-utils": "^4.5.3",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/sol-compiler": "^4.2.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.12",
+        "@0x/contracts-dev-utils": "^1.3.29",
+        "@0x/contracts-erc20": "^3.3.9",
+        "@0x/contracts-exchange-libs": "^4.3.30",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.9",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.2.4",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/lodash": "4.14.104",
         "@types/node": "12.12.54",
         "chai": "^4.0.1",
@@ -84,15 +84,15 @@
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typedoc": "~0.16.11",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contracts-test-utils": "^5.3.6",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "ethereum-types": "^3.3.3",
-        "ethereumjs-util": "^5.1.1"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.1",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "ethereum-types": "^3.5.0",
+        "ethereumjs-util": "^7.0.10"
     },
     "publishConfig": {
         "access": "public"

contracts/staking/src/types.ts

@@ -4,6 +4,7 @@ import { DecodedLogArgs, LogWithDecodedArgs } from 'ethereum-types';
 
 import { constants as stakingConstants } from './constants';
 
+export { Numberish } from '@0x/contracts-test-utils';
 // tslint:disable:max-classes-per-file
 
 export interface StakingParams {
@@ -259,5 +260,3 @@ export class AggregatedStats {
 export interface AggregatedStatsByEpoch {
     [epoch: string]: AggregatedStats;
 }
-
-export type Numberish = Numberish;

contracts/staking/test/artifacts.ts

@@ -33,6 +33,7 @@ import * as MixinStakingPool from '../test/generated-artifacts/MixinStakingPool.
 import * as MixinStakingPoolRewards from '../test/generated-artifacts/MixinStakingPoolRewards.json';
 import * as MixinStorage from '../test/generated-artifacts/MixinStorage.json';
 import * as Staking from '../test/generated-artifacts/Staking.json';
+import * as StakingPatch from '../test/generated-artifacts/StakingPatch.json';
 import * as StakingProxy from '../test/generated-artifacts/StakingProxy.json';
 import * as TestAssertStorageParams from '../test/generated-artifacts/TestAssertStorageParams.json';
 import * as TestCobbDouglas from '../test/generated-artifacts/TestCobbDouglas.json';
@@ -61,6 +62,7 @@ import * as TestStorageLayoutAndConstants from '../test/generated-artifacts/Test
 import * as ZrxVault from '../test/generated-artifacts/ZrxVault.json';
 export const artifacts = {
     Staking: Staking as ContractArtifact,
+    StakingPatch: StakingPatch as ContractArtifact,
     StakingProxy: StakingProxy as ContractArtifact,
     ZrxVault: ZrxVault as ContractArtifact,
     MixinExchangeFees: MixinExchangeFees as ContractArtifact,

contracts/staking/test/patch_mainnet_test.ts

@@ -0,0 +1,66 @@
+import { blockchainTests, constants, expect, filterLogsToArguments } from '@0x/contracts-test-utils';
+import { BigNumber, logUtils } from '@0x/utils';
+import * as _ from 'lodash';
+
+import { artifacts } from './artifacts';
+import { StakingEvents, StakingPatchContract, StakingProxyContract, StakingProxyEvents } from './wrappers';
+
+const abis = _.mapValues(artifacts, v => v.compilerOutput.abi);
+const STAKING_PROXY = '0xa26e80e7dea86279c6d778d702cc413e6cffa777';
+const STAKING_OWNER = '0x7d3455421bbc5ed534a83c88fd80387dc8271392';
+const EXCHANGE_PROXY = '0xdef1c0ded9bec7f1a1670819833240f027b25eff';
+blockchainTests.configure({
+    fork: {
+        unlockedAccounts: [STAKING_OWNER, EXCHANGE_PROXY],
+    },
+});
+
+blockchainTests.fork('Staking patch mainnet fork tests', env => {
+    let stakingProxyContract: StakingProxyContract;
+    let patchedStakingPatchContract: StakingPatchContract;
+
+    before(async () => {
+        stakingProxyContract = new StakingProxyContract(STAKING_PROXY, env.provider, undefined, abis);
+        patchedStakingPatchContract = await StakingPatchContract.deployFrom0xArtifactAsync(
+            artifacts.Staking,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+    });
+
+    it('Staking proxy successfully attaches to patched logic', async () => {
+        const tx = await stakingProxyContract
+            .attachStakingContract(patchedStakingPatchContract.address)
+            .awaitTransactionSuccessAsync({ from: STAKING_OWNER, gasPrice: 0 }, { shouldValidate: false });
+        expect(filterLogsToArguments(tx.logs, StakingProxyEvents.StakingContractAttachedToProxy)).to.deep.equal([
+            {
+                newStakingPatchContractAddress: patchedStakingPatchContract.address,
+            },
+        ]);
+        expect(filterLogsToArguments(tx.logs, StakingEvents.EpochEnded).length).to.equal(1);
+        expect(filterLogsToArguments(tx.logs, StakingEvents.EpochFinalized).length).to.equal(1);
+        logUtils.log(`${tx.gasUsed} gas used`);
+    });
+
+    it('Patched staking handles 0 gas protocol fees', async () => {
+        const staking = new StakingPatchContract(STAKING_PROXY, env.provider, undefined, abis);
+        const maker = '0x7b1886e49ab5433bb46f7258548092dc8cdca28b';
+        const zeroFeeTx = await staking
+            .payProtocolFee(maker, constants.NULL_ADDRESS, constants.ZERO_AMOUNT)
+            .awaitTransactionSuccessAsync({ from: EXCHANGE_PROXY, gasPrice: 0 }, { shouldValidate: false });
+        // StakingPoolEarnedRewardsInEpoch should _not_ be emitted for a zero protocol fee.
+        // tslint:disable-next-line:no-unused-expression
+        expect(filterLogsToArguments(zeroFeeTx.logs, StakingEvents.StakingPoolEarnedRewardsInEpoch)).to.be.empty;
+
+        // Coincidentally there's some ETH in the ExchangeProxy
+        const nonZeroFeeTx = await staking
+            .payProtocolFee(maker, constants.NULL_ADDRESS, new BigNumber(1))
+            .awaitTransactionSuccessAsync({ from: EXCHANGE_PROXY, gasPrice: 0, value: 1 }, { shouldValidate: false });
+        // StakingPoolEarnedRewardsInEpoch _should_ be emitted for a non-zero protocol fee.
+        expect(
+            filterLogsToArguments(nonZeroFeeTx.logs, StakingEvents.StakingPoolEarnedRewardsInEpoch),
+        ).to.have.lengthOf(1);
+    });
+});
+// tslint:enable:no-unnecessary-type-assertion

contracts/staking/test/unit_tests/exchange_test.ts

@@ -12,7 +12,6 @@ import {
 
 blockchainTests.resets('Exchange Unit Tests', env => {
     // Addresses
-    let nonOwner: string;
     let owner: string;
     let nonExchange: string;
     let exchange: string;
@@ -24,7 +23,7 @@ blockchainTests.resets('Exchange Unit Tests', env => {
 
     before(async () => {
         // Set up addresses for testing.
-        [nonOwner, owner, nonExchange, exchange, nonAuthority, authority] = await env.getAccountAddressesAsync();
+        [, owner, nonExchange, exchange, nonAuthority, authority] = await env.getAccountAddressesAsync();
 
         // Deploy the Exchange Manager contract.
         exchangeManager = await TestExchangeManagerContract.deployFrom0xArtifactAsync(

contracts/staking/test/unit_tests/finalizer_test.ts

@@ -543,7 +543,7 @@ blockchainTests.resets('Finalizer unit tests', env => {
             const expectedPoolRewards = await calculatePoolRewardsAsync(INITIAL_BALANCE, pools);
             const [pool, reward] = _.sampleSize(shortZip(pools, expectedPoolRewards), 1)[0];
             return assertUnfinalizedPoolRewardsAsync(pool.poolId, {
-                totalReward: (reward as any) as BigNumber,
+                totalReward: reward,
                 membersStake: pool.membersStake,
             });
         });

contracts/staking/test/unit_tests/lib_cobb_douglas_test.ts

@@ -12,17 +12,13 @@ import * as _ from 'lodash';
 import { artifacts } from '../artifacts';
 import { TestCobbDouglasContract } from '../wrappers';
 
-// tslint:disable: no-unnecessary-type-assertion
 blockchainTests('LibCobbDouglas unit tests', env => {
     const FUZZ_COUNT = 1024;
     const PRECISION = 15;
 
     let testContract: TestCobbDouglasContract;
-    let ownerAddress: string;
-    let notOwnerAddress: string;
 
     before(async () => {
-        [ownerAddress, notOwnerAddress] = await env.getAccountAddressesAsync();
         testContract = await TestCobbDouglasContract.deployFrom0xArtifactAsync(
             artifacts.TestCobbDouglas,
             env.provider,
@@ -211,4 +207,3 @@ blockchainTests('LibCobbDouglas unit tests', env => {
         });
     });
 });
-// tslint:enable:no-unnecessary-type-assertion

contracts/staking/test/wrappers.ts

@@ -31,6 +31,7 @@ export * from '../test/generated-wrappers/mixin_staking_pool';
 export * from '../test/generated-wrappers/mixin_staking_pool_rewards';
 export * from '../test/generated-wrappers/mixin_storage';
 export * from '../test/generated-wrappers/staking';
+export * from '../test/generated-wrappers/staking_patch';
 export * from '../test/generated-wrappers/staking_proxy';
 export * from '../test/generated-wrappers/test_assert_storage_params';
 export * from '../test/generated-wrappers/test_cobb_douglas';

contracts/staking/tsconfig.json

@@ -40,6 +40,7 @@
         "test/generated-artifacts/MixinStakingPoolRewards.json",
         "test/generated-artifacts/MixinStorage.json",
         "test/generated-artifacts/Staking.json",
+        "test/generated-artifacts/StakingPatch.json",
         "test/generated-artifacts/StakingProxy.json",
         "test/generated-artifacts/TestAssertStorageParams.json",
         "test/generated-artifacts/TestCobbDouglas.json",

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,194 @@
 [
+    {
+        "timestamp": 1621600614,
+        "version": "5.4.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "5.4.0",
+        "changes": [
+            {
+                "note": "Set default ganache gas limit to 100e6",
+                "pr": 197
+            }
+        ],
+        "timestamp": 1620214333
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "5.3.25",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "5.3.24",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "5.3.23",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "5.3.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1612950500,
+        "version": "5.3.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1611648096,
+        "version": "5.3.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1610510890,
+        "version": "5.3.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1609802516,
+        "version": "5.3.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608692071,
+        "version": "5.3.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1608245516,
+        "version": "5.3.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607485227,
+        "version": "5.3.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1607381756,
+        "version": "5.3.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1606961263,
+        "version": "5.3.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605763885,
+        "version": "5.3.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "5.3.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "5.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "5.3.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "5.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "5.3.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1603833198,
         "version": "5.3.6",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,90 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.1 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v5.4.0 - _May 5, 2021_
+
+    * Set default ganache gas limit to 100e6 (#197)
+
+## v5.3.25 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v5.3.24 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v5.3.23 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v5.3.22 - _February 24, 2021_
+
+    * Dependencies updated
+
+## v5.3.21 - _February 10, 2021_
+
+    * Dependencies updated
+
+## v5.3.20 - _January 26, 2021_
+
+    * Dependencies updated
+
+## v5.3.19 - _January 13, 2021_
+
+    * Dependencies updated
+
+## v5.3.18 - _January 4, 2021_
+
+    * Dependencies updated
+
+## v5.3.17 - _December 23, 2020_
+
+    * Dependencies updated
+
+## v5.3.16 - _December 17, 2020_
+
+    * Dependencies updated
+
+## v5.3.15 - _December 9, 2020_
+
+    * Dependencies updated
+
+## v5.3.14 - _December 7, 2020_
+
+    * Dependencies updated
+
+## v5.3.13 - _December 3, 2020_
+
+    * Dependencies updated
+
+## v5.3.12 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v5.3.11 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v5.3.10 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v5.3.9 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v5.3.8 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v5.3.7 - _October 28, 2020_
+
+    * Dependencies updated
+
 ## v5.3.6 - _October 27, 2020_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.3.6",
+    "version": "5.4.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,28 +34,28 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
     "devDependencies": {
-        "@0x/sol-compiler": "^4.2.3",
-        "@0x/tslint-config": "^4.1.3",
+        "@0x/sol-compiler": "^4.7.3",
+        "@0x/tslint-config": "^4.1.4",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.13",
-        "@0x/base-contract": "^6.2.7",
-        "@0x/contract-addresses": "^5.0.0",
-        "@0x/dev-utils": "^3.3.4",
-        "@0x/json-schemas": "^5.2.3",
-        "@0x/order-utils": "^10.4.1",
-        "@0x/sol-coverage": "^4.0.14",
-        "@0x/sol-profiler": "^4.1.4",
-        "@0x/sol-trace": "^3.0.14",
-        "@0x/subproviders": "^6.1.5",
-        "@0x/types": "^3.2.4",
-        "@0x/typescript-typings": "^5.1.5",
-        "@0x/utils": "^5.6.3",
-        "@0x/web3-wrapper": "^7.2.4",
+        "@0x/assert": "^3.0.27",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contract-addresses": "^6.2.0",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/json-schemas": "^6.1.3",
+        "@0x/order-utils": "^10.4.22",
+        "@0x/sol-coverage": "^4.0.37",
+        "@0x/sol-profiler": "^4.1.27",
+        "@0x/sol-trace": "^3.0.37",
+        "@0x/subproviders": "^6.5.3",
+        "@0x/types": "^3.3.3",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",
@@ -67,8 +67,8 @@
         "chai-bignumber": "^3.0.0",
         "decimal.js": "^10.2.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.3.3",
-        "ethereumjs-util": "^5.1.1",
+        "ethereum-types": "^3.5.0",
+        "ethereumjs-util": "^7.0.10",
         "ethers": "~4.0.4",
         "js-combinatorics": "^0.5.3",
         "lodash": "^4.17.11",