Publish

- @0x/contracts-integrations@2.7.47
 - @0x/contracts-treasury@1.2.0
 - @0x/asset-swapper@6.17.0

.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 }} && \

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "3.7.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.7.13 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "3.7.6",
+    "version": "3.7.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,15 +51,15 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contract-wrappers": "^13.12.3",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contract-wrappers": "^13.16.3",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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.18",
-        "@0x/contracts-erc1155": "^2.1.24",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-erc721": "^3.1.24",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/types": "^3.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
-        "ethereum-types": "^3.4.0",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-erc1155": "^2.1.31",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-erc721": "^3.1.31",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/order-utils": "^10.4.23",
+        "@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/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/broker/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "1.1.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/broker/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.31 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/broker/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-broker",
-    "version": "1.1.24",
+    "version": "1.1.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,20 +51,20 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-erc721": "^3.1.24",
-        "@0x/contracts-exchange": "^3.2.25",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-erc721": "^3.1.31",
+        "@0x/contracts-exchange": "^3.2.32",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.18",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "ethereum-types": "^3.4.0"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/order-utils": "^10.4.23",
+        "@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,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "3.1.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.32 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "3.1.25",
+    "version": "3.1.32",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,17 +52,17 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-dev-utils": "^1.3.23",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-dev-utils": "^1.3.30",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.23",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.21",
-        "@0x/base-contract": "^6.2.18",
-        "@0x/contract-addresses": "^5.10.0",
-        "@0x/contracts-exchange": "^3.2.25",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/json-schemas": "^5.4.1",
-        "@0x/types": "^3.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "ethereum-types": "^3.4.0",
+        "@0x/assert": "^3.0.27",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contract-addresses": "^6.3.0",
+        "@0x/contracts-exchange": "^3.2.32",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "1.3.30",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.3.30 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-dev-utils",
-    "version": "1.3.23",
+    "version": "1.3.30",
     "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.19",
-        "@0x/assert": "^3.0.21",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/assert": "^3.0.27",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/utils": "^6.2.0",
-        "ethereum-types": "^3.4.0",
+        "@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.18",
+        "@0x/base-contract": "^6.4.0",
         "@types/node": "12.12.54"
     },
     "publishConfig": {

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "2.1.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/erc1155/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.31 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/erc1155/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc1155",
-    "version": "2.1.24",
+    "version": "2.1.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,15 +52,15 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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.3.1",
-        "@0x/typescript-typings": "^5.1.6",
+        "@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.4.0",
+        "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.18",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/utils": "^6.4.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "3.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.3.10 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.3",
+    "version": "3.3.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,18 +51,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.4.0",
+        "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.18"
+        "@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,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "3.1.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/erc721/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.31 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/erc721/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc721",
-    "version": "3.1.24",
+    "version": "3.1.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,18 +52,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.4.0",
+        "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.18"
+        "@0x/base-contract": "^6.4.0"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-forwarder/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "4.2.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/exchange-forwarder/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.2.32 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/exchange-forwarder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-forwarder",
-    "version": "4.2.25",
+    "version": "4.2.32",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,25 +52,25 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-dev-utils": "^1.3.23",
-        "@0x/contracts-erc1155": "^2.1.24",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-erc721": "^3.1.24",
-        "@0x/contracts-exchange": "^3.2.25",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-dev-utils": "^1.3.30",
+        "@0x/contracts-erc1155": "^2.1.31",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-erc721": "^3.1.31",
+        "@0x/contracts-exchange": "^3.2.32",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.23",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.18",
-        "@0x/typescript-typings": "^5.1.6",
-        "ethereum-types": "^3.4.0"
+        "@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,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "4.3.31",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/exchange-libs/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.3.31 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/exchange-libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-libs",
-    "version": "4.3.24",
+    "version": "4.3.31",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,14 +52,14 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/libs",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
-        "@0x/subproviders": "^6.4.1",
+        "@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.4.1",
+        "@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.18",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/types": "^3.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "ethereum-types": "^3.4.0"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@0x/order-utils": "^10.4.23",
+        "@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,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "3.2.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/exchange/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.2.32 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/exchange/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "3.2.25",
+    "version": "3.2.32",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,21 +52,21 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-multisig": "^4.1.25",
-        "@0x/contracts-staking": "^2.0.32",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-multisig": "^4.1.32",
+        "@0x/contracts-staking": "^2.0.39",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.4.0",
-        "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.18",
-        "@0x/contracts-dev-utils": "^1.3.23",
-        "@0x/contracts-erc1155": "^2.1.24",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-erc721": "^3.1.24",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/utils": "^6.2.0",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-dev-utils": "^1.3.30",
+        "@0x/contracts-erc1155": "^2.1.31",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-erc721": "^3.1.31",
+        "@0x/order-utils": "^10.4.23",
+        "@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,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "6.2.26",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v6.2.26 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "6.2.19",
+    "version": "6.2.26",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,23 +52,23 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-dev-utils": "^1.3.23",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-erc721": "^3.1.24",
-        "@0x/contracts-exchange": "^3.2.25",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-dev-utils": "^1.3.30",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-erc721": "^3.1.31",
+        "@0x/contracts-exchange": "^3.2.32",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.10",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.23",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.18",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/typescript-typings": "^5.1.6",
-        "ethereum-types": "^3.4.0"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/typescript-typings": "^5.2.0",
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/integrations/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-integrations",
-    "version": "2.7.26",
+    "version": "2.7.47",
     "private": true,
     "engines": {
         "node": ">=6.12"
@@ -52,25 +52,25 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contract-addresses": "^5.10.0",
-        "@0x/contract-wrappers": "^13.12.3",
-        "@0x/contracts-broker": "^1.1.24",
-        "@0x/contracts-coordinator": "^3.1.25",
-        "@0x/contracts-dev-utils": "^1.3.23",
-        "@0x/contracts-exchange-forwarder": "^4.2.25",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/contracts-extensions": "^6.2.19",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-utils": "^4.7.3",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contract-addresses": "^6.3.0",
+        "@0x/contract-wrappers": "^13.16.3",
+        "@0x/contracts-broker": "^1.1.31",
+        "@0x/contracts-coordinator": "^3.1.32",
+        "@0x/contracts-dev-utils": "^1.3.30",
+        "@0x/contracts-exchange-forwarder": "^4.2.32",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/contracts-extensions": "^6.2.26",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.10",
         "@0x/coordinator-server": "^1.0.5",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/migrations": "^6.6.0",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/protocol-utils": "^1.2.0",
-        "@0x/sol-compiler": "^4.5.2",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/migrations": "^8.0.8",
+        "@0x/order-utils": "^10.4.23",
+        "@0x/protocol-utils": "^1.6.2",
+        "@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",
@@ -90,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": "^6.0.0",
-        "@0x/base-contract": "^6.2.18",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-erc1155": "^2.1.24",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-erc721": "^3.1.24",
-        "@0x/contracts-exchange": "^3.2.25",
-        "@0x/contracts-multisig": "^4.1.25",
-        "@0x/contracts-staking": "^2.0.32",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-zero-ex": "^0.18.2",
-        "@0x/subproviders": "^6.4.1",
-        "@0x/types": "^3.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "ethereum-types": "^3.4.0",
-        "ethereumjs-util": "^6.2.0",
+        "@0x/asset-swapper": "^6.17.0",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-erc1155": "^2.1.31",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-erc721": "^3.1.31",
+        "@0x/contracts-exchange": "^3.2.32",
+        "@0x/contracts-multisig": "^4.1.32",
+        "@0x/contracts-staking": "^2.0.39",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-zero-ex": "^0.24.1",
+        "@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/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/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/multisig/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "4.1.32",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.1.32 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "4.1.25",
+    "version": "4.1.32",
     "engines": {
         "node": ">=6.12"
     },
@@ -49,18 +49,18 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/multisig",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/sol-compiler": "^4.5.2",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/contracts-utils": "^4.7.10",
+        "@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.18",
-        "@0x/typescript-typings": "^5.1.6",
-        "ethereum-types": "^3.4.0"
+        "@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,68 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "2.0.39",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/staking/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.39 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

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.32",
+    "version": "2.0.39",
     "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.19",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-dev-utils": "^1.3.23",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-exchange-libs": "^4.3.24",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-utils": "^4.7.3",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/sol-compiler": "^4.5.2",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-dev-utils": "^1.3.30",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-exchange-libs": "^4.3.31",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-utils": "^4.7.10",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.23",
+        "@0x/sol-compiler": "^4.7.3",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@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.18",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "ethereum-types": "^3.4.0",
-        "ethereumjs-util": "^5.1.1"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@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,68 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "5.4.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.4.2 - _May 25, 2021_
+
+    * Dependencies updated
+
+## 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

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.3.21",
+    "version": "5.4.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -34,28 +34,28 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
     "devDependencies": {
-        "@0x/sol-compiler": "^4.5.2",
-        "@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.21",
-        "@0x/base-contract": "^6.2.18",
-        "@0x/contract-addresses": "^5.10.0",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/json-schemas": "^5.4.1",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/sol-coverage": "^4.0.29",
-        "@0x/sol-profiler": "^4.1.19",
-        "@0x/sol-trace": "^3.0.29",
-        "@0x/subproviders": "^6.4.1",
-        "@0x/types": "^3.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@0x/assert": "^3.0.27",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/contract-addresses": "^6.3.0",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/json-schemas": "^6.1.3",
+        "@0x/order-utils": "^10.4.23",
+        "@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.4.0",
-        "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",

contracts/test-utils/src/constants.ts

@@ -77,7 +77,7 @@ export const constants = {
     ZERO_AMOUNT: new BigNumber(0),
     PERCENTAGE_DENOMINATOR: new BigNumber(10).pow(18),
     TIME_BUFFER: new BigNumber(1000),
-    KECCAK256_NULL: ethUtil.addHexPrefix(ethUtil.bufferToHex(ethUtil.SHA3_NULL)),
+    KECCAK256_NULL: ethUtil.bufferToHex(ethUtil.keccak256(Buffer.alloc(0))),
     MAX_UINT256_ROOT: new BigNumber('340282366920938463463374607431768211456'),
     ONE_ETHER: new BigNumber(1e18),
     EIP712_DOMAIN_NAME: '0x Protocol',

contracts/test-utils/src/lang_utils.ts

@@ -14,6 +14,6 @@ export function shortZip<T1, T2>(a: T1[], b: T2[]): Array<[T1, T2]> {
 export function replaceKeysDeep(obj: {}, mapKeys: (key: string) => string | void): _.Dictionary<{}> {
     return _.transform(obj, (result, value, key) => {
         const currentKey = mapKeys(key) || key;
-        result[currentKey] = _.isObject(value) ? replaceKeysDeep(value, mapKeys) : value;
+        result[currentKey] = _.isObject(value) ? replaceKeysDeep(value as {}, mapKeys) : (value as {});
     });
 }

contracts/test-utils/src/order_factory.ts

@@ -22,14 +22,14 @@ export class OrderFactory {
     ): Promise<SignedOrder> {
         const fifteenMinutesInSeconds = 15 * 60;
         const currentBlockTimestamp = await getLatestBlockTimestampAsync();
-        const order = ({
+        const order = {
             takerAddress: constants.NULL_ADDRESS,
             senderAddress: constants.NULL_ADDRESS,
             expirationTimeSeconds: new BigNumber(currentBlockTimestamp).plus(fifteenMinutesInSeconds),
             salt: generatePseudoRandomSalt(),
             ...this._defaultOrderParams,
             ...customOrderParams,
-        } as any) as Order;
+        } as Order; // tslint:disable-line:no-object-literal-type-assertion
         const orderHashBuff = orderHashUtils.getOrderHashBuffer(order);
         const signature = signingUtils.signMessage(orderHashBuff, this._privateKey, signatureType);
         const signedOrder = {

contracts/test-utils/src/order_utils.ts

@@ -30,7 +30,8 @@ export const orderUtils = {
         return cancel;
     },
     createOrderWithoutSignature(signedOrder: SignedOrder): Order {
-        return _.omit(signedOrder, ['signature']) as Order;
+        const { signature, ...order } = signedOrder;
+        return order;
     },
     createBatchMatchOrders(signedOrdersLeft: SignedOrder[], signedOrdersRight: SignedOrder[]): BatchMatchOrder {
         return {

contracts/test-utils/src/web3_wrapper.ts

@@ -20,6 +20,7 @@ export let providerConfigs: Web3Config = {
     shouldUseInProcessGanache: true,
     shouldAllowUnlimitedContractSize: true,
     hardfork: 'istanbul',
+    gasLimit: 100e6,
     unlocked_accounts: [
         '0x6cc5f688a315f3dc28a7781717a9a798a59fda7b',
         '0x55dc8f21d20d4c6ed3c82916a438a413ca68e335',

contracts/test-utils/test/order_hash_test.ts

@@ -57,9 +57,7 @@ describe('Order hashing', () => {
                 ...order,
                 takerAddress: (null as any) as string,
             };
-            const expectedErrorMessage = `Order taker must be of type string. If you want anyone to be able to fill an order - pass ${
-                constants.NULL_ADDRESS
-            }`;
+            const expectedErrorMessage = `Expected order to conform to schema`;
             expect(() => orderHashUtils.getOrderHashHex(orderWithInvalidtakerFormat)).to.throw(expectedErrorMessage);
         });
     });

contracts/treasury/CHANGELOG.json

@@ -1,4 +1,106 @@
 [
+    {
+        "version": "1.2.0",
+        "changes": [
+            {
+                "note": "Added proposal 0 params and test",
+                "pr": 252
+            }
+        ],
+        "timestamp": 1622154125
+    },
+    {
+        "timestamp": 1621944788,
+        "version": "1.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1621600614,
+        "version": "1.1.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "1.1.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.1.5",
+        "changes": [
+            {
+                "note": "Patched votingPower logic",
+                "pr": 214
+            }
+        ],
+        "timestamp": 1619825976
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "1.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619481586,
+        "version": "1.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1618259868,
+        "version": "1.1.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "1.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.1.0",
+        "changes": [
+            {
+                "note": "Make the proposal/quorum thresholds updatable",
+                "pr": 165
+            }
+        ],
+        "timestamp": 1616005394
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1612950500,
         "version": "1.0.1",

contracts/treasury/CHANGELOG.md

@@ -5,6 +5,50 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.2.0 - _May 27, 2021_
+
+    * Added proposal 0 params and test (#252)
+
+## v1.1.8 - _May 25, 2021_
+
+    * Dependencies updated
+
+## v1.1.7 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v1.1.6 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v1.1.5 - _April 30, 2021_
+
+    * Patched votingPower logic (#214)
+
+## v1.1.4 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v1.1.3 - _April 26, 2021_
+
+    * Dependencies updated
+
+## v1.1.2 - _April 12, 2021_
+
+    * Dependencies updated
+
+## v1.1.1 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v1.1.0 - _March 17, 2021_
+
+    * Make the proposal/quorum thresholds updatable (#165)
+
+## v1.0.2 - _February 24, 2021_
+
+    * Dependencies updated
+
 ## v1.0.1 - _February 10, 2021_
 
     * Dependencies updated

contracts/treasury/contracts/src/IZrxTreasury.sol

@@ -30,6 +30,7 @@ interface IZrxTreasury {
         uint256 votingPeriod;
         uint256 proposalThreshold;
         uint256 quorumThreshold;
+        bytes32 defaultPoolId;
     }
 
     struct ProposedAction {
@@ -96,6 +97,18 @@ interface IZrxTreasury {
         view
         returns (uint256);
 
+    /// @dev Updates the proposal and quorum thresholds to the given
+    ///      values. Note that this function is only callable by the
+    ///      treasury contract itself, so the threshold can only be
+    ///      updated via a successful treasury proposal.
+    /// @param newProposalThreshold The new value for the proposal threshold.
+    /// @param newQuorumThreshold The new value for the quorum threshold.
+    function updateThresholds(
+        uint256 newProposalThreshold,
+        uint256 newQuorumThreshold
+    )
+        external;
+
     /// @dev Creates a proposal to send ZRX from this treasury on the
     ///      the given actions. Must have at least `proposalThreshold`
     ///      of voting power to call this function. See `getVotingPower`

contracts/treasury/contracts/src/ZrxTreasury.sol

@@ -20,8 +20,6 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
-import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibBytesV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
@@ -32,7 +30,6 @@ import "./IZrxTreasury.sol";
 contract ZrxTreasury is
     IZrxTreasury
 {
-    using LibERC20TokenV06 for IERC20TokenV06;
     using LibSafeMathV06 for uint256;
     using LibRichErrorsV06 for bytes;
     using LibBytesV06 for bytes;
@@ -42,8 +39,8 @@ contract ZrxTreasury is
     DefaultPoolOperator public immutable override defaultPoolOperator;
     bytes32 public immutable override defaultPoolId;
     uint256 public immutable override votingPeriod;
-    uint256 public immutable override proposalThreshold;
-    uint256 public immutable override quorumThreshold;
+    uint256 public override proposalThreshold;
+    uint256 public override quorumThreshold;
 
     // Storage
     Proposal[] public proposals;
@@ -52,11 +49,9 @@ contract ZrxTreasury is
     /// @dev Initializes the ZRX treasury and creates the default
     ///      staking pool.
     /// @param stakingProxy_ The 0x staking proxy contract.
-    /// @param weth_ The WETH token contract.
     /// @param params Immutable treasury parameters.
     constructor(
         IStaking stakingProxy_,
-        IERC20TokenV06 weth_,
         TreasuryParameters memory params
     )
         public
@@ -66,15 +61,12 @@ contract ZrxTreasury is
             "VOTING_PERIOD_TOO_LONG"
         );
         stakingProxy = stakingProxy_;
-        DefaultPoolOperator defaultPoolOperator_ = new DefaultPoolOperator(
-            stakingProxy_,
-            weth_
-        );
-        defaultPoolOperator = defaultPoolOperator_;
-        defaultPoolId = defaultPoolOperator_.poolId();
         votingPeriod = params.votingPeriod;
         proposalThreshold = params.proposalThreshold;
         quorumThreshold = params.quorumThreshold;
+        defaultPoolId = params.defaultPoolId;
+        IStaking.Pool memory defaultPool = stakingProxy_.getStakingPool(params.defaultPoolId);
+        defaultPoolOperator = DefaultPoolOperator(defaultPool.operator);
     }
 
     // solhint-disable
@@ -82,6 +74,24 @@ contract ZrxTreasury is
     receive() external payable {}
     // solhint-enable
 
+    /// @dev Updates the proposal and quorum thresholds to the given
+    ///      values. Note that this function is only callable by the
+    ///      treasury contract itself, so the threshold can only be
+    ///      updated via a successful treasury proposal.
+    /// @param newProposalThreshold The new value for the proposal threshold.
+    /// @param newQuorumThreshold The new value for the quorum threshold.
+    function updateThresholds(
+        uint256 newProposalThreshold,
+        uint256 newQuorumThreshold
+    )
+        external
+        override
+    {
+        require(msg.sender == address(this), "updateThresholds/ONLY_SELF");
+        proposalThreshold = newProposalThreshold;
+        quorumThreshold = newQuorumThreshold;
+    }
+
     /// @dev Creates a proposal to send ZRX from this treasury on the
     ///      the given actions. Must have at least `proposalThreshold`
     ///      of voting power to call this function. See `getVotingPower`
@@ -268,6 +278,12 @@ contract ZrxTreasury is
 
         // Add voting power for operated staking pools.
         for (uint256 i = 0; i != operatedPoolIds.length; i++) {
+            for (uint256 j = 0; j != i; j++) {
+                require(
+                    operatedPoolIds[i] != operatedPoolIds[j],
+                    "getVotingPower/DUPLICATE_POOL_ID"
+                );
+            }
             IStaking.Pool memory pool = stakingProxy.getStakingPool(operatedPoolIds[i]);
             require(
                 pool.operator == account,

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.0.1",
+    "version": "1.2.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,16 +46,16 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.13",
-        "@0x/contract-addresses": "^5.10.0",
-        "@0x/contracts-asset-proxy": "^3.7.6",
-        "@0x/contracts-erc20": "^3.3.3",
-        "@0x/contracts-gen": "^2.0.24",
-        "@0x/contracts-staking": "^2.0.32",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/sol-compiler": "^4.4.1",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contract-addresses": "^6.3.0",
+        "@0x/contracts-asset-proxy": "^3.7.13",
+        "@0x/contracts-erc20": "^3.3.10",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-staking": "^2.0.39",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@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/isomorphic-fetch": "^0.0.35",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,18 +69,18 @@
         "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.14",
-        "@0x/protocol-utils": "^1.2.0",
-        "@0x/subproviders": "^6.2.3",
-        "@0x/types": "^3.3.1",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.1.1",
-        "@0x/web3-wrapper": "^7.3.0",
-        "ethereum-types": "^3.4.0",
-        "ethereumjs-util": "^5.1.1"
+        "@0x/base-contract": "^6.4.0",
+        "@0x/protocol-utils": "^1.6.2",
+        "@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",
+        "ethereum-types": "^3.5.0",
+        "ethereumjs-util": "^7.0.10"
     },
     "publishConfig": {
         "access": "public"

contracts/treasury/test/proposal_test.ts

@@ -0,0 +1,154 @@
+import { artifacts as erc20Artifacts, ERC20TokenEvents } from '@0x/contracts-erc20';
+import { StakingContract, StakingProxyContract } from '@0x/contracts-staking';
+import { blockchainTests, constants, verifyEventsFromLogs } from '@0x/contracts-test-utils';
+import { BigNumber, hexUtils, logUtils } from '@0x/utils';
+import * as _ from 'lodash';
+
+import { proposals } from '../src/proposals';
+
+import { artifacts } from './artifacts';
+import { ZrxTreasuryContract, ZrxTreasuryEvents } from './wrappers';
+
+const SUBGRAPH_URL = 'https://api.thegraph.com/subgraphs/name/mzhu25/zeroex-staking';
+const STAKING_PROXY_ADDRESS = '0xa26e80e7dea86279c6d778d702cc413e6cffa777';
+const TREASURY_ADDRESS = '0x0bb1810061c2f5b2088054ee184e6c79e1591101';
+const PROPOSER = process.env.PROPOSER || constants.NULL_ADDRESS;
+const VOTER = '0xba4f44e774158408e2dc6c5cb65bc995f0a89180';
+const VOTER_OPERATED_POOLS = ['0x0000000000000000000000000000000000000000000000000000000000000017'];
+blockchainTests.configure({
+    fork: {
+        unlockedAccounts: [PROPOSER, VOTER],
+    },
+});
+
+async function querySubgraphAsync(operatorAddress: string): Promise<string[]> {
+    const query = `
+        {
+            stakingActor(id: "${operatorAddress}") {
+                operatedPools {
+                    id
+                }
+            }
+        }
+    `;
+    const response = await fetch(SUBGRAPH_URL, {
+        method: 'POST',
+        headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            query,
+        }),
+    });
+    const {
+        data: { stakingActor },
+    } = await response.json();
+    if (stakingActor) {
+        return stakingActor.operatedPools.map((pool: { id: string }) => hexUtils.leftPad(pool.id));
+    } else {
+        return [];
+    }
+}
+
+blockchainTests.fork.skip('Treasury proposal mainnet fork tests', env => {
+    let staking: StakingContract;
+    let stakingProxy: StakingProxyContract;
+    let treasury: ZrxTreasuryContract;
+    let votingPeriod: BigNumber;
+
+    async function fastForwardToNextEpochAsync(): Promise<void> {
+        const epochEndTime = await staking.getCurrentEpochEarliestEndTimeInSeconds().callAsync();
+        const lastBlockTime = await env.web3Wrapper.getBlockTimestampAsync('latest');
+        const dt = Math.max(0, epochEndTime.minus(lastBlockTime).toNumber());
+        await env.web3Wrapper.increaseTimeAsync(dt);
+        // mine next block
+        await env.web3Wrapper.mineBlockAsync();
+        const lastPoolId = new BigNumber(await staking.lastPoolId().callAsync(), 16);
+        const batchExecuteCalldata = [
+            ...[...new Array(lastPoolId.toNumber())].map((_x, i) =>
+                staking.finalizePool(hexUtils.leftPad(i + 1)).getABIEncodedTransactionData(),
+            ),
+            staking.endEpoch().getABIEncodedTransactionData(),
+            ...[...new Array(lastPoolId.toNumber())].map((_x, i) =>
+                staking.finalizePool(hexUtils.leftPad(i + 1)).getABIEncodedTransactionData(),
+            ),
+            ...[...new Array(lastPoolId.toNumber())].map((_x, i) =>
+                staking.finalizePool(hexUtils.leftPad(i + 1)).getABIEncodedTransactionData(),
+            ),
+        ];
+        await stakingProxy.batchExecute(batchExecuteCalldata).awaitTransactionSuccessAsync();
+    }
+
+    before(async () => {
+        const abis = _.mapValues({ ...artifacts, ...erc20Artifacts }, v => v.compilerOutput.abi);
+        treasury = new ZrxTreasuryContract(TREASURY_ADDRESS, env.provider, env.txDefaults, abis);
+        votingPeriod = await treasury.votingPeriod().callAsync();
+        staking = new StakingContract(STAKING_PROXY_ADDRESS, env.provider, env.txDefaults);
+        stakingProxy = new StakingProxyContract(STAKING_PROXY_ADDRESS, env.provider, env.txDefaults);
+    });
+
+    describe('Proposal 0', () => {
+        it('works', async () => {
+            const proposal = proposals[0];
+            let executionEpoch: BigNumber;
+            if (proposal.executionEpoch) {
+                executionEpoch = proposal.executionEpoch;
+            } else {
+                const currentEpoch = await staking.currentEpoch().callAsync();
+                executionEpoch = currentEpoch.plus(2);
+            }
+            const pools = await querySubgraphAsync(PROPOSER);
+            const proposeTx = treasury.propose(proposal.actions, executionEpoch, proposal.description, pools);
+
+            const calldata = proposeTx.getABIEncodedTransactionData();
+            logUtils.log('ZrxTreasury.propose calldata:');
+            logUtils.log(calldata);
+
+            const proposalId = await proposeTx.callAsync({ from: PROPOSER });
+            const receipt = await proposeTx.awaitTransactionSuccessAsync({ from: PROPOSER });
+            verifyEventsFromLogs(
+                receipt.logs,
+                [
+                    {
+                        ...proposal,
+                        proposalId,
+                        executionEpoch,
+                        proposer: PROPOSER,
+                        operatedPoolIds: pools,
+                    },
+                ],
+                ZrxTreasuryEvents.ProposalCreated,
+            );
+            await fastForwardToNextEpochAsync();
+            await fastForwardToNextEpochAsync();
+            await treasury
+                .castVote(proposalId, true, VOTER_OPERATED_POOLS)
+                .awaitTransactionSuccessAsync({ from: VOTER });
+            await env.web3Wrapper.increaseTimeAsync(votingPeriod.plus(1).toNumber());
+            await env.web3Wrapper.mineBlockAsync();
+            const executeTx = await treasury.execute(proposalId, proposal.actions).awaitTransactionSuccessAsync();
+            verifyEventsFromLogs(
+                executeTx.logs,
+                [
+                    {
+                        proposalId,
+                    },
+                ],
+                ZrxTreasuryEvents.ProposalExecuted,
+            );
+            const recipient = '0xf9347f751a6a1467abc722ec7d80ba2698dd9d6c';
+            verifyEventsFromLogs(
+                executeTx.logs,
+                [
+                    {
+                        _from: TREASURY_ADDRESS,
+                        _to: recipient,
+                        _value: new BigNumber(400_000).times('1e18'),
+                    },
+                ],
+                ERC20TokenEvents.Transfer,
+            );
+        });
+    });
+});

contracts/treasury/test/treasury_test.ts

@@ -28,6 +28,7 @@ blockchainTests.resets('Treasury governance', env => {
         votingPeriod: new BigNumber(3).times(stakingConstants.ONE_DAY_IN_SECONDS),
         proposalThreshold: new BigNumber(100),
         quorumThreshold: new BigNumber(1000),
+        defaultPoolId: stakingConstants.INITIAL_POOL_ID,
     };
     const PROPOSAL_DESCRIPTION = 'A very compelling proposal!';
     const TREASURY_BALANCE = constants.INITIAL_ERC20_BALANCE;
@@ -135,6 +136,16 @@ blockchainTests.resets('Treasury governance', env => {
             .approve(erc20ProxyContract.address, constants.INITIAL_ERC20_ALLOWANCE)
             .awaitTransactionSuccessAsync({ from: delegator });
 
+        defaultPoolOperator = await DefaultPoolOperatorContract.deployFrom0xArtifactAsync(
+            artifacts.DefaultPoolOperator,
+            env.provider,
+            env.txDefaults,
+            { ...artifacts, ...erc20Artifacts },
+            staking.address,
+            weth.address,
+        );
+        defaultPoolId = stakingConstants.INITIAL_POOL_ID;
+
         const createStakingPoolTx = staking.createStakingPool(stakingConstants.PPM, false);
         nonDefaultPoolId = await createStakingPoolTx.callAsync({ from: poolOperator });
         await createStakingPoolTx.awaitTransactionSuccessAsync({ from: poolOperator });
@@ -145,9 +156,9 @@ blockchainTests.resets('Treasury governance', env => {
             env.txDefaults,
             { ...artifacts, ...erc20Artifacts },
             staking.address,
-            weth.address,
             TREASURY_PARAMS,
         );
+
         await zrx.mint(TREASURY_BALANCE).awaitTransactionSuccessAsync();
         await zrx.transfer(treasury.address, TREASURY_BALANCE).awaitTransactionSuccessAsync();
         actions = [
@@ -166,10 +177,6 @@ blockchainTests.resets('Treasury governance', env => {
                 value: constants.ZERO_AMOUNT,
             },
         ];
-
-        defaultPoolId = await treasury.defaultPoolId().callAsync();
-        const defaultPoolOperatorAddress = await treasury.defaultPoolOperator().callAsync();
-        defaultPoolOperator = new DefaultPoolOperatorContract(defaultPoolOperatorAddress, env.provider, env.txDefaults);
     });
     describe('getVotingPower()', () => {
         it('Unstaked ZRX has no voting power', async () => {
@@ -222,6 +229,19 @@ blockchainTests.resets('Treasury governance', env => {
             const operatorVotingPower = await treasury.getVotingPower(poolOperator, [nonDefaultPoolId]).callAsync();
             expect(operatorVotingPower).to.bignumber.equal(TREASURY_PARAMS.proposalThreshold.dividedBy(2));
         });
+        it('Reverts if given duplicate pool IDs', async () => {
+            await staking.stake(TREASURY_PARAMS.proposalThreshold).awaitTransactionSuccessAsync({ from: delegator });
+            await staking
+                .moveStake(
+                    new StakeInfo(StakeStatus.Undelegated),
+                    new StakeInfo(StakeStatus.Delegated, nonDefaultPoolId),
+                    TREASURY_PARAMS.proposalThreshold,
+                )
+                .awaitTransactionSuccessAsync({ from: delegator });
+            await fastForwardToNextEpochAsync();
+            const tx = treasury.getVotingPower(poolOperator, [nonDefaultPoolId, nonDefaultPoolId]).callAsync();
+            return expect(tx).to.revertWith('getVotingPower/DUPLICATE_POOL_ID');
+        });
         it('Correctly sums voting power delegated to multiple pools', async () => {
             await staking
                 .stake(TREASURY_PARAMS.proposalThreshold.times(2))
@@ -580,4 +600,47 @@ blockchainTests.resets('Treasury governance', env => {
             expect(await weth.balanceOf(staking.address).callAsync()).to.bignumber.equal(wethAmount);
         });
     });
+    describe('Can update thresholds via proposal', () => {
+        it('Updates proposal and quorum thresholds', async () => {
+            // Delegator has enough ZRX to create and pass a proposal
+            await staking.stake(TREASURY_PARAMS.quorumThreshold).awaitTransactionSuccessAsync({ from: delegator });
+            await staking
+                .moveStake(
+                    new StakeInfo(StakeStatus.Undelegated),
+                    new StakeInfo(StakeStatus.Delegated, defaultPoolId),
+                    TREASURY_PARAMS.quorumThreshold,
+                )
+                .awaitTransactionSuccessAsync({ from: delegator });
+            await fastForwardToNextEpochAsync();
+            const currentEpoch = await staking.currentEpoch().callAsync();
+            const newProposalThreshold = new BigNumber(420);
+            const newQuorumThreshold = new BigNumber(1337);
+            const updateThresholdsAction = {
+                target: treasury.address,
+                data: treasury
+                    .updateThresholds(newProposalThreshold, newQuorumThreshold)
+                    .getABIEncodedTransactionData(),
+                value: constants.ZERO_AMOUNT,
+            };
+            const tx = treasury.propose(
+                [updateThresholdsAction],
+                currentEpoch.plus(3),
+                `Updates proposal threshold to ${newProposalThreshold} and quorum threshold to ${newQuorumThreshold}`,
+                [],
+            );
+            const proposalId = await tx.callAsync({ from: delegator });
+            await tx.awaitTransactionSuccessAsync({ from: delegator });
+            await fastForwardToNextEpochAsync();
+            await fastForwardToNextEpochAsync();
+            await treasury.castVote(proposalId, true, []).awaitTransactionSuccessAsync({ from: delegator });
+            await fastForwardToNextEpochAsync();
+            await treasury
+                .execute(proposalId, [updateThresholdsAction])
+                .awaitTransactionSuccessAsync({ from: delegator });
+            const proposalThreshold = await treasury.proposalThreshold().callAsync();
+            const quorumThreshold = await treasury.quorumThreshold().callAsync();
+            expect(proposalThreshold).to.bignumber.equal(newProposalThreshold);
+            expect(quorumThreshold).to.bignumber.equal(newQuorumThreshold);
+        });
+    });
 });

contracts/utils/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "4.7.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1621600614,
+        "version": "4.7.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1620214333,
+        "version": "4.7.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619596077,
+        "version": "4.7.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1617311315,
+        "version": "4.7.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1616005394,
+        "version": "4.7.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1614141718,
+        "version": "4.7.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1612950500,
         "version": "4.7.3",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,34 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.7.10 - _May 25, 2021_
+
+    * Dependencies updated
+
+## v4.7.9 - _May 21, 2021_
+
+    * Dependencies updated
+
+## v4.7.8 - _May 5, 2021_
+
+    * Dependencies updated
+
+## v4.7.7 - _April 28, 2021_
+
+    * Dependencies updated
+
+## v4.7.6 - _April 1, 2021_
+
+    * Dependencies updated
+
+## v4.7.5 - _March 17, 2021_
+
+    * Dependencies updated
+
+## v4.7.4 - _February 24, 2021_
+
+    * Dependencies updated
+
 ## v4.7.3 - _February 10, 2021_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.7.3",
+    "version": "4.7.10",
     "engines": {
         "node": ">=6.12"
     },
@@ -50,15 +50,15 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
     "devDependencies": {
-        "@0x/abi-gen": "^5.4.19",
-        "@0x/contracts-gen": "^2.0.30",
-        "@0x/contracts-test-utils": "^5.3.21",
-        "@0x/dev-utils": "^4.2.1",
-        "@0x/order-utils": "^10.4.16",
-        "@0x/sol-compiler": "^4.5.2",
-        "@0x/tslint-config": "^4.1.3",
-        "@0x/types": "^3.3.1",
-        "@0x/web3-wrapper": "^7.4.1",
+        "@0x/abi-gen": "^5.6.0",
+        "@0x/contracts-gen": "^2.0.38",
+        "@0x/contracts-test-utils": "^5.4.2",
+        "@0x/dev-utils": "^4.2.7",
+        "@0x/order-utils": "^10.4.23",
+        "@0x/sol-compiler": "^4.7.3",
+        "@0x/tslint-config": "^4.1.4",
+        "@0x/types": "^3.3.3",
+        "@0x/web3-wrapper": "^7.5.3",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -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",
@@ -76,14 +76,14 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typescript": "3.0.1"
+        "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.18",
-        "@0x/typescript-typings": "^5.1.6",
-        "@0x/utils": "^6.2.0",
+        "@0x/base-contract": "^6.4.0",
+        "@0x/typescript-typings": "^5.2.0",
+        "@0x/utils": "^6.4.3",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^3.4.0"
+        "ethereum-types": "^3.5.0"
     },
     "publishConfig": {
         "access": "public"

contracts/utils/test/lib_eip712.ts

@@ -2,7 +2,6 @@ import { chaiSetup, constants, provider, txDefaults, web3Wrapper } from '@0x/con
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { BigNumber, hexUtils, signTypedDataUtils } from '@0x/utils';
 import * as chai from 'chai';
-import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
 import { artifacts } from './artifacts';
@@ -78,7 +77,7 @@ describe('LibEIP712', () => {
 
         // Hash the provided input to get the expected hash
         const input = '0x1901'.concat(unprefixedDomainHash.concat(unprefixedHashStruct));
-        const expectedHash = '0x'.concat(ethUtil.sha3(input).toString('hex'));
+        const expectedHash = hexUtils.hash(input);
 
         // Get the actual hash by calling the smart contract
         const actualHash = await lib.externalHashEIP712Message(domainHash, hashStruct).callAsync();

contracts/zero-ex/CHANGELOG.json

@@ -1,4 +1,170 @@
 [
+    {
+        "timestamp": 1621944788,
+        "version": "0.24.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.24.0",
+        "changes": [
+            {
+                "note": "Add special selectors to selector collision test",
+                "pr": 243
+            }
+        ],
+        "timestamp": 1621600614
+    },
+    {
+        "version": "0.23.0",
+        "changes": [
+            {
+                "note": "Added ETH support to `MixinCurve`",
+                "pr": 220
+            },
+            {
+                "note": "Add Balancer V2 integration",
+                "pr": 206
+            }
+        ],
+        "timestamp": 1620214333
+    },
+    {
+        "timestamp": 1619830995,
+        "version": "0.22.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1619825976,
+        "version": "0.22.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.22.1",
+        "changes": [
+            {
+                "note": "bump feature version to 1.2",
+                "pr": 213
+            }
+        ],
+        "timestamp": 1619596077
+    },
+    {
+        "version": "0.22.0",
+        "changes": [
+            {
+                "note": "Add order signer registry to NativeOrdersFeature",
+                "pr": 195
+            }
+        ],
+        "timestamp": 1619481586
+    },
+    {
+        "timestamp": 1618259868,
+        "version": "0.21.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            },
+            {
+                "note": "BSC Uniswap clones (ApeSwap, CafeSwap, CheeseSwap, JulSwap)",
+                "pr": 208
+            }
+        ]
+    },
+    {
+        "version": "0.21.0",
+        "changes": [
+            {
+                "note": "Encoding protocol ID and source name in bridge source ID",
+                "pr": 162
+            },
+            {
+                "note": "Add PancakeSwapFeature",
+                "pr": 164
+            },
+            {
+                "note": "Remove TokenSpender/AllowanceTarget/greedy tokens stuff",
+                "pr": 164
+            },
+            {
+                "note": "Added Nerve in BridgeAdapter",
+                "pr": 181
+            },
+            {
+                "note": "Delete TokenSpenderFeature",
+                "pr": 189
+            },
+            {
+                "note": "Fix PancakeSwapFeature BakerySwap swap selector",
+                "pr": 190
+            }
+        ],
+        "timestamp": 1617311315
+    },
+    {
+        "version": "0.20.0",
+        "changes": [
+            {
+                "note": "Add `MooniswapLiquidityProvider`",
+                "pr": 143
+            },
+            {
+                "note": "Emit `LiquidityProviderFill` event in `CurveLiquidityProvider`",
+                "pr": 143
+            },
+            {
+                "note": "Add BatchFillNativeOrdersFeature and MultiplexFeature",
+                "pr": 140
+            },
+            {
+                "note": "Export MultiplexFeatureContract",
+                "pr": 168
+            }
+        ],
+        "timestamp": 1616005394
+    },
+    {
+        "version": "0.19.0",
+        "changes": [
+            {
+                "note": "Add `CurveLiquidityProvider` and misc refactors",
+                "pr": 127
+            },
+            {
+                "note": "Export `CurveLiquidityProviderContract`",
+                "pr": 144
+            },
+            {
+                "note": "Add `DodoV2`",
+                "pr": 152
+            },
+            {
+                "note": "Add `Linkswap`",
+                "pr": 153
+            },
+            {
+                "note": "refund ETH with no gas limit in FQT",
+                "pr": 155
+            },
+            {
+                "note": "Added an opt-in `PositiveSlippageAffiliateFee`",
+                "pr": 101
+            }
+        ],
+        "timestamp": 1614141718
+    },
     {
         "version": "0.18.2",
         "changes": [

contracts/zero-ex/CHANGELOG.md

@@ -5,6 +5,65 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.24.1 - _May 25, 2021_
+
+    * Dependencies updated
+
+## v0.24.0 - _May 21, 2021_
+
+    * Add special selectors to selector collision test (#243)
+
+## v0.23.0 - _May 5, 2021_
+
+    * Added ETH support to `MixinCurve` (#220)
+    * Add Balancer V2 integration (#206)
+
+## v0.22.3 - _May 1, 2021_
+
+    * Dependencies updated
+
+## v0.22.2 - _April 30, 2021_
+
+    * Dependencies updated
+
+## v0.22.1 - _April 28, 2021_
+
+    * bump feature version to 1.2 (#213)
+
+## v0.22.0 - _April 26, 2021_
+
+    * Add order signer registry to NativeOrdersFeature (#195)
+
+## v0.21.1 - _April 12, 2021_
+
+    * Dependencies updated
+    * BSC Uniswap clones (ApeSwap, CafeSwap, CheeseSwap, JulSwap) (#208)
+
+## v0.21.0 - _April 1, 2021_
+
+    * Encoding protocol ID and source name in bridge source ID (#162)
+    * Add PancakeSwapFeature (#164)
+    * Remove TokenSpender/AllowanceTarget/greedy tokens stuff (#164)
+    * Added Nerve in BridgeAdapter (#181)
+    * Delete TokenSpenderFeature (#189)
+    * Fix PancakeSwapFeature BakerySwap swap selector (#190)
+
+## v0.20.0 - _March 17, 2021_
+
+    * Add `MooniswapLiquidityProvider` (#143)
+    * Emit `LiquidityProviderFill` event in `CurveLiquidityProvider` (#143)
+    * Add BatchFillNativeOrdersFeature and MultiplexFeature (#140)
+    * Export MultiplexFeatureContract (#168)
+
+## v0.19.0 - _February 24, 2021_
+
+    * Add `CurveLiquidityProvider` and misc refactors (#127)
+    * Export `CurveLiquidityProviderContract` (#144)
+    * Add `DodoV2` (#152)
+    * Add `Linkswap` (#153)
+    * refund ETH with no gas limit in FQT (#155)
+    * Added an opt-in `PositiveSlippageAffiliateFee` (#101)
+
 ## v0.18.2 - _February 10, 2021_
 
     * Update FQT for v4 native orders (#104)

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

@@ -20,26 +20,31 @@
 pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
-import "./features/IOwnableFeature.sol";
-import "./features/ISimpleFunctionRegistryFeature.sol";
-import "./features/ITokenSpenderFeature.sol";
-import "./features/ITransformERC20Feature.sol";
-import "./features/IMetaTransactionsFeature.sol";
-import "./features/IUniswapFeature.sol";
-import "./features/ILiquidityProviderFeature.sol";
-import "./features/INativeOrdersFeature.sol";
+import "./features/interfaces/IOwnableFeature.sol";
+import "./features/interfaces/ISimpleFunctionRegistryFeature.sol";
+import "./features/interfaces/ITokenSpenderFeature.sol";
+import "./features/interfaces/ITransformERC20Feature.sol";
+import "./features/interfaces/IMetaTransactionsFeature.sol";
+import "./features/interfaces/IUniswapFeature.sol";
+import "./features/interfaces/IPancakeSwapFeature.sol";
+import "./features/interfaces/ILiquidityProviderFeature.sol";
+import "./features/interfaces/INativeOrdersFeature.sol";
+import "./features/interfaces/IBatchFillNativeOrdersFeature.sol";
+import "./features/interfaces/IMultiplexFeature.sol";
 
 
 /// @dev Interface for a fully featured Exchange Proxy.
 interface IZeroEx is
     IOwnableFeature,
     ISimpleFunctionRegistryFeature,
-    ITokenSpenderFeature,
     ITransformERC20Feature,
     IMetaTransactionsFeature,
     IUniswapFeature,
+    IPancakeSwapFeature,
     ILiquidityProviderFeature,
-    INativeOrdersFeature
+    INativeOrdersFeature,
+    IBatchFillNativeOrdersFeature,
+    IMultiplexFeature
 {
     // solhint-disable state-visibility
 

contracts/zero-ex/contracts/src/errors/LibNativeOrdersRichErrors.sol

@@ -88,6 +88,21 @@ library LibNativeOrdersRichErrors {
         );
     }
 
+    function InvalidSignerError(
+        address maker,
+        address signer
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("InvalidSignerError(address,address)")),
+            maker,
+            signer
+        );
+    }
+
     function OrderNotFillableBySenderError(
         bytes32 orderHash,
         address sender,
@@ -170,4 +185,21 @@ library LibNativeOrdersRichErrors {
             maker
         );
     }
+
+    function BatchFillIncompleteError(
+        bytes32 orderHash,
+        uint256 takerTokenFilledAmount,
+        uint256 takerTokenFillAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("BatchFillIncompleteError(bytes32,uint256,uint256)")),
+            orderHash,
+            takerTokenFilledAmount,
+            takerTokenFillAmount
+        );
+    }
 }

contracts/zero-ex/contracts/src/external/AllowanceTarget.sol

@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  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;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
-import "@0x/contracts-utils/contracts/src/v06/AuthorizableV06.sol";
-import "../errors/LibSpenderRichErrors.sol";
-import "./IAllowanceTarget.sol";
-
-
-/// @dev The allowance target for the TokenSpender feature.
-contract AllowanceTarget is
-    IAllowanceTarget,
-    AuthorizableV06
-{
-    // solhint-disable no-unused-vars,indent,no-empty-blocks
-    using LibRichErrorsV06 for bytes;
-
-    /// @dev Execute an arbitrary call. Only an authority can call this.
-    /// @param target The call target.
-    /// @param callData The call data.
-    /// @return resultData The data returned by the call.
-    function executeCall(
-        address payable target,
-        bytes calldata callData
-    )
-        external
-        override
-        onlyAuthorized
-        returns (bytes memory resultData)
-    {
-        bool success;
-        (success, resultData) = target.call(callData);
-        if (!success) {
-            resultData.rrevert();
-        }
-    }
-}

contracts/zero-ex/contracts/src/external/ILiquidityProviderSandbox.sol

@@ -20,6 +20,9 @@
 pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "../vendor/ILiquidityProvider.sol";
+
 
 interface ILiquidityProviderSandbox {
 
@@ -32,9 +35,9 @@ interface ILiquidityProviderSandbox {
     /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     function executeSellTokenForToken(
-        address provider,
-        address inputToken,
-        address outputToken,
+        ILiquidityProvider provider,
+        IERC20TokenV06 inputToken,
+        IERC20TokenV06 outputToken,
         address recipient,
         uint256 minBuyAmount,
         bytes calldata auxiliaryData
@@ -49,8 +52,8 @@ interface ILiquidityProviderSandbox {
     /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     function executeSellEthForToken(
-        address provider,
-        address outputToken,
+        ILiquidityProvider provider,
+        IERC20TokenV06 outputToken,
         address recipient,
         uint256 minBuyAmount,
         bytes calldata auxiliaryData
@@ -65,8 +68,8 @@ interface ILiquidityProviderSandbox {
     /// @param minBuyAmount The minimum acceptable amount of ETH to buy.
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     function executeSellTokenForEth(
-        address provider,
-        address inputToken,
+        ILiquidityProvider provider,
+        IERC20TokenV06 inputToken,
         address recipient,
         uint256 minBuyAmount,
         bytes calldata auxiliaryData

contracts/zero-ex/contracts/src/external/LiquidityProviderSandbox.sol

@@ -17,6 +17,7 @@ pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/errors/LibOwnableRichErrorsV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 import "../vendor/ILiquidityProvider.sol";
 import "../vendor/v3/IERC20Bridge.sol";
 import "./ILiquidityProviderSandbox.sol";
@@ -58,9 +59,9 @@ contract LiquidityProviderSandbox is
     /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     function executeSellTokenForToken(
-        address provider,
-        address inputToken,
-        address outputToken,
+        ILiquidityProvider provider,
+        IERC20TokenV06 inputToken,
+        IERC20TokenV06 outputToken,
         address recipient,
         uint256 minBuyAmount,
         bytes calldata auxiliaryData
@@ -69,7 +70,7 @@ contract LiquidityProviderSandbox is
         onlyOwner
         override
     {
-        ILiquidityProvider(provider).sellTokenForToken(
+        provider.sellTokenForToken(
             inputToken,
             outputToken,
             recipient,
@@ -86,8 +87,8 @@ contract LiquidityProviderSandbox is
     /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     function executeSellEthForToken(
-        address provider,
-        address outputToken,
+        ILiquidityProvider provider,
+        IERC20TokenV06 outputToken,
         address recipient,
         uint256 minBuyAmount,
         bytes calldata auxiliaryData
@@ -96,7 +97,7 @@ contract LiquidityProviderSandbox is
         onlyOwner
         override
     {
-        ILiquidityProvider(provider).sellEthForToken(
+        provider.sellEthForToken(
             outputToken,
             recipient,
             minBuyAmount,
@@ -112,8 +113,8 @@ contract LiquidityProviderSandbox is
     /// @param minBuyAmount The minimum acceptable amount of ETH to buy.
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     function executeSellTokenForEth(
-        address provider,
-        address inputToken,
+        ILiquidityProvider provider,
+        IERC20TokenV06 inputToken,
         address recipient,
         uint256 minBuyAmount,
         bytes calldata auxiliaryData
@@ -122,7 +123,7 @@ contract LiquidityProviderSandbox is
         onlyOwner
         override
     {
-        ILiquidityProvider(provider).sellTokenForEth(
+        provider.sellTokenForEth(
             inputToken,
             payable(recipient),
             minBuyAmount,

contracts/zero-ex/contracts/src/features/BatchFillNativeOrdersFeature.sol

@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
+import "../errors/LibNativeOrdersRichErrors.sol";
+import "../fixins/FixinCommon.sol";
+import "../fixins/FixinEIP712.sol";
+import "../migrations/LibMigrate.sol";
+import "./interfaces/IFeature.sol";
+import "./interfaces/IBatchFillNativeOrdersFeature.sol";
+import "./interfaces/INativeOrdersFeature.sol";
+import "./libs/LibNativeOrder.sol";
+import "./libs/LibSignature.sol";
+
+
+/// @dev Feature for batch/market filling limit and RFQ orders.
+contract BatchFillNativeOrdersFeature is
+    IFeature,
+    IBatchFillNativeOrdersFeature,
+    FixinCommon,
+    FixinEIP712
+{
+    using LibSafeMathV06 for uint128;
+    using LibSafeMathV06 for uint256;
+    using LibRichErrorsV06 for bytes;
+
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "BatchFill";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+
+    constructor(address zeroExAddress)
+        public
+        FixinEIP712(zeroExAddress)
+    {
+        // solhint-disable no-empty-blocks
+    }
+
+    /// @dev Initialize and register this feature.
+    ///      Should be delegatecalled by `Migrate.migrate()`.
+    /// @return success `LibMigrate.SUCCESS` on success.
+    function migrate()
+        external
+        returns (bytes4 success)
+    {
+        _registerFeatureFunction(this.batchFillLimitOrders.selector);
+        _registerFeatureFunction(this.batchFillRfqOrders.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Fills multiple limit orders.
+    /// @param orders Array of limit orders.
+    /// @param signatures Array of signatures corresponding to each order.
+    /// @param takerTokenFillAmounts Array of desired amounts to fill each order.
+    /// @param revertIfIncomplete If true, reverts if this function fails to
+    ///        fill the full fill amount for any individual order.
+    /// @return takerTokenFilledAmounts Array of amounts filled, in taker token.
+    /// @return makerTokenFilledAmounts Array of amounts filled, in maker token.
+    function batchFillLimitOrders(
+        LibNativeOrder.LimitOrder[] calldata orders,
+        LibSignature.Signature[] calldata signatures,
+        uint128[] calldata takerTokenFillAmounts,
+        bool revertIfIncomplete
+    )
+        external
+        payable
+        override
+        returns (
+            uint128[] memory takerTokenFilledAmounts,
+            uint128[] memory makerTokenFilledAmounts
+        )
+    {
+        require(
+            orders.length == signatures.length && orders.length == takerTokenFillAmounts.length,
+            'BatchFillNativeOrdersFeature::batchFillLimitOrders/MISMATCHED_ARRAY_LENGTHS'
+        );
+        takerTokenFilledAmounts = new uint128[](orders.length);
+        makerTokenFilledAmounts = new uint128[](orders.length);
+        uint256 protocolFee = uint256(INativeOrdersFeature(address(this)).getProtocolFeeMultiplier())
+            .safeMul(tx.gasprice);
+        uint256 ethProtocolFeePaid;
+        for (uint256 i = 0; i != orders.length; i++) {
+            try
+                INativeOrdersFeature(address(this))._fillLimitOrder
+                    (
+                        orders[i],
+                        signatures[i],
+                        takerTokenFillAmounts[i],
+                        msg.sender,
+                        msg.sender
+                    )
+                returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+            {
+                // Update amounts filled.
+                (takerTokenFilledAmounts[i], makerTokenFilledAmounts[i]) =
+                    (takerTokenFilledAmount, makerTokenFilledAmount);
+                ethProtocolFeePaid = ethProtocolFeePaid.safeAdd(protocolFee);
+            } catch {}
+
+            if (
+                revertIfIncomplete &&
+                takerTokenFilledAmounts[i] < takerTokenFillAmounts[i]
+            ) {
+                bytes32 orderHash = _getEIP712Hash(
+                    LibNativeOrder.getLimitOrderStructHash(orders[i])
+                );
+                // Did not fill the amount requested.
+                LibNativeOrdersRichErrors.BatchFillIncompleteError(
+                    orderHash,
+                    takerTokenFilledAmounts[i],
+                    takerTokenFillAmounts[i]
+                ).rrevert();
+            }
+        }
+        LibNativeOrder.refundExcessProtocolFeeToSender(ethProtocolFeePaid);
+    }
+
+    /// @dev Fills multiple RFQ orders.
+    /// @param orders Array of RFQ orders.
+    /// @param signatures Array of signatures corresponding to each order.
+    /// @param takerTokenFillAmounts Array of desired amounts to fill each order.
+    /// @param revertIfIncomplete If true, reverts if this function fails to
+    ///        fill the full fill amount for any individual order.
+    /// @return takerTokenFilledAmounts Array of amounts filled, in taker token.
+    /// @return makerTokenFilledAmounts Array of amounts filled, in maker token.
+    function batchFillRfqOrders(
+        LibNativeOrder.RfqOrder[] calldata orders,
+        LibSignature.Signature[] calldata signatures,
+        uint128[] calldata takerTokenFillAmounts,
+        bool revertIfIncomplete
+    )
+        external
+        override
+        returns (
+            uint128[] memory takerTokenFilledAmounts,
+            uint128[] memory makerTokenFilledAmounts
+        )
+    {
+        require(
+            orders.length == signatures.length && orders.length == takerTokenFillAmounts.length,
+            'BatchFillNativeOrdersFeature::batchFillRfqOrders/MISMATCHED_ARRAY_LENGTHS'
+        );
+        takerTokenFilledAmounts = new uint128[](orders.length);
+        makerTokenFilledAmounts = new uint128[](orders.length);
+        for (uint256 i = 0; i != orders.length; i++) {
+            try
+                INativeOrdersFeature(address(this))._fillRfqOrder
+                    (
+                        orders[i],
+                        signatures[i],
+                        takerTokenFillAmounts[i],
+                        msg.sender
+                    )
+                returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+            {
+                // Update amounts filled.
+                (takerTokenFilledAmounts[i], makerTokenFilledAmounts[i]) =
+                    (takerTokenFilledAmount, makerTokenFilledAmount);
+            } catch {}
+
+            if (
+                revertIfIncomplete &&
+                takerTokenFilledAmounts[i] < takerTokenFillAmounts[i]
+            ) {
+                // Did not fill the amount requested.
+                bytes32 orderHash = _getEIP712Hash(
+                    LibNativeOrder.getRfqOrderStructHash(orders[i])
+                );
+                LibNativeOrdersRichErrors.BatchFillIncompleteError(
+                    orderHash,
+                    takerTokenFilledAmounts[i],
+                    takerTokenFillAmounts[i]
+                ).rrevert();
+            }
+        }
+    }
+}

contracts/zero-ex/contracts/src/features/BootstrapFeature.sol

@@ -23,7 +23,7 @@ pragma experimental ABIEncoderV2;
 import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
 import "../migrations/LibBootstrap.sol";
 import "../storage/LibProxyStorage.sol";
-import "./IBootstrapFeature.sol";
+import "./interfaces/IBootstrapFeature.sol";
 
 
 /// @dev Detachable `bootstrap()` feature.

contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.sol

@@ -23,14 +23,16 @@ pragma experimental ABIEncoderV2;
 import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
 import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
 import "../errors/LibLiquidityProviderRichErrors.sol";
 import "../external/ILiquidityProviderSandbox.sol";
 import "../external/LiquidityProviderSandbox.sol";
 import "../fixins/FixinCommon.sol";
 import "../fixins/FixinTokenSpender.sol";
 import "../migrations/LibMigrate.sol";
-import "./IFeature.sol";
-import "./ILiquidityProviderFeature.sol";
+import "../transformers/LibERC20Transformer.sol";
+import "./interfaces/IFeature.sol";
+import "./interfaces/ILiquidityProviderFeature.sol";
 
 
 contract LiquidityProviderFeature is
@@ -45,27 +47,14 @@ contract LiquidityProviderFeature is
     /// @dev Name of this feature.
     string public constant override FEATURE_NAME = "LiquidityProviderFeature";
     /// @dev Version of this feature.
-    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 2);
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 4);
 
-    /// @dev ETH pseudo-token address.
-    address constant internal ETH_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
     /// @dev The sandbox contract address.
     ILiquidityProviderSandbox public immutable sandbox;
 
-    /// @dev Event for data pipeline.
-    event LiquidityProviderSwap(
-        address inputToken,
-        address outputToken,
-        uint256 inputTokenAmount,
-        uint256 outputTokenAmount,
-        address provider,
-        address recipient
-    );
-
-    constructor(LiquidityProviderSandbox sandbox_, bytes32 greedyTokensBloomFilter)
+    constructor(LiquidityProviderSandbox sandbox_)
         public
         FixinCommon()
-        FixinTokenSpender(greedyTokensBloomFilter)
     {
         sandbox = sandbox_;
     }
@@ -95,9 +84,9 @@ contract LiquidityProviderFeature is
     /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
     /// @return boughtAmount The amount of `outputToken` bought.
     function sellToLiquidityProvider(
-        address inputToken,
-        address outputToken,
-        address payable provider,
+        IERC20TokenV06 inputToken,
+        IERC20TokenV06 outputToken,
+        ILiquidityProvider provider,
         address recipient,
         uint256 sellAmount,
         uint256 minBuyAmount,
@@ -114,21 +103,21 @@ contract LiquidityProviderFeature is
 
         // Forward all attached ETH to the provider.
         if (msg.value > 0) {
-            provider.transfer(msg.value);
+            payable(address(provider)).transfer(msg.value);
         }
 
-        if (inputToken != ETH_TOKEN_ADDRESS) {
+        if (!LibERC20Transformer.isTokenETH(inputToken)) {
             // Transfer input ERC20 tokens to the provider.
             _transferERC20Tokens(
-                IERC20TokenV06(inputToken),
+                inputToken,
                 msg.sender,
-                provider,
+                address(provider),
                 sellAmount
             );
         }
 
-        if (inputToken == ETH_TOKEN_ADDRESS) {
-            uint256 balanceBefore = IERC20TokenV06(outputToken).balanceOf(recipient);
+        if (LibERC20Transformer.isTokenETH(inputToken)) {
+            uint256 balanceBefore = outputToken.balanceOf(recipient);
             sandbox.executeSellEthForToken(
                 provider,
                 outputToken,
@@ -137,7 +126,7 @@ contract LiquidityProviderFeature is
                 auxiliaryData
             );
             boughtAmount = IERC20TokenV06(outputToken).balanceOf(recipient).safeSub(balanceBefore);
-        } else if (outputToken == ETH_TOKEN_ADDRESS) {
+        } else if (LibERC20Transformer.isTokenETH(outputToken)) {
             uint256 balanceBefore = recipient.balance;
             sandbox.executeSellTokenForEth(
                 provider,
@@ -148,7 +137,7 @@ contract LiquidityProviderFeature is
             );
             boughtAmount = recipient.balance.safeSub(balanceBefore);
         } else {
-            uint256 balanceBefore = IERC20TokenV06(outputToken).balanceOf(recipient);
+            uint256 balanceBefore = outputToken.balanceOf(recipient);
             sandbox.executeSellTokenForToken(
                 provider,
                 inputToken,
@@ -157,14 +146,14 @@ contract LiquidityProviderFeature is
                 minBuyAmount,
                 auxiliaryData
             );
-            boughtAmount = IERC20TokenV06(outputToken).balanceOf(recipient).safeSub(balanceBefore);
+            boughtAmount = outputToken.balanceOf(recipient).safeSub(balanceBefore);
         }
 
         if (boughtAmount < minBuyAmount) {
             LibLiquidityProviderRichErrors.LiquidityProviderIncompleteSellError(
-                provider,
-                outputToken,
-                inputToken,
+                address(provider),
+                address(outputToken),
+                address(inputToken),
                 sellAmount,
                 boughtAmount,
                 minBuyAmount

contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol

@@ -30,11 +30,11 @@ import "../fixins/FixinTokenSpender.sol";
 import "../fixins/FixinEIP712.sol";
 import "../migrations/LibMigrate.sol";
 import "../storage/LibMetaTransactionsStorage.sol";
-import "./IMetaTransactionsFeature.sol";
-import "./ITransformERC20Feature.sol";
+import "./interfaces/IFeature.sol";
+import "./interfaces/IMetaTransactionsFeature.sol";
+import "./interfaces/INativeOrdersFeature.sol";
+import "./interfaces/ITransformERC20Feature.sol";
 import "./libs/LibSignature.sol";
-import "./IFeature.sol";
-import "./INativeOrdersFeature.sol";
 
 /// @dev MetaTransactions feature.
 contract MetaTransactionsFeature is
@@ -78,7 +78,7 @@ contract MetaTransactionsFeature is
     /// @dev Name of this feature.
     string public constant override FEATURE_NAME = "MetaTransactions";
     /// @dev Version of this feature.
-    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 1, 0);
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 1, 1);
     /// @dev EIP712 typehash of the `MetaTransactionData` struct.
     bytes32 public immutable MTX_EIP712_TYPEHASH = keccak256(
         "MetaTransactionData("
@@ -105,11 +105,10 @@ contract MetaTransactionsFeature is
         }
     }
 
-    constructor(address zeroExAddress, bytes32 greedyTokensBloomFilter)
+    constructor(address zeroExAddress)
         public
         FixinCommon()
         FixinEIP712(zeroExAddress)
-        FixinTokenSpender(greedyTokensBloomFilter)
     {
         // solhint-disable-next-line no-empty-blocks
     }

contracts/zero-ex/contracts/src/features/MultiplexFeature.sol

@@ -0,0 +1,803 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+
+  Copyright 2021 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../external/ILiquidityProviderSandbox.sol";
+import "../fixins/FixinCommon.sol";
+import "../fixins/FixinEIP712.sol";
+import "../fixins/FixinTokenSpender.sol";
+import "../migrations/LibMigrate.sol";
+import "../transformers/LibERC20Transformer.sol";
+import "../vendor/ILiquidityProvider.sol";
+import "../vendor/IUniswapV2Pair.sol";
+import "./interfaces/IFeature.sol";
+import "./interfaces/IMultiplexFeature.sol";
+import "./interfaces/INativeOrdersFeature.sol";
+import "./interfaces/ITransformERC20Feature.sol";
+import "./libs/LibNativeOrder.sol";
+
+
+/// @dev This feature enables efficient batch and multi-hop trades
+///      using different liquidity sources.
+contract MultiplexFeature is
+    IFeature,
+    IMultiplexFeature,
+    FixinCommon,
+    FixinEIP712,
+    FixinTokenSpender
+{
+    using LibERC20Transformer for IERC20TokenV06;
+    using LibSafeMathV06 for uint128;
+    using LibSafeMathV06 for uint256;
+
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "MultiplexFeature";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 1);
+
+    /// @dev The WETH token contract.
+    IEtherTokenV06 private immutable weth;
+    /// @dev The sandbox contract address.
+    ILiquidityProviderSandbox public immutable sandbox;
+    // address of the UniswapV2Factory contract.
+    address private constant UNISWAP_FACTORY = 0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f;
+    // address of the (Sushiswap) UniswapV2Factory contract.
+    address private constant SUSHISWAP_FACTORY = 0xC0AEe478e3658e2610c5F7A4A2E1777cE9e4f2Ac;
+    // Init code hash of the UniswapV2Pair contract.
+    uint256 private constant UNISWAP_PAIR_INIT_CODE_HASH = 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f;
+    // Init code hash of the (Sushiswap) UniswapV2Pair contract.
+    uint256 private constant SUSHISWAP_PAIR_INIT_CODE_HASH = 0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303;
+
+    constructor(
+        address zeroExAddress,
+        IEtherTokenV06 weth_,
+        ILiquidityProviderSandbox sandbox_
+    )
+        public
+        FixinEIP712(zeroExAddress)
+    {
+        weth = weth_;
+        sandbox = sandbox_;
+    }
+
+    /// @dev Initialize and register this feature.
+    ///      Should be delegatecalled by `Migrate.migrate()`.
+    /// @return success `LibMigrate.SUCCESS` on success.
+    function migrate()
+        external
+        returns (bytes4 success)
+    {
+        _registerFeatureFunction(this.batchFill.selector);
+        _registerFeatureFunction(this.multiHopFill.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Executes a batch of fills selling `fillData.inputToken`
+    ///      for `fillData.outputToken` in sequence. Refer to the
+    ///      internal variant `_batchFill` for the allowed nested
+    ///      operations.
+    /// @param fillData Encodes the input/output tokens, the sell
+    ///        amount, and the nested operations for this batch fill.
+    /// @param minBuyAmount The minimum amount of `fillData.outputToken`
+    ///        to buy. Reverts if this amount is not met.
+    /// @return outputTokenAmount The amount of the output token bought.
+    function batchFill(
+        BatchFillData memory fillData,
+        uint256 minBuyAmount
+    )
+        public
+        payable
+        override
+        returns (uint256 outputTokenAmount)
+    {
+        // Cache the sender's balance of the output token.
+        outputTokenAmount = fillData.outputToken.getTokenBalanceOf(msg.sender);
+        // Cache the contract's ETH balance prior to this call.
+        uint256 ethBalanceBefore = address(this).balance.safeSub(msg.value);
+
+        // Perform the batch fill.
+        _batchFill(fillData);
+
+        // The `outputTokenAmount` returned by `_batchFill` may not
+        // be fully accurate (e.g. due to some janky token).
+        outputTokenAmount = fillData.outputToken.getTokenBalanceOf(msg.sender)
+            .safeSub(outputTokenAmount);
+        require(
+            outputTokenAmount >= minBuyAmount,
+            "MultiplexFeature::batchFill/UNDERBOUGHT"
+        );
+
+        uint256 ethBalanceAfter = address(this).balance;
+        require(
+            ethBalanceAfter >= ethBalanceBefore,
+            "MultiplexFeature::batchFill/OVERSPENT_ETH"
+        );
+        // Refund ETH
+        if (ethBalanceAfter > ethBalanceBefore) {
+            _transferEth(msg.sender, ethBalanceAfter - ethBalanceBefore);
+        }
+    }
+
+    /// @dev Executes a sequence of fills "hopping" through the
+    ///      path of tokens given by `fillData.tokens`. Refer to the
+    ///      internal variant `_multiHopFill` for the allowed nested
+    ///      operations.
+    /// @param fillData Encodes the path of tokens, the sell amount,
+    ///        and the nested operations for this multi-hop fill.
+    /// @param minBuyAmount The minimum amount of the output token
+    ///        to buy. Reverts if this amount is not met.
+    /// @return outputTokenAmount The amount of the output token bought.
+    function multiHopFill(
+        MultiHopFillData memory fillData,
+        uint256 minBuyAmount
+    )
+        public
+        payable
+        override
+        returns (uint256 outputTokenAmount)
+    {
+        IERC20TokenV06 outputToken = IERC20TokenV06(fillData.tokens[fillData.tokens.length - 1]);
+        // Cache the sender's balance of the output token.
+        outputTokenAmount = outputToken.getTokenBalanceOf(msg.sender);
+        // Cache the contract's ETH balance prior to this call.
+        uint256 ethBalanceBefore = address(this).balance.safeSub(msg.value);
+
+        // Perform the multi-hop fill. Pass in `msg.value` as the maximum
+        // allowable amount of ETH for the wrapped calls to consume.
+        _multiHopFill(fillData, msg.value);
+
+        // The `outputTokenAmount` returned by `_multiHopFill` may not
+        // be fully accurate (e.g. due to some janky token).
+        outputTokenAmount = outputToken.getTokenBalanceOf(msg.sender)
+            .safeSub(outputTokenAmount);
+        require(
+            outputTokenAmount >= minBuyAmount,
+            "MultiplexFeature::multiHopFill/UNDERBOUGHT"
+        );
+
+        uint256 ethBalanceAfter = address(this).balance;
+        require(
+            ethBalanceAfter >= ethBalanceBefore,
+            "MultiplexFeature::multiHopFill/OVERSPENT_ETH"
+        );
+        // Refund ETH
+        if (ethBalanceAfter > ethBalanceBefore) {
+            _transferEth(msg.sender, ethBalanceAfter - ethBalanceBefore);
+        }
+    }
+
+    // Similar to FQT. If `fillData.sellAmount` is set to `type(uint256).max`,
+    // this is effectively a batch fill. Otherwise it can be set to perform a
+    // market sell of some amount. Note that the `outputTokenAmount` returned
+    // by this function could theoretically be inaccurate if `msg.sender` has
+    // set a token allowance on an external contract that gets called during
+    // the execution of this function.
+    function _batchFill(BatchFillData memory fillData)
+        internal
+        returns (uint256 outputTokenAmount, uint256 remainingEth)
+    {
+        // Track the remaining ETH allocated to this call.
+        remainingEth = msg.value;
+        // Track the amount of input token sold.
+        uint256 soldAmount;
+        for (uint256 i = 0; i != fillData.calls.length; i++) {
+            // Check if we've hit our target.
+            if (soldAmount >= fillData.sellAmount) { break; }
+            WrappedBatchCall memory wrappedCall = fillData.calls[i];
+            // Compute the fill amount.
+            uint256 inputTokenAmount = LibSafeMathV06.min256(
+                wrappedCall.sellAmount,
+                fillData.sellAmount.safeSub(soldAmount)
+            );
+            if (wrappedCall.selector == INativeOrdersFeature._fillRfqOrder.selector) {
+                // Decode the RFQ order and signature.
+                (
+                    LibNativeOrder.RfqOrder memory order,
+                    LibSignature.Signature memory signature
+                ) = abi.decode(
+                    wrappedCall.data,
+                    (LibNativeOrder.RfqOrder, LibSignature.Signature)
+                );
+                if (order.expiry <= uint64(block.timestamp)) {
+                    bytes32 orderHash = _getEIP712Hash(
+                        LibNativeOrder.getRfqOrderStructHash(order)
+                    );
+                    emit ExpiredRfqOrder(
+                        orderHash,
+                        order.maker,
+                        order.expiry
+                    );
+                    continue;
+                }
+                require(
+                    order.takerToken == fillData.inputToken &&
+                    order.makerToken == fillData.outputToken,
+                    "MultiplexFeature::_batchFill/RFQ_ORDER_INVALID_TOKENS"
+                );
+                // Try filling the RFQ order. Swallows reverts.
+                try
+                    INativeOrdersFeature(address(this))._fillRfqOrder
+                        (
+                            order,
+                            signature,
+                            inputTokenAmount.safeDowncastToUint128(),
+                            msg.sender
+                        )
+                    returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+                {
+                    // Increment the sold and bought amounts.
+                    soldAmount = soldAmount.safeAdd(takerTokenFilledAmount);
+                    outputTokenAmount = outputTokenAmount.safeAdd(makerTokenFilledAmount);
+                } catch {}
+            } else if (wrappedCall.selector == this._sellToUniswap.selector) {
+                (address[] memory tokens, bool isSushi) = abi.decode(
+                    wrappedCall.data,
+                    (address[], bool)
+                );
+                require(
+                    tokens.length >= 2 &&
+                    tokens[0] == address(fillData.inputToken) &&
+                    tokens[tokens.length - 1] == address(fillData.outputToken),
+                    "MultiplexFeature::_batchFill/UNISWAP_INVALID_TOKENS"
+                );
+                // Perform the Uniswap/Sushiswap trade.
+                uint256 outputTokenAmount_  = _sellToUniswap(
+                    tokens,
+                    inputTokenAmount,
+                    isSushi,
+                    address(0),
+                    msg.sender
+                );
+                // Increment the sold and bought amounts.
+                soldAmount = soldAmount.safeAdd(inputTokenAmount);
+                outputTokenAmount = outputTokenAmount.safeAdd(outputTokenAmount_);
+            } else if (wrappedCall.selector == this._sellToLiquidityProvider.selector) {
+                (address provider, bytes memory auxiliaryData) = abi.decode(
+                    wrappedCall.data,
+                    (address, bytes)
+                );
+                if (fillData.inputToken.isTokenETH()) {
+                    inputTokenAmount = LibSafeMathV06.min256(
+                        inputTokenAmount,
+                        remainingEth
+                    );
+                    // Transfer the input ETH to the provider.
+                    _transferEth(payable(provider), inputTokenAmount);
+                    // Count that ETH as spent.
+                    remainingEth -= inputTokenAmount;
+                } else {
+                    // Transfer input ERC20 tokens to the provider.
+                    _transferERC20Tokens(
+                        fillData.inputToken,
+                        msg.sender,
+                        provider,
+                        inputTokenAmount
+                    );
+                }
+                // Perform the PLP trade.
+                uint256 outputTokenAmount_ = _sellToLiquidityProvider(
+                    fillData.inputToken,
+                    fillData.outputToken,
+                    inputTokenAmount,
+                    ILiquidityProvider(provider),
+                    msg.sender,
+                    auxiliaryData
+                );
+                // Increment the sold and bought amounts.
+                soldAmount = soldAmount.safeAdd(inputTokenAmount);
+                outputTokenAmount = outputTokenAmount.safeAdd(outputTokenAmount_);
+            } else if (wrappedCall.selector == ITransformERC20Feature._transformERC20.selector) {
+                ITransformERC20Feature.TransformERC20Args memory args;
+                args.taker = msg.sender;
+                args.inputToken = fillData.inputToken;
+                args.outputToken = fillData.outputToken;
+                args.inputTokenAmount = inputTokenAmount;
+                args.minOutputTokenAmount = 0;
+                uint256 ethValue;
+                (args.transformations, ethValue) = abi.decode(
+                    wrappedCall.data,
+                    (ITransformERC20Feature.Transformation[], uint256)
+                );
+                // Do not spend more than the remaining ETH.
+                ethValue = LibSafeMathV06.min256(
+                    ethValue,
+                    remainingEth
+                );
+                if (ethValue > 0) {
+                    require(
+                        args.inputToken.isTokenETH(),
+                        "MultiplexFeature::_batchFill/ETH_TRANSFORM_ONLY"
+                    );
+                }
+                try ITransformERC20Feature(address(this))._transformERC20
+                    {value: ethValue}
+                    (args)
+                    returns (uint256 outputTokenAmount_)
+                {
+                    remainingEth -= ethValue;
+                    soldAmount = soldAmount.safeAdd(inputTokenAmount);
+                    outputTokenAmount = outputTokenAmount.safeAdd(outputTokenAmount_);
+                } catch {}
+            } else if (wrappedCall.selector == this._multiHopFill.selector) {
+                MultiHopFillData memory multiHopFillData;
+                uint256 ethValue;
+                (
+                    multiHopFillData.tokens,
+                    multiHopFillData.calls,
+                    ethValue
+                ) = abi.decode(
+                    wrappedCall.data,
+                    (address[], WrappedMultiHopCall[], uint256)
+                );
+                multiHopFillData.sellAmount = inputTokenAmount;
+                // Do not spend more than the remaining ETH.
+                ethValue = LibSafeMathV06.min256(
+                    ethValue,
+                    remainingEth
+                );
+                // Subtract the ethValue allocated to the nested multi-hop fill.
+                remainingEth -= ethValue;
+                (uint256 outputTokenAmount_, uint256 leftoverEth) =
+                    _multiHopFill(multiHopFillData, ethValue);
+                // Increment the sold and bought amounts.
+                soldAmount = soldAmount.safeAdd(inputTokenAmount);
+                outputTokenAmount = outputTokenAmount.safeAdd(outputTokenAmount_);
+                // Add back any ETH that wasn't used by the nested multi-hop fill.
+                remainingEth += leftoverEth;
+            } else {
+                revert("MultiplexFeature::_batchFill/UNRECOGNIZED_SELECTOR");
+            }
+        }
+    }
+
+    // Internal variant of `multiHopFill`. This function can be nested within
+    // a `_batchFill`.
+    // This function executes a sequence of fills "hopping" through the
+    // path of tokens given by `fillData.tokens`. The nested operations that
+    // can be used as "hops" are:
+    // - WETH.deposit (wraps ETH)
+    // - WETH.withdraw (unwraps WETH)
+    // - _sellToUniswap (executes a Uniswap/Sushiswap swap)
+    // - _sellToLiquidityProvider (executes a PLP swap)
+    // - _transformERC20 (executes arbitrary ERC20 Transformations)
+    // This function optimizes the number of ERC20 transfers performed
+    // by having each hop transfer its output tokens directly to the
+    // target address of the next hop. Note that the `outputTokenAmount` returned
+    // by this function could theoretically be inaccurate if `msg.sender` has
+    // set a token allowance on an external contract that gets called during
+    // the execution of this function.
+    function _multiHopFill(MultiHopFillData memory fillData, uint256 totalEth)
+        public
+        returns (uint256 outputTokenAmount, uint256 remainingEth)
+    {
+        // There should be one call/hop between every two tokens
+        // in the path.
+        // tokens[0]––calls[0]––>tokens[1]––...––calls[n-1]––>tokens[n]
+        require(
+            fillData.tokens.length == fillData.calls.length + 1,
+            "MultiplexFeature::_multiHopFill/MISMATCHED_ARRAY_LENGTHS"
+        );
+        // Track the remaining ETH allocated to this call.
+        remainingEth = totalEth;
+        // This variable is used as the input and output amounts of
+        // each hop. After the final hop, this will contain the output
+        // amount of the multi-hop fill.
+        outputTokenAmount = fillData.sellAmount;
+        // This variable is used to cache the address to target in the
+        // next hop. See `_computeHopRecipient` for details.
+        address nextTarget;
+        for (uint256 i = 0; i != fillData.calls.length; i++) {
+            WrappedMultiHopCall memory wrappedCall = fillData.calls[i];
+            if (wrappedCall.selector == this._sellToUniswap.selector) {
+                // If the next hop supports a "transfer then execute" pattern,
+                // the recipient will not be `msg.sender`. See `_computeHopRecipient`
+                // for details.
+                address recipient = _computeHopRecipient(fillData.calls, i);
+                (address[] memory tokens, bool isSushi) = abi.decode(
+                    wrappedCall.data,
+                    (address[], bool)
+                );
+                // Perform the Uniswap/Sushiswap trade.
+                outputTokenAmount = _sellToUniswap(
+                    tokens,
+                    outputTokenAmount,
+                    isSushi,
+                    nextTarget,
+                    recipient
+                );
+                // If the recipient was not `msg.sender`, it must be the target
+                // contract for the next hop.
+                nextTarget = recipient == msg.sender ? address(0) : recipient;
+            } else if (wrappedCall.selector == this._sellToLiquidityProvider.selector) {
+                // If the next hop supports a "transfer then execute" pattern,
+                // the recipient will not be `msg.sender`. See `_computeHopRecipient`
+                // for details.
+                address recipient = _computeHopRecipient(fillData.calls, i);
+                // If `nextTarget` was not set in the previous hop, then we
+                // need to send in the input ETH/tokens to the liquidity provider
+                // contract before executing the trade.
+                if (nextTarget == address(0)) {
+                    (address provider, bytes memory auxiliaryData) = abi.decode(
+                        wrappedCall.data,
+                        (address, bytes)
+                    );
+                    // Transfer input ETH or ERC20 tokens to the liquidity
+                    // provider contract.
+                    if (IERC20TokenV06(fillData.tokens[i]).isTokenETH()) {
+                        outputTokenAmount = LibSafeMathV06.min256(
+                            outputTokenAmount,
+                            remainingEth
+                        );
+                        _transferEth(payable(provider), outputTokenAmount);
+                        remainingEth -= outputTokenAmount;
+                    } else {
+                        _transferERC20Tokens(
+                            IERC20TokenV06(fillData.tokens[i]),
+                            msg.sender,
+                            provider,
+                            outputTokenAmount
+                        );
+                    }
+                    outputTokenAmount = _sellToLiquidityProvider(
+                        IERC20TokenV06(fillData.tokens[i]),
+                        IERC20TokenV06(fillData.tokens[i + 1]),
+                        outputTokenAmount,
+                        ILiquidityProvider(provider),
+                        recipient,
+                        auxiliaryData
+                    );
+                } else {
+                    (, bytes memory auxiliaryData) = abi.decode(
+                        wrappedCall.data,
+                        (address, bytes)
+                    );
+                    // Tokens and ETH have already been transferred to
+                    // the liquidity provider contract in the previous hop.
+                    outputTokenAmount = _sellToLiquidityProvider(
+                        IERC20TokenV06(fillData.tokens[i]),
+                        IERC20TokenV06(fillData.tokens[i + 1]),
+                        outputTokenAmount,
+                        ILiquidityProvider(nextTarget),
+                        recipient,
+                        auxiliaryData
+                    );
+                }
+                // If the recipient was not `msg.sender`, it must be the target
+                // contract for the next hop.
+                nextTarget = recipient == msg.sender ? address(0) : recipient;
+            } else if (wrappedCall.selector == ITransformERC20Feature._transformERC20.selector) {
+                ITransformERC20Feature.TransformERC20Args memory args;
+                args.inputToken = IERC20TokenV06(fillData.tokens[i]);
+                args.outputToken = IERC20TokenV06(fillData.tokens[i + 1]);
+                args.minOutputTokenAmount = 0;
+                args.taker = payable(_computeHopRecipient(fillData.calls, i));
+                if (nextTarget != address(0)) {
+                    // If `nextTarget` was set in the previous hop, then the input
+                    // token was already sent to the FlashWallet. Setting
+                    // `inputTokenAmount` to 0 indicates that no tokens need to
+                    // be pulled into the FlashWallet before executing the
+                    // transformations.
+                    args.inputTokenAmount = 0;
+                } else if (
+                    args.taker != msg.sender &&
+                    !args.inputToken.isTokenETH()
+                ) {
+                    address flashWallet = address(
+                        ITransformERC20Feature(address(this)).getTransformWallet()
+                    );
+                    // The input token has _not_ already been sent to the
+                    // FlashWallet. We also want PayTakerTransformer to
+                    // send the output token to some address other than
+                    // msg.sender, so we must transfer the input token
+                    // to the FlashWallet here.
+                    _transferERC20Tokens(
+                        args.inputToken,
+                        msg.sender,
+                        flashWallet,
+                        outputTokenAmount
+                    );
+                    args.inputTokenAmount = 0;
+                } else {
+                    // Otherwise, either:
+                    // (1) args.taker == msg.sender, in which case
+                    //     `_transformERC20` will pull the input token
+                    //     into the FlashWallet, or
+                    // (2) args.inputToken == ETH_TOKEN_ADDRESS, in which
+                    //     case ETH is attached to the call and no token
+                    //     transfer occurs.
+                    args.inputTokenAmount = outputTokenAmount;
+                }
+                uint256 ethValue;
+                (args.transformations, ethValue) = abi.decode(
+                    wrappedCall.data,
+                    (ITransformERC20Feature.Transformation[], uint256)
+                );
+                // Do not spend more than the remaining ETH.
+                ethValue = LibSafeMathV06.min256(ethValue, remainingEth);
+                if (ethValue > 0) {
+                    require(
+                        args.inputToken.isTokenETH(),
+                        "MultiplexFeature::_multiHopFill/ETH_TRANSFORM_ONLY"
+                    );
+                }
+                // Call `_transformERC20`.
+                outputTokenAmount = ITransformERC20Feature(address(this))
+                    ._transformERC20{value: ethValue}(args);
+                // Decrement the remaining ETH.
+                remainingEth -= ethValue;
+                // If the recipient was not `msg.sender`, it must be the target
+                // contract for the next hop.
+                nextTarget = args.taker == msg.sender ? address(0) : args.taker;
+            } else if (wrappedCall.selector == IEtherTokenV06.deposit.selector) {
+                require(
+                    i == 0,
+                    "MultiplexFeature::_multiHopFill/DEPOSIT_FIRST_HOP_ONLY"
+                );
+                uint256 ethValue = LibSafeMathV06.min256(outputTokenAmount, remainingEth);
+                // Wrap ETH.
+                weth.deposit{value: ethValue}();
+                nextTarget = _computeHopRecipient(fillData.calls, i);
+                weth.transfer(nextTarget, ethValue);
+                remainingEth -= ethValue;
+            } else if (wrappedCall.selector == IEtherTokenV06.withdraw.selector) {
+                require(
+                    i == fillData.calls.length - 1,
+                    "MultiplexFeature::_multiHopFill/WITHDRAW_LAST_HOP_ONLY"
+                );
+                // Unwrap WETH and send to `msg.sender`.
+                weth.withdraw(outputTokenAmount);
+                _transferEth(msg.sender, outputTokenAmount);
+                nextTarget = address(0);
+            } else {
+                revert("MultiplexFeature::_multiHopFill/UNRECOGNIZED_SELECTOR");
+            }
+        }
+    }
+
+    // Similar to the UniswapFeature, but with a couple of differences:
+    // - Does not perform the transfer in if `pairAddress` is given,
+    //   which indicates that the transfer in was already performed
+    //   in the previous hop of a multi-hop fill.
+    // - Does not include a minBuyAmount check (which is performed in
+    //   either `batchFill` or `multiHopFill`).
+    // - Takes a `recipient` address parameter, so the output of the
+    //   final `swap` call can be sent to an address other than `msg.sender`.
+    function _sellToUniswap(
+        address[] memory tokens,
+        uint256 sellAmount,
+        bool isSushi,
+        address pairAddress,
+        address recipient
+    )
+        public
+        returns (uint256 outputTokenAmount)
+    {
+        require(tokens.length > 1, "MultiplexFeature::_sellToUniswap/InvalidTokensLength");
+
+        if (pairAddress == address(0)) {
+            pairAddress = _computeUniswapPairAddress(tokens[0], tokens[1], isSushi);
+            _transferERC20Tokens(
+                IERC20TokenV06(tokens[0]),
+                msg.sender,
+                pairAddress,
+                sellAmount
+            );
+        }
+
+        for (uint256 i = 0; i < tokens.length - 1; i++) {
+            (address inputToken, address outputToken) = (tokens[i], tokens[i + 1]);
+            outputTokenAmount = _computeUniswapOutputAmount(
+                pairAddress,
+                inputToken,
+                outputToken,
+                sellAmount
+            );
+            (uint256 amount0Out, uint256 amount1Out) = inputToken < outputToken
+                ? (uint256(0), outputTokenAmount)
+                : (outputTokenAmount, uint256(0));
+            address to = i < tokens.length - 2
+                ? _computeUniswapPairAddress(outputToken, tokens[i + 2], isSushi)
+                : recipient;
+            IUniswapV2Pair(pairAddress).swap(
+                amount0Out,
+                amount1Out,
+                to,
+                new bytes(0)
+            );
+            pairAddress = to;
+            sellAmount = outputTokenAmount;
+        }
+    }
+
+    // Same as the LiquidityProviderFeature, but without the transfer in
+    // (which is potentially done in the previous hop of a multi-hop fill)
+    // and without the minBuyAmount check (which is performed at the top, i.e.
+    // in either `batchFill` or `multiHopFill`).
+    function _sellToLiquidityProvider(
+        IERC20TokenV06 inputToken,
+        IERC20TokenV06 outputToken,
+        uint256 inputTokenAmount,
+        ILiquidityProvider provider,
+        address recipient,
+        bytes memory auxiliaryData
+    )
+        public
+        returns (uint256 outputTokenAmount)
+    {
+        uint256 balanceBefore = IERC20TokenV06(outputToken).getTokenBalanceOf(recipient);
+        if (IERC20TokenV06(inputToken).isTokenETH()) {
+            sandbox.executeSellEthForToken(
+                provider,
+                outputToken,
+                recipient,
+                0,
+                auxiliaryData
+            );
+        } else if (IERC20TokenV06(outputToken).isTokenETH()) {
+            sandbox.executeSellTokenForEth(
+                provider,
+                inputToken,
+                recipient,
+                0,
+                auxiliaryData
+            );
+        } else {
+            sandbox.executeSellTokenForToken(
+                provider,
+                inputToken,
+                outputToken,
+                recipient,
+                0,
+                auxiliaryData
+            );
+        }
+        outputTokenAmount = IERC20TokenV06(outputToken).getTokenBalanceOf(recipient)
+            .safeSub(balanceBefore);
+        emit LiquidityProviderSwap(
+            address(inputToken),
+            address(outputToken),
+            inputTokenAmount,
+            outputTokenAmount,
+            address(provider),
+            recipient
+        );
+        return outputTokenAmount;
+    }
+
+    function _transferEth(address payable recipient, uint256 amount)
+        private
+    {
+        (bool success,) = recipient.call{value: amount}("");
+        require(success, "MultiplexFeature::_transferEth/TRANSFER_FALIED");
+    }
+
+    // Some liquidity sources (e.g. Uniswap, Sushiswap, and PLP) can be passed
+    // a `recipient` parameter so the boguht tokens are transferred to the
+    // `recipient` address rather than `msg.sender`.
+    // Some liquidity sources (also Uniswap, Sushiswap, and PLP incidentally)
+    // support a "transfer then execute" pattern, where the token being sold
+    // can be transferred into the contract before calling a swap function to
+    // execute the trade.
+    // If the current hop in a multi-hop fill satisfies the first condition,
+    // and the next hop satisfies the second condition, the tokens bought
+    // in the current hop can be directly sent to the target contract of
+    // the next hop to save a transfer.
+    function _computeHopRecipient(
+        WrappedMultiHopCall[] memory calls,
+        uint256 i
+    )
+        private
+        view
+        returns (address recipient)
+    {
+        recipient = msg.sender;
+        if (i < calls.length - 1) {
+            WrappedMultiHopCall memory nextCall = calls[i + 1];
+            if (nextCall.selector == this._sellToUniswap.selector) {
+                (address[] memory tokens, bool isSushi) = abi.decode(
+                    nextCall.data,
+                    (address[], bool)
+                );
+                recipient = _computeUniswapPairAddress(tokens[0], tokens[1], isSushi);
+            } else if (nextCall.selector == this._sellToLiquidityProvider.selector) {
+                (recipient,) = abi.decode(
+                    nextCall.data,
+                    (address, bytes)
+                );
+            } else if (nextCall.selector == IEtherTokenV06.withdraw.selector) {
+                recipient = address(this);
+            } else if (nextCall.selector == ITransformERC20Feature._transformERC20.selector) {
+                recipient = address(
+                    ITransformERC20Feature(address(this)).getTransformWallet()
+                );
+            }
+        }
+        require(
+            recipient != address(0),
+            "MultiplexFeature::_computeHopRecipient/RECIPIENT_IS_NULL"
+        );
+    }
+
+    // Computes the the amount of output token that would be bought
+    // from Uniswap/Sushiswap given the input amount.
+    function _computeUniswapOutputAmount(
+        address pairAddress,
+        address inputToken,
+        address outputToken,
+        uint256 inputAmount
+    )
+        private
+        view
+        returns (uint256 outputAmount)
+    {
+        require(
+            inputAmount > 0,
+            "MultiplexFeature::_computeUniswapOutputAmount/INSUFFICIENT_INPUT_AMOUNT"
+        );
+        (uint256 reserve0, uint256 reserve1,) = IUniswapV2Pair(pairAddress).getReserves();
+        require(
+            reserve0 > 0 && reserve1 > 0,
+            'MultiplexFeature::_computeUniswapOutputAmount/INSUFFICIENT_LIQUIDITY'
+        );
+        (uint256 inputReserve, uint256 outputReserve) = inputToken < outputToken
+            ? (reserve0, reserve1)
+            : (reserve1, reserve0);
+        uint256 inputAmountWithFee = inputAmount.safeMul(997);
+        uint256 numerator = inputAmountWithFee.safeMul(outputReserve);
+        uint256 denominator = inputReserve.safeMul(1000).safeAdd(inputAmountWithFee);
+        return numerator / denominator;
+    }
+
+    // Computes the Uniswap/Sushiswap pair contract address for the
+    // given tokens.
+    function _computeUniswapPairAddress(
+        address tokenA,
+        address tokenB,
+        bool isSushi
+    )
+        private
+        pure
+        returns (address pairAddress)
+    {
+        (address token0, address token1) = tokenA < tokenB
+            ? (tokenA, tokenB)
+            : (tokenB, tokenA);
+        if (isSushi) {
+            return address(uint256(keccak256(abi.encodePacked(
+                hex'ff',
+                SUSHISWAP_FACTORY,
+                keccak256(abi.encodePacked(token0, token1)),
+                SUSHISWAP_PAIR_INIT_CODE_HASH
+            ))));
+        } else {
+            return address(uint256(keccak256(abi.encodePacked(
+                hex'ff',
+                UNISWAP_FACTORY,
+                keccak256(abi.encodePacked(token0, token1)),
+                UNISWAP_PAIR_INIT_CODE_HASH
+            ))));
+        }
+    }
+}