Publish: Sync development into main (#749 )

* Create PRs to reflect publish changes (#743) * Create PRs to reflect publish changes * Using gh instead of third party action * Adding github token * Add Velodrome V2 support on Base (#747) * Publish: CHANGELOG and Package Version Updates into development (#748) * Updated CHANGELOGS & MD docs * Publish - @0x/contracts-erc20@4.0.13 - @0x/contracts-test-utils@5.4.59 - @0x/contracts-treasury@1.4.53 - @0x/contracts-utils@4.8.51 - @0x/contracts-zero-ex@0.48.0 - @0x/contract-addresses@8.12.0 - @0x/contract-wrappers@13.23.7 - @0x/protocol-utils@11.24.1 --------- Co-authored-by: Github Actions <github-actions@github.com> --------- Co-authored-by: Savarn Dontamsetti (Sav) <SavDont@users.noreply.github.com> Co-authored-by: Kyu <kyuhyun217@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Github Actions <github-actions@github.com>
Merge branch 'refs/heads/development'
2023-08-29 15:29:55 -07:00 · 2023-08-18 14:24:54 +00:00 · 2023-08-18 14:24:32 +00:00 · 2023-08-18 14:24:27 +00:00 · 2023-08-17 17:11:05 -04:00 · 2023-08-17 12:59:38 -04:00
38 changed files with 661 additions and 42 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,19 +1,21 @@
 name: publish

 on:
-  workflow_dispatch:
-      inputs:
-          ci_status:
-              description: 'required CI status'
-              default: 'success'
-              required: true
-          prerelease:
-              description: 'prerelease name'
-              required: false
+    workflow_dispatch:
+        inputs:
+            ci_status:
+                description: 'required CI status'
+                default: 'success'
+                required: true
+            prerelease:
+                description: 'prerelease name'
+                required: false

 jobs:
    publish:
        runs-on: ubuntu-latest
+        env:
+            PublishBranch: publish/${{github.ref_name }}-${{ github.run_id }}-${{ github.run_number }}
        steps:
            - name: 'check successful status'
              run: |
@@ -28,16 +30,20 @@ jobs:
                  version: nightly
            - uses: actions/checkout@v2
              with:
-                ref: ${{ github.ref }}
-                fetch-depth: 0
+                  ref: ${{ github.ref }}
+                  fetch-depth: 0
            - uses: actions/setup-node@v1
              with:
-                node-version: 16
+                  node-version: 16
            - uses: actions/setup-python@v2
            - name: 'configure git'
              run: |
                  git config --global user.email "github-actions@github.com"
                  git config --global user.name "Github Actions"
+            - name: 'Checkout new branch'
+              run: |
+                  git checkout -b $PublishBranch
+                  git push -u origin $PublishBranch
            - name: 'install dependencies'
              run: |
                  yarn -D
@@ -49,9 +55,23 @@ jobs:
                  NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
                  GITHUB_TOKEN: ${{ github.token }}
                  PUBLISH_PRERELEASE: ${{ github.event.inputs.prerelease }}
-            - name: 'merge into main branch'
-              if: github.event.inputs.prerelease == '' # unless it's a prerelease
+            - name: 'Create PR to merge into ref branch'
              run: |
-                  git checkout main && \
-                  git merge ${{ github.ref }} && \
-                  git push
+                  gh pr create \
+                    -B ${{ github.ref_name }} \
+                    -H $PublishBranch \
+                    --title "Publish: CHANGELOG and Package Version Updates into ${{ github.ref_name }}" \
+                    --body "Syncing CHANGELOG and package version updates from publish action ${{github.run_id}}-${{github.run_number}} into ${{ github.ref_name}} branch" \
+                    --reviewer ${{ github.actor }}
+              env:
+                  GITHUB_TOKEN: ${{ github.token }}
+            - name: 'Create PR to merge ref branch into main'
+              run: |
+                  gh pr create \
+                    -B main \
+                    -H ${{ github.ref_name }} \
+                    --title "Publish: Sync ${{ github.ref_name }} into main " \
+                    --body "Syncing ${{ github.ref_name }} back into main after publish action. NOTE: this PR should be merged after CHANGELOG and package version updates have been merged into ${{ github.ref_name }}" \
+                    --reviewer ${{ github.actor }}
+              env:
+                  GITHUB_TOKEN: ${{ github.token }}
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "4.0.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1692368658,
+        "version": "4.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1691617396,
+        "version": "4.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1689974915,
        "version": "4.0.10",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.0.13 - _August 29, 2023_
+
+    * Dependencies updated
+
+## v4.0.12 - _August 18, 2023_
+
+    * Dependencies updated
+
+## v4.0.11 - _August 9, 2023_
+
+    * Dependencies updated
+
 ## v4.0.10 - _July 21, 2023_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "4.0.10",
+    "version": "4.0.13",
    "engines": {
        "node": ">=6.12"
    },
@@ -24,7 +24,7 @@
    },
    "homepage": "https://github.com/0xProject/protocol",
    "devDependencies": {
-        "@0x/contracts-utils": "^4.8.48",
+        "@0x/contracts-utils": "^4.8.51",
        "@0x/ts-doc-gen": "^0.0.28",
        "typedoc": "~0.16.11"
    },
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "5.4.59",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1692368658,
+        "version": "5.4.58",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1691617396,
+        "version": "5.4.57",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1689974915,
        "version": "5.4.56",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v5.4.59 - _August 29, 2023_
+
+    * Dependencies updated
+
+## v5.4.58 - _August 18, 2023_
+
+    * Dependencies updated
+
+## v5.4.57 - _August 9, 2023_
+
+    * Dependencies updated
+
 ## v5.4.56 - _July 21, 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.56",
+    "version": "5.4.59",
    "engines": {
        "node": ">=6.12"
    },
@@ -41,7 +41,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.9.0",
+        "@0x/contract-addresses": "^8.12.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,31 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "1.4.53",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1692368658,
+        "version": "1.4.52",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1691617396,
+        "version": "1.4.51",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1689974915,
        "version": "1.4.50",
--- a/contracts/treasury/CHANGELOG.md
+++ b/contracts/treasury/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v1.4.53 - _August 29, 2023_
+
+    * Dependencies updated
+
+## v1.4.52 - _August 18, 2023_
+
+    * Dependencies updated
+
+## v1.4.51 - _August 9, 2023_
+
+    * Dependencies updated
+
 ## v1.4.50 - _July 21, 2023_

    * Dependencies updated
--- a/contracts/treasury/package.json
+++ b/contracts/treasury/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-treasury",
-    "version": "1.4.50",
+    "version": "1.4.53",
    "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.9.0",
+        "@0x/contract-addresses": "^8.12.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.56",
+        "@0x/contracts-test-utils": "^5.4.59",
        "@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.4",
+        "@0x/protocol-utils": "^11.24.1",
        "@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,31 @@
 [
+    {
+        "timestamp": 1693346928,
+        "version": "4.8.51",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1692368658,
+        "version": "4.8.50",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1691617396,
+        "version": "4.8.49",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1689974915,
        "version": "4.8.48",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.8.51 - _August 29, 2023_
+
+    * Dependencies updated
+
+## v4.8.50 - _August 18, 2023_
+
+    * Dependencies updated
+
+## v4.8.49 - _August 9, 2023_
+
+    * Dependencies updated
+
 ## v4.8.48 - _July 21, 2023_

    * Dependencies updated
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.8.48",
+    "version": "4.8.51",
    "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.56",
+        "@0x/contracts-test-utils": "^5.4.59",
        "@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,31 @@
 [
+    {
+        "version": "0.48.0",
+        "changes": [
+            {
+                "note": "Add VelodromeV2 support on Base"
+            }
+        ],
+        "timestamp": 1693346928
+    },
+    {
+        "version": "0.47.0",
+        "changes": [
+            {
+                "note": "Add MaverickV1 support on Ethereum, BSC, and Base"
+            }
+        ],
+        "timestamp": 1692368658
+    },
+    {
+        "version": "0.46.0",
+        "changes": [
+            {
+                "note": "Add VelodromeV2 support on Optimism"
+            }
+        ],
+        "timestamp": 1691617396
+    },
    {
        "timestamp": 1689974915,
        "version": "0.45.1",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.48.0 - _August 29, 2023_
+
+    * Add VelodromeV2 support on Base
+
+## v0.47.0 - _August 18, 2023_
+
+    * Add MaverickV1 support on Ethereum, BSC, and Base
+
+## v0.46.0 - _August 9, 2023_
+
+    * Add VelodromeV2 support on Optimism
+
 ## v0.45.1 - _July 21, 2023_

    * Dependencies updated
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BSCBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BSCBridgeAdapter.sol
@@ -22,6 +22,7 @@ import "./mixins/MixinDodo.sol";
 import "./mixins/MixinDodoV2.sol";
 import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinKyberElastic.sol";
+import "./mixins/MixinMaverickV1.sol";
 import "./mixins/MixinMooniswap.sol";
 import "./mixins/MixinNerve.sol";
 import "./mixins/MixinUniswapV2.sol";
@@ -36,6 +37,7 @@ contract BSCBridgeAdapter is
    MixinDodoV2,
    MixinKyberDmm,
    MixinKyberElastic,
+    MixinMaverickV1,
    MixinMooniswap,
    MixinNerve,
    MixinUniswapV2,
@@ -103,6 +105,11 @@ contract BSCBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeWOOFi(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.MAVERICKV1) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeMaverickV1(sellToken, buyToken, sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.UNKNOWN) {
            if (dryRun) {
                return (0, true);
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BaseBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BaseBridgeAdapter.sol
@@ -22,7 +22,9 @@ import "./mixins/MixinUniswapV2.sol";
 import "./mixins/MixinBalancerV2Batch.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
+import "./mixins/MixinMaverickV1.sol";
 import "./mixins/MixinSolidly.sol";
+import "./mixins/MixinVelodromeV2.sol";

 contract BaseBridgeAdapter is
    AbstractBridgeAdapter(8453, "Base"),
@@ -31,7 +33,9 @@ contract BaseBridgeAdapter is
    MixinBalancerV2Batch,
    MixinCurve,
    MixinCurveV2,
-    MixinSolidly
+    MixinMaverickV1,
+    MixinSolidly,
+    MixinVelodromeV2
 {
    constructor(IEtherToken weth) public MixinCurve(weth) {}

@@ -73,6 +77,16 @@ contract BaseBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeBalancerV2Batch(sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.MAVERICKV1) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeMaverickV1(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.VELODROMEV2) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeVelodromeV2(sellToken, sellAmount, order.bridgeData);
        }
        emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);
    }
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol
@@ -57,4 +57,6 @@ library BridgeProtocols {
    uint128 internal constant KYBERELASTIC = 33;
    uint128 internal constant BARTER = 34;
    uint128 internal constant TRADERJOEV2 = 35;
+    uint128 internal constant VELODROMEV2 = 36;
+    uint128 internal constant MAVERICKV1 = 37;
 }
--- a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol
@@ -32,6 +32,7 @@ import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinKyberElastic.sol";
 import "./mixins/MixinLido.sol";
 import "./mixins/MixinMakerPSM.sol";
+import "./mixins/MixinMaverickV1.sol";
 import "./mixins/MixinNerve.sol";
 import "./mixins/MixinSynthetix.sol";
 import "./mixins/MixinUniswap.sol";
@@ -56,6 +57,7 @@ contract EthereumBridgeAdapter is
    MixinKyberElastic,
    MixinLido,
    MixinMakerPSM,
+    MixinMaverickV1,
    MixinNerve,
    MixinSynthetix,
    MixinUniswap,
@@ -175,6 +177,11 @@ contract EthereumBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeBarter(sellToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.MAVERICKV1) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeMaverickV1(sellToken, buyToken, sellAmount, order.bridgeData);
        } else if (protocolId == BridgeProtocols.UNKNOWN) {
            if (dryRun) {
                return (0, true);
--- a/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol
@@ -26,6 +26,7 @@ import "./mixins/MixinNerve.sol";
 import "./mixins/MixinSolidly.sol";
 import "./mixins/MixinSynthetix.sol";
 import "./mixins/MixinUniswapV3.sol";
+import "./mixins/MixinVelodromeV2.sol";
 import "./mixins/MixinWOOFi.sol";
 import "./mixins/MixinZeroExBridge.sol";

@@ -39,6 +40,7 @@ contract OptimismBridgeAdapter is
    MixinNerve,
    MixinSynthetix,
    MixinUniswapV3,
+    MixinVelodromeV2,
    MixinSolidly,
    MixinWOOFi,
    MixinZeroExBridge
@@ -109,6 +111,11 @@ contract OptimismBridgeAdapter is
                return (0, true);
            }
            boughtAmount = _tradeKyberElastic(sellToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.VELODROMEV2) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeVelodromeV2(sellToken, sellAmount, order.bridgeData);
        }

        emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMaverickV1.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinMaverickV1.sol
@@ -0,0 +1,63 @@
+// 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 IMaverickV1Router {
+    struct ExactInputSingleParams {
+        address tokenIn;
+        address tokenOut;
+        address pool;
+        address recipient;
+        uint256 deadline;
+        uint256 amountIn;
+        uint256 amountOutMinimum;
+        uint256 sqrtPriceLimitD18;
+    }
+
+    function exactInputSingle(ExactInputSingleParams calldata params) external payable returns (uint256 amountOut);
+}
+
+contract MixinMaverickV1 {
+    using LibERC20TokenV06 for IERC20Token;
+
+    function _tradeMaverickV1(
+        IERC20Token sellToken,
+        IERC20Token buyToken,
+        uint256 sellAmount,
+        bytes memory bridgeData
+    ) internal returns (uint256 boughtAmount) {
+        (IMaverickV1Router router, address pool) = abi.decode(bridgeData, (IMaverickV1Router, address));
+
+        // Grant the MaverickV1 router an allowance to sell the sellToken
+        sellToken.approveIfBelow(address(router), sellAmount);
+
+        boughtAmount = router.exactInputSingle(
+            IMaverickV1Router.ExactInputSingleParams({
+                tokenIn: address(sellToken),
+                tokenOut: address(buyToken),
+                pool: pool,
+                recipient: address(this),
+                deadline: block.timestamp,
+                amountIn: sellAmount,
+                amountOutMinimum: 1,
+                sqrtPriceLimitD18: 0
+            })
+        );
+    }
+}
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinVelodromeV2.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinVelodromeV2.sol
@@ -0,0 +1,69 @@
+// 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 IVelodromeV2Router {
+    struct Route {
+        address from;
+        address to;
+        bool stable;
+        address factory;
+    }
+
+    /// @notice Swap one token for another
+    /// @param amountIn     Amount of token in
+    /// @param amountOutMin Minimum amount of desired token received
+    /// @param routes       Array of trade routes used in the swap
+    /// @param to           Recipient of the tokens received
+    /// @param deadline     Deadline to receive tokens
+    /// @return amounts     Array of amounts returned per route
+    function swapExactTokensForTokens(
+        uint256 amountIn,
+        uint256 amountOutMin,
+        Route[] calldata routes,
+        address to,
+        uint256 deadline
+    ) external returns (uint256[] memory amounts);
+}
+
+contract MixinVelodromeV2 {
+    using LibERC20TokenV06 for IERC20Token;
+
+    function _tradeVelodromeV2(
+        IERC20Token sellToken,
+        uint256 sellAmount,
+        bytes memory bridgeData
+    ) internal returns (uint256 boughtAmount) {
+        (IVelodromeV2Router router, IVelodromeV2Router.Route[] memory routes) = abi.decode(
+            bridgeData,
+            (IVelodromeV2Router, IVelodromeV2Router.Route[])
+        );
+        sellToken.approveIfBelow(address(router), sellAmount);
+
+        uint256[] memory amounts = router.swapExactTokensForTokens(
+            sellAmount,
+            1,
+            routes,
+            address(this),
+            block.timestamp + 1
+        );
+
+        return amounts[amounts.length - 1];
+    }
+}
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.45.1",
+    "version": "0.48.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -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.9.0",
+        "@0x/contract-addresses": "^8.12.0",
        "@0x/contracts-erc20": "^3.3.57",
        "@0x/contracts-gen": "^2.0.50",
-        "@0x/contracts-test-utils": "^5.4.56",
+        "@0x/contracts-test-utils": "^5.4.59",
        "@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.4",
+        "@0x/protocol-utils": "^11.24.1",
        "@0x/subproviders": "^8.0.1",
        "@0x/types": "^3.3.7",
        "@0x/typescript-typings": "^5.3.1",
--- a/contracts/zero-ex/tests/transformers/bridges/BSCBridgeAdapterTest.t.sol
+++ b/contracts/zero-ex/tests/transformers/bridges/BSCBridgeAdapterTest.t.sol
@@ -32,4 +32,8 @@ contract BSCBridgeAdapterTest is Test {
    function testSupportsUniswapV3() public {
        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.UNISWAPV3) << 128)));
    }
+
+    function testSupportMaverickV1() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.MAVERICKV1) << 128)));
+    }
 }
--- a/contracts/zero-ex/tests/transformers/bridges/BaseBridgeAdapterTest.t.sol
+++ b/contracts/zero-ex/tests/transformers/bridges/BaseBridgeAdapterTest.t.sol
@@ -0,0 +1,47 @@
+// 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 "forge-std/Test.sol";
+import "../../../contracts/src/transformers/bridges/BaseBridgeAdapter.sol";
+import "../../../contracts/src/transformers/bridges/BridgeProtocols.sol";
+
+contract BaseBridgeAdapterTest is Test {
+    address constant WETH = 0x4200000000000000000000000000000000000006;
+
+    BaseBridgeAdapter private adapter;
+
+    function setUp() public {
+        vm.chainId(8453);
+        adapter = new BaseBridgeAdapter(IEtherToken(WETH));
+    }
+
+    function testSupportsUniswapV3() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.UNISWAPV3) << 128)));
+    }
+
+    function testSupportMaverickV1() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.MAVERICKV1) << 128)));
+    }
+
+    function testSupportSolidly() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.SOLIDLY) << 128)));
+    }
+
+    function testSupportVelodromeV2() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.VELODROMEV2) << 128)));
+    }
+}
--- a/contracts/zero-ex/tests/transformers/bridges/EthereumBridgeAdapterTest.t.sol
+++ b/contracts/zero-ex/tests/transformers/bridges/EthereumBridgeAdapterTest.t.sol
@@ -0,0 +1,39 @@
+// 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 "forge-std/Test.sol";
+import "../../../contracts/src/transformers/bridges/EthereumBridgeAdapter.sol";
+import "../../../contracts/src/transformers/bridges/BridgeProtocols.sol";
+
+contract EthereumBridgeAdapterTest is Test {
+    address constant WETH = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
+
+    EthereumBridgeAdapter private adapter;
+
+    function setUp() public {
+        vm.chainId(1);
+        adapter = new EthereumBridgeAdapter(IEtherToken(WETH));
+    }
+
+    function testSupportsUniswapV3() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.UNISWAPV3) << 128)));
+    }
+
+    function testSupportMaverickV1() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.MAVERICKV1) << 128)));
+    }
+}
--- a/contracts/zero-ex/tests/transformers/bridges/OptimismBridgeAdapterTest.t.sol
+++ b/contracts/zero-ex/tests/transformers/bridges/OptimismBridgeAdapterTest.t.sol
@@ -0,0 +1,35 @@
+// 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 "forge-std/Test.sol";
+import "../../../contracts/src/transformers/bridges/OptimismBridgeAdapter.sol";
+import "../../../contracts/src/transformers/bridges/BridgeProtocols.sol";
+
+contract OptimismBridgeAdapterTest is Test {
+    address constant WETH = 0x4200000000000000000000000000000000000006;
+
+    OptimismBridgeAdapter private adapter;
+
+    function setUp() public {
+        vm.chainId(10);
+        adapter = new OptimismBridgeAdapter(IEtherToken(WETH));
+    }
+
+    function testSupportVelodromeV2() public {
+        assertTrue(adapter.isSupportedSource(bytes32(uint256(BridgeProtocols.VELODROMEV2) << 128)));
+    }
+}
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+	{
+		"version": "8.12.0",
+		"changes": [
+			{
+				"note": "Add VelodromeV2 support on Base"
+			}
+		],
+		"timestamp": 1693346928
+	},
+	{
+		"version": "8.11.0",
+		"changes": [
+			{
+				"note": "Add MaverickV1 support on Ethereum, BSC, and Base"
+			}
+		],
+		"timestamp": 1692368658
+	},
+	{
+		"version": "8.10.0",
+		"changes": [
+			{
+				"note": "Add VelodromeV2 support on Optimism"
+			}
+		],
+		"timestamp": 1691617396
+	},
 	{
 		"version": "8.9.0",
 		"changes": [
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -6,6 +6,15 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v8.12.0 - _August 29, 2023_
+
+    * Add VelodromeV2 support on Base
+## v8.11.0 - _August 18, 2023_
+
+    * Add MaverickV1 support on Ethereum, BSC, and Base
+## v8.10.0 - _August 9, 2023_
+
+    * Add VelodromeV2 support on Optimism
 ## v8.9.0 - _July 21, 2023_

    * Add Uniswap V3 router v2 support in Base FillQuoteTransformer
--- a/packages/contract-addresses/addresses.json
+++ b/packages/contract-addresses/addresses.json
@@ -18,7 +18,7 @@
            "wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
            "payTakerTransformer": "0xea500d073652336a58846ada15c25f2c6d2d241f",
            "affiliateFeeTransformer": "0x8146cbbe327364b13d0699f2ced39c637f92501a",
-            "fillQuoteTransformer": "0x21c3bee93fad436dedd29f971dc4fdf82f3e3a3a",
+            "fillQuoteTransformer": "0x2fd08c1f9fc8406c1d7e3a799a13883a7e7949f0",
            "positiveSlippageFeeTransformer": "0x818a4a855bfeb16c305cb65e8d4fb239a308bc48"
        }
    },
@@ -64,7 +64,7 @@
            "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f",
            "payTakerTransformer": "0x7e788f3a3e39cdd1944ba111fafc5fb7e59b5e90",
            "affiliateFeeTransformer": "0x043300d113de0c64684ab89c56a45cd94c7ef54c",
-            "fillQuoteTransformer": "0xa9c57c539690d4e1439411f648ead5b121b34a23",
+            "fillQuoteTransformer": "0x6073f12fc63bcc64bd4fed5d44aa1035e37d68ee",
            "positiveSlippageFeeTransformer": "0x6ff35e8cbaf56d8a8f6bf9963b902a4576243030"
        }
    },
@@ -225,7 +225,7 @@
            "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
            "payTakerTransformer": "0xa6c3ca183a67fcb4299fb4199c12ca74874ca489",
            "affiliateFeeTransformer": "0x3102aea537ecb6f164550b094663c82a8c53a972",
-            "fillQuoteTransformer": "0xd140adb61d4e3e3978d4f32ac6b92240ff6e3a6e",
+            "fillQuoteTransformer": "0x521f3184ab27abde4a34e744a908b1a08dc8ef91",
            "positiveSlippageFeeTransformer": "0x9a4947d3fb77a7afc2c9cd6714bbae96dddde059"
        }
    },
@@ -271,7 +271,7 @@
            "wethTransformer": "0x63186ea36e78ecbf0128e448362f1b81e9bf7412",
            "payTakerTransformer": "0x5cc22a0e06ea11097c612a962e63674b90e96099",
            "affiliateFeeTransformer": "0x9e52d8b32d835206d09810c310593bcc77264066",
-            "fillQuoteTransformer": "0x98b159db76c820dc877782f199e287a97420b1d2",
+            "fillQuoteTransformer": "0x2c46d57bb5af87a13a51dd5b62ba7d3bc7e12e9c",
            "positiveSlippageFeeTransformer": "0xf98a130d3b4029c70e6d93098cb82a003421341e"
        }
    }
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-addresses",
-    "version": "8.9.0",
+    "version": "8.12.0",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+	{
+		"timestamp": 1693346928,
+		"version": "13.23.7",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
+	{
+		"timestamp": 1692368658,
+		"version": "13.23.6",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
+	{
+		"timestamp": 1691617396,
+		"version": "13.23.5",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
 	{
 		"timestamp": 1689974915,
 		"version": "13.23.4",
--- a/packages/contract-wrappers/CHANGELOG.md
+++ b/packages/contract-wrappers/CHANGELOG.md
@@ -6,6 +6,15 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v13.23.7 - _August 29, 2023_
+
+    * Dependencies updated
+## v13.23.6 - _August 18, 2023_
+
+    * Dependencies updated
+## v13.23.5 - _August 9, 2023_
+
+    * Dependencies updated
 ## v13.23.4 - _July 21, 2023_

    * Dependencies updated
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contract-wrappers",
-    "version": "13.23.4",
+    "version": "13.23.7",
    "engines": {
        "node": ">=6.12"
    },
@@ -59,7 +59,7 @@
    "dependencies": {
        "@0x/assert": "^3.0.36",
        "@0x/base-contract": "^7.0.0",
-        "@0x/contract-addresses": "^8.9.0",
+        "@0x/contract-addresses": "^8.12.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,31 @@
 [
+	{
+		"timestamp": 1693346928,
+		"version": "11.24.1",
+		"changes": [
+			{
+				"note": "Dependencies updated"
+			}
+		]
+	},
+	{
+		"version": "11.24.0",
+		"changes": [
+			{
+				"note": "Add MaverickV1 support on Ethereum, BSC, and Base"
+			}
+		],
+		"timestamp": 1692368658
+	},
+	{
+		"version": "11.23.0",
+		"changes": [
+			{
+				"note": "Add VelodromeV2 support on Optimism"
+			}
+		],
+		"timestamp": 1691617396
+	},
 	{
 		"timestamp": 1689974915,
 		"version": "11.22.4",
--- a/packages/protocol-utils/CHANGELOG.md
+++ b/packages/protocol-utils/CHANGELOG.md
@@ -6,6 +6,15 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v11.24.1 - _August 29, 2023_
+
+    * Dependencies updated
+## v11.24.0 - _August 18, 2023_
+
+    * Add MaverickV1 support on Ethereum, BSC, and Base
+## v11.23.0 - _August 9, 2023_
+
+    * Add VelodromeV2 support on Optimism
 ## v11.22.4 - _July 21, 2023_

    * Dependencies updated
--- a/packages/protocol-utils/package.json
+++ b/packages/protocol-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/protocol-utils",
-    "version": "11.22.4",
+    "version": "11.24.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -62,8 +62,8 @@
    },
    "dependencies": {
        "@0x/assert": "^3.0.36",
-        "@0x/contract-addresses": "^8.9.0",
-        "@0x/contract-wrappers": "^13.23.4",
+        "@0x/contract-addresses": "^8.12.0",
+        "@0x/contract-wrappers": "^13.23.7",
        "@0x/json-schemas": "^6.4.4",
        "@0x/subproviders": "^8.0.1",
        "@0x/utils": "^7.0.0",
--- a/packages/protocol-utils/src/transformer_utils.ts
+++ b/packages/protocol-utils/src/transformer_utils.ts
@@ -166,6 +166,8 @@ export enum BridgeProtocol {
    KyberElastic,
    Barter,
    TraderJoeV2,
+    VelodromeV2,
+    MaverickV1,
 }

 /**
Author	SHA1	Message	Date
github-actions[bot]	9d42af7dd9	Publish: Sync development into main (#749 ) * Create PRs to reflect publish changes (#743) * Create PRs to reflect publish changes * Using gh instead of third party action * Adding github token * Add Velodrome V2 support on Base (#747) * Publish: CHANGELOG and Package Version Updates into development (#748) * Updated CHANGELOGS & MD docs * Publish - @0x/contracts-erc20@4.0.13 - @0x/contracts-test-utils@5.4.59 - @0x/contracts-treasury@1.4.53 - @0x/contracts-utils@4.8.51 - @0x/contracts-zero-ex@0.48.0 - @0x/contract-addresses@8.12.0 - @0x/contract-wrappers@13.23.7 - @0x/protocol-utils@11.24.1 --------- Co-authored-by: Github Actions <github-actions@github.com> --------- Co-authored-by: Savarn Dontamsetti (Sav) <SavDont@users.noreply.github.com> Co-authored-by: Kyu <kyuhyun217@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Github Actions <github-actions@github.com>	2023-08-29 15:29:55 -07:00
Github Actions	48cc9d2dc1	Merge branch 'refs/heads/development'	2023-08-18 14:24:54 +00:00
Github Actions	ec336b92aa	Publish - @0x/contracts-erc20@4.0.12 - @0x/contracts-test-utils@5.4.58 - @0x/contracts-treasury@1.4.52 - @0x/contracts-utils@4.8.50 - @0x/contracts-zero-ex@0.47.0 - @0x/contract-addresses@8.11.0 - @0x/contract-wrappers@13.23.6 - @0x/protocol-utils@11.24.0	2023-08-18 14:24:32 +00:00
Github Actions	62a530d7ec	Updated CHANGELOGS & MD docs	2023-08-18 14:24:27 +00:00
Savarn Dontamsetti (Sav)	09d6fbce81	Rename Maverick to MaverickV1 and add tests (#742 ) * Renaming Maverick and adding tests * Update Base chain ID	2023-08-17 17:11:05 -04:00
Savarn Dontamsetti (Sav)	7f324dd75d	feat/Add Maverick V1 Support (#741 ) * Add Maverick V1 Support for Ethereum, BSC, and Base	2023-08-17 12:59:38 -04:00
Github Actions	bd02e7b3d5	Merge branch 'refs/heads/development'	2023-08-09 21:43:47 +00:00
Github Actions	e1f9e107e9	Publish - @0x/contracts-erc20@4.0.11 - @0x/contracts-test-utils@5.4.57 - @0x/contracts-treasury@1.4.51 - @0x/contracts-utils@4.8.49 - @0x/contracts-zero-ex@0.46.0 - @0x/contract-addresses@8.10.0 - @0x/contract-wrappers@13.23.5 - @0x/protocol-utils@11.23.0	2023-08-09 21:43:27 +00:00
Github Actions	3c98225720	Updated CHANGELOGS & MD docs	2023-08-09 21:43:23 +00:00
Savarn Dontamsetti (Sav)	19e0c3364a	Add Velodrome V2 compatibility test to Optimism Bridge Adapter Test (#740 ) * Add Velodrome V2 compatibility test to Optimism Bridge Adapter Test * Replace Avalanche Bridge Adapter with Optimism Bridge Adapter	2023-08-09 10:37:13 -04:00
Savarn Dontamsetti (Sav)	43e3dce965	Adding support for Velodrome V2 on Optimism (#739 ) * Adding support for Velodrome V2 for Optimism	2023-08-08 16:20:03 -04:00
Github Actions	9da449ec32	Merge branch 'refs/heads/development'	2023-07-21 21:29:05 +00:00
Github Actions	f59d2438b0	Merge branch 'refs/heads/development'	2023-07-19 18:30:57 +00:00
Github Actions	fcdebe6b01	Merge branch 'refs/heads/development'	2023-05-10 20:04:52 +00:00
Github Actions	c4a83f211f	Merge branch 'refs/heads/development'	2023-05-01 21:26:04 +00:00
Github Actions	e086caa94b	Merge branch 'refs/heads/development'	2023-04-24 11:12:43 +00:00
abls	53e83e74e2	Merge branch 'development'	2023-04-24 02:14:12 -07:00
Github Actions	0179320e55	Publish - @0x/contracts-erc20@4.0.4 - @0x/contracts-test-utils@5.4.51 - @0x/contracts-treasury@1.4.44 - @0x/contracts-utils@4.8.42 - @0x/contracts-zero-ex@0.40.0 - @0x/contract-addresses@8.3.0 - @0x/contract-wrappers@13.22.20 - @0x/protocol-utils@11.19.0	2023-04-17 02:08:56 +00:00