Add Curve and Velodrome to Polygon zkEVM bridge adapter

.github/workflows/ci.yml

@@ -83,30 +83,28 @@ jobs:
                     -p @0x/order-utils \
                     -m --serial -c test:ci
 
-            # NOTE: disabled as ZRXToken.sol did not compile with the latest forge.
-            # TODO: re-enable once the issue is resolved.
             - name: Run Forge build for erc20
               working-directory: contracts/erc20
               run: |
                   forge --version
-                  forge build --sizes --skip ZRXToken
+                  forge build --sizes
 
-            # - name: Run Forge tests for erc20
-            #   working-directory: contracts/erc20
-            #   run: |
-            #       forge test -vvv --gas-report
+            - name: Run Forge tests for erc20
+              working-directory: contracts/erc20
+              run: |
+                  forge test -vvv --gas-report
 
-            # - name: Run Forge coverage for erc20
-            #   working-directory: contracts/erc20
-            #   run: |
-            #       forge coverage --report summary --report lcov
+            - name: Run Forge coverage for erc20
+              working-directory: contracts/erc20
+              run: |
+                  forge coverage --report summary --report lcov
 
-            # - name: Upload the coverage report to Coveralls
-            #   uses: coverallsapp/github-action@master
-            #   with:
-            #       github-token: ${{ secrets.GITHUB_TOKEN }}
-            #       base-path: ./contracts/erc20/
-            #       path-to-lcov: ./contracts/erc20/lcov.info
+            - name: Upload the coverage report to Coveralls
+              uses: coverallsapp/github-action@master
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  base-path: ./contracts/erc20/
+                  path-to-lcov: ./contracts/erc20/lcov.info
 
             - name: Run Forge build for zero-ex
               working-directory: contracts/zero-ex
@@ -144,20 +142,19 @@ jobs:
                   forge --version
                   forge build --sizes
 
-            # TODO: re-enable once the issue is resolved.
-            # - name: Run Forge tests on governance contracts
-            #   working-directory: ./contracts/governance
-            #   run: |
-            #       forge test -vvv --gas-report
+            - name: Run Forge tests on governance contracts
+              working-directory: ./contracts/governance
+              run: |
+                  forge test -vvv --gas-report
 
-            # - name: Run Forge coverage on governance contracts
-            #   working-directory: ./contracts/governance
-            #   run: |
-            #       forge coverage --report lcov
+            - name: Run Forge coverage on governance contracts
+              working-directory: ./contracts/governance
+              run: |
+                  forge coverage --report lcov
 
-            # - name: Upload the coverage report to Coveralls
-            #   uses: coverallsapp/github-action@master
-            #   with:
-            #       github-token: ${{ secrets.GITHUB_TOKEN }}
-            #       base-path: ./contracts/governance/
-            #       path-to-lcov: ./contracts/governance/lcov.info
+            - name: Upload the coverage report to Coveralls
+              uses: coverallsapp/github-action@master
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  base-path: ./contracts/governance/
+                  path-to-lcov: ./contracts/governance/lcov.info

contracts/erc20/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1700094997,
-        "version": "4.0.14",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1693346928,
         "version": "4.0.13",

contracts/erc20/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v4.0.14 - _November 16, 2023_
-
-    * Dependencies updated
-
 ## v4.0.13 - _August 29, 2023_
 
     * Dependencies updated

contracts/erc20/package.json

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

contracts/test-utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1700094997,
-        "version": "5.4.60",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1693346928,
         "version": "5.4.59",

contracts/test-utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v5.4.60 - _November 16, 2023_
-
-    * Dependencies updated
-
 ## v5.4.59 - _August 29, 2023_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.60",
+    "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.13.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",

contracts/treasury/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1700094997,
-        "version": "1.4.54",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1693346928,
         "version": "1.4.53",

contracts/treasury/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.4.54 - _November 16, 2023_
-
-    * Dependencies updated
-
 ## v1.4.53 - _August 29, 2023_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.54",
+    "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.13.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.60",
+        "@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.24.2",
+        "@0x/protocol-utils": "^11.24.1",
         "@0x/subproviders": "^8.0.1",
         "@0x/types": "^3.3.7",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1700094997,
-        "version": "4.8.52",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1693346928,
         "version": "4.8.51",

contracts/utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v4.8.52 - _November 16, 2023_
-
-    * Dependencies updated
-
 ## v4.8.51 - _August 29, 2023_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.52",
+    "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.60",
+        "@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",

contracts/zero-ex/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "version": "0.49.0",
-        "changes": [
-            {
-                "note": "Allowlist Sepolia in AbstractBridgeAdapter"
-            }
-        ],
-        "timestamp": 1700094997
-    },
     {
         "version": "0.48.0",
         "changes": [

contracts/zero-ex/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v0.49.0 - _November 16, 2023_
-
-    * Allowlist Sepolia in AbstractBridgeAdapter
-
 ## v0.48.0 - _August 29, 2023_
 
     * Add VelodromeV2 support on Base

contracts/zero-ex/compiler.json

@@ -124,6 +124,7 @@
         "./contracts/src/transformers/bridges/IBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/OptimismBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/PolygonBridgeAdapter.sol",
+        "./contracts/src/transformers/bridges/PolygonZkevmBridgeAdapter.sol",
         "./contracts/src/transformers/bridges/mixins/MixinAaveV2.sol",
         "./contracts/src/transformers/bridges/mixins/MixinBalancer.sol",
         "./contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol",

contracts/zero-ex/contracts/src/transformers/bridges/AbstractBridgeAdapter.sol

@@ -23,14 +23,12 @@ abstract contract AbstractBridgeAdapter is IBridgeAdapter {
         assembly {
             chainId := chainid()
         }
-        // Skip chain id validation on Ganache (1337), Anvil (31337), Goerli (5), Mumbai (80001), Base Goerli (84531),
-        // Sepolia (11155111)
+        // Skip chain id validation on Ganache (1337), Anvil (31337), Goerli (5), Mumbai (80001), Base Goerli (84531)
         bool skipValidation = (chainId == 1337 ||
             chainId == 31337 ||
             chainId == 5 ||
             chainId == 80001 ||
-            chainId == 84531 ||
-            chainId == 11155111);
+            chainId == 84531);
 
         if (chainId != expectedChainId && !skipValidation) {
             revert(string(abi.encodePacked(expectedChainName, "BridgeAdapter.constructor: wrong chain ID")));

contracts/zero-ex/contracts/src/transformers/bridges/PolygonZkevmBridgeAdapter.sol

@@ -0,0 +1,86 @@
+// 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 "./AbstractBridgeAdapter.sol";
+import "./BridgeProtocols.sol";
+import "./mixins/MixinUniswapV3.sol";
+import "./mixins/MixinUniswapV2.sol";
+import "./mixins/MixinWOOFi.sol";
+import "./mixins/MixinBalancerV2Batch.sol";
+import "./mixins/MixinCurve.sol";
+import "./mixins/MixinCurveV2.sol";
+import "./mixins/MixinVelodromeV2.sol";
+
+contract PolygonZkevmBridgeAdapter is
+    AbstractBridgeAdapter(1101, "Polygon zkEVM"),
+    MixinUniswapV3,
+    MixinUniswapV2,
+    MixinBalancerV2Batch,
+    MixinWOOFi,
+    MixinCurve,
+    MixinCurveV2,
+    MixinVelodromeV2
+{
+    constructor(IEtherToken weth) public MixinCurve(weth) {}
+
+    function _trade(
+        BridgeOrder memory order,
+        IERC20Token sellToken,
+        IERC20Token buyToken,
+        uint256 sellAmount,
+        bool dryRun
+    ) internal override returns (uint256 boughtAmount, bool supportedSource) {
+        uint128 protocolId = uint128(uint256(order.source) >> 128);
+        if (protocolId == BridgeProtocols.UNISWAPV3) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeUniswapV3(sellToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.UNISWAPV2) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.WOOFI) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeWOOFi(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeBalancerV2Batch(sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.CURVE) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeCurve(sellToken, buyToken, sellAmount, order.bridgeData);
+        } else if (protocolId == BridgeProtocols.CURVEV2) {
+            if (dryRun) {
+                return (0, true);
+            }
+            boughtAmount = _tradeCurveV2(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);
+    }
+}

contracts/zero-ex/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-zero-ex",
-    "version": "0.49.0",
+    "version": "0.48.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -36,9 +36,9 @@
         "typechain": "typechain --target=ethers-v5 --out-dir='typechain-wrappers'  './foundry-artifacts/**/*.json'"
     },
     "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,BaseGoerliBridgeAdapter,BaseBridgeAdapter,BSCBridgeAdapter,CeloBridgeAdapter,EthereumBridgeAdapter,FantomBridgeAdapter,OptimismBridgeAdapter,PolygonBridgeAdapter,MetaTransactionsFeatureV2",
+        "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,BaseGoerliBridgeAdapter,BaseBridgeAdapter,BSCBridgeAdapter,CeloBridgeAdapter,EthereumBridgeAdapter,FantomBridgeAdapter,OptimismBridgeAdapter,PolygonBridgeAdapter,PolygonZkevmBridgeAdapter,MetaTransactionsFeatureV2",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|ArbitrumBridgeAdapter|AvalancheBridgeAdapter|BSCBridgeAdapter|BaseBridgeAdapter|BaseGoerliBridgeAdapter|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"
+        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|ArbitrumBridgeAdapter|AvalancheBridgeAdapter|BSCBridgeAdapter|BaseBridgeAdapter|BaseGoerliBridgeAdapter|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|PolygonZkevmBridgeAdapter|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.13.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.60",
+        "@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.24.2",
+        "@0x/protocol-utils": "^11.24.1",
         "@0x/subproviders": "^8.0.1",
         "@0x/types": "^3.3.7",
         "@0x/typescript-typings": "^5.3.1",

contracts/zero-ex/src/artifacts.ts

@@ -42,6 +42,7 @@ import * as OtcOrdersFeature from '../generated-artifacts/OtcOrdersFeature.json'
 import * as OwnableFeature from '../generated-artifacts/OwnableFeature.json';
 import * as PayTakerTransformer from '../generated-artifacts/PayTakerTransformer.json';
 import * as PolygonBridgeAdapter from '../generated-artifacts/PolygonBridgeAdapter.json';
+import * as PolygonZkevmBridgeAdapter from '../generated-artifacts/PolygonZkevmBridgeAdapter.json';
 import * as PositiveSlippageFeeTransformer from '../generated-artifacts/PositiveSlippageFeeTransformer.json';
 import * as SimpleFunctionRegistryFeature from '../generated-artifacts/SimpleFunctionRegistryFeature.json';
 import * as TransformERC20Feature from '../generated-artifacts/TransformERC20Feature.json';
@@ -89,5 +90,6 @@ export const artifacts = {
     FantomBridgeAdapter: FantomBridgeAdapter as ContractArtifact,
     OptimismBridgeAdapter: OptimismBridgeAdapter as ContractArtifact,
     PolygonBridgeAdapter: PolygonBridgeAdapter as ContractArtifact,
+    PolygonZkevmBridgeAdapter: PolygonZkevmBridgeAdapter as ContractArtifact,
     MetaTransactionsFeatureV2: MetaTransactionsFeatureV2 as ContractArtifact,
 };

contracts/zero-ex/src/wrappers.ts

@@ -40,6 +40,7 @@ export * from '../generated-wrappers/otc_orders_feature';
 export * from '../generated-wrappers/ownable_feature';
 export * from '../generated-wrappers/pay_taker_transformer';
 export * from '../generated-wrappers/polygon_bridge_adapter';
+export * from '../generated-wrappers/polygon_zkevm_bridge_adapter';
 export * from '../generated-wrappers/positive_slippage_fee_transformer';
 export * from '../generated-wrappers/simple_function_registry_feature';
 export * from '../generated-wrappers/transform_erc20_feature';

contracts/zero-ex/test/artifacts.ts

@@ -152,6 +152,7 @@ import * as PancakeSwapFeature from '../test/generated-artifacts/PancakeSwapFeat
 import * as PayTakerTransformer from '../test/generated-artifacts/PayTakerTransformer.json';
 import * as PermissionlessTransformerDeployer from '../test/generated-artifacts/PermissionlessTransformerDeployer.json';
 import * as PolygonBridgeAdapter from '../test/generated-artifacts/PolygonBridgeAdapter.json';
+import * as PolygonZkevmBridgeAdapter from '../test/generated-artifacts/PolygonZkevmBridgeAdapter.json';
 import * as PositiveSlippageFeeTransformer from '../test/generated-artifacts/PositiveSlippageFeeTransformer.json';
 import * as SimpleFunctionRegistryFeature from '../test/generated-artifacts/SimpleFunctionRegistryFeature.json';
 import * as TestCurve from '../test/generated-artifacts/TestCurve.json';
@@ -330,6 +331,7 @@ export const artifacts = {
     IBridgeAdapter: IBridgeAdapter as ContractArtifact,
     OptimismBridgeAdapter: OptimismBridgeAdapter as ContractArtifact,
     PolygonBridgeAdapter: PolygonBridgeAdapter as ContractArtifact,
+    PolygonZkevmBridgeAdapter: PolygonZkevmBridgeAdapter as ContractArtifact,
     MixinAaveV2: MixinAaveV2 as ContractArtifact,
     MixinBalancer: MixinBalancer as ContractArtifact,
     MixinBalancerV2Batch: MixinBalancerV2Batch as ContractArtifact,

contracts/zero-ex/test/wrappers.ts

@@ -150,6 +150,7 @@ export * from '../test/generated-wrappers/pancake_swap_feature';
 export * from '../test/generated-wrappers/pay_taker_transformer';
 export * from '../test/generated-wrappers/permissionless_transformer_deployer';
 export * from '../test/generated-wrappers/polygon_bridge_adapter';
+export * from '../test/generated-wrappers/polygon_zkevm_bridge_adapter';
 export * from '../test/generated-wrappers/positive_slippage_fee_transformer';
 export * from '../test/generated-wrappers/simple_function_registry_feature';
 export * from '../test/generated-wrappers/test_curve';

contracts/zero-ex/tsconfig.json

@@ -40,6 +40,7 @@
         "generated-artifacts/OwnableFeature.json",
         "generated-artifacts/PayTakerTransformer.json",
         "generated-artifacts/PolygonBridgeAdapter.json",
+        "generated-artifacts/PolygonZkevmBridgeAdapter.json",
         "generated-artifacts/PositiveSlippageFeeTransformer.json",
         "generated-artifacts/SimpleFunctionRegistryFeature.json",
         "generated-artifacts/TransformERC20Feature.json",
@@ -192,6 +193,7 @@
         "test/generated-artifacts/PayTakerTransformer.json",
         "test/generated-artifacts/PermissionlessTransformerDeployer.json",
         "test/generated-artifacts/PolygonBridgeAdapter.json",
+        "test/generated-artifacts/PolygonZkevmBridgeAdapter.json",
         "test/generated-artifacts/PositiveSlippageFeeTransformer.json",
         "test/generated-artifacts/SimpleFunctionRegistryFeature.json",
         "test/generated-artifacts/TestCurve.json",

docs/basics/addresses.rst

@@ -66,8 +66,3 @@ Note: Some addresses have changed across various networks
     Avalanche, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://snowtrace.io/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
     Fantom, `0xdef189deaef76e379df891899eb5a00a94cbc250 <https://ftmscan.com/address/0xdef189deaef76e379df891899eb5a00a94cbc250>`__
     Celo, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://explorer.celo.org/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
-    Arbitrum, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://arbiscan.io/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
-    Base, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://basescan.org/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
-    zkEVM, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://zkevm.polygonscan.com/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
-    Sepolia, `0xdef1c0ded9bec7f1a1670819833240f027b25eff <https://sepolia.etherscan.io/address/0xdef1c0ded9bec7f1a1670819833240f027b25eff>`__
-    Mumbai, `0xf471d32cb40837bf24529fcf17418fc1a4807626 <https://mumbai.polygonscan.com/address/0xf471d32cb40837bf24529fcf17418fc1a4807626>`__

funding.json

@@ -1,5 +0,0 @@
-{
-  "opRetro": {
-    "projectId": "0x0fad18f37ecec4f4f4ca18e60c353eb11462363e8aa14562b5d96af54108d106"
-  }
-}

packages/contract-addresses/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-	{
-		"version": "8.13.0",
-		"changes": [
-			{
-				"note": "Add Sepolia addresses"
-			}
-		],
-		"timestamp": 1700094997
-	},
 	{
 		"version": "8.12.0",
 		"changes": [

packages/contract-addresses/CHANGELOG.md

@@ -6,9 +6,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v8.13.0 - _November 16, 2023_
-
-    * Add Sepolia addresses
 ## v8.12.0 - _August 29, 2023_
 
     * Add VelodromeV2 support on Base

packages/contract-addresses/addresses.json

@@ -274,28 +274,5 @@
             "fillQuoteTransformer": "0x2c46d57bb5af87a13a51dd5b62ba7d3bc7e12e9c",
             "positiveSlippageFeeTransformer": "0xf98a130d3b4029c70e6d93098cb82a003421341e"
         }
-    },
-    "11155111": {
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0xfff9976782d46cc05630d1f6ebab18b2324d6b14",
-        "zeroExGovernor": "0x5c1f7772ce24d942b85e9b6576f7b5ef70686f5a",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0x5c1f7772ce24d942b85e9b6576f7b5ef70686f5a",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0x58bca53ebba1aaf25f0edcd8dad6421872fe20b2",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "transformers": {
-            "wethTransformer": "0xf98a130d3b4029c70e6d93098cb82a003421341e",
-            "payTakerTransformer": "0x44e0f3975e95387f3866dd7cab1f51050394a3d1",
-            "affiliateFeeTransformer": "0x5cc22a0e06ea11097c612a962e63674b90e96099",
-            "fillQuoteTransformer": "0x63186ea36e78ecbf0128e448362f1b81e9bf7412",
-            "positiveSlippageFeeTransformer": "0x9e52d8b32d835206d09810c310593bcc77264066"
-        }
     }
 }

packages/contract-addresses/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-addresses",
-    "version": "8.13.0",
+    "version": "8.12.0",
     "engines": {
         "node": ">=6.12"
     },

packages/contract-addresses/src/index.ts

@@ -1,16 +1,20 @@
 import addresses from '../addresses.json';
 
 export interface ContractAddresses {
-    erc20BridgeProxy: string;
-    erc20BridgeSampler: string;
+    zrxToken: string;
     etherToken: string;
-    exchangeProxy: string;
-    exchangeProxyFlashWallet: string;
-    exchangeProxyGovernor: string;
-    exchangeProxyLiquidityProviderSandbox: string;
-    exchangeProxyTransformerDeployer: string;
+    zeroExGovernor: string;
+    zrxVault: string;
     staking: string;
     stakingProxy: string;
+    erc20BridgeProxy: string;
+    erc20BridgeSampler: string;
+    exchangeProxyGovernor: string;
+    exchangeProxy: string;
+    exchangeProxyTransformerDeployer: string;
+    exchangeProxyFlashWallet: string;
+    exchangeProxyLiquidityProviderSandbox: string;
+    zrxTreasury: string;
     transformers: {
         wethTransformer: string;
         payTakerTransformer: string;
@@ -18,33 +22,21 @@ export interface ContractAddresses {
         affiliateFeeTransformer: string;
         positiveSlippageFeeTransformer: string;
     };
-    zeroExGovernor: string;
-    zrxToken: string;
-    zrxTreasury: string;
-    zrxVault: string;
 }
 
 export enum ChainId {
     Mainnet = 1,
     Goerli = 5,
-    Optimism = 10,
+    Ganache = 1337,
     BSC = 56,
     Polygon = 137,
-    Fantom = 250,
-    Ganache = 1337,
-    Base = 8453,
-    Arbitrum = 42161,
-    Avalanche = 43114,
-    Celo = 42220,
     PolygonMumbai = 80001,
-    Sepolia = 11155111
-}
-
-/**
- * Narrow a JavaScript number to a Chain ID.
- */
-export function isChainId(chainId: number): chainId is ChainId {
-    return Object.values(ChainId).includes(chainId);
+    Avalanche = 43114,
+    Fantom = 250,
+    Celo = 42220,
+    Optimism = 10,
+    Arbitrum = 42161,
+    Base = 8453,
 }
 
 /**

packages/contract-addresses/test/addresses_test.ts

@@ -2,7 +2,7 @@ import * as chai from 'chai';
 import { bufferToHex, rlphash } from 'ethereumjs-util';
 import 'mocha';
 
-import { ChainId, getContractAddressesForChainOrThrow, isChainId } from '../src';
+import { ChainId, getContractAddressesForChainOrThrow } from '../src';
 
 const expect = chai.expect;
 
@@ -68,12 +68,3 @@ describe('addresses.json sanity test', () => {
         });
     });
 });
-
-describe("isChainId", () => {
-    it("should return true for existing chain ids", () => {
-      expect(isChainId(1)).to.be.true;
-    });
-    it("should return false for non-existing chain ids", () => {
-      expect(isChainId(666)).to.be.false;
-    });
-});

packages/contract-wrappers/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-	{
-		"timestamp": 1700094997,
-		"version": "13.23.8",
-		"changes": [
-			{
-				"note": "Dependencies updated"
-			}
-		]
-	},
 	{
 		"timestamp": 1693346928,
 		"version": "13.23.7",

packages/contract-wrappers/CHANGELOG.md

@@ -6,9 +6,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v13.23.8 - _November 16, 2023_
-
-    * Dependencies updated
 ## v13.23.7 - _August 29, 2023_
 
     * Dependencies updated

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-wrappers",
-    "version": "13.23.8",
+    "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.13.0",
+        "@0x/contract-addresses": "^8.12.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/types": "^3.3.7",
         "@0x/utils": "^7.0.0",

packages/protocol-utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-	{
-		"timestamp": 1700094997,
-		"version": "11.24.2",
-		"changes": [
-			{
-				"note": "Dependencies updated"
-			}
-		]
-	},
 	{
 		"timestamp": 1693346928,
 		"version": "11.24.1",

packages/protocol-utils/CHANGELOG.md

@@ -6,9 +6,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v11.24.2 - _November 16, 2023_
-
-    * Dependencies updated
 ## v11.24.1 - _August 29, 2023_
 
     * Dependencies updated

packages/protocol-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/protocol-utils",
-    "version": "11.24.2",
+    "version": "11.24.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -62,8 +62,8 @@
     },
     "dependencies": {
         "@0x/assert": "^3.0.36",
-        "@0x/contract-addresses": "^8.13.0",
-        "@0x/contract-wrappers": "^13.23.8",
+        "@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",