shift note about ZEIP-91 to top

Fix code block rendering (#729 )
Offboard Shell and MStable (#726 )
2023-07-05 09:03:15 -05:00 · 2023-06-20 11:22:54 -05:00 · 2023-06-06 11:49:44 +09:00 · 2023-06-04 19:32:43 -04:00 · 2023-05-16 09:38:26 -07:00 · 2023-05-10 20:03:48 +00:00
51 changed files with 394 additions and 363 deletions
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1683749017,
+        "version": "4.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1682976338,
+        "version": "4.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1681969282,
        "version": "4.0.6",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.0.8 - _May 10, 2023_
+
+    * Dependencies updated
+
+## v4.0.7 - _May 1, 2023_
+
+    * Dependencies updated
+
 ## v4.0.6 - _April 20, 2023_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "4.0.6",
+    "version": "4.0.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -24,7 +24,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol",
    "devDependencies": {
-        "@0x/contracts-utils": "^4.8.44",
+        "@0x/contracts-utils": "^4.8.46",
        "@0x/ts-doc-gen": "^0.0.28",
        "typedoc": "~0.16.11"
    },
--- a/contracts/erc20/test/WETH9V06Test.t.sol
+++ b/contracts/erc20/test/WETH9V06Test.t.sol
@@ -39,7 +39,6 @@ contract WETH9V06Test is Test {
    function testShouldConvertDepositedETHToWrappedETH() public {
        vm.prank(user);
        etherToken.deposit{value: 1e20}();
-        vm.stopPrank();

        assertEq(etherToken.balanceOf(user), 1e20);
        assertEq(address(etherToken).balance, 1e20);
@@ -58,7 +57,6 @@ contract WETH9V06Test is Test {
        etherToken.deposit{value: 1e20}();
        vm.prank(user);
        etherToken.withdraw(100);
-        vm.stopPrank();

        assertEq(etherToken.balanceOf(user), 1e20 - 100);
        assertEq(address(etherToken).balance, 1e20 - 100);
@@ -68,7 +66,6 @@ contract WETH9V06Test is Test {
    function testShouldConvertSentETHToWrappedETH() public {
        vm.prank(user);
        address(etherToken).call{value: 1e20}(new bytes(0));
-        vm.stopPrank();

        assertEq(etherToken.balanceOf(user), 1e20);
        assertEq(address(etherToken).balance, 1e20);
--- a/contracts/erc20/test/ZRXTokenTest.t.sol
+++ b/contracts/erc20/test/ZRXTokenTest.t.sol
@@ -34,7 +34,6 @@ contract ZRXTokenTest is Test {
        assembly {
            _address := create(0, add(_bytecode, 0x20), mload(_bytecode))
        }
-        vm.stopPrank();
        zrxToken = IERC20Token(address(_address));
    }

@@ -73,7 +72,6 @@ contract ZRXTokenTest is Test {
    function testShouldReturnFalseIfSenderHasInsufficientBalance() public {
        vm.prank(owner);
        zrxToken.approve(user, totalSupply + 1);
-        vm.stopPrank();

        bool success = zrxToken.transferFrom(owner, user, totalSupply + 1);
        assertEq(success, false);
@@ -82,7 +80,6 @@ contract ZRXTokenTest is Test {
    function testShouldReturnFalseIfRecipientHasInsufficientAllowance() public {
        vm.prank(owner);
        zrxToken.approve(user, totalSupply - 1);
-        vm.stopPrank();

        bool success = zrxToken.transferFrom(owner, user, totalSupply);
        assertEq(success, false);
@@ -97,7 +94,6 @@ contract ZRXTokenTest is Test {
    function testShouldNotModifySenderAllowanceIfSetToUINT256Max() public {
        vm.prank(owner);
        zrxToken.approve(user, type(uint256).max);
-        vm.stopPrank();

        zrxToken.transferFrom(owner, user, 100);
        assertEq(zrxToken.allowance(owner, user), type(uint256).max);
@@ -106,7 +102,6 @@ contract ZRXTokenTest is Test {
    function testShouldTransferCorrectlyWhenSufficientAllowance() public {
        vm.prank(owner);
        zrxToken.approve(user, 1000 * 1e18);
-        vm.stopPrank();

        vm.prank(user);
        zrxToken.transferFrom(owner, user, 100 * 1e18);
--- a/contracts/governance/CHANGELOG.json
+++ b/contracts/governance/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1682976338,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1681756154,
        "version": "1.0.4",
--- a/contracts/governance/CHANGELOG.md
+++ b/contracts/governance/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.0.5 - _May 1, 2023_
+
+    * Dependencies updated
+
 ## v1.0.4 - _April 17, 2023_

    * Dependencies updated
--- a/contracts/governance/package.json
+++ b/contracts/governance/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@0x/governance",
-  "version": "1.0.4",
+  "version": "1.0.5",
  "description": "Governance implementation for the 0x protocol and treasury",
  "main": "index.js",
  "directories": {
--- a/contracts/governance/test/unit/ZeroExGovernorBaseTest.t.sol
+++ b/contracts/governance/test/unit/ZeroExGovernorBaseTest.t.sol
@@ -90,7 +90,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -155,7 +154,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -266,7 +264,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -330,7 +327,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -366,7 +362,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -402,7 +397,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -438,7 +432,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
--- a/contracts/governance/test/unit/ZeroExProtocolGovernor.t.sol
+++ b/contracts/governance/test/unit/ZeroExProtocolGovernor.t.sol
@@ -70,13 +70,12 @@ contract ZeroExProtocolGovernorTest is ZeroExGovernorBaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
+
        vm.prank(account3);
        governor.castVote(proposalId, 0); // Vote "against"
-        vm.stopPrank();
+
        vm.prank(account4);
        governor.castVote(proposalId, 2); // Vote "abstain"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
--- a/contracts/governance/test/unit/ZeroExTreasuryGovernor.t.sol
+++ b/contracts/governance/test/unit/ZeroExTreasuryGovernor.t.sol
@@ -66,13 +66,12 @@ contract ZeroExTreasuryGovernorTest is ZeroExGovernorBaseTest {
        // Vote
        vm.prank(account2);
        governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
+
        vm.prank(account3);
        governor.castVote(proposalId, 0); // Vote "against"
-        vm.stopPrank();
+
        vm.prank(account4);
        governor.castVote(proposalId, 2); // Vote "abstain"
-        vm.stopPrank();

        // Fast forward to vote end
        vm.roll(governor.proposalDeadline(proposalId) + 1);
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1683749017,
+        "version": "5.4.54",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1682976338,
+        "version": "5.4.53",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1681969282,
        "version": "5.4.52",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v5.4.54 - _May 10, 2023_
+
+    * Dependencies updated
+
+## v5.4.53 - _May 1, 2023_
+
+    * Dependencies updated
+
 ## v5.4.52 - _April 20, 2023_

    * Dependencies updated
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-test-utils",
-    "version": "5.4.52",
+    "version": "5.4.54",
    "engines": {
        "node": ">=6.12"
    },
@@ -41,7 +41,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.5.0",
+        "@0x/contract-addresses": "^8.7.0",
        "@0x/dev-utils": "^5.0.2",
        "@0x/json-schemas": "^6.4.4",
        "@0x/order-utils": "^10.4.28",
--- a/contracts/treasury/CHANGELOG.json
+++ b/contracts/treasury/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1683749017,
+        "version": "1.4.48",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1682976338,
+        "version": "1.4.47",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1682334742,
        "version": "1.4.46",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.4.48 - _May 10, 2023_
+
+    * Dependencies updated
+
+## v1.4.47 - _May 1, 2023_
+
+    * Dependencies updated
+
 ## v1.4.46 - _April 24, 2023_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.46",
+    "version": "1.4.48",
    "engines": {
        "node": ">=6.12"
    },
@@ -46,12 +46,12 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.5",
-        "@0x/contract-addresses": "^8.5.0",
+        "@0x/contract-addresses": "^8.7.0",
        "@0x/contracts-asset-proxy": "^3.7.19",
        "@0x/contracts-erc20": "3.3.57",
        "@0x/contracts-gen": "^2.0.50",
        "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.52",
+        "@0x/contracts-test-utils": "^5.4.54",
        "@0x/sol-compiler": "^4.8.2",
        "@0x/ts-doc-gen": "^0.0.28",
        "@types/isomorphic-fetch": "^0.0.35",
@@ -73,7 +73,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.22.0",
+        "@0x/protocol-utils": "^11.22.2",
        "@0x/subproviders": "^8.0.1",
        "@0x/types": "^3.3.7",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1683749017,
+        "version": "4.8.46",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1682976338,
+        "version": "4.8.45",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1681969282,
        "version": "4.8.44",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.8.46 - _May 10, 2023_
+
+    * Dependencies updated
+
+## v4.8.45 - _May 1, 2023_
+
+    * Dependencies updated
+
 ## v4.8.44 - _April 20, 2023_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.44",
+    "version": "4.8.46",
    "engines": {
        "node": ">=6.12"
    },
@@ -45,7 +45,7 @@
    "devDependencies": {
        "@0x/abi-gen": "^5.8.5",
        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.52",
+        "@0x/contracts-test-utils": "^5.4.54",
        "@0x/dev-utils": "^5.0.2",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.8.2",
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -1,4 +1,33 @@
 [
+    {
+        "version": "0.45.0",
+        "changes": [
+            {
+                "note": "Remove Bancor V1 support"
+            },
+            {
+                "note": "Remove Shell and MStable support"
+            }
+        ]
+    },
+    {
+        "version": "0.44.0",
+        "changes": [
+            {
+                "note": "Add Trader Joe V2 MixIn to Arbitrum"
+            }
+        ],
+        "timestamp": 1683749017
+    },
+    {
+        "version": "0.43.0",
+        "changes": [
+            {
+                "note": "Add Trader Joe V2.1 Router Support for MixIn"
+            }
+        ],
+        "timestamp": 1682976338
+    },
    {
        "timestamp": 1682334742,
        "version": "0.42.1",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.44.0 - _May 10, 2023_
+
+    * Add Trader Joe V2 MixIn to Arbitrum
+
+## v0.43.0 - _May 1, 2023_
+
+    * Add Trader Joe V2.1 Router Support for MixIn
+
 ## v0.42.1 - _April 24, 2023_

    * Dependencies updated
--- a/contracts/zero-ex/compiler.json
+++ b/contracts/zero-ex/compiler.json
@@ -125,7 +125,6 @@
        "./contracts/src/transformers/bridges/mixins/MixinAaveV2.sol",
        "./contracts/src/transformers/bridges/mixins/MixinBalancer.sol",
        "./contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol",
-        "./contracts/src/transformers/bridges/mixins/MixinBancor.sol",
        "./contracts/src/transformers/bridges/mixins/MixinBancorV3.sol",
        "./contracts/src/transformers/bridges/mixins/MixinCompound.sol",
        "./contracts/src/transformers/bridges/mixins/MixinCryptoCom.sol",
@@ -136,12 +135,10 @@
        "./contracts/src/transformers/bridges/mixins/MixinGMX.sol",
        "./contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol",
        "./contracts/src/transformers/bridges/mixins/MixinLido.sol",
-        "./contracts/src/transformers/bridges/mixins/MixinMStable.sol",
        "./contracts/src/transformers/bridges/mixins/MixinMakerPSM.sol",
        "./contracts/src/transformers/bridges/mixins/MixinMooniswap.sol",
        "./contracts/src/transformers/bridges/mixins/MixinNerve.sol",
        "./contracts/src/transformers/bridges/mixins/MixinPlatypus.sol",
-        "./contracts/src/transformers/bridges/mixins/MixinShell.sol",
        "./contracts/src/transformers/bridges/mixins/MixinSolidly.sol",
        "./contracts/src/transformers/bridges/mixins/MixinSynthetix.sol",
        "./contracts/src/transformers/bridges/mixins/MixinUniswap.sol",
--- a/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol
@@ -26,6 +26,7 @@ import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinKyberElastic.sol";
 import "./mixins/MixinGMX.sol";
 import "./mixins/MixinNerve.sol";
+import "./mixins/MixinTraderJoeV2.sol";
 import "./mixins/MixinUniswapV3.sol";
 import "./mixins/MixinUniswapV2.sol";
 import "./mixins/MixinWOOFi.sol";
@@ -42,6 +43,7 @@ contract ArbitrumBridgeAdapter is
    MixinKyberElastic,
    MixinGMX,
    MixinNerve,
+    MixinTraderJoeV2,
    MixinUniswapV3,
    MixinUniswapV2,
    MixinWOOFi,
@@ -97,6 +99,11 @@ contract ArbitrumBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.TRADERJOEV2) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeTraderJoeV2(buyToken, sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.GMX) {
            if (dryRun) {
                return (0, true);
--- a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol
@@ -20,7 +20,6 @@ import "./BridgeProtocols.sol";
 import "./mixins/MixinAaveV2.sol";
 import "./mixins/MixinBalancer.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
-import "./mixins/MixinBancor.sol";
 import "./mixins/MixinBancorV3.sol";
 import "./mixins/MixinBarter.sol";
 import "./mixins/MixinCompound.sol";
@@ -33,9 +32,7 @@ import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinKyberElastic.sol";
 import "./mixins/MixinLido.sol";
 import "./mixins/MixinMakerPSM.sol";
-import "./mixins/MixinMStable.sol";
 import "./mixins/MixinNerve.sol";
-import "./mixins/MixinShell.sol";
 import "./mixins/MixinSynthetix.sol";
 import "./mixins/MixinUniswap.sol";
 import "./mixins/MixinUniswapV2.sol";
@@ -47,7 +44,6 @@ contract EthereumBridgeAdapter is
    MixinAaveV2,
    MixinBalancer,
    MixinBalancerV2Batch,
-    MixinBancor,
    MixinBancorV3,
    MixinBarter,
    MixinCompound,
@@ -60,9 +56,7 @@ contract EthereumBridgeAdapter is
    MixinKyberElastic,
    MixinLido,
    MixinMakerPSM,
-    MixinMStable,
    MixinNerve,
-    MixinShell,
    MixinSynthetix,
    MixinUniswap,
    MixinUniswapV2,
@@ -71,15 +65,7 @@ contract EthereumBridgeAdapter is
 {
    constructor(
        IEtherToken weth
-    )
-        public
-        MixinBancor(weth)
-        MixinBancorV3(weth)
-        MixinCompound(weth)
-        MixinCurve(weth)
-        MixinLido(weth)
-        MixinUniswap(weth)
-    {}
+    ) public MixinBancorV3(weth) MixinCompound(weth) MixinCurve(weth) MixinLido(weth) MixinUniswap(weth) {}

    function _trade(
        BridgeOrder memory order,
@@ -129,16 +115,6 @@ contract EthereumBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeMakerPsm(sellToken, buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.MSTABLE) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeMStable(sellToken, buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.SHELL) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeShell(sellToken, buyToken, sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.DODO) {
            if (dryRun) {
                return (0, true);
@@ -154,11 +130,6 @@ contract EthereumBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeCryptoCom(buyToken, sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.BANCOR) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeBancor(buyToken, sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.NERVE) {
            if (dryRun) {
                return (0, true);
--- a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol
@@ -26,7 +26,6 @@ import "./mixins/MixinDodo.sol";
 import "./mixins/MixinDodoV2.sol";
 import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinKyberElastic.sol";
-import "./mixins/MixinMStable.sol";
 import "./mixins/MixinNerve.sol";
 import "./mixins/MixinSolidly.sol";
 import "./mixins/MixinUniswapV2.sol";
@@ -45,7 +44,6 @@ contract PolygonBridgeAdapter is
    MixinDodoV2,
    MixinKyberDmm,
    MixinKyberElastic,
-    MixinMStable,
    MixinNerve,
    MixinUniswapV2,
    MixinUniswapV3,
@@ -88,11 +86,6 @@ contract PolygonBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeBalancerV2Batch(sellAmount, order.bridgeData);
-        } else if (protocolId == BridgeProtocols.MSTABLE) {
-            if (dryRun) {
-                return (0, true);
-            }
-            boughtAmount = _tradeMStable(sellToken, buyToken, sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.DODO) {
            if (dryRun) {
                return (0, true);
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancor.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBancor.sol
@@ -1,93 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-  Copyright 2023 ZeroEx Intl.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/src/v06/LibERC20TokenV06.sol";
-import "@0x/contracts-erc20/src/IERC20Token.sol";
-import "@0x/contracts-erc20/src/IEtherToken.sol";
-import "../IBridgeAdapter.sol";
-
-interface IBancorNetwork {
-    function convertByPath(
-        IERC20Token[] calldata _path,
-        uint256 _amount,
-        uint256 _minReturn,
-        address _beneficiary,
-        address _affiliateAccount,
-        uint256 _affiliateFee
-    ) external payable returns (uint256);
-}
-
-contract MixinBancor {
-    /// @dev Bancor ETH pseudo-address.
-    IERC20Token public constant BANCOR_ETH_ADDRESS = IERC20Token(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE);
-    IEtherToken private immutable WETH;
-
-    constructor(IEtherToken weth) public {
-        WETH = weth;
-    }
-
-    function _tradeBancor(
-        IERC20Token buyToken,
-        uint256 sellAmount,
-        bytes memory bridgeData
-    ) internal returns (uint256 boughtAmount) {
-        // Decode the bridge data.
-        IBancorNetwork bancorNetworkAddress;
-        IERC20Token[] memory path;
-        {
-            address[] memory _path;
-            (bancorNetworkAddress, _path) = abi.decode(bridgeData, (IBancorNetwork, address[]));
-            // To get around `abi.decode()` not supporting interface array types.
-            assembly {
-                path := _path
-            }
-        }
-
-        require(path.length >= 2, "MixinBancor/PATH_LENGTH_MUST_BE_AT_LEAST_TWO");
-        require(
-            path[path.length - 1] == buyToken || (path[path.length - 1] == BANCOR_ETH_ADDRESS && buyToken == WETH),
-            "MixinBancor/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN"
-        );
-
-        uint256 payableAmount = 0;
-        // If it's ETH in the path then withdraw from WETH
-        // The Bancor path will have ETH as the 0xeee address
-        // Bancor expects to be paid in ETH not WETH
-        if (path[0] == BANCOR_ETH_ADDRESS) {
-            WETH.withdraw(sellAmount);
-            payableAmount = sellAmount;
-        } else {
-            // Grant an allowance to the Bancor Network.
-            LibERC20TokenV06.approveIfBelow(path[0], address(bancorNetworkAddress), sellAmount);
-        }
-
-        // Convert the tokens
-        boughtAmount = bancorNetworkAddress.convertByPath{value: payableAmount}(
-            path, // path originating with source token and terminating in destination token
-            sellAmount, // amount of source token to trade
-            1, // minimum amount of destination token expected to receive
-            address(this), // beneficiary
-            address(0), // affiliateAccount; no fee paid
-            0 // affiliateFee; no fee paid
-        );
-        if (path[path.length - 1] == BANCOR_ETH_ADDRESS) {
-            WETH.deposit{value: boughtAmount}();
-        }
-
-        return boughtAmount;
-    }
-}
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-  Copyright 2023 ZeroEx Intl.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/src/v06/LibERC20TokenV06.sol";
-import "@0x/contracts-erc20/src/IERC20Token.sol";
-
-interface IShell {
-    function originSwap(
-        IERC20Token from,
-        IERC20Token to,
-        uint256 fromAmount,
-        uint256 minTargetAmount,
-        uint256 deadline
-    ) external returns (uint256 toAmount);
-}
-
-contract MixinShell {
-    using LibERC20TokenV06 for IERC20Token;
-
-    function _tradeShell(
-        IERC20Token sellToken,
-        IERC20Token buyToken,
-        uint256 sellAmount,
-        bytes memory bridgeData
-    ) internal returns (uint256 boughtAmount) {
-        IShell pool = abi.decode(bridgeData, (IShell));
-
-        // Grant the Shell contract an allowance to sell the first token.
-        IERC20Token(sellToken).approveIfBelow(address(pool), sellAmount);
-
-        boughtAmount = pool.originSwap(
-            sellToken,
-            buyToken,
-            // Sell all tokens we hold.
-            sellAmount,
-            // Minimum buy amount.
-            1,
-            // deadline
-            block.timestamp + 1
-        );
-        return boughtAmount;
-    }
-}
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinTraderJoeV2.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinTraderJoeV2.sol
@@ -20,19 +20,43 @@ import "@0x/contracts-erc20/src/IERC20Token.sol";
 import "../IBridgeAdapter.sol";

 interface ILBRouter {
-    /// @notice Swaps exact tokens for tokens while performing safety checks
-    /// @param amountIn The amount of token to send
-    /// @param amountOutMin The min amount of token to receive
-    /// @param pairBinSteps The bin step of the pairs (0: V1, other values will use V2)
-    /// @param tokenPath The swap path using the binSteps following `_pairBinSteps`
-    /// @param to The address of the recipient
-    /// @param deadline The deadline of the tx
-    /// @return amountOut Output amount of the swap
+    /**
+     * @dev This enum represents the version of the pair requested
+     * - V1: Joe V1 pair
+     * - V2: LB pair V2. Also called legacyPair
+     * - V2_1: LB pair V2.1 (current version)
+     */
+    enum Version {
+        V1,
+        V2,
+        V2_1
+    }
+
+    /**
+     * @dev The path parameters, such as:
+     * - pairBinSteps: The list of bin steps of the pairs to go through
+     * - versions: The list of versions of the pairs to go through
+     * - tokenPath: The list of tokens in the path to go through
+     */
+    struct Path {
+        uint256[] pairBinSteps;
+        Version[] versions;
+        IERC20Token[] tokenPath;
+    }
+
+    /**
+     * @notice Swaps exact tokens for tokens while performing safety checks
+     * @param amountIn The amount of token to send
+     * @param amountOutMin The min amount of token to receive
+     * @param path The path of the swap
+     * @param to The address of the recipient
+     * @param deadline The deadline of the tx
+     * @return amountOut Output amount of the swap
+     */
    function swapExactTokensForTokens(
        uint256 amountIn,
        uint256 amountOutMin,
-        uint256[] memory pairBinSteps,
-        IERC20Token[] memory tokenPath,
+        Path memory path,
        address to,
        uint256 deadline
    ) external returns (uint256 amountOut);
@@ -49,12 +73,16 @@ contract MixinTraderJoeV2 {
        ILBRouter router;
        IERC20Token[] memory tokenPath;
        uint256[] memory pairBinSteps;
+        ILBRouter.Version[] memory versions;
        {
-            address[] memory _path;
-            (router, _path, pairBinSteps) = abi.decode(bridgeData, (ILBRouter, address[], uint256[]));
+            address[] memory _tokenPath;
+            (router, _tokenPath, pairBinSteps, versions) = abi.decode(
+                bridgeData,
+                (ILBRouter, address[], uint256[], ILBRouter.Version[])
+            );
            // To get around `abi.decode()` not supporting interface array types.
            assembly {
-                tokenPath := _path
+                tokenPath := _tokenPath
            }
        }

@@ -63,6 +91,10 @@ contract MixinTraderJoeV2 {
            tokenPath.length == pairBinSteps.length + 1,
            "MixinTraderJoeV2/PAIR_BIN_STEPS_LENGTH_MUST_BE_ONE_LESS_THAN_TOKEN_PATH_LENGTH"
        );
+        require(
+            versions.length == pairBinSteps.length,
+            "MixinTraderJoeV2/VERSIONS_LENGTH_MUST_BE_EQUAL_TO_PAIR_BIN_STEPS_LENGTH"
+        );
        require(
            tokenPath[tokenPath.length - 1] == buyToken,
            "MixinTraderJoeV2/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN"
@@ -70,13 +102,11 @@ contract MixinTraderJoeV2 {
        // Grant the Trader Joe V2 router an allowance to sell the first token.
        tokenPath[0].approveIfBelow(address(router), sellAmount);

-        boughtAmount = router.swapExactTokensForTokens(
-            sellAmount,
-            1,
-            pairBinSteps,
-            tokenPath,
-            address(this),
-            block.timestamp
-        );
+        ILBRouter.Path memory path = ILBRouter.Path({
+            pairBinSteps: pairBinSteps,
+            versions: versions,
+            tokenPath: tokenPath
+        });
+        boughtAmount = router.swapExactTokensForTokens(sellAmount, 1, path, address(this), block.timestamp);
    }
 }
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.42.1",
+    "version": "0.44.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -38,7 +38,7 @@
    "config": {
        "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,PositiveSlippageFeeTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,AffiliateFeeTransformer,MetaTransactionsFeature,LogMetadataTransformer,LiquidityProviderFeature,ILiquidityProviderFeature,NativeOrdersFeature,INativeOrdersFeature,FeeCollectorController,FeeCollector,CurveLiquidityProvider,BatchFillNativeOrdersFeature,IBatchFillNativeOrdersFeature,MultiplexFeature,IMultiplexFeature,OtcOrdersFeature,IOtcOrdersFeature,AvalancheBridgeAdapter,BSCBridgeAdapter,CeloBridgeAdapter,EthereumBridgeAdapter,FantomBridgeAdapter,OptimismBridgeAdapter,PolygonBridgeAdapter,MetaTransactionsFeatureV2",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|ArbitrumBridgeAdapter|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMetaTransactionsFeatureV2|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MetaTransactionsFeatureV2|MixinAaveV2|MixinBalancer|MixinBalancerV2Batch|MixinBancor|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinShell|MixinSolidly|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
+        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|ArbitrumBridgeAdapter|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMetaTransactionsFeatureV2|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MetaTransactionsFeatureV2|MixinAaveV2|MixinBalancer|MixinBalancerV2Batch|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinSolidly|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
    },
    "repository": {
        "type": "git",
@@ -51,10 +51,10 @@
    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
        "@0x/abi-gen": "^5.8.5",
-        "@0x/contract-addresses": "^8.5.0",
+        "@0x/contract-addresses": "^8.7.0",
        "@0x/contracts-erc20": "^3.3.57",
        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.52",
+        "@0x/contracts-test-utils": "^5.4.54",
        "@0x/dev-utils": "^5.0.2",
        "@0x/order-utils": "^10.4.28",
        "@0x/sol-compiler": "^4.8.2",
@@ -80,7 +80,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^7.0.0",
-        "@0x/protocol-utils": "^11.22.0",
+        "@0x/protocol-utils": "^11.22.2",
        "@0x/subproviders": "^8.0.1",
        "@0x/types": "^3.3.7",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/zero-ex/test/artifacts.ts
+++ b/contracts/zero-ex/test/artifacts.ts
@@ -109,7 +109,6 @@ import * as MetaTransactionsFeatureV2 from '../test/generated-artifacts/MetaTran
 import * as MixinAaveV2 from '../test/generated-artifacts/MixinAaveV2.json';
 import * as MixinBalancer from '../test/generated-artifacts/MixinBalancer.json';
 import * as MixinBalancerV2Batch from '../test/generated-artifacts/MixinBalancerV2Batch.json';
-import * as MixinBancor from '../test/generated-artifacts/MixinBancor.json';
 import * as MixinBancorV3 from '../test/generated-artifacts/MixinBancorV3.json';
 import * as MixinCompound from '../test/generated-artifacts/MixinCompound.json';
 import * as MixinCryptoCom from '../test/generated-artifacts/MixinCryptoCom.json';
@@ -122,10 +121,8 @@ import * as MixinKyberDmm from '../test/generated-artifacts/MixinKyberDmm.json';
 import * as MixinLido from '../test/generated-artifacts/MixinLido.json';
 import * as MixinMakerPSM from '../test/generated-artifacts/MixinMakerPSM.json';
 import * as MixinMooniswap from '../test/generated-artifacts/MixinMooniswap.json';
-import * as MixinMStable from '../test/generated-artifacts/MixinMStable.json';
 import * as MixinNerve from '../test/generated-artifacts/MixinNerve.json';
 import * as MixinPlatypus from '../test/generated-artifacts/MixinPlatypus.json';
-import * as MixinShell from '../test/generated-artifacts/MixinShell.json';
 import * as MixinSolidly from '../test/generated-artifacts/MixinSolidly.json';
 import * as MixinSynthetix from '../test/generated-artifacts/MixinSynthetix.json';
 import * as MixinUniswap from '../test/generated-artifacts/MixinUniswap.json';
@@ -332,7 +329,6 @@ export const artifacts = {
    MixinAaveV2: MixinAaveV2 as ContractArtifact,
    MixinBalancer: MixinBalancer as ContractArtifact,
    MixinBalancerV2Batch: MixinBalancerV2Batch as ContractArtifact,
-    MixinBancor: MixinBancor as ContractArtifact,
    MixinBancorV3: MixinBancorV3 as ContractArtifact,
    MixinCompound: MixinCompound as ContractArtifact,
    MixinCryptoCom: MixinCryptoCom as ContractArtifact,
@@ -343,12 +339,10 @@ export const artifacts = {
    MixinGMX: MixinGMX as ContractArtifact,
    MixinKyberDmm: MixinKyberDmm as ContractArtifact,
    MixinLido: MixinLido as ContractArtifact,
-    MixinMStable: MixinMStable as ContractArtifact,
    MixinMakerPSM: MixinMakerPSM as ContractArtifact,
    MixinMooniswap: MixinMooniswap as ContractArtifact,
    MixinNerve: MixinNerve as ContractArtifact,
    MixinPlatypus: MixinPlatypus as ContractArtifact,
-    MixinShell: MixinShell as ContractArtifact,
    MixinSolidly: MixinSolidly as ContractArtifact,
    MixinSynthetix: MixinSynthetix as ContractArtifact,
    MixinUniswap: MixinUniswap as ContractArtifact,
--- a/contracts/zero-ex/test/wrappers.ts
+++ b/contracts/zero-ex/test/wrappers.ts
@@ -107,7 +107,6 @@ export * from '../test/generated-wrappers/meta_transactions_feature_v2';
 export * from '../test/generated-wrappers/mixin_aave_v2';
 export * from '../test/generated-wrappers/mixin_balancer';
 export * from '../test/generated-wrappers/mixin_balancer_v2_batch';
-export * from '../test/generated-wrappers/mixin_bancor';
 export * from '../test/generated-wrappers/mixin_bancor_v3';
 export * from '../test/generated-wrappers/mixin_compound';
 export * from '../test/generated-wrappers/mixin_crypto_com';
@@ -118,12 +117,10 @@ export * from '../test/generated-wrappers/mixin_dodo_v2';
 export * from '../test/generated-wrappers/mixin_g_m_x';
 export * from '../test/generated-wrappers/mixin_kyber_dmm';
 export * from '../test/generated-wrappers/mixin_lido';
-export * from '../test/generated-wrappers/mixin_m_stable';
 export * from '../test/generated-wrappers/mixin_maker_p_s_m';
 export * from '../test/generated-wrappers/mixin_mooniswap';
 export * from '../test/generated-wrappers/mixin_nerve';
 export * from '../test/generated-wrappers/mixin_platypus';
-export * from '../test/generated-wrappers/mixin_shell';
 export * from '../test/generated-wrappers/mixin_solidly';
 export * from '../test/generated-wrappers/mixin_synthetix';
 export * from '../test/generated-wrappers/mixin_uniswap';
--- a/contracts/zero-ex/tests/MetaTransactionV2Test.t.sol
+++ b/contracts/zero-ex/tests/MetaTransactionV2Test.t.sol
@@ -263,6 +263,7 @@ contract MetaTransactionTest is LocalTest {
    function test_transformERC20() external {
        bytes memory transformCallData = _transformERC20Call(zrx, dai, USER_ADDRESS);
        IMetaTransactionsFeatureV2.MetaTransactionDataV2 memory mtxData = _getMetaTransaction(transformCallData);
+        LibSignature.Signature memory sig = _mtxSignature(mtxData);

        assertEq(dai.balanceOf(USER_ADDRESS), 1e18);
        vm.expectEmit(true, false, false, true);
@@ -273,10 +274,8 @@ contract MetaTransactionTest is LocalTest {
            address(this)
        );

-        IMetaTransactionsFeatureV2(address(zeroExDeployed.zeroEx)).executeMetaTransactionV2(
-            mtxData,
-            _mtxSignature(mtxData)
-        );
+        IMetaTransactionsFeatureV2(address(zeroExDeployed.zeroEx)).executeMetaTransactionV2(mtxData, sig);
+
        assertEq(zrx.balanceOf(USER_ADDRESS), 1e18);
        assertEq(dai.balanceOf(USER_ADDRESS), 0);
        assertEq(weth.balanceOf(address(this)), 1);
@@ -285,6 +284,7 @@ contract MetaTransactionTest is LocalTest {
    function test_rfqOrder() external {
        bytes memory callData = _makeTestRfqOrder(zrx, dai, signerAddress, USER_ADDRESS, signerKey);
        IMetaTransactionsFeatureV2.MetaTransactionDataV2 memory mtxData = _getMetaTransaction(callData);
+        LibSignature.Signature memory sig = _mtxSignature(mtxData);

        assertEq(dai.balanceOf(USER_ADDRESS), 1e18);
        vm.expectEmit(true, false, false, true);
@@ -295,10 +295,7 @@ contract MetaTransactionTest is LocalTest {
            address(this)
        );

-        IMetaTransactionsFeatureV2(address(zeroExDeployed.zeroEx)).executeMetaTransactionV2(
-            mtxData,
-            _mtxSignature(mtxData)
-        );
+        IMetaTransactionsFeatureV2(address(zeroExDeployed.zeroEx)).executeMetaTransactionV2(mtxData, sig);

        assertEq(zrx.balanceOf(signerAddress), 0);
        assertEq(zrx.balanceOf(USER_ADDRESS), 1e18);
@@ -310,6 +307,7 @@ contract MetaTransactionTest is LocalTest {
    function test_fillLimitOrder() external {
        bytes memory callData = _makeTestLimitOrder(zrx, dai, signerAddress, USER_ADDRESS, signerKey);
        IMetaTransactionsFeatureV2.MetaTransactionDataV2 memory mtxData = _getMetaTransaction(callData);
+        LibSignature.Signature memory sig = _mtxSignature(mtxData);

        assertEq(dai.balanceOf(USER_ADDRESS), 1e18);
        vm.expectEmit(true, false, false, true);
@@ -320,10 +318,7 @@ contract MetaTransactionTest is LocalTest {
            address(this)
        );

-        IMetaTransactionsFeatureV2(address(zeroExDeployed.zeroEx)).executeMetaTransactionV2(
-            mtxData,
-            _mtxSignature(mtxData)
-        );
+        IMetaTransactionsFeatureV2(address(zeroExDeployed.zeroEx)).executeMetaTransactionV2(mtxData, sig);

        assertEq(zrx.balanceOf(signerAddress), 0);
        assertEq(zrx.balanceOf(USER_ADDRESS), 1e18);
--- a/contracts/zero-ex/tests/addresses/SourceAddresses.json
+++ b/contracts/zero-ex/tests/addresses/SourceAddresses.json
@@ -5,7 +5,7 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0x952ffc4c47d66b454a8181f5c68b6248e18b66ec",
-        "TraderJoeV2Pool": "0x0000000000000000000000000000000000000000",
+        "TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000",
        "TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
    },
    "56": {
@@ -14,7 +14,7 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0xfbfab68ba077d099cd4b66fa76920572cc0b557c",
-        "TraderJoeV2Pool": "0x0000000000000000000000000000000000000000",
+        "TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000",
        "TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
    },
    "137": {
@@ -23,7 +23,7 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0xf9cc934753a127100585812181ac04d07158a4c2",
-        "TraderJoeV2Pool": "0x0000000000000000000000000000000000000000",
+        "TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000",
        "TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
    },
    "43114": {
@@ -32,8 +32,8 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0x6038373de7f64da99b2a31951628b7d778b2c3cf",
-        "TraderJoeV2Pool": "0x1D7A1a79e2b4Ef88D2323f3845246D24a3c20F1d",
-        "TraderJoeV2Router": "0xE3Ffc583dC176575eEA7FD9dF2A7c65F7E23f4C3"
+        "TraderJoeV2Quoter": "0x64b57F4249aA99a812212cee7DAEFEDC40B203cD",
+        "TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30"
    },
    "250": {
        "UniswapV2Router": "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
@@ -41,7 +41,7 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0x8dcf5fed6ae6bf0befb5e4f0c9414c2cb9a4ed01",
-        "TraderJoeV2Pool": "0x0000000000000000000000000000000000000000",
+        "TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000",
        "TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
    },
    "10": {
@@ -50,7 +50,7 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0x7e29ccaa4bf2894aca02c77e6b99cafc1d24b2f5",
-        "TraderJoeV2Pool": "0x0000000000000000000000000000000000000000",
+        "TraderJoeV2Quoter": "0x0000000000000000000000000000000000000000",
        "TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
    },
    "42161": {
@@ -59,7 +59,7 @@
        "KyberElasticQuoter": "0x0d125c15d54ca1f8a813c74a81aee34ebb508c1f",
        "KyberElasticRouter": "0xc1e7dfe73e1598e3910ef4c7845b68a9ab6f4c83",
        "KyberElasticPool": "0x087abaab9cd85025a8b3916948c69fe173c837ea",
-        "TraderJoeV2Pool": "0x0000000000000000000000000000000000000000",
-        "TraderJoeV2Router": "0x0000000000000000000000000000000000000000"
+        "TraderJoeV2Quoter": "0x64b57F4249aA99a812212cee7DAEFEDC40B203cD",
+        "TraderJoeV2Router": "0xb4315e873dBcf96Ffd0acd8EA43f689D8c20fB30"
    }
 }
--- a/contracts/zero-ex/tests/forked/SwapERC20ForERC20Test.t.sol
+++ b/contracts/zero-ex/tests/forked/SwapERC20ForERC20Test.t.sol
@@ -56,8 +56,8 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {

    function test_swapERC20ForERC20OnTraderJoeV2() public {
        for (uint256 i = 0; i < chains.length; i++) {
-            // TraderJoeV2 mixin only enabled on Avalanche
-            if (i != 3) {
+            // TraderJoeV2 mixin only enabled on Avalanche and Arbitrum
+            if (i != 3 && i != 6) {
                continue;
            }
            vm.selectFork(forkIds[chains[i]]);
@@ -81,8 +81,8 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
            emit log_string("TraderJoeV2Router not available on this chain");
            return;
        }
-        if (sources.TraderJoeV2Pool == address(0)) {
-            emit log_string("TraderJoeV2Pool not available on this chain");
+        if (sources.TraderJoeV2Quoter == address(0)) {
+            emit log_string("TraderJoeV2Quoter not available on this chain");
            return;
        }

@@ -94,12 +94,11 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
        fqtData.fillSequence[0] = FillQuoteTransformer.OrderType.Bridge;
        fqtData.fillAmount = 1e6;

-        (uint256 amountOut, uint256 binStep) = sampleTraderJoeV2(
+        (uint256 amountOut, uint256 binStep, uint256 version) = sampleTraderJoeV2(
            fqtData.fillAmount,
            address(fqtData.sellToken),
            address(fqtData.buyToken),
-            sources.TraderJoeV2Router,
-            sources.TraderJoeV2Pool
+            sources.TraderJoeV2Quoter
        );
        log_named_uint("amountOut", amountOut);

@@ -110,7 +109,9 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
            tokenPath[1] = address(fqtData.buyToken);
            uint256[] memory binSteps = new uint256[](1);
            binSteps[0] = binStep;
-            order.bridgeData = abi.encode(address(sources.TraderJoeV2Router), tokenPath, binSteps);
+            uint256[] memory versions = new uint256[](1);
+            versions[0] = version;
+            order.bridgeData = abi.encode(address(sources.TraderJoeV2Router), tokenPath, binSteps, versions);
        }

        order.source = bytes32(uint256(BridgeProtocols.TRADERJOEV2) << 128);
@@ -198,20 +199,23 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
        uint256 amount,
        address takerToken,
        address makerToken,
-        address router,
-        address pool
-    ) private returns (uint256 makerTokenAmount, uint256 binStep) {
+        address quoter
+    ) private returns (uint256 makerTokenAmount, uint256 binStep, uint256 version) {
        log_string("Sampling TraderJoeV2");
        log_named_address("takerToken", takerToken);
        log_named_address("makerToken", makerToken);
-        log_named_address("router", router);
-        log_named_address("pool", pool);
+        log_named_address("quoter", quoter);

-        bool swapForY = ITraderJoeV2Pool(pool).tokenY() == makerToken;
+        address[] memory tokenPath = new address[](2);
+        tokenPath[0] = takerToken;
+        tokenPath[1] = makerToken;

-        (makerTokenAmount, ) = ITraderJoeV2Router(router).getSwapOut(pool, amount, swapForY);
+        ITraderJoeV2Quoter.Quote memory quote = ITraderJoeV2Quoter(quoter).findBestPathFromAmountIn(
+            tokenPath,
+            uint128(amount)
+        );

-        binStep = ITraderJoeV2Pool(pool).feeParameters().binStep;
+        return (quote.amounts[1], quote.binSteps[0], uint256(quote.versions[0]));
    }

    function deployFQTAndGetDeploymentNonce(
--- a/contracts/zero-ex/tests/utils/ForkUtils.sol
+++ b/contracts/zero-ex/tests/utils/ForkUtils.sol
@@ -93,7 +93,7 @@ struct LiquiditySources {
    address KyberElasticPool;
    address KyberElasticQuoter;
    address KyberElasticRouter;
-    address TraderJoeV2Pool;
+    address TraderJoeV2Quoter;
    address TraderJoeV2Router;
    address UniswapV2Router;
    address UniswapV3Router;
@@ -103,35 +103,27 @@ interface IFQT {
    function bridgeAdapter() external returns (address);
 }

-interface ITraderJoeV2Pool {
-    struct FeeParameters {
-        // 144 lowest bits in slot
-        uint16 binStep;
-        uint16 baseFactor;
-        uint16 filterPeriod;
-        uint16 decayPeriod;
-        uint16 reductionFactor;
-        uint24 variableFeeControl;
-        uint16 protocolShare;
-        uint24 maxVolatilityAccumulated;
-        // 112 highest bits in slot
-        uint24 volatilityAccumulated;
-        uint24 volatilityReference;
-        uint24 indexRef;
-        uint40 time;
+interface ITraderJoeV2Quoter {
+    enum Version {
+        V1,
+        V2,
+        V2_1
    }

-    function feeParameters() external view returns (FeeParameters memory);
+    struct Quote {
+        address[] route;
+        address[] pairs;
+        uint256[] binSteps;
+        Version[] versions;
+        uint128[] amounts;
+        uint128[] virtualAmountsWithoutSlippage;
+        uint128[] fees;
+    }

-    function tokenY() external view returns (address);
-}
-
-interface ITraderJoeV2Router {
-    function getSwapOut(
-        address pool,
-        uint256 amountIn,
-        bool swapForY
-    ) external view returns (uint256 amountOut, uint256 feesIn);
+    function findBestPathFromAmountIn(
+        address[] calldata route,
+        uint128 amountIn
+    ) external view returns (Quote memory quote);
 }

 interface IKyberElasticQuoter {
--- a/contracts/zero-ex/tsconfig.json
+++ b/contracts/zero-ex/tsconfig.json
@@ -147,7 +147,6 @@
        "test/generated-artifacts/MixinAaveV2.json",
        "test/generated-artifacts/MixinBalancer.json",
        "test/generated-artifacts/MixinBalancerV2Batch.json",
-        "test/generated-artifacts/MixinBancor.json",
        "test/generated-artifacts/MixinBancorV3.json",
        "test/generated-artifacts/MixinCompound.json",
        "test/generated-artifacts/MixinCryptoCom.json",
@@ -158,12 +157,10 @@
        "test/generated-artifacts/MixinGMX.json",
        "test/generated-artifacts/MixinKyberDmm.json",
        "test/generated-artifacts/MixinLido.json",
-        "test/generated-artifacts/MixinMStable.json",
        "test/generated-artifacts/MixinMakerPSM.json",
        "test/generated-artifacts/MixinMooniswap.json",
        "test/generated-artifacts/MixinNerve.json",
        "test/generated-artifacts/MixinPlatypus.json",
-        "test/generated-artifacts/MixinShell.json",
        "test/generated-artifacts/MixinSolidly.json",
        "test/generated-artifacts/MixinSynthetix.json",
        "test/generated-artifacts/MixinUniswap.json",
--- a/docs/additional/bounties.rst
+++ b/docs/additional/bounties.rst
@@ -19,14 +19,14 @@ The following contracts are in scope of the bug bounty. Please note that any bug
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | **Release**      | **Contracts**                                                                                                                                                                                                                                                                                 | **Commit Hash**                                                                                                                      |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
-| Exchange V4      | * Documentation at `https://protocol.0x.org/en/latest/ <https://protocol.0x.org/en/latest/>`__                                                                                                                                                                                                | `c1177416f5 <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts>`__                       |
-|                  | * `ZeroEx.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/ZeroEx.sol>`__                                                                                                                                             |                                                                                                                                      |
-|                  | * `ZeroExOptimized.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/ZeroExOptimized.sol>`__                                                                                                                           |                                                                                                                                      |
-|                  | * `external/*.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/external>`__                                                                                                                                           |                                                                                                                                      |
-|                  | * `features/**.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/features>`__                                                                                                                                          |                                                                                                                                      |
-|                  | * `fixins/*.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/fixins>`__                                                                                                                                               |                                                                                                                                      |
-|                  | * `migrations/*.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/migrations>`__                                                                                                                                       |                                                                                                                                      |
-|                  | * `storage/*.sol <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src/storage>`__                                                                                                                                             |                                                                                                                                      |
+| Exchange V4      | * Documentation at `https://docs.0xProtocol.org/en/latest/ <https://docs.0xProtocol.org/en/latest/>`__                                                                                                                                                                                        |                                                                                                                                      |
+|                  | * `ZeroEx.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/ZeroEx.sol>`__                                                                                                                                                                          |                                                                                                                                      |
+|                  | * `ZeroExOptimized.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/ZeroExOptimized.sol>`__                                                                                                                                                        |                                                                                                                                      |
+|                  | * `external/*.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/external>`__                                                                                                                                                                        |                                                                                                                                      |
+|                  | * `features/*.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/features>`__                                                                                                                                                                        |                                                                                                                                      |
+|                  | * `fixins/*.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/fixins>`__                                                                                                                                                                            |                                                                                                                                      |
+|                  | * `migrations/*.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/migrations>`__                                                                                                                                                                    |                                                                                                                                      |
+|                  | * `storage/*.sol <https://github.com/0xProject/protocol/tree/development/contracts/zero-ex/contracts/src/storage>`__                                                                                                                                                                          |                                                                                                                                      |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | Exchange V3      | * `ERC20BridgeProxy.sol <https://github.com/0xProject/0x-monorepo/blob/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts/asset-proxy/contracts/src/ERC20BridgeProxy.sol>`_ (`spec <https://github.com/0xProject/0x-protocol-specification/blob/master/asset-proxy/erc20-bridge-proxy.md>`__) | `fb8360edfd <https://github.com/0xProject/0x-monorepo/tree/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts>`__                    |
 |                  | * `Exchange.sol <https://github.com/0xProject/0x-monorepo/blob/fb8360edfd4f42f2d2b127b95c156eb1b0daa02b/contracts/exchange/contracts/src/Exchange.sol>`__ (`spec <https://github.com/0xProject/0x-protocol-specification/blob/master/v3/v3-specification.md>`__)                              |                                                                                                                                      |
@@ -46,8 +46,6 @@ The following contracts are in scope of the bug bounty. Please note that any bug
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
 | ERC20BridgeProxy | * `ERC20BridgeProxy.sol <https://github.com/0xProject/0x-monorepo/blob/281658ba349a2c5088b40b503998bea5020284a6/contracts/asset-proxy/contracts/src/ERC20BridgeProxy.sol>`__                                                                                                                  | `281658ba34 <https://github.com/0xProject/0x-monorepo/tree/281658ba349a2c5088b40b503998bea5020284a6/contracts>`_                     |
 +------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+
-| ExchangeProxy    | * `contracts/src <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src>`__                                                                                                                                                     | `c1177416f5 <https://github.com/0xProject/protocol/tree/c1177416f50c2465ee030dacc14ff996eebd4e74/contracts/zero-ex/contracts/src>`_  |
-+------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+

 Bounties
 --------
@@ -67,19 +65,10 @@ The final reward amount is at the sole discretion of 0x Labs and will be paid in
 | Low (CVSS 0.0 - 3.9)       | up to $5,000        |
 +----------------------------+---------------------+

-Recent Inclusions 
-----------------
-
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Change**                | ****                                                                                                                                                    |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-| NFT feature               | * Trade ERC721 and ERC1155 assets. See `ZEIP-93 <https://github.com/0xProject/ZEIPs/issues/93>`__ for more details                                      |
-+---------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
-

 Disclosures
 -----------
 Please e-mail all submissions to security@0x.org with the subject "BUG BOUNTY". Your submission 
 should include any steps required to reproduce or exploit the vulnerability. Please allow time for 
 the vulnerability to be fixed before discussing any findings publicly. After receiving a submission, 
-we will contact you with expected timelines for a fix to be implemented.
+we will contact you with expected timelines for a fix to be implemented.
--- a/docs/basics/orders.rst
+++ b/docs/basics/orders.rst
@@ -295,7 +295,7 @@ In both cases, the ``@0x/protocol-utils`` package simplifies generating these si

 The Orderbook
 =======================
-Orders can be hosted by any server and are usually represented as a JSON object off-chain. For example, one off-chain way to post and discover orders is through `0x API <https://0x.org/api>`_.
+Orders can be hosted by any server and are usually represented as a JSON object off-chain. For example, one off-chain way to post and discover orders is through `0x Orderbook API <https://0x.org/docs/category/orderbook-api>`_.

 Below is a table represention and example of how orders should be formatted off-chain.

--- a/docs/basics/protocol_fees.rst
+++ b/docs/basics/protocol_fees.rst
@@ -2,21 +2,15 @@
 Protocol Fees
 ###############################

+.. note::
+
+    As of September 29, 2021, protocol fees have been removed for all order types in both Exchange V4 and V3 in accordance with `ZEIP-91 <https://0x.org/zrx/vote/zeip-91>`_.
+
 An ETH protocol fee is paid by the Taker each time a `Limit Order <./orders.html#limit-orders>`_ is `filled <./functions.html>`_.
 The fee is proportional to the gas cost of filling an order and scales linearly with gas price. The cost is currently ``0 * tx.gasprice``. 
 At the end of every Staking Epoch, these fees are aggregated and distributed to the makers as a liquidity reward: the reward is proportional to the maker's collected fees and staked ZRX relative to other makers.
 To learn more about protocol fees and liquidity incentives, see the `Official Spec <https://github.com/0xProject/0x-protocol-specification/blob/master/staking/staking-specification.md>`_.

-.. note::
-
-    As of September 29, 2021, protocol fees have been removed for all order types in both Exchange V4 and V3 in accordance with `ZEIP-91 <https://0x.org/zrx/vote/zeip-91>`_.
-
-.. note::
-
-    `RFQ Orders <./orders.html#rfq-orders>`_ are introduced in Exchange V4, and there is currently no protocol fee for filling this type of order.
-    The existing fee mechanics work well for limit orders, where arb bots pay to compete for liquidity; however, it does not translate well to RFQ where makers are matched with a specific taker.
-    We are researching fee models that could be used for RFQ and will keep the community up-to-date on our `Forum <https://forum.0x.org/>`_.
-
 .. warning::

    In Exchange V3, protocol fees could be paid in ETH or WETH. As of V4, they can only be paid in ETH. 
--- a/docs/guides/nft_guide.rst
+++ b/docs/guides/nft_guide.rst
@@ -15,6 +15,7 @@ Create an ERC721Order
 The following code snippet shows how to construct a basic ERC721 sell order in JavaScript. In the following example, the seller indicates that they would like to receive ether by providing the sentinel value `0xeee...`` as the `erc20Token`.

 .. code-block:: javascript
+
    const { ERC721Order, NFTOrder } = require("@0x/protocol-utils");
    const utils = require("@0x/utils");

@@ -48,6 +49,7 @@ The following code snippet shows how to construct a basic ERC721 sell order in J
 An ERC721 sell order can be created similarly. Note that buy orders must use WETH instead of ether, because the ERC20 `transferFrom` functionality is needed to execute a buy order. 

 .. code-block:: javascript
+
    const { ERC721Order, NFTOrder } = require("@0x/protocol-utils");
    const utils = require("@0x/utils");

@@ -97,6 +99,7 @@ Fees are paid by the **buyer**, denominated in the asset paid by the buyer, and
 The following code snippet shows how to create an ERC721 order with a single fee. Multiple fees can be specified by providing multiple fee objects in the order fees field.

 .. code-block:: javascript
+
    const { ERC721Order, NFTOrder } = require("@0x/protocol-utils");
    const utils = require("@0x/utils");

@@ -130,6 +133,7 @@ The following code snippet shows how to create an ERC721 order with a single fee
 In 0x V4, it is possible to create a bid for any NFT in a particular collection. The following code snippet shows how to create an order to buy any CryptoCoven $WITCH. 

 .. code-block:: javascript
+
    const { ERC721Order, NFTOrder } = require("@0x/protocol-utils");
    const utils = require("@0x/utils");

@@ -169,6 +173,7 @@ Off-chain orders must be signed by the order maker to be filled. For on-chain or
 Signing an order with a private key is easy: the `ERC721Order` and `ERC1155Order` classes from `@0x/protocol-utils` expose a `getSignatureWithKey` function that take a 0x-prefixed private key string.

 .. code-block:: javascript
+
    const { ERC721Order, NFTOrder, SignatureType } = require("@0x/protocol-utils");
    const utils = require("@0x/utils");

@@ -196,6 +201,7 @@ Signing an order with a private key is easy: the `ERC721Order` and `ERC1155Order
 **Signing with ethers**

 .. code-block:: javascript
+
    const { ERC721Order, NFTOrder, SignatureType } = require("@0x/protocol-utils");
    const utils = require("@0x/utils");
    const { ethers } = require("ethers");
@@ -243,6 +249,7 @@ Signing an order with a private key is easy: the `ERC721Order` and `ERC1155Order
 Orders can be simultaneously "signed" and listed on-chain using the `preSignERC721Order` or `preSignERC1155Order` functions. Orders can only be signed by the maker address specified in the order. 

 .. code-block:: solidity
+
    /// @dev Approves an ERC721 order on-chain. After pre-signing
    ///      the order, the `PRESIGNED` signature type will become
    ///      valid for that order and signer.
@@ -260,6 +267,7 @@ Orders can be simultaneously "signed" and listed on-chain using the `preSignERC7
 If an order has been pre-signed, it can be filled by providing a “null” signature with the PRESIGNED signature type (see `LibSignature.sol <https://github.com/0xProject/protocol/blob/refactor/nft-orders/contracts/zero-ex/contracts/src/features/libs/LibSignature.sol#L42-L61>`_):

 .. code-block:: solidity
+
    LibSignature.Signature({
    signatureType: LibSignature.SignatureType.PRESIGNED,
    v: uint8(0),
@@ -270,6 +278,7 @@ If an order has been pre-signed, it can be filled by providing a “null” sign
 The pre-sign functions emit the entire order as an event, so that the order is easily indexable by subgraphs and thus easily indexable by subgraphs and thus easily discoverable without the need for an off-chain database.

 .. code-block:: solidity
+
    /// @dev Emitted when an `ERC721Order` is pre-signed.
    ///      Contains all the fields of the order.
    event ERC721OrderPreSigned(
@@ -311,6 +320,7 @@ Filling an ERC721 Order
 The basic functions used for filling NFT orders are the following:

 .. code-block:: solidity
+
    /// @dev Sells an ERC721 asset to fill the given order.
    /// @param buyOrder The ERC721 buy order.
    /// @param signature The order signature from the maker.
@@ -407,6 +417,7 @@ Cancelling an ERC721 Order
 All orders, whether off-chain or on-chain, can only be cancelled on-chain. The following contract functions are used to cancel individual ERC721 and ERC1155 orders. 

 .. code-block:: solidity
+
    /// @dev Cancel a single ERC721 order by its nonce. The caller
    ///      should be the maker of the order. Silently succeeds if
    ///      an order with the same nonce has already been filled or
@@ -427,6 +438,7 @@ Note that if there are multiple outstanding orders with the same nonce, calling
 The following functions can be used to cancel multiple orders.

 .. code-block:: solidity
+    
    /// @dev Cancel multiple ERC721 orders by their nonces. The caller
    ///      should be the maker of the orders. Silently succeeds if
    ///      an order with the same nonce has already been filled or
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+	{
+		"version": "8.7.0",
+		"changes": [
+			{
+				"note": "Add Trader Joe V2 MixIn to Arbitrum"
+			}
+		],
+		"timestamp": 1683749017
+	},
+	{
+		"version": "8.6.0",
+		"changes": [
+			{
+				"note": "Add Trader Joe V2.1 Router Support for MixIn"
+			}
+		],
+		"timestamp": 1682976338
+	},
 	{
 		"version": "8.5.0",
 		"changes": [
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -6,6 +6,12 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v8.7.0 - _May 10, 2023_
+
+    * Add Trader Joe V2 MixIn to Arbitrum
+## v8.6.0 - _May 1, 2023_
+
+    * Add Trader Joe V2.1 Router Support for MixIn
 ## v8.5.0 - _April 20, 2023_

    * Add Trader Joe V2 support on Avalanche
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -156,7 +156,7 @@
            "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c",
            "payTakerTransformer": "0xb9a4c32547bc3cdc2ee2fb13cc1a0717dac9888f",
            "affiliateFeeTransformer": "0x105679f99d668001370b4621ad8648ac570c860f",
-            "fillQuoteTransformer": "0x540079df6023d39b2686fd9f6c06f1f8f66aca4a",
+            "fillQuoteTransformer": "0x886e4f97d7e06ab66dba574a7a861046dcf7ae4f",
            "positiveSlippageFeeTransformer": "0xadbfdc58a24b6dbc16f21541800f43dd6e282250"
        }
    },
@@ -248,7 +248,7 @@
            "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
            "payTakerTransformer": "0xd81e65fc9bb7323bdbef8b2cdddd3b83fe41d630",
            "affiliateFeeTransformer": "0x970e318b8f074c20bf0cee06970f01dc7a761e50",
-            "fillQuoteTransformer": "0x5d3a221bad31c3f3c07bea2f1de9b3ec17664b69",
+            "fillQuoteTransformer": "0x4a8815c2fc605e3b01aee52aade4d096c4e862c6",
            "positiveSlippageFeeTransformer": "0x20f935b037e8490d8027f2751f9452725eee01ad"
        }
    }
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "8.5.0",
+    "version": "8.7.0",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+	{
+		"timestamp": 1683749017,
+		"version": "13.23.2",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
+	{
+		"timestamp": 1682976338,
+		"version": "13.23.1",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"version": "13.23.0",
 		"changes": [
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -6,6 +6,12 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v13.23.2 - _May 10, 2023_
+
+    * Dependencies updated
+## v13.23.1 - _May 1, 2023_
+
+    * Dependencies updated
 ## v13.23.0 - _April 24, 2023_

    * Regenerate IZeroEx wrapper
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-wrappers",
-    "version": "13.23.0",
+    "version": "13.23.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -59,7 +59,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.5.0",
+        "@0x/contract-addresses": "^8.7.0",
        "@0x/json-schemas": "^6.4.4",
        "@0x/types": "^3.3.7",
        "@0x/utils": "^7.0.0",
--- a/packages/protocol-utils/CHANGELOG.json
+++ b/packages/protocol-utils/CHANGELOG.json
@@ -1,4 +1,22 @@
 [
+	{
+		"timestamp": 1683749017,
+		"version": "11.22.2",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
+	{
+		"timestamp": 1682976338,
+		"version": "11.22.1",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"version": "11.22.0",
 		"changes": [
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -6,6 +6,12 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v11.22.2 - _May 10, 2023_
+
+    * Dependencies updated
+## v11.22.1 - _May 1, 2023_
+
+    * Dependencies updated
 ## v11.22.0 - _April 24, 2023_

    * Add MetaTransactionV2 utilities
--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.22.0",
+    "version": "11.22.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -62,8 +62,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.36",
-        "@0x/contract-addresses": "^8.5.0",
-        "@0x/contract-wrappers": "^13.23.0",
+        "@0x/contract-addresses": "^8.7.0",
+        "@0x/contract-wrappers": "^13.23.2",
        "@0x/json-schemas": "^6.4.4",
        "@0x/subproviders": "^8.0.1",
        "@0x/utils": "^7.0.0",
Author	SHA1	Message	Date
Eric Wong	9e0a36477d	shift note about ZEIP-91 to top	2023-07-05 09:03:15 -05:00
wonge97	fd68edb239	Fix code block rendering (#729 )	2023-06-20 11:22:54 -05:00
Kyu	e5e1393f0e	Offboard Shell and MStable (#726 ) * Offboard Shell and MStable * Update README	2023-06-06 11:49:44 +09:00
Andy	20961ef42e	Fix usage of expectEmit in MetaTransactionsFeatureV2 tests (#727 ) * fix MetaTransactionsFeatureV2 tests * pretty	2023-06-04 19:32:43 -04:00
Kyu	34febd728a	Remove Bancor v1 support from EthereumBridgeAdapter (#724 )	2023-05-16 09:38:26 -07:00
Github Actions	c2aed76f2f	Publish - @0x/contracts-erc20@4.0.8 - @0x/contracts-test-utils@5.4.54 - @0x/contracts-treasury@1.4.48 - @0x/contracts-utils@4.8.46 - @0x/contracts-zero-ex@0.44.0 - @0x/contract-addresses@8.7.0 - @0x/contract-wrappers@13.23.2 - @0x/protocol-utils@11.22.2	2023-05-10 20:03:48 +00:00
Github Actions	198d986fdc	Updated CHANGELOGS & MD docs	2023-05-10 20:03:45 +00:00
Savarn Dontamsetti (Sav)	e2e1d1074c	feat: Add TraderJoeV2 MixIn to Arbitrum BridgeAdapter (#723 ) * Add TraderJoeV2 MixIn to ArbitrumBridgeAdapter	2023-05-10 15:40:36 -04:00
wonge97	6a15dc3f13	update link (#721 )	2023-05-08 17:25:34 -05:00
Github Actions	fefa3c13f6	Publish - @0x/contracts-erc20@4.0.7 - @0x/governance@1.0.5 - @0x/contracts-test-utils@5.4.53 - @0x/contracts-treasury@1.4.47 - @0x/contracts-utils@4.8.45 - @0x/contracts-zero-ex@0.43.0 - @0x/contract-addresses@8.6.0 - @0x/contract-wrappers@13.23.1 - @0x/protocol-utils@11.22.1	2023-05-01 21:25:50 +00:00
Github Actions	f1d096a8af	Updated CHANGELOGS & MD docs	2023-05-01 21:25:47 +00:00
Savarn Dontamsetti (Sav)	394ccbdc24	feat: Update Trader Joe V2 MixIn to support V2.1 router (#717 ) * Add Trader Joe V2.1 Router MixIn * Update changelog and FQT address * lowercasing Avalanche FQT	2023-05-01 15:33:35 -04:00
Savarn Dontamsetti (Sav)	5a47f04ffc	fix: remove vm.stopPrank if vm.startPrank not present (#719 ) * remove vm.stopPrank if vm.startPrank not present * remove unnecessary vm.stopPrank from governance tests	2023-05-01 14:13:56 -04:00
wonge97	3c414c12e6	fix malformed table (#718 ) table was missing one space :(	2023-04-27 13:19:52 -05:00
wonge97	d268a1136c	update bounty page (#716 )	2023-04-27 11:51:55 -05:00