prettier and lint

.github/workflows/publish.yml

@@ -22,10 +22,6 @@ jobs:
                   | jq .state)
                   [[ "${REF_STATUS}" == '"${{ github.event.inputs.ci_status }}"' ]] || \
                   (echo "::error ::${{ github.ref }} does not have a successful CI status" && false)
-            - name: Add foundry
-              uses: foundry-rs/foundry-toolchain@v1
-              with:
-                  version: nightly
             - uses: actions/checkout@v2
               with:
                 ref: ${{ github.ref }}

contracts/erc20/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1681157139,
-        "version": "4.0.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1678410794,
         "version": "4.0.2",

contracts/erc20/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v4.0.3 - _April 10, 2023_
-
-    * Dependencies updated
-
 ## v4.0.2 - _March 10, 2023_
 
     * Dependencies updated

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "4.0.3",
+    "version": "4.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -24,7 +24,7 @@
     },
     "homepage": "https://github.com/0xProject/protocol",
     "devDependencies": {
-        "@0x/contracts-utils": "^4.8.41",
+        "@0x/contracts-utils": "^4.8.40",
         "@0x/ts-doc-gen": "^0.0.28",
         "typedoc": "~0.16.11"
     },

contracts/governance/CHANGELOG.json

@@ -1,11 +0,0 @@
-[
-    {
-        "timestamp": 1681157139,
-        "version": "1.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    }
-]

contracts/governance/CHANGELOG.md

@@ -1,10 +0,0 @@
-<!--
-changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
-Edit the package's CHANGELOG.json file only.
--->
-
-CHANGELOG
-
-## v1.0.1 - _April 10, 2023_
-
-    * Dependencies updated

contracts/governance/README.md

@@ -1,74 +0,0 @@
-## Governance
-
-This package contains contracts for the ZeroEx governance of 0x Protocol and Treasury.
-
-## Production deployment
-
-`ZRXWrappedToken` 0xfcfaf7834f134f5146dbb3274bab9bed4bafa917
-`ZeroExVotesProxy` 0x9c766e51b46cbc1fa4f8b6718ed4a60ac9d591fb
-`ZeroExVotes` 0x8d208c5514b98c5b9ceed650b02df2aeb1c73e6f
-Protocol `ZeroExTimelock` 0xb6a1f58c5df9f13312639cddda0d128bf28cdd87
-`ZeroExProtocolGovernor` 0xc256035fe8533f9ce362012a6ae0aefed4df30f4
-Treasury `ZeroExTimelock` 0x0dcfb77a581bc8fe432e904643a5480cc183f38d
-`ZeroExTreasuryGovernor` 0x4822cfc1e7699bdb9551bdfd3a838ee414bc2008
-Security council 0x979BDb496e5f0A00af078b7a45F1E9E6bcff170F
-
-## Design
-
-This implementation fully decentralises governance of 0x Protocol and Treasury. This is enabled via a wrapped ZRX token and a Compound-like governors design. There are two separate governors for Protocol - `ZeroExProtocolGovernor` and Treasury - `ZeroExTreasuryGovernor` respectively working with two separate Timelock instances of the same contract implementation - `ZeroExTimelock`.
-
-### Upgradability
-`ZRXWrappedToken` , `ZeroExProtocolGovernor` and `ZeroExTreasuryGovernor` governors are non-upgradable by design. However the voting implementation the governors use - `ZeroExVotes` is upgradable and using the OZ `ERC1967Proxy`.
-
-### Wrapped ZRX
-wZRX will be issued 1-to-1 for ZRX. No locking/vesting mechanisms will exist between wZRX and ZRX and the two will be freely interchangeable. The ZRX token is non-upgradable and same will be valid for its wrapped equivalent.
-
-The token supports delegation which allows a user to delegate their entire voting power to another account (which doesn't necessarily need to be a token holder). This is modelled on the standard OpenZeppelin `ERC20Votes` implementation. We have added logic for block number stamping delegators' balance changes stored in the `DelegateInfo.balanceLastUpdated` property. This block number information is sent in calls to `ZeroExVotes.moveVotingPower` in order to provide support for future upgrades to the vote power calculation.
-Note that for consistency `block.number` is used for the governor settings, voting checkpoints and this delegators' balance last updated property while timelock logic for the governor uses block.timestamp.
-
-### Governors' settings
-Changing governors' settings for `votingDelay`, `votingPeriod` and `proposalThreshold` can be done via the normal proposal mechanism. Governors are deployed with the following initial settings:
-
-|                                | voting delay | voting period | proposal threshold |
-|-------------------|--------------|---------------|--------------------|
-| Protocol governor | 2 days            | 7 days             |  1000000e18           |
-| Treasury governor | 2 days           |  7 days             |   250000e18          |
-
-
-This is using standard openzeppelin `GovernorSettings` implementation.
-
-### Quorum
-Quorum for Protocol is fixed at 10m (10000000e18) while for Treasury this is calculated as 10% of voting power of the total supply (see voting strategies below for quadratic voting power implementation specifics). The quorum calculations for Treasury are using OpenZeppelin's `GovernorVotesQuorumFraction`.
-
-Note that in-place updates to the quorum are not supported and will need to go through a governance upgrade. Reasoning behind this can be found in this discussion https://forum.openzeppelin.com/t/quorum-default-behaviour-on-governors/34560.
-
-### Voting strategies
-The voting strategy will be linear 1-token-1-vote for Protocol and quadratic with threshold of 1000000e18 for Treasury (i.e. voting weight is linear up to 1m tokens and balance above that threshold is quadratic).
-
-Worth noting is the `Checkpoint` struct design. For packing every `Checkpoint` into a single storage slot we are using the minimum uint type size for `votes` and `quadraticVotes` members, e.g.
-
-```
-struct Checkpoint {
-        uint32 fromBlock;
-        uint96 votes;
-        uint96 quadraticVotes;
-    }
-```
-
-since the maximum token supply is 1bn we can have maximum value for:
-`votes` : 1bn *10^18 => can be stored in 90 bits
-`quadraticVotes` : due to the likelihood of threshold changing and potentially bringing it closer to a linear vote, we are preemptively keeping this to the same size as linear votes slot.
-
-### Time locks
-Governance proposals are subject to a 3 days delay for Protocol and 2 days for Treasury. This delay allows Security Council time to review passed proposals and take action where needed.
-
-### Security Council
-The concept of a Security council is introduced which allows a multisig of security council members to cancel a proposal on the treasury or protocol governors and also rollback the protocol to an earlier version.
-
-When no security council is assigned the following apply:
-
-- ongoing proposals can still be voted on
-- new proposals cannot be created - except assignSecurityCouncil
-- expired proposals that are successful cannot be queued - excepted assignSecurityCouncil
-
-There is a provision for the governors to have different security council set although initially these are the same.

contracts/governance/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0x/governance",
-  "version": "1.0.1",
+  "version": "1.0.0",
   "description": "Governance implementation for the 0x protocol and treasury",
   "main": "index.js",
   "directories": {
@@ -20,5 +20,6 @@
     "type": "git",
     "url": "https://github.com/0xProject/protocol.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "dependencies": {}
 }

contracts/governance/script/DeployGovernance.s.sol

@@ -14,20 +14,20 @@ import "../src/ZeroExProtocolGovernor.sol";
 import "../src/ZeroExTreasuryGovernor.sol";
 
 contract Deploy is Script {
+    address internal constant DEPLOYER = 0xEf37aD2BACD70119F141140f7B5E46Cd53a65fc4;
     address internal constant ZRX_TOKEN = 0xE41d2489571d322189246DaFA5ebDe1F4699F498;
     address internal constant TREASURY = 0x0bB1810061C2f5b2088054eE184E6C79e1591101;
     address internal constant EXCHANGE = 0xDef1C0ded9bec7F1a1670819833240f027b25EfF;
-    address payable internal constant SECURITY_COUNCIL = payable(0x979BDb496e5f0A00af078b7a45F1E9E6bcff170F);
+    address payable internal constant SECURITY_COUNCIL = payable(DEPLOYER);
     uint256 internal constant QUADRATIC_THRESHOLD = 1000000e18;
 
     function setUp() public {}
 
     function run() external {
-        address deployer = vm.envAddress("DEPLOYER");
-        vm.startBroadcast(deployer);
+        vm.startBroadcast(vm.envAddress("DEPLOYER"));
 
         console2.log("Zrx Token", ZRX_TOKEN);
-        address wTokenPrediction = predict(deployer, vm.getNonce(deployer) + 2);
+        address wTokenPrediction = predict(DEPLOYER, vm.getNonce(DEPLOYER) + 2);
         ZeroExVotes votesImpl = new ZeroExVotes(wTokenPrediction, QUADRATIC_THRESHOLD);
         ERC1967Proxy votesProxy = new ERC1967Proxy(address(votesImpl), abi.encodeCall(votesImpl.initialize, ()));
         ZRXWrappedToken wToken = new ZRXWrappedToken(IERC20(ZRX_TOKEN), ZeroExVotes(address(votesProxy)));
@@ -41,7 +41,7 @@ contract Deploy is Script {
         address[] memory proposers = new address[](0);
         address[] memory executors = new address[](0);
 
-        ZeroExTimelock protocolTimelock = new ZeroExTimelock(3 days, proposers, executors, deployer);
+        ZeroExTimelock protocolTimelock = new ZeroExTimelock(3 days, proposers, executors, DEPLOYER);
         console2.log("Protocol timelock", address(protocolTimelock));
 
         ZeroExProtocolGovernor protocolGovernor = new ZeroExProtocolGovernor(
@@ -52,10 +52,9 @@ contract Deploy is Script {
         protocolTimelock.grantRole(protocolTimelock.PROPOSER_ROLE(), address(protocolGovernor));
         protocolTimelock.grantRole(protocolTimelock.EXECUTOR_ROLE(), address(protocolGovernor));
         protocolTimelock.grantRole(protocolTimelock.CANCELLER_ROLE(), address(protocolGovernor));
-        protocolTimelock.renounceRole(protocolTimelock.TIMELOCK_ADMIN_ROLE(), deployer);
         console2.log("Protocol governor", address(protocolGovernor));
 
-        ZeroExTimelock treasuryTimelock = new ZeroExTimelock(2 days, proposers, executors, deployer);
+        ZeroExTimelock treasuryTimelock = new ZeroExTimelock(2 days, proposers, executors, DEPLOYER);
         console2.log("Treasury timelock", address(treasuryTimelock));
 
         ZeroExTreasuryGovernor treasuryGovernor = new ZeroExTreasuryGovernor(
@@ -67,7 +66,6 @@ contract Deploy is Script {
         treasuryTimelock.grantRole(treasuryTimelock.PROPOSER_ROLE(), address(treasuryGovernor));
         treasuryTimelock.grantRole(treasuryTimelock.EXECUTOR_ROLE(), address(treasuryGovernor));
         treasuryTimelock.grantRole(treasuryTimelock.CANCELLER_ROLE(), address(treasuryGovernor));
-        treasuryTimelock.renounceRole(treasuryTimelock.TIMELOCK_ADMIN_ROLE(), deployer);
         console2.log("Treasury governor", address(treasuryGovernor));
         console2.log(unicode"0x governance deployed successfully 🎉");
         vm.stopBroadcast();

contracts/governance/test/integration/GovernanceE2E.t.sol

@@ -23,7 +23,6 @@ import "@openzeppelin/token/ERC20/IERC20.sol";
 import "../mocks/IZeroExMock.sol";
 import "../mocks/IZrxTreasuryMock.sol";
 import "../mocks/IStakingMock.sol";
-import "../mocks/IZrxVaultMock.sol";
 import "../BaseTest.t.sol";
 import "../../src/ZRXWrappedToken.sol";
 import "../../src/ZeroExVotes.sol";
@@ -35,11 +34,6 @@ contract GovernanceE2ETest is BaseTest {
     uint256 internal mainnetFork;
     string internal MAINNET_RPC_URL = vm.envString("MAINNET_RPC_URL");
 
-    struct DelegatorPool {
-        address delegator;
-        bytes32 pool;
-    }
-
     address internal constant ZRX_TOKEN = 0xE41d2489571d322189246DaFA5ebDe1F4699F498;
     address internal constant MATIC_TOKEN = 0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0;
     address internal constant WCELO_TOKEN = 0xE452E6Ea2dDeB012e20dB73bf5d3863A3Ac8d77a;
@@ -48,25 +42,10 @@ contract GovernanceE2ETest is BaseTest {
     address internal constant EXCHANGE_PROXY = 0xDef1C0ded9bec7F1a1670819833240f027b25EfF;
     address internal constant EXCHANGE_GOVERNOR = 0x618F9C67CE7Bf1a50afa1E7e0238422601b0ff6e;
     address internal constant TREASURY = 0x0bB1810061C2f5b2088054eE184E6C79e1591101;
-    address internal constant STAKING = 0xa26e80e7Dea86279c6d778D702Cc413E6CFfA777; // Holds ~$262K in WETH for rewards
-    address internal constant ZRX_VAULT = 0xBa7f8b5fB1b19c1211c5d49550fcD149177A5Eaf; // Holds ~$10m in staked ZRX
-    address internal constant STAKING_AND_VAULT_OWNER = 0x7D3455421BbC5Ed534a83c88FD80387dc8271392;
-
-    address internal staker1 = 0x885c327cAD2aebb969dfaAb4c928B73CA17e3887;
-    address internal staker2 = 0x03c823e96F6964076C118395F08a2D7edF0f8a8C;
-
-    address[] internal topStakers = [
-        0x5775afA796818ADA27b09FaF5c90d101f04eF600,
-        0xE1bdcd3B70e077D2d66ADcbe78be3941F0BF380B,
-        0xcCa71809E8870AFEB72c4720d0fe50d5C3230e05,
-        0x828FD91d3e3a9FFa6305e78B9aE2Cfbc5B5D9f6B,
-        0x4A36C3DA5d367B148d17265e7d7feafcf8fb4a21,
-        0xEeff6fd32DeaFe1a9d3258A51c7F952F9FF0B2Ce,
-        0x1D0738b927dFCBFBD59A9F0944BbD1860d3B9248,
-        0x0C073E7248C1b548a08b27dD3af5D0f39c774280,
-        0xA178FF321335BB777A7E21A56376592F69556b9c,
-        0xD06CfBb59d2e8918F84D99d981039d7706DCA288
-    ];
+    address internal constant STAKING = 0xa26e80e7Dea86279c6d778D702Cc413E6CFfA777;
+    address internal staker = 0x5265Bde27F57E738bE6c1F6AB3544e82cdc92a8f;
+    bytes32 internal stakerPool = 0x0000000000000000000000000000000000000000000000000000000000000032;
+    bytes32[] internal staker_operated_poolIds = [stakerPool];
 
     // voting power 1500000e18
     address internal voter1 = 0x292c6DAE7417B3D31d8B6e1d2EeA0258d14C4C4b;
@@ -110,9 +89,7 @@ contract GovernanceE2ETest is BaseTest {
 
     IZeroExMock internal exchange;
     IZrxTreasuryMock internal treasury;
-    IZrxVaultMock internal vault;
     IStakingMock internal staking;
-    IERC20 internal weth;
 
     ZRXWrappedToken internal wToken;
     ZeroExVotes internal votes;
@@ -132,9 +109,7 @@ contract GovernanceE2ETest is BaseTest {
 
         exchange = IZeroExMock(payable(EXCHANGE_PROXY));
         treasury = IZrxTreasuryMock(TREASURY);
-        vault = IZrxVaultMock(ZRX_VAULT);
         staking = IStakingMock(STAKING);
-        weth = IERC20(staking.getWethContract());
 
         address protocolGovernorAddress;
         address treasuryGovernorAddress;
@@ -167,7 +142,7 @@ contract GovernanceE2ETest is BaseTest {
         uint256 currentEpoch = staking.currentEpoch();
         uint256 executionEpoch = currentEpoch + 2;
 
-        vm.startPrank(voter3);
+        vm.startPrank(staker);
 
         IZrxTreasuryMock.ProposedAction[] memory actions = new IZrxTreasuryMock.ProposedAction[](4);
 
@@ -207,7 +182,7 @@ contract GovernanceE2ETest is BaseTest {
             actions,
             executionEpoch,
             "Z-5 Migrate to new treasury governor",
-            voter3_operated_poolIds
+            staker_operated_poolIds
         );
 
         // Once a proposal is created, it becomes open for voting at the epoch after next (currentEpoch + 2)
@@ -268,187 +243,4 @@ contract GovernanceE2ETest is BaseTest {
         uint256 wyvBalanceNewTreasury = wyvToken.balanceOf(address(treasuryGovernor));
         assertEq(wyvBalanceNewTreasury, wyvBalance);
     }
-
-    // Test entering catastrophic failure mode on the zrx vault to decomission v3 staking
-    function testCatastrophicFailureModeOnStaking() public {
-        DelegatorPool[5] memory delegatorPools = [
-            DelegatorPool(
-                0x0ee1F33A2EB0da738FdF035C48d62d75e996a3bd,
-                0x0000000000000000000000000000000000000000000000000000000000000016
-            ),
-            DelegatorPool(
-                0xcAb3d8cBBb3dA1bDabfB003B9C828B27a821717f,
-                0x0000000000000000000000000000000000000000000000000000000000000017
-            ),
-            DelegatorPool(
-                0x7f88b00Db27a500fBfA7EbC9c3CaA2Dea6F59d5b,
-                0x0000000000000000000000000000000000000000000000000000000000000014
-            ),
-            DelegatorPool(
-                0xcE266E6123B682f7A7388097e2155b5379D9AC78,
-                0x0000000000000000000000000000000000000000000000000000000000000014
-            ),
-            DelegatorPool(
-                0xBa4f44E774158408E2DC6c5cb65BC995F0a89180, // pool operator
-                0x0000000000000000000000000000000000000000000000000000000000000017
-            )
-        ];
-
-        // Enter catastrophic failure mode on the zrx vault
-        vm.prank(STAKING_AND_VAULT_OWNER);
-        vault.enterCatastrophicFailure();
-        vm.stopPrank();
-
-        // Stakes can still be withdrawn
-        // staker1 withdraws
-        uint256 stake1 = vault.balanceOf(staker1);
-        uint256 balance1 = token.balanceOf(staker1);
-        assertGt(stake1, 0);
-
-        vm.prank(staker1);
-        vault.withdrawAllFrom(staker1);
-        vm.stopPrank();
-
-        assertEq(vault.balanceOf(staker1), 0);
-        assertEq(token.balanceOf(staker1), stake1 + balance1);
-
-        // staker2 withdraws
-        uint256 stake2 = vault.balanceOf(staker2);
-        uint256 balance2 = token.balanceOf(staker2);
-        assertGt(stake2, 0);
-
-        vm.prank(staker2);
-        vault.withdrawAllFrom(staker2);
-        vm.stopPrank();
-
-        assertEq(vault.balanceOf(staker2), 0);
-        assertEq(token.balanceOf(staker2), stake2 + balance2);
-
-        // Test top stakers can withdraw
-        for (uint256 i = 0; i < topStakers.length; i++) {
-            address staker = topStakers[i];
-            uint256 stake = vault.balanceOf(staker);
-            uint256 balance = token.balanceOf(staker);
-            assertGt(stake, 0);
-
-            vm.prank(staker);
-            vault.withdrawAllFrom(staker);
-            vm.stopPrank();
-
-            assertEq(vault.balanceOf(staker), 0);
-            assertEq(token.balanceOf(staker), stake + balance);
-        }
-
-        // Delegator can withdraw rewards
-        for (uint256 i = 0; i < delegatorPools.length; i++) {
-            address delegator = delegatorPools[i].delegator;
-            bytes32 pool = delegatorPools[i].pool;
-            uint256 reward = staking.computeRewardBalanceOfDelegator(pool, delegator);
-            assertGt(reward, 0);
-            uint256 balanceBeforeReward = weth.balanceOf(delegator);
-
-            vm.prank(delegator);
-            staking.withdrawDelegatorRewards(pool);
-            vm.stopPrank();
-
-            assertEq(weth.balanceOf(delegator), balanceBeforeReward + reward);
-        }
-    }
-
-    function testSwitchDelegationInCatastrophicMode() public {
-        // Enter catastrophic failure mode on the zrx vault
-        vm.prank(STAKING_AND_VAULT_OWNER);
-        vault.enterCatastrophicFailure();
-
-        // 0x delegator
-        address delegator = 0x5775afA796818ADA27b09FaF5c90d101f04eF600;
-
-        uint256 stake = vault.balanceOf(delegator);
-        uint256 balance = token.balanceOf(delegator);
-        assertGt(stake, 0);
-
-        // Withdraw stake all at once
-        vm.startPrank(delegator);
-        vault.withdrawAllFrom(delegator);
-
-        assertEq(vault.balanceOf(delegator), 0);
-        assertEq(token.balanceOf(delegator), stake + balance);
-
-        // delegate 1M ZRX to 0x4990cE223209FCEc4ec4c1ff6E0E81eebD8Cca08
-        vm.roll(block.number + 1);
-        address delegate = 0x4990cE223209FCEc4ec4c1ff6E0E81eebD8Cca08;
-        uint256 amountToDelegate = 1000000e18;
-
-        // Approve the wrapped token and deposit 1m ZRX
-        token.approve(address(wToken), amountToDelegate);
-        wToken.depositFor(delegator, amountToDelegate);
-
-        assertEq(wToken.balanceOf(delegator), amountToDelegate);
-
-        vm.roll(block.number + 1);
-        wToken.delegate(delegate);
-        vm.stopPrank();
-
-        assertEq(votes.getVotes(delegate), amountToDelegate);
-        assertEq(votes.getQuadraticVotes(delegate), amountToDelegate);
-    }
-
-    function testSwitchDelegationInNormalOperationMode() public {
-        // 0x delegator
-        address delegator = 0x5775afA796818ADA27b09FaF5c90d101f04eF600;
-        uint256 balance = token.balanceOf(delegator);
-
-        // Undelegate stake from pool 0x35
-        vm.startPrank(delegator);
-        staking.moveStake(
-            IStructs.StakeInfo(
-                IStructs.StakeStatus.DELEGATED,
-                0x0000000000000000000000000000000000000000000000000000000000000035
-            ),
-            IStructs.StakeInfo(IStructs.StakeStatus.UNDELEGATED, bytes32(0)),
-            3000000000000000000000000
-        );
-
-        // Undelegate stake from pool 0x38
-        IStructs.StoredBalance memory storedBalance38 = staking.getStakeDelegatedToPoolByOwner(
-            delegator,
-            0x0000000000000000000000000000000000000000000000000000000000000038
-        );
-        staking.moveStake(
-            IStructs.StakeInfo(
-                IStructs.StakeStatus.DELEGATED,
-                0x0000000000000000000000000000000000000000000000000000000000000038
-            ),
-            IStructs.StakeInfo(IStructs.StakeStatus.UNDELEGATED, bytes32(0)),
-            storedBalance38.currentEpochBalance
-        );
-
-        // Warp past an epochs and unstake
-        uint256 epochEndTime = staking.getCurrentEpochEarliestEndTimeInSeconds();
-        vm.warp(epochEndTime + 1);
-        staking.endEpoch();
-
-        staking.unstake(6000000000000000000000000);
-        vm.stopPrank();
-
-        assertEq(token.balanceOf(delegator), balance + 2 * 3000000000000000000000000);
-
-        // delegate 1M ZRX to 0x4990cE223209FCEc4ec4c1ff6E0E81eebD8Cca08
-        vm.roll(block.number + 1);
-        address delegate = 0x4990cE223209FCEc4ec4c1ff6E0E81eebD8Cca08;
-        uint256 amountToDelegate = 1000000e18;
-
-        // Approve the wrapped token and deposit 1m ZRX
-        token.approve(address(wToken), amountToDelegate);
-        wToken.depositFor(delegator, amountToDelegate);
-
-        assertEq(wToken.balanceOf(delegator), amountToDelegate);
-
-        vm.roll(block.number + 1);
-        wToken.delegate(delegate);
-        vm.stopPrank();
-
-        assertEq(votes.getVotes(delegate), amountToDelegate);
-        assertEq(votes.getQuadraticVotes(delegate), amountToDelegate);
-    }
 }

contracts/governance/test/mocks/IStakingMock.sol

@@ -17,16 +17,36 @@
 
 */
 
-import "./IZrxVaultMock.sol";
-import "./IStructs.sol";
-import "./IStorageMock.sol";
-
 pragma solidity ^0.8.19;
 
-interface IStakingMock is IStorageMock {
-    /// @dev Adds a new exchange address
-    /// @param addr Address of exchange contract to add
-    function addExchangeAddress(address addr) external;
+interface IStakingMock {
+    /// @dev Statuses that stake can exist in.
+    ///      Any stake can be (re)delegated effective at the next epoch
+    ///      Undelegated stake can be withdrawn if it is available in both the current and next epoch
+    enum StakeStatus {
+        UNDELEGATED,
+        DELEGATED
+    }
+
+    /// @dev Encapsulates a balance for the current and next epochs.
+    /// Note that these balances may be stale if the current epoch
+    /// is greater than `currentEpoch`.
+    /// @param currentEpoch The current epoch
+    /// @param currentEpochBalance Balance in the current epoch.
+    /// @param nextEpochBalance Balance in `currentEpoch+1`.
+    struct StoredBalance {
+        uint64 currentEpoch;
+        uint96 currentEpochBalance;
+        uint96 nextEpochBalance;
+    }
+
+    /// @dev Holds the metadata for a staking pool.
+    /// @param operator Operator of the pool.
+    /// @param operatorShare Fraction of the total balance owned by the operator, in ppm.
+    struct Pool {
+        address operator;
+        uint32 operatorShare;
+    }
 
     /// @dev Create a new staking pool. The sender will be the operator of this pool.
     /// Note that an operator must be payable.
@@ -35,105 +55,26 @@ interface IStakingMock is IStorageMock {
     /// @return poolId The unique pool id generated for this pool.
     function createStakingPool(uint32 operatorShare, bool addOperatorAsMaker) external returns (bytes32 poolId);
 
-    /// @dev Decreases the operator share for the given pool (i.e. increases pool rewards for members).
-    /// @param poolId Unique Id of pool.
-    /// @param newOperatorShare The newly decreased percentage of any rewards owned by the operator.
-    function decreaseStakingPoolOperatorShare(bytes32 poolId, uint32 newOperatorShare) external;
+    /// @dev Returns the current staking epoch number.
+    /// @return epoch The current epoch.
+    function currentEpoch() external view returns (uint256 epoch);
 
-    /// @dev Begins a new epoch, preparing the prior one for finalization.
-    ///      Throws if not enough time has passed between epochs or if the
-    ///      previous epoch was not fully finalized.
-    /// @return numPoolsToFinalize The number of unfinalized pools.
-    function endEpoch() external returns (uint256);
+    /// @dev Returns the time (in seconds) at which the current staking epoch started.
+    /// @return startTime The start time of the current epoch, in seconds.
+    function currentEpochStartTimeInSeconds() external view returns (uint256 startTime);
 
-    /// @dev Instantly finalizes a single pool that earned rewards in the previous
-    ///      epoch, crediting it rewards for members and withdrawing operator's
-    ///      rewards as WETH. This can be called by internal functions that need
-    ///      to finalize a pool immediately. Does nothing if the pool is already
-    ///      finalized or did not earn rewards in the previous epoch.
-    /// @param poolId The pool ID to finalize.
-    function finalizePool(bytes32 poolId) external;
+    /// @dev Returns the duration of an epoch in seconds. This value can be updated.
+    /// @return duration The duration of an epoch, in seconds.
+    function epochDurationInSeconds() external view returns (uint256 duration);
 
-    /// @dev Initialize storage owned by this contract.
-    ///      This function should not be called directly.
-    ///      The StakingProxy contract will call it in `attachStakingContract()`.
-    function init() external;
-
-    /// @dev Allows caller to join a staking pool as a maker.
+    /// @dev Returns a staking pool
     /// @param poolId Unique id of pool.
-    function joinStakingPoolAsMaker(bytes32 poolId) external;
-
-    /// @dev Moves stake between statuses: 'undelegated' or 'delegated'.
-    ///      Delegated stake can also be moved between pools.
-    ///      This change comes into effect next epoch.
-    /// @param from status to move stake out of.
-    /// @param to status to move stake into.
-    /// @param amount of stake to move.
-    function moveStake(IStructs.StakeInfo calldata from, IStructs.StakeInfo calldata to, uint256 amount) external;
-
-    /// @dev Pays a protocol fee in ETH.
-    /// @param makerAddress The address of the order's maker.
-    /// @param payerAddress The address that is responsible for paying the protocol fee.
-    /// @param protocolFee The amount of protocol fees that should be paid.
-    function payProtocolFee(address makerAddress, address payerAddress, uint256 protocolFee) external payable;
-
-    /// @dev Removes an existing exchange address
-    /// @param addr Address of exchange contract to remove
-    function removeExchangeAddress(address addr) external;
-
-    /// @dev Set all configurable parameters at once.
-    /// @param _epochDurationInSeconds Minimum seconds between epochs.
-    /// @param _rewardDelegatedStakeWeight How much delegated stake is weighted vs operator stake, in ppm.
-    /// @param _minimumPoolStake Minimum amount of stake required in a pool to collect rewards.
-    /// @param _cobbDouglasAlphaNumerator Numerator for cobb douglas alpha factor.
-    /// @param _cobbDouglasAlphaDenominator Denominator for cobb douglas alpha factor.
-    function setParams(
-        uint256 _epochDurationInSeconds,
-        uint32 _rewardDelegatedStakeWeight,
-        uint256 _minimumPoolStake,
-        uint32 _cobbDouglasAlphaNumerator,
-        uint32 _cobbDouglasAlphaDenominator
-    ) external;
-
-    /// @dev Stake ZRX tokens. Tokens are deposited into the ZRX Vault.
-    ///      Unstake to retrieve the ZRX. Stake is in the 'Active' status.
-    /// @param amount of ZRX to stake.
-    function stake(uint256 amount) external;
-
-    /// @dev Unstake. Tokens are withdrawn from the ZRX Vault and returned to
-    ///      the staker. Stake must be in the 'undelegated' status in both the
-    ///      current and next epoch in order to be unstaked.
-    /// @param amount of ZRX to unstake.
-    function unstake(uint256 amount) external;
-
-    /// @dev Withdraws the caller's WETH rewards that have accumulated
-    ///      until the last epoch.
-    /// @param poolId Unique id of pool.
-    function withdrawDelegatorRewards(bytes32 poolId) external;
-
-    /// @dev Computes the reward balance in ETH of a specific member of a pool.
-    /// @param poolId Unique id of pool.
-    /// @param member The member of the pool.
-    /// @return reward Balance in ETH.
-    function computeRewardBalanceOfDelegator(bytes32 poolId, address member) external view returns (uint256 reward);
-
-    /// @dev Computes the reward balance in ETH of the operator of a pool.
-    /// @param poolId Unique id of pool.
-    /// @return reward Balance in ETH.
-    function computeRewardBalanceOfOperator(bytes32 poolId) external view returns (uint256 reward);
-
-    /// @dev Returns the earliest end time in seconds of this epoch.
-    ///      The next epoch can begin once this time is reached.
-    ///      Epoch period = [startTimeInSeconds..endTimeInSeconds)
-    /// @return Time in seconds.
-    function getCurrentEpochEarliestEndTimeInSeconds() external view returns (uint256);
+    function getStakingPool(bytes32 poolId) external view returns (Pool memory);
 
     /// @dev Gets global stake for a given status.
     /// @param stakeStatus UNDELEGATED or DELEGATED
     /// @return balance Global stake for given status.
-    function getGlobalStakeByStatus(
-        IStructs.StakeStatus stakeStatus
-    ) external view returns (IStructs.StoredBalance memory balance);
+    function getGlobalStakeByStatus(StakeStatus stakeStatus) external view returns (StoredBalance memory balance);
 
     /// @dev Gets an owner's stake balances by status.
     /// @param staker Owner of stake.
@@ -141,56 +82,25 @@ interface IStakingMock is IStorageMock {
     /// @return balance Owner's stake balances for given status.
     function getOwnerStakeByStatus(
         address staker,
-        IStructs.StakeStatus stakeStatus
-    ) external view returns (IStructs.StoredBalance memory balance);
+        StakeStatus stakeStatus
+    ) external view returns (StoredBalance memory balance);
 
-    /// @dev Retrieves all configurable parameter values.
-    /// @return _epochDurationInSeconds Minimum seconds between epochs.
-    /// @return _rewardDelegatedStakeWeight How much delegated stake is weighted vs operator stake, in ppm.
-    /// @return _minimumPoolStake Minimum amount of stake required in a pool to collect rewards.
-    /// @return _cobbDouglasAlphaNumerator Numerator for cobb douglas alpha factor.
-    /// @return _cobbDouglasAlphaDenominator Denominator for cobb douglas alpha factor.
-    function getParams()
-        external
-        view
-        returns (
-            uint256 _epochDurationInSeconds,
-            uint32 _rewardDelegatedStakeWeight,
-            uint256 _minimumPoolStake,
-            uint32 _cobbDouglasAlphaNumerator,
-            uint32 _cobbDouglasAlphaDenominator
-        );
+    /// @dev Returns the total stake delegated to a specific staking pool,
+    ///      across all members.
+    /// @param poolId Unique Id of pool.
+    /// @return balance Total stake delegated to pool.
+    function getTotalStakeDelegatedToPool(bytes32 poolId) external view returns (StoredBalance memory balance);
 
+    /// @dev Returns the stake delegated to a specific staking pool, by a given staker.
     /// @param staker of stake.
     /// @param poolId Unique Id of pool.
     /// @return balance Stake delegated to pool by staker.
     function getStakeDelegatedToPoolByOwner(
         address staker,
         bytes32 poolId
-    ) external view returns (IStructs.StoredBalance memory balance);
+    ) external view returns (StoredBalance memory balance);
 
-    /// @dev Returns a staking pool
-    /// @param poolId Unique id of pool.
-    function getStakingPool(bytes32 poolId) external view returns (IStructs.Pool memory);
+    function endEpoch() external returns (uint256);
 
-    /// @dev Get stats on a staking pool in this epoch.
-    /// @param poolId Pool Id to query.
-    /// @return PoolStats struct for pool id.
-    function getStakingPoolStatsThisEpoch(bytes32 poolId) external view returns (IStructs.PoolStats memory);
-
-    /// @dev Returns the total stake delegated to a specific staking pool,
-    ///      across all members.
-    /// @param poolId Unique Id of pool.
-    /// @return balance Total stake delegated to pool.
-    function getTotalStakeDelegatedToPool(bytes32 poolId) external view returns (IStructs.StoredBalance memory balance);
-
-    /// @dev An overridable way to access the deployed WETH contract.
-    ///      Must be view to allow overrides to access state.
-    /// @return wethContract The WETH contract instance.
-    function getWethContract() external view returns (address wethContract);
-
-    /// @dev An overridable way to access the deployed zrxVault.
-    ///      Must be view to allow overrides to access state.
-    /// @return zrxVault The zrxVault contract.
-    function getZrxVault() external view returns (IZrxVaultMock zrxVault);
+    function finalizePool(bytes32 poolId) external;
 }

contracts/governance/test/mocks/IStorageMock.sol

@@ -1,49 +0,0 @@
-// 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.8.19;
-
-import "./IZrxVaultMock.sol";
-import "./IStructs.sol";
-
-interface IStorageMock {
-    function stakingContract() external view returns (address);
-
-    function lastPoolId() external view returns (bytes32);
-
-    function numMakersByPoolId(bytes32 poolId) external view returns (uint256);
-
-    function currentEpoch() external view returns (uint256);
-
-    function currentEpochStartTimeInSeconds() external view returns (uint256);
-
-    function protocolFeesThisEpochByPool(bytes32 poolId) external view returns (uint256);
-
-    function validExchanges(address exchangeAddress) external view returns (bool);
-
-    function epochDurationInSeconds() external view returns (uint256);
-
-    function rewardDelegatedStakeWeight() external view returns (uint32);
-
-    function minimumPoolStake() external view returns (uint256);
-
-    function cobbDouglasAlphaNumerator() external view returns (uint32);
-
-    function cobbDouglasAlphaDenominator() external view returns (uint32);
-}

contracts/governance/test/mocks/IStructs.sol

@@ -1,92 +0,0 @@
-// 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.8.19;
-
-interface IStructs {
-    /// @dev Stats for a pool that earned rewards.
-    /// @param feesCollected Fees collected in ETH by this pool.
-    /// @param weightedStake Amount of weighted stake in the pool.
-    /// @param membersStake Amount of non-operator stake in the pool.
-    struct PoolStats {
-        uint256 feesCollected;
-        uint256 weightedStake;
-        uint256 membersStake;
-    }
-
-    /// @dev Holds stats aggregated across a set of pools.
-    /// @param rewardsAvailable Rewards (ETH) available to the epoch
-    ///        being finalized (the previous epoch). This is simply the balance
-    ///        of the contract at the end of the epoch.
-    /// @param numPoolsToFinalize The number of pools that have yet to be finalized through `finalizePools()`.
-    /// @param totalFeesCollected The total fees collected for the epoch being finalized.
-    /// @param totalWeightedStake The total fees collected for the epoch being finalized.
-    /// @param totalRewardsFinalized Amount of rewards that have been paid during finalization.
-    struct AggregatedStats {
-        uint256 rewardsAvailable;
-        uint256 numPoolsToFinalize;
-        uint256 totalFeesCollected;
-        uint256 totalWeightedStake;
-        uint256 totalRewardsFinalized;
-    }
-
-    /// @dev Encapsulates a balance for the current and next epochs.
-    /// Note that these balances may be stale if the current epoch
-    /// is greater than `currentEpoch`.
-    /// @param currentEpoch the current epoch
-    /// @param currentEpochBalance balance in the current epoch.
-    /// @param nextEpochBalance balance in `currentEpoch+1`.
-    struct StoredBalance {
-        uint64 currentEpoch;
-        uint96 currentEpochBalance;
-        uint96 nextEpochBalance;
-    }
-
-    /// @dev Statuses that stake can exist in.
-    ///      Any stake can be (re)delegated effective at the next epoch
-    ///      Undelegated stake can be withdrawn if it is available in both the current and next epoch
-    enum StakeStatus {
-        UNDELEGATED,
-        DELEGATED
-    }
-
-    /// @dev Info used to describe a status.
-    /// @param status of the stake.
-    /// @param poolId Unique Id of pool. This is set when status=DELEGATED.
-    struct StakeInfo {
-        StakeStatus status;
-        bytes32 poolId;
-    }
-
-    /// @dev Struct to represent a fraction.
-    /// @param numerator of fraction.
-    /// @param denominator of fraction.
-    struct Fraction {
-        uint256 numerator;
-        uint256 denominator;
-    }
-
-    /// @dev Holds the metadata for a staking pool.
-    /// @param operator of the pool.
-    /// @param operatorShare Fraction of the total balance owned by the operator, in ppm.
-    struct Pool {
-        address operator;
-        uint32 operatorShare;
-    }
-}

contracts/governance/test/mocks/IZrxVaultMock.sol

@@ -1,83 +0,0 @@
-/*
-
-  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.8.19;
-
-interface IZrxVaultMock {
-    /// @dev Emmitted whenever a StakingProxy is set in a vault.
-    event StakingProxySet(address stakingProxyAddress);
-
-    /// @dev Emitted when the Staking contract is put into Catastrophic Failure Mode
-    /// @param sender Address of sender (`msg.sender`)
-    event InCatastrophicFailureMode(address sender);
-
-    /// @dev Emitted when Zrx Tokens are deposited into the vault.
-    /// @param staker of Zrx Tokens.
-    /// @param amount of Zrx Tokens deposited.
-    event Deposit(address indexed staker, uint256 amount);
-
-    /// @dev Emitted when Zrx Tokens are withdrawn from the vault.
-    /// @param staker of Zrx Tokens.
-    /// @param amount of Zrx Tokens withdrawn.
-    event Withdraw(address indexed staker, uint256 amount);
-
-    /// @dev Emitted whenever the ZRX AssetProxy is set.
-    event ZrxProxySet(address zrxProxyAddress);
-
-    /// @dev Sets the address of the StakingProxy contract.
-    /// Note that only the contract staker can call this function.
-    /// @param _stakingProxyAddress Address of Staking proxy contract.
-    function setStakingProxy(address _stakingProxyAddress) external;
-
-    /// @dev Vault enters into Catastrophic Failure Mode.
-    /// *** WARNING - ONCE IN CATOSTROPHIC FAILURE MODE, YOU CAN NEVER GO BACK! ***
-    /// Note that only the contract staker can call this function.
-    function enterCatastrophicFailure() external;
-
-    /// @dev Sets the Zrx proxy.
-    /// Note that only the contract staker can call this.
-    /// Note that this can only be called when *not* in Catastrophic Failure mode.
-    /// @param zrxProxyAddress Address of the 0x Zrx Proxy.
-    function setZrxProxy(address zrxProxyAddress) external;
-
-    /// @dev Deposit an `amount` of Zrx Tokens from `staker` into the vault.
-    /// Note that only the Staking contract can call this.
-    /// Note that this can only be called when *not* in Catastrophic Failure mode.
-    /// @param staker of Zrx Tokens.
-    /// @param amount of Zrx Tokens to deposit.
-    function depositFrom(address staker, uint256 amount) external;
-
-    /// @dev Withdraw an `amount` of Zrx Tokens to `staker` from the vault.
-    /// Note that only the Staking contract can call this.
-    /// Note that this can only be called when *not* in Catastrophic Failure mode.
-    /// @param staker of Zrx Tokens.
-    /// @param amount of Zrx Tokens to withdraw.
-    function withdrawFrom(address staker, uint256 amount) external;
-
-    /// @dev Withdraw ALL Zrx Tokens to `staker` from the vault.
-    /// Note that this can only be called when *in* Catastrophic Failure mode.
-    /// @param staker of Zrx Tokens.
-    function withdrawAllFrom(address staker) external returns (uint256);
-
-    /// @dev Returns the balance in Zrx Tokens of the `staker`
-    /// @return Balance in Zrx.
-    function balanceOf(address staker) external view returns (uint256);
-
-    /// @dev Returns the entire balance of Zrx tokens in the vault.
-    function balanceOfZrxVault() external view returns (uint256);
-}

contracts/test-utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "version": "5.4.50",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1681157139
-    },
     {
         "timestamp": 1678410794,
         "version": "5.4.49",

contracts/test-utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v5.4.50 - _April 10, 2023_
-
-    * Dependencies updated
-
 ## v5.4.49 - _March 10, 2023_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.50",
+    "version": "5.4.49",
     "engines": {
         "node": ">=6.12"
     },
@@ -39,19 +39,19 @@
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.36",
+        "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
         "@0x/contract-addresses": "^8.2.0",
-        "@0x/dev-utils": "^5.0.2",
+        "@0x/dev-utils": "^5.0.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-profiler": "^4.1.36",
         "@0x/sol-trace": "^3.0.46",
-        "@0x/subproviders": "^8.0.1",
-        "@0x/types": "^3.3.7",
+        "@0x/subproviders": "^7.0.0",
+        "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.1",
+        "@0x/web3-wrapper": "^8.0.0",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",

contracts/test-utils/src/index.ts

@@ -20,6 +20,7 @@ export { signingUtils } from './signing_utils';
 export { orderUtils } from './order_utils';
 export { typeEncodingUtils } from './type_encoding_utils';
 export { profiler } from './profiler';
+export { Web3ProviderEngine } from '@0x/subproviders';
 export { randomAddress } from './address_utils';
 export { OrderFactory } from './order_factory';
 export { bytes32Values, testCombinatoriallyWithReferenceFunc, uint256Values } from './combinatorial_utils';

contracts/test-utils/src/web3_wrapper.ts

@@ -1,9 +1,12 @@
 import { devConstants, env, EnvVars, Web3Config, web3Factory } from '@0x/dev-utils';
-import { Web3ProviderEngine } from '@0x/subproviders';
+import { prependSubprovider, Web3ProviderEngine } from '@0x/subproviders';
+import { logUtils } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
 import { constants } from './constants';
+import { profiler } from './profiler';
+import { revertTrace } from './revert_trace';
 
 export const txDefaults = {
     from: devConstants.TESTRPC_FIRST_ADDRESS,
@@ -28,9 +31,26 @@ export const providerConfigs: Web3Config = {
 export const provider: Web3ProviderEngine = web3Factory.getRpcProvider(providerConfigs);
 provider.stop();
 const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
-const enabledSubproviderCount = _.filter([isCoverageEnabled], _.identity.bind(_)).length;
+const isProfilerEnabled = env.parseBoolean(EnvVars.SolidityProfiler);
+const isRevertTraceEnabled = env.parseBoolean(EnvVars.SolidityRevertTrace);
+const enabledSubproviderCount = _.filter(
+    [isCoverageEnabled, isProfilerEnabled, isRevertTraceEnabled],
+    _.identity.bind(_),
+).length;
 if (enabledSubproviderCount > 1) {
     throw new Error(`Only one of profiler or revert trace subproviders can be enabled at a time`);
 }
+if (isProfilerEnabled) {
+    const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+    logUtils.log(
+        "By default profilerSubprovider is stopped so that you don't get noise from setup code. Don't forget to start it before the code you want to profile and stop it afterwards",
+    );
+    profilerSubprovider.stop();
+    prependSubprovider(provider, profilerSubprovider);
+}
+if (isRevertTraceEnabled) {
+    const revertTraceSubprovider = revertTrace.getRevertTraceSubproviderSingleton();
+    prependSubprovider(provider, revertTraceSubprovider);
+}
 
 export const web3Wrapper = new Web3Wrapper(provider);

contracts/treasury/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "version": "1.4.43",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1681157139
-    },
     {
         "timestamp": 1678410794,
         "version": "1.4.42",

contracts/treasury/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.4.43 - _April 10, 2023_
-
-    * Dependencies updated
-
 ## v1.4.42 - _March 10, 2023_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.43",
+    "version": "1.4.42",
     "engines": {
         "node": ">=6.12"
     },
@@ -45,13 +45,13 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.5",
+        "@0x/abi-gen": "^5.8.1",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
         "@0x/contracts-erc20": "3.3.57",
-        "@0x/contracts-gen": "^2.0.50",
+        "@0x/contracts-gen": "^2.0.48",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.50",
+        "@0x/contracts-test-utils": "^5.4.49",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
         "@types/isomorphic-fetch": "^0.0.35",
@@ -73,12 +73,12 @@
     },
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.18.2",
-        "@0x/subproviders": "^8.0.1",
-        "@0x/types": "^3.3.7",
+        "@0x/protocol-utils": "^11.18.1",
+        "@0x/subproviders": "^7.0.0",
+        "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.1",
+        "@0x/web3-wrapper": "^8.0.0",
         "ethereum-types": "^3.7.1",
         "ethereumjs-util": "^7.0.10"
     },

contracts/utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "version": "4.8.41",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1681157139
-    },
     {
         "timestamp": 1678410794,
         "version": "4.8.40",

contracts/utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v4.8.41 - _April 10, 2023_
-
-    * Dependencies updated
-
 ## v4.8.40 - _March 10, 2023_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.41",
+    "version": "4.8.40",
     "engines": {
         "node": ">=6.12"
     },
@@ -15,6 +15,7 @@
         "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
+        "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
         "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
         "compile": "sol-compiler",
@@ -43,14 +44,14 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.5",
-        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.50",
-        "@0x/dev-utils": "^5.0.2",
+        "@0x/abi-gen": "^5.8.1",
+        "@0x/contracts-gen": "^2.0.48",
+        "@0x/contracts-test-utils": "^5.4.49",
+        "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
-        "@0x/types": "^3.3.7",
-        "@0x/web3-wrapper": "^8.0.1",
+        "@0x/types": "^3.3.6",
+        "@0x/web3-wrapper": "^8.0.0",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",

contracts/utils/src/index.ts

@@ -3,3 +3,12 @@ export * from './wrappers';
 
 import * as ReferenceFunctionsToExport from './reference_functions';
 export import ReferenceFunctions = ReferenceFunctionsToExport;
+
+export {
+    AuthorizableRevertErrors,
+    LibAddressArrayRevertErrors,
+    LibBytesRevertErrors,
+    OwnableRevertErrors,
+    ReentrancyGuardRevertErrors,
+    SafeMathRevertErrors,
+} from '@0x/utils';

contracts/zero-ex/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "version": "0.39.2",
-        "changes": [
-            {
-                "note": "Uprgade dependencies"
-            }
-        ],
-        "timestamp": 1681157139
-    },
     {
         "version": "0.39.1",
         "changes": [

contracts/zero-ex/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v0.39.2 - _April 10, 2023_
-
-    * Uprgade dependencies
-
 ## v0.39.1 - _March 10, 2023_
 
     * Add KyberElastic mixin for Optimism and BSC

contracts/zero-ex/contracts/src/transformers/FillQuoteTransformer.sol

@@ -119,7 +119,9 @@ contract FillQuoteTransformer is Transformer {
     /// @dev Intermediate state variables to get around stack limits.
     struct FillState {
         uint256 ethRemaining;
+        /// deprecated
         uint256 boughtAmount;
+        /// deprecated
         uint256 soldAmount;
         uint256 protocolFee;
         uint256 takerTokenBalanceRemaining;
@@ -208,19 +210,6 @@ contract FillQuoteTransformer is Transformer {
 
         // Fill the orders.
         for (uint256 i = 0; i < data.fillSequence.length; ++i) {
-            // Check if we've hit our targets.
-            if (data.side == Side.Sell) {
-                // Market sell check.
-                if (state.soldAmount >= data.fillAmount) {
-                    break;
-                }
-            } else {
-                // Market buy check.
-                if (state.boughtAmount >= data.fillAmount) {
-                    break;
-                }
-            }
-
             state.currentOrderType = OrderType(data.fillSequence[i]);
             uint256 orderIndex = state.currentIndices[uint256(state.currentOrderType)];
             // Fill the order.
@@ -238,30 +227,10 @@ contract FillQuoteTransformer is Transformer {
             }
 
             // Accumulate totals.
-            state.soldAmount = state.soldAmount.safeAdd(results.takerTokenSoldAmount);
-            state.boughtAmount = state.boughtAmount.safeAdd(results.makerTokenBoughtAmount);
             state.ethRemaining = state.ethRemaining.safeSub(results.protocolFeePaid);
-            state.takerTokenBalanceRemaining = state.takerTokenBalanceRemaining.safeSub(results.takerTokenSoldAmount);
             state.currentIndices[uint256(state.currentOrderType)]++;
         }
 
-        // Ensure we hit our targets.
-        if (data.side == Side.Sell) {
-            // Market sell check.
-            if (state.soldAmount < data.fillAmount) {
-                LibTransformERC20RichErrors
-                    .IncompleteFillSellQuoteError(address(data.sellToken), state.soldAmount, data.fillAmount)
-                    .rrevert();
-            }
-        } else {
-            // Market buy check.
-            if (state.boughtAmount < data.fillAmount) {
-                LibTransformERC20RichErrors
-                    .IncompleteFillBuyQuoteError(address(data.buyToken), state.boughtAmount, data.fillAmount)
-                    .rrevert();
-            }
-        }
-
         // Refund unspent protocol fees.
         if (state.ethRemaining > 0 && data.refundReceiver != address(0)) {
             bool transferSuccess;

contracts/zero-ex/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-zero-ex",
-    "version": "0.39.2",
+    "version": "0.39.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -50,12 +50,12 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
     "devDependencies": {
-        "@0x/abi-gen": "^5.8.5",
+        "@0x/abi-gen": "^5.8.1",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/contracts-erc20": "^3.3.57",
-        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.50",
-        "@0x/dev-utils": "^5.0.2",
+        "@0x/contracts-gen": "^2.0.48",
+        "@0x/contracts-test-utils": "^5.4.49",
+        "@0x/dev-utils": "^5.0.0",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.2",
         "@0x/ts-doc-gen": "^0.0.28",
@@ -80,12 +80,12 @@
     },
     "dependencies": {
         "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.18.2",
-        "@0x/subproviders": "^8.0.1",
-        "@0x/types": "^3.3.7",
+        "@0x/protocol-utils": "^11.18.1",
+        "@0x/subproviders": "^7.0.0",
+        "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.1",
+        "@0x/web3-wrapper": "^8.0.0",
         "ethereum-types": "^3.7.1",
         "ethereumjs-util": "^7.0.10",
         "ethers": "~4.0.4"

contracts/zero-ex/scripts/rollback.ts

@@ -1,9 +1,9 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
 import { constants } from '@0x/contracts-test-utils';
-import { RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders';
+import { RPCSubprovider, SupportedProvider, Web3ProviderEngine } from '@0x/subproviders';
 import { AbiEncoder, BigNumber, logUtils, providerUtils } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
-import { MethodAbi, SupportedProvider } from 'ethereum-types';
+import { MethodAbi } from 'ethereum-types';
 import * as fetch from 'isomorphic-fetch';
 import * as _ from 'lodash';
 import * as prompts from 'prompts';

contracts/zero-ex/src/index.ts

@@ -1,3 +1,33 @@
+export { ZeroExRevertErrors } from '@0x/utils';
+export {
+    AbiDefinition,
+    CompilerOpts,
+    CompilerSettings,
+    CompilerSettingsMetadata,
+    ConstructorAbi,
+    ConstructorStateMutability,
+    ContractAbi,
+    ContractArtifact,
+    ContractChainData,
+    ContractChains,
+    DataItem,
+    DevdocOutput,
+    EventAbi,
+    EventParameter,
+    EvmBytecodeOutput,
+    EvmBytecodeOutputLinkReferences,
+    EvmOutput,
+    FallbackAbi,
+    FunctionAbi,
+    MethodAbi,
+    OptimizerSettings,
+    OutputField,
+    ParamDescription,
+    RevertErrorAbi,
+    StandardContractOutput,
+    StateMutability,
+    TupleDataItem,
+} from 'ethereum-types';
 export { artifacts } from './artifacts';
 export * from './migration';
 export * from './nonce_utils';
@@ -27,3 +57,5 @@ export {
     WethTransformerContract,
     ZeroExContract,
 } from './wrappers';
+export { EIP712TypedData } from '@0x/types';
+export { SupportedProvider } from '@0x/subproviders';

contracts/zero-ex/src/migration.ts

@@ -1,6 +1,7 @@
+import { SupportedProvider } from '@0x/subproviders';
 import { SimpleContractArtifact } from '@0x/types';
 import { NULL_ADDRESS } from '@0x/utils';
-import { TxData, SupportedProvider } from 'ethereum-types';
+import { TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { artifacts } from './artifacts';

doc-gen-config.json

@@ -19,23 +19,7 @@
         "TFillData": true,
         "IterableIterator": true,
         "Set": true,
-        "Exclude": true,
-        "#": "private types below",
-        "SupportedProvider": true,
-        "ContractAddresses": true,
-        "AbiDecoder": true,
-        "TxData": true,
-        "ContractAbi": true,
-        "EncoderOverrides": true,
-        "ContractFunctionObj": true,
-        "ContractTxFunctionObj": true,
-        "ContractArtifact": true,
-        "SimpleContractArtifact": true,
-        "DataItem": true,
-        "BlockRange": true,
-        "IndexedFilterValues": true,
-        "EventCallback": true,
-        "ContractEventArg": true
+        "Exclude": true
     },
     "ignoredExcessiveTypes": [
         "NonceSubproviderErrors",

packages/contract-wrappers/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-	{
-		"version": "13.22.19",
-		"changes": [
-			{
-				"note": "Dependencies updated"
-			}
-		],
-		"timestamp": 1681157139
-	},
 	{
 		"timestamp": 1678410794,
 		"version": "13.22.18",

packages/contract-wrappers/CHANGELOG.md

@@ -6,9 +6,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v13.22.19 - _April 10, 2023_
-
-    * Dependencies updated
 ## v13.22.18 - _March 10, 2023_
 
     * Dependencies updated

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-wrappers",
-    "version": "13.22.19",
+    "version": "13.22.18",
     "engines": {
         "node": ">=6.12"
     },
@@ -57,13 +57,13 @@
         "typescript": "4.6.3"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.36",
+        "@0x/assert": "^3.0.35",
         "@0x/base-contract": "^7.0.0",
         "@0x/contract-addresses": "^8.2.0",
         "@0x/json-schemas": "^6.4.4",
-        "@0x/types": "^3.3.7",
+        "@0x/types": "^3.3.6",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.1",
+        "@0x/web3-wrapper": "^8.0.0",
         "ethereum-types": "^3.7.1",
         "ethers": "~4.0.4"
     },

packages/contract-wrappers/src/index.ts

@@ -1,3 +1,80 @@
+export {
+    AwaitTransactionSuccessOpts,
+    ContractEvent,
+    ContractFunctionObj,
+    ContractTxFunctionObj,
+    EncoderOverrides,
+    SendTransactionOpts,
+    SubscriptionErrors,
+} from '@0x/base-contract';
+export { ContractAddresses } from '@0x/contract-addresses';
+export {
+    DecodedLogEvent,
+    EventCallback,
+    IndexedFilterValues,
+    SimpleContractArtifact,
+    SimpleEvmBytecodeOutput,
+    SimpleEvmOutput,
+    SimpleStandardContractOutput,
+} from '@0x/types';
+export { AbiDecoder, AbiEncoder, DecodedCalldata, EncodingRules } from '@0x/utils';
+export {
+    AbiDefinition,
+    BlockParam,
+    BlockParamLiteral,
+    BlockRange,
+    CallData,
+    CompilerOpts,
+    CompilerSettings,
+    CompilerSettingsMetadata,
+    ConstructorAbi,
+    ConstructorStateMutability,
+    ContractAbi,
+    ContractArtifact,
+    ContractChainData,
+    ContractChains,
+    ContractEventArg,
+    DataItem,
+    DecodedLogArgs,
+    DecodedLogEntry,
+    DecodedLogEntryEvent,
+    DevdocOutput,
+    EIP1193Event,
+    EIP1193Provider,
+    EventAbi,
+    EventParameter,
+    EvmBytecodeOutput,
+    EvmBytecodeOutputLinkReferences,
+    EvmOutput,
+    FallbackAbi,
+    FunctionAbi,
+    GanacheProvider,
+    GethCallOverrides,
+    JSONRPCErrorCallback,
+    JSONRPCRequestPayload,
+    JSONRPCResponseError,
+    JSONRPCResponsePayload,
+    LogEntry,
+    LogEntryEvent,
+    LogWithDecodedArgs,
+    MethodAbi,
+    OptimizerSettings,
+    OutputField,
+    ParamDescription,
+    RawLog,
+    RevertErrorAbi,
+    StandardContractOutput,
+    StateMutability,
+    SupportedProvider,
+    TupleDataItem,
+    TxData,
+    TxDataPayable,
+    Web3JsProvider,
+    Web3JsV1Provider,
+    Web3JsV2Provider,
+    Web3JsV3Provider,
+    ZeroExProvider,
+} from 'ethereum-types';
 export { ContractWrappers } from './contract_wrappers';
 export { CoordinatorContract } from './generated-wrappers/coordinator';
 export { DevUtilsContract } from './generated-wrappers/dev_utils';

packages/protocol-utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-	{
-		"version": "11.18.2",
-		"changes": [
-			{
-				"note": "Dependencies updated"
-			}
-		],
-		"timestamp": 1681157139
-	},
 	{
 		"timestamp": 1678410794,
 		"version": "11.18.1",

packages/protocol-utils/CHANGELOG.md

@@ -6,9 +6,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v11.18.2 - _April 10, 2023_
-
-    * Dependencies updated
 ## v11.18.1 - _March 10, 2023_
 
     * Dependencies updated

packages/protocol-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/protocol-utils",
-    "version": "11.18.2",
+    "version": "11.18.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -38,9 +38,9 @@
     },
     "homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils",
     "devDependencies": {
-        "@0x/dev-utils": "^5.0.2",
+        "@0x/dev-utils": "^5.0.0",
         "@0x/ts-doc-gen": "^0.0.28",
-        "@0x/types": "^3.3.7",
+        "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
@@ -61,13 +61,13 @@
         "web3-provider-engine": "14.0.6"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.36",
+        "@0x/assert": "^3.0.35",
         "@0x/contract-addresses": "^8.2.0",
-        "@0x/contract-wrappers": "^13.22.19",
+        "@0x/contract-wrappers": "^13.22.18",
         "@0x/json-schemas": "^6.4.4",
-        "@0x/subproviders": "^8.0.1",
+        "@0x/subproviders": "^7.0.0",
         "@0x/utils": "^7.0.0",
-        "@0x/web3-wrapper": "^8.0.1",
+        "@0x/web3-wrapper": "^8.0.0",
         "@typescript-eslint/parser": "^5.38.0",
         "chai": "^4.0.1",
         "ethereumjs-util": "^7.0.10",

packages/protocol-utils/src/meta_transactions.ts

@@ -1,5 +1,5 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
-import { SupportedProvider } from 'ethereum-types';
+import { SupportedProvider } from '@0x/subproviders';
 import { EIP712TypedData } from '@0x/types';
 import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 

packages/protocol-utils/src/nft_orders.ts

@@ -1,5 +1,5 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
-import { SupportedProvider } from 'ethereum-types';
+import { SupportedProvider } from '@0x/subproviders';
 import { EIP712TypedData } from '@0x/types';
 import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 

packages/protocol-utils/src/orders.ts

@@ -1,5 +1,5 @@
 import { getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
-import { SupportedProvider } from 'ethereum-types';
+import { SupportedProvider } from '@0x/subproviders';
 import { EIP712TypedData } from '@0x/types';
 import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
 

packages/protocol-utils/src/signature_utils.ts

@@ -1,4 +1,4 @@
-import { SupportedProvider } from 'ethereum-types';
+import { SupportedProvider } from '@0x/subproviders';
 import { EIP712TypedData } from '@0x/types';
 import { hexUtils, providerUtils, signTypedDataUtils } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';

yarn.lock

@@ -703,10 +703,10 @@
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
-"@0x/abi-gen@^5.8.5":
-  version "5.8.5"
-  resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.8.5.tgz#9df908a57844d8c3b8bc14b7e9f0533467fd7a3b"
-  integrity sha512-1DDijrWql0Y5ym6W4QSgLkhLLK7miU97QR3obHCphXleXQSDjZGTd6KyT3nHFuATVMX54rlR3axXGS8bf56aOQ==
+"@0x/abi-gen@^5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.8.1.tgz#1818dd32c16456a4e245feecf128679ffeea0458"
+  integrity sha512-DG1PNUEhUIxw552c4xwIjG8ythnyCNhLkUgbM9p9ugkNoTehL/Vev6BDFSjwlBWcIUd69On2qSnwiY8imTlrXw==
   dependencies:
     "@0x/types" "^3.3.7"
     "@0x/typescript-typings" "^5.3.2"
@@ -714,7 +714,7 @@
     "@types/node" "12.12.54"
     "@types/toposort" "^2.0.1"
     chalk "^2.3.0"
-    change-case "^4.1.2"
+    change-case "^3.0.2"
     cli-format "^3.0.9"
     ethereum-types "^3.7.1"
     glob "^7.1.2"
@@ -738,18 +738,6 @@
     lodash "^4.17.21"
     valid-url "^1.0.9"
 
-"@0x/assert@^3.0.36":
-  version "3.0.36"
-  resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.36.tgz#91f82973e11826c08011a5830508246262b43284"
-  integrity sha512-sUtrV5MhixXvWZpATjFqIDtgvvv64duSTuOyPdPJjB+/Lcl5jQhlSNuoN0X3XP0P79Sp+6tuez5MupgFGPA2QQ==
-  dependencies:
-    "@0x/json-schemas" "^6.4.6"
-    "@0x/typescript-typings" "^5.3.2"
-    "@0x/utils" "^7.0.0"
-    "@types/node" "12.12.54"
-    lodash "^4.17.21"
-    valid-url "^1.0.9"
-
 "@0x/base-contract@^6.4.0":
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/@0x/base-contract/-/base-contract-6.5.0.tgz#95b0c3000e571cf4c2a4ee648d029d0ed744b88f"
@@ -848,12 +836,12 @@
     "@0x/utils" "^6.4.3"
     ethereum-types "^3.5.0"
 
-"@0x/contracts-gen@^2.0.50":
-  version "2.0.51"
-  resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.51.tgz#0a1434e3b81e0bac9387cf17e040900e9ee9e405"
-  integrity sha512-yqKxzxi8wArTkgOLHAVhGioKdorqpLQlDyqbGirxOUBXjUsjNU1go5OBrPicjF/mA6Yy2cReBeT8edwERj3elg==
+"@0x/contracts-gen@^2.0.48":
+  version "2.0.48"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.48.tgz#fa308099246e0b694f4ee5a2d26a83445d2cc945"
+  integrity sha512-tTtrkD0Z28k8Y9feJ45LUXRhQKgwtQqgYMgPSbqBY+IOvXXKaNNmXHe/sy7n1RKJLo171ez6fM6NehA3ls57iw==
   dependencies:
-    "@0x/sol-compiler" "^4.8.5"
+    "@0x/sol-compiler" "^4.8.2"
     "@0x/sol-resolver" "^3.1.13"
     "@0x/types" "^3.3.7"
     "@0x/typescript-typings" "^5.3.2"
@@ -897,26 +885,6 @@
     lodash "^4.17.21"
     web3-provider-engine "16.0.4"
 
-"@0x/dev-utils@^5.0.2":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-5.0.3.tgz#8de9b2f8241caa649ceffc6b891122aa923150a0"
-  integrity sha512-V58tT2aiiHNSQtEt2XQWZDsPMsQ4wPDnjZRUaW38W46QasIFfCbcpKmfCsAGJyFxM7t0m0JJJwmYTJwZhCGcoQ==
-  dependencies:
-    "@0x/subproviders" "^8.0.1"
-    "@0x/types" "^3.3.7"
-    "@0x/typescript-typings" "^5.3.2"
-    "@0x/utils" "^7.0.0"
-    "@0x/web3-wrapper" "^8.0.1"
-    "@types/node" "12.12.54"
-    "@types/web3-provider-engine" "^14.0.0"
-    chai "^4.0.1"
-    chai-as-promised "^7.1.0"
-    chai-bignumber "^3.0.0"
-    dirty-chai "^2.0.1"
-    ethereum-types "^3.7.1"
-    lodash "^4.17.21"
-    web3-provider-engine "16.0.4"
-
 "@0x/json-schemas@^6.1.3", "@0x/json-schemas@^6.4.4", "@0x/json-schemas@^6.4.5":
   version "6.4.5"
   resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.5.tgz#c509411360fcf0a6aa5774ba99e337ac4427fdf0"
@@ -927,16 +895,6 @@
     ajv "^6.12.5"
     lodash.values "^4.3.0"
 
-"@0x/json-schemas@^6.4.6":
-  version "6.4.6"
-  resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.6.tgz#3904b8219ad2fefdf47ddb94fb65c1b9fb82d1d7"
-  integrity sha512-TaqvhOkmLN/vkcpMUNVFZBTnWP05ZVo9iGAnP1CG/B8l4rvnUbLZvWx8KeDKs62I/5d7jdYISvXyOwP4EwrG4w==
-  dependencies:
-    "@0x/typescript-typings" "^5.3.2"
-    "@types/node" "12.12.54"
-    ajv "^6.12.5"
-    lodash.values "^4.3.0"
-
 "@0x/monorepo-scripts@^3.2.4":
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/@0x/monorepo-scripts/-/monorepo-scripts-3.2.5.tgz#12b8c81848d02de33682a5f7aecf50a2a7a9c89f"
@@ -1009,35 +967,6 @@
     web3-eth-abi "^1.0.0-beta.24"
     yargs "^17.5.1"
 
-"@0x/sol-compiler@^4.8.5":
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.8.5.tgz#49579cee7de838d8ebd1bfd094a0d30a9e96506c"
-  integrity sha512-hAc3ZjpD+/fgSt/UQaAim8d2fQL3kWpnP5+tSEVf3/xetDDp3BhTOMi+wKnVuYo9FzuTgHx5MFueWM+mojE41A==
-  dependencies:
-    "@0x/assert" "^3.0.36"
-    "@0x/json-schemas" "^6.4.6"
-    "@0x/sol-resolver" "^3.1.13"
-    "@0x/types" "^3.3.7"
-    "@0x/typescript-typings" "^5.3.2"
-    "@0x/utils" "^7.0.0"
-    "@0x/web3-wrapper" "^8.0.1"
-    "@types/node" "12.12.54"
-    "@types/yargs" "^11.0.0"
-    chalk "^2.3.0"
-    chokidar "^3.0.2"
-    ethereum-types "^3.7.1"
-    ethereumjs-util "^7.1.5"
-    lodash "^4.17.21"
-    mkdirp "^0.5.1"
-    pluralize "^7.0.0"
-    require-from-string "^2.0.1"
-    semver "5.5.0"
-    solc "^0.8"
-    source-map-support "^0.5.0"
-    strip-comments "^2.0.1"
-    web3-eth-abi "^1.0.0-beta.24"
-    yargs "^17.5.1"
-
 "@0x/sol-profiler@^4.1.36":
   version "4.1.36"
   resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.36.tgz#c478f7e4ecf73472697a8777bb0d1ebe5f602e10"
@@ -1137,30 +1066,6 @@
   optionalDependencies:
     "@ledgerhq/hw-transport-node-hid" "^5.51.1"
 
-"@0x/subproviders@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-8.0.1.tgz#b934547bfa1c8049030b243a134de9755792d53a"
-  integrity sha512-Lax7Msb1Ef9D6Dd7PQ19oPgjl5GIrKje7XsrO7YCfx5A0RM3Hr4nSQIxgg78jwvuulSFxQ5Sr8WiZ2hTHATtQg==
-  dependencies:
-    "@0x/assert" "^3.0.36"
-    "@0x/types" "^3.3.7"
-    "@0x/typescript-typings" "^5.3.2"
-    "@0x/utils" "^7.0.0"
-    "@0x/web3-wrapper" "^8.0.1"
-    "@ethereumjs/common" "^2.6.3"
-    "@ethereumjs/tx" "^3.5.1"
-    "@types/hdkey" "^0.7.0"
-    "@types/node" "12.12.54"
-    "@types/web3-provider-engine" "^14.0.0"
-    bip39 "2.5.0"
-    ethereum-types "^3.7.1"
-    ethereumjs-util "^7.1.5"
-    ganache "^7.4.0"
-    hdkey "2.1.0"
-    json-rpc-error "2.0.0"
-    lodash "^4.17.21"
-    web3-provider-engine "16.0.4"
-
 "@0x/ts-doc-gen@^0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@0x/ts-doc-gen/-/ts-doc-gen-0.0.28.tgz#075f53268e99ece6448515a3347b1d51fe92365f"
@@ -1285,21 +1190,6 @@
     ethers "~4.0.4"
     lodash "^4.17.21"
 
-"@0x/web3-wrapper@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-8.0.1.tgz#3625e63737d005fe6a92b71d0e676b4d03e88c60"
-  integrity sha512-2rqugeCld5r/3yg+Un9sPCUNVeZW5J64Fm6i/W6qRE87X+spIJG48oJymTjSMDXw/w3FaP4nAvhSj2C5fvhN6w==
-  dependencies:
-    "@0x/assert" "^3.0.36"
-    "@0x/json-schemas" "^6.4.6"
-    "@0x/typescript-typings" "^5.3.2"
-    "@0x/utils" "^7.0.0"
-    "@types/node" "12.12.54"
-    ethereum-types "^3.7.1"
-    ethereumjs-util "^7.1.5"
-    ethers "~4.0.4"
-    lodash "^4.17.21"
-
 "@0xproject/npm-cli-login@^0.0.11":
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/@0xproject/npm-cli-login/-/npm-cli-login-0.0.11.tgz#3f1ec06112ce62aad300ff0575358f68aeecde2e"
@@ -4359,17 +4249,6 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bip39@2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.5.0.tgz#51cbd5179460504a63ea3c000db3f787ca051235"
-  integrity sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA==
-  dependencies:
-    create-hash "^1.1.0"
-    pbkdf2 "^3.0.9"
-    randombytes "^2.0.1"
-    safe-buffer "^5.0.1"
-    unorm "^1.3.3"
-
 bip39@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.6.0.tgz#9e3a720b42ec8b3fbe4038f1e445317b6a99321c"
@@ -4685,13 +4564,13 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
+camel-case@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==
   dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
@@ -4739,15 +4618,6 @@ caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001370:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz#3d2159bf5a8f9ca093275b0d3ecc717b00f27b67"
   integrity sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==
 
-capital-case@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
-  integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case-first "^2.0.2"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -4811,23 +4681,29 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-change-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12"
-  integrity sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==
+change-case@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.1.0.tgz#0e611b7edc9952df2e8513b27b42de72647dd17e"
+  integrity sha512-2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw==
   dependencies:
-    camel-case "^4.1.2"
-    capital-case "^1.0.4"
-    constant-case "^3.0.4"
-    dot-case "^3.0.4"
-    header-case "^2.0.4"
-    no-case "^3.0.4"
-    param-case "^3.0.4"
-    pascal-case "^3.1.2"
-    path-case "^3.0.4"
-    sentence-case "^3.0.4"
-    snake-case "^3.0.4"
-    tslib "^2.0.3"
+    camel-case "^3.0.0"
+    constant-case "^2.0.0"
+    dot-case "^2.1.0"
+    header-case "^1.0.0"
+    is-lower-case "^1.1.0"
+    is-upper-case "^1.1.0"
+    lower-case "^1.1.1"
+    lower-case-first "^1.0.0"
+    no-case "^2.3.2"
+    param-case "^2.1.0"
+    pascal-case "^2.0.0"
+    path-case "^2.1.0"
+    sentence-case "^2.1.0"
+    snake-case "^2.1.0"
+    swap-case "^1.1.0"
+    title-case "^2.1.0"
+    upper-case "^1.1.1"
+    upper-case-first "^1.1.0"
 
 chardet@^0.7.0:
   version "0.7.0"
@@ -5182,14 +5058,13 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
-constant-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1"
-  integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==
+constant-case@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-2.0.0.tgz#4175764d389d3fa9c8ecd29186ed6005243b6a46"
+  integrity sha512-eS0N9WwmjTqrOmR3o83F5vW8Z+9R1HnVz3xmzT2PMFug9ly+Au/fxRWlEBSb6LcZwspSsEn9Xs1uw9YgzAg1EQ==
   dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case "^2.0.2"
+    snake-case "^2.1.0"
+    upper-case "^1.1.1"
 
 conventional-changelog-angular@^5.0.3:
   version "5.0.13"
@@ -5719,13 +5594,12 @@ dom-walk@^0.1.0:
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+dot-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
+  integrity sha512-HnM6ZlFqcajLsyudHq7LeeLDr2rFAVYtDv/hV5qchQEidSck8j9OPUsXY9KwJv/lHMtYlX4DjRQqwFYa+0r8Ug==
   dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
+    no-case "^2.2.0"
 
 dot-prop@^4.2.0:
   version "4.2.1"
@@ -7619,16 +7493,6 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hdkey@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-2.1.0.tgz#755b30b73f54e93c31919c1b2f19205a8e57cb92"
-  integrity sha512-i9Wzi0Dy49bNS4tXXeGeu0vIcn86xXdPQUpEYg+SO1YiO8HtomjmmRMaRyqL0r59QfcD4PfVbSF3qmsWFwAemA==
-  dependencies:
-    bs58check "^2.1.2"
-    ripemd160 "^2.0.2"
-    safe-buffer "^5.1.1"
-    secp256k1 "^4.0.0"
-
 hdkey@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632"
@@ -7642,13 +7506,13 @@ he@1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-header-case@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063"
-  integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==
+header-case@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/header-case/-/header-case-1.0.1.tgz#9535973197c144b09613cd65d317ef19963bd02d"
+  integrity sha512-i0q9mkOeSuhXw6bGgiQCCBgY/jlZuV/7dZXyZ9c6LcBrqwvT8eT719E9uxE5LiZftdl+z81Ugbg/VvXV4OJOeQ==
   dependencies:
-    capital-case "^1.0.4"
-    tslib "^2.0.3"
+    no-case "^2.2.0"
+    upper-case "^1.1.3"
 
 highlight.js@^9.17.1:
   version "9.18.5"
@@ -8128,6 +7992,13 @@ is-hex-prefixed@1.0.0:
   resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"
   integrity sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==
 
+is-lower-case@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-1.1.3.tgz#7e147be4768dc466db3bfb21cc60b31e6ad69393"
+  integrity sha512-+5A1e/WJpLLXZEDlgz4G//WYSHyQBD32qa4Jd3Lw06qQlv3fJHnp3YIHjTQSGzHMgzmVKz2ZP3rBxTHkPw/lxA==
+  dependencies:
+    lower-case "^1.1.0"
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -8256,6 +8127,13 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
+is-upper-case@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-1.1.2.tgz#8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"
+  integrity sha512-GQYSJMgfeAmVwh9ixyk888l7OIhNAGKtY6QA+IrWlu9MDTCaXmeozOZ2S9Knj7bQwBO/H6J2kb+pbyTUiMNbsw==
+  dependencies:
+    upper-case "^1.1.0"
+
 is-url@^1.1.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
@@ -9100,12 +8978,17 @@ loupe@^2.3.1:
   dependencies:
     get-func-name "^2.0.0"
 
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+lower-case-first@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-1.0.2.tgz#e5da7c26f29a7073be02d52bac9980e5922adfa1"
+  integrity sha512-UuxaYakO7XeONbKrZf5FEgkantPf5DUqDayzP5VXZrtRPdH86s4kN47I8B3TW10S4QKiE3ziHNf3kRN//okHjA==
   dependencies:
-    tslib "^2.0.3"
+    lower-case "^1.1.2"
+
+lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==
 
 lru-cache@^4.0.1:
   version "4.1.5"
@@ -9733,13 +9616,12 @@ nise@^1.2.0:
     lolex "^5.0.1"
     path-to-regexp "^1.7.0"
 
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+no-case@^2.2.0, no-case@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
   dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
+    lower-case "^1.1.1"
 
 node-abi@^2.21.0:
   version "2.30.1"
@@ -10357,13 +10239,12 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
+param-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==
   dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
+    no-case "^2.2.0"
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -10427,26 +10308,25 @@ parse-url@^6.0.0:
     parse-path "^4.0.0"
     protocols "^1.4.0"
 
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
+pascal-case@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-2.0.1.tgz#2d578d3455f660da65eca18ef95b4e0de912761e"
+  integrity sha512-qjS4s8rBOJa2Xm0jmxXiyh1+OFf6ekCWOvUaRgAQSktzlTbMotS0nmG9gyYAybCWBcuP4fsBeRCKNwGBnMe2OQ==
   dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
+    camel-case "^3.0.0"
+    upper-case-first "^1.1.0"
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
 
-path-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f"
-  integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==
+path-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5"
+  integrity sha512-Ou0N05MioItesaLr9q8TtHVWmJ6fxWdqKB2RohFmNWVyJ+2zeKIeDNWAN6B/Pe7wpzWChhZX6nONYmOnMeJQ/Q==
   dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
+    no-case "^2.2.0"
 
 path-dirname@^1.0.0:
   version "1.0.2"
@@ -11388,7 +11268,7 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.2:
+ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
   integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
@@ -11508,7 +11388,7 @@ secp256k1@^3.0.1:
     nan "^2.14.0"
     safe-buffer "^5.1.2"
 
-secp256k1@^4.0.0, secp256k1@^4.0.1:
+secp256k1@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303"
   integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==
@@ -11586,14 +11466,13 @@ semver@~5.4.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
   integrity sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==
 
-sentence-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f"
-  integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==
+sentence-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-2.1.1.tgz#1f6e2dda39c168bf92d13f86d4a918933f667ed4"
+  integrity sha512-ENl7cYHaK/Ktwk5OTD+aDbQ3uC8IByu/6Bkg+HDv8Mm+XnBnppVNalcfJTNsp1ibstKh030/JKQQWglDvtKwEQ==
   dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-    upper-case-first "^2.0.2"
+    no-case "^2.2.0"
+    upper-case-first "^1.1.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -11807,13 +11686,12 @@ smart-buffer@^4.1.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-snake-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
-  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
+snake-case@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
+  integrity sha512-FMR5YoPFwOLuh4rRz92dywJjyKYZNLpMn1R5ujVpIYkbA9p01fq8RMg0FkO4M+Yobt4MjHeLTJVm5xFFBHSV2Q==
   dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
+    no-case "^2.2.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -12367,6 +12245,14 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+swap-case@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3"
+  integrity sha512-BAmWG6/bx8syfc6qXPprof3Mn5vQgf5dwdUNJhsNqU9WdPt5P+ES/wQ5bxfijy8zwZgZZHslC3iAsxsuQMCzJQ==
+  dependencies:
+    lower-case "^1.1.1"
+    upper-case "^1.1.1"
+
 table-layout@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04"
@@ -12555,6 +12441,14 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8,
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
+title-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"
+  integrity sha512-EkJoZ2O3zdCz3zJsYCsxyq2OC5hrxR9mfdd5I+w8h/tmFfeOxJ+vvkxsKxdmN0WtS9zLdHEgfgVOiMVgv+Po4Q==
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.0.3"
+
 tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -12698,11 +12592,6 @@ tslib@^2.0.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslib@^2.0.3:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-
 tslib@^2.1.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
@@ -12949,19 +12838,17 @@ update-browserslist-db@^1.0.5:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-upper-case-first@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324"
-  integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==
+upper-case-first@^1.1.0, upper-case-first@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115"
+  integrity sha512-wINKYvI3Db8dtjikdAqoBbZoP6Q+PZUyfMR7pmwHzjC2quzSkUq5DmPrTtPEqHaz8AGtmsB4TqwapMTM1QAQOQ==
   dependencies:
-    tslib "^2.0.3"
+    upper-case "^1.1.1"
 
-upper-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a"
-  integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==
-  dependencies:
-    tslib "^2.0.3"
+upper-case@^1.0.3, upper-case@^1.1.0, upper-case@^1.1.1, upper-case@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==
 
 uri-js@^4.2.2:
   version "4.4.1"