From 3f8dbf3fe900a8b07a0f915f4b89bd2af6b3ecbe Mon Sep 17 00:00:00 2001 From: "Savarn Dontamsetti (Sav)" Date: Mon, 12 Dec 2022 10:08:15 -0500 Subject: [PATCH] Removing Balancer V2 from Bridge Adapters (#629) --- contracts/zero-ex/compiler.json | 1 - .../bridges/ArbitrumBridgeAdapter.sol | 9 +- .../bridges/EthereumBridgeAdapter.sol | 7 -- .../bridges/FantomBridgeAdapter.sol | 7 -- .../bridges/OptimismBridgeAdapter.sol | 7 -- .../bridges/PolygonBridgeAdapter.sol | 7 -- .../bridges/mixins/MixinBalancerV2.sol | 119 ------------------ contracts/zero-ex/package.json | 2 +- contracts/zero-ex/test/artifacts.ts | 2 - contracts/zero-ex/test/wrappers.ts | 1 - contracts/zero-ex/tsconfig.json | 1 - 11 files changed, 2 insertions(+), 161 deletions(-) delete mode 100644 contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol diff --git a/contracts/zero-ex/compiler.json b/contracts/zero-ex/compiler.json index 6da83c8b7d..7b38881a7a 100644 --- a/contracts/zero-ex/compiler.json +++ b/contracts/zero-ex/compiler.json @@ -121,7 +121,6 @@ "./contracts/src/transformers/bridges/PolygonBridgeAdapter.sol", "./contracts/src/transformers/bridges/mixins/MixinAaveV2.sol", "./contracts/src/transformers/bridges/mixins/MixinBalancer.sol", - "./contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol", "./contracts/src/transformers/bridges/mixins/MixinBalancerV2Batch.sol", "./contracts/src/transformers/bridges/mixins/MixinBancor.sol", "./contracts/src/transformers/bridges/mixins/MixinBancorV3.sol", diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol index ba81db4994..d5280ef6c1 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/ArbitrumBridgeAdapter.sol @@ -23,7 +23,6 @@ pragma experimental ABIEncoderV2; import "./AbstractBridgeAdapter.sol"; import "./BridgeProtocols.sol"; import "./mixins/MixinAaveV3.sol"; -import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2Batch.sol"; import "./mixins/MixinCurve.sol"; import "./mixins/MixinCurveV2.sol"; @@ -38,7 +37,6 @@ import "./mixins/MixinZeroExBridge.sol"; contract ArbitrumBridgeAdapter is AbstractBridgeAdapter(42161, "Arbitrum"), MixinAaveV3, - MixinBalancerV2, MixinBalancerV2Batch, MixinCurve, MixinCurveV2, @@ -60,12 +58,7 @@ contract ArbitrumBridgeAdapter is bool dryRun ) internal override returns (uint256 boughtAmount, bool supportedSource) { uint128 protocolId = uint128(uint256(order.source) >> 128); - if (protocolId == BridgeProtocols.BALANCERV2) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) { + if (protocolId == BridgeProtocols.BALANCERV2BATCH) { if (dryRun) { return (0, true); } diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol index c517021d91..ead5f04185 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol @@ -24,7 +24,6 @@ import "./AbstractBridgeAdapter.sol"; import "./BridgeProtocols.sol"; import "./mixins/MixinAaveV2.sol"; import "./mixins/MixinBalancer.sol"; -import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2Batch.sol"; import "./mixins/MixinBancor.sol"; import "./mixins/MixinBancorV3.sol"; @@ -50,7 +49,6 @@ contract EthereumBridgeAdapter is AbstractBridgeAdapter(1, "Ethereum"), MixinAaveV2, MixinBalancer, - MixinBalancerV2, MixinBalancerV2Batch, MixinBancor, MixinBancorV3, @@ -122,11 +120,6 @@ contract EthereumBridgeAdapter is return (0, true); } boughtAmount = _tradeBalancer(sellToken, buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.BALANCERV2) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData); } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) { if (dryRun) { return (0, true); diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol index c48cc2ecaa..ffe00718a8 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/FantomBridgeAdapter.sol @@ -22,7 +22,6 @@ pragma experimental ABIEncoderV2; import "./AbstractBridgeAdapter.sol"; import "./BridgeProtocols.sol"; -import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2Batch.sol"; import "./mixins/MixinCurve.sol"; import "./mixins/MixinCurveV2.sol"; @@ -33,7 +32,6 @@ import "./mixins/MixinZeroExBridge.sol"; contract FantomBridgeAdapter is AbstractBridgeAdapter(250, "Fantom"), - MixinBalancerV2, MixinBalancerV2Batch, MixinCurve, MixinCurveV2, @@ -67,11 +65,6 @@ contract FantomBridgeAdapter is return (0, true); } boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.BALANCERV2) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData); } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) { if (dryRun) { return (0, true); diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol index 32632d14e1..38bc6dfe9d 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol @@ -18,7 +18,6 @@ pragma experimental ABIEncoderV2; import "./AbstractBridgeAdapter.sol"; import "./BridgeProtocols.sol"; import "./mixins/MixinAaveV3.sol"; -import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2Batch.sol"; import "./mixins/MixinCurve.sol"; import "./mixins/MixinCurveV2.sol"; @@ -31,7 +30,6 @@ import "./mixins/MixinZeroExBridge.sol"; contract OptimismBridgeAdapter is AbstractBridgeAdapter(10, "Optimism"), MixinAaveV3, - MixinBalancerV2, MixinBalancerV2Batch, MixinCurve, MixinCurveV2, @@ -86,11 +84,6 @@ contract OptimismBridgeAdapter is return (0, true); } boughtAmount = _tradeZeroExBridge(sellToken, buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.BALANCERV2) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData); } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) { if (dryRun) { return (0, true); diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol index 870855d7c8..16a44db66d 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol @@ -24,7 +24,6 @@ import "./AbstractBridgeAdapter.sol"; import "./BridgeProtocols.sol"; import "./mixins/MixinAaveV3.sol"; import "./mixins/MixinAaveV2.sol"; -import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2Batch.sol"; import "./mixins/MixinCurve.sol"; import "./mixins/MixinCurveV2.sol"; @@ -43,7 +42,6 @@ contract PolygonBridgeAdapter is AbstractBridgeAdapter(137, "Polygon"), MixinAaveV3, MixinAaveV2, - MixinBalancerV2, MixinBalancerV2Batch, MixinCurve, MixinCurveV2, @@ -88,11 +86,6 @@ contract PolygonBridgeAdapter is return (0, true); } boughtAmount = _tradeUniswapV2(buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.BALANCERV2) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeBalancerV2(sellToken, buyToken, sellAmount, order.bridgeData); } else if (protocolId == BridgeProtocols.BALANCERV2BATCH) { if (dryRun) { return (0, true); diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol deleted file mode 100644 index 738f9e165c..0000000000 --- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinBalancerV2.sol +++ /dev/null @@ -1,119 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -/* - - Copyright 2020 ZeroEx Intl. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -*/ - -pragma solidity ^0.6.5; -pragma experimental ABIEncoderV2; - -import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol"; -import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol"; - -interface IBalancerV2Vault { - enum SwapKind { - GIVEN_IN, - GIVEN_OUT - } - - // solhint-disable max-line-length - /** - * @dev Performs a swap with a single Pool. - * - * If the swap is given in (the number of tokens to send to the Pool is known), returns the amount of tokens - * taken from the Pool, which must be greater than or equal to `limit`. - * - * If the swap is given out (the number of tokens to take from the Pool is known), returns the amount of - * tokens sent to the Pool, which must be less than or equal to `limit`. - * - * Internal Balance usage and the recipient are determined by the `funds` struct. - * - * Emits a `Swap` event. - * For full documentation see https://github.com/balancer-labs/balancer-core-v2/blob/master/contracts/vault/interfaces/IVault.sol - */ - - // solhint-enable max-line-length - - function swap( - SingleSwap calldata request, - FundManagement calldata funds, - uint256 limit, - uint256 deadline - ) external payable returns (uint256); - - struct SingleSwap { - bytes32 poolId; - SwapKind kind; - IERC20TokenV06 assetIn; - IERC20TokenV06 assetOut; - uint256 amount; - bytes userData; - } - - struct FundManagement { - address sender; - bool fromInternalBalance; - address payable recipient; - bool toInternalBalance; - } -} - -contract MixinBalancerV2 { - using LibERC20TokenV06 for IERC20TokenV06; - - struct BalancerV2BridgeData { - IBalancerV2Vault vault; - bytes32 poolId; - } - - function _tradeBalancerV2( - IERC20TokenV06 sellToken, - IERC20TokenV06 buyToken, - uint256 sellAmount, - bytes memory bridgeData - ) internal returns (uint256 boughtAmount) { - // Decode the bridge data. - BalancerV2BridgeData memory data = abi.decode(bridgeData, (BalancerV2BridgeData)); - - // Grant an allowance to the exchange to spend `fromTokenAddress` token. - sellToken.approveIfBelow(address(data.vault), sellAmount); - - // Sell the entire sellAmount - IBalancerV2Vault.SingleSwap memory request = IBalancerV2Vault.SingleSwap({ - poolId: data.poolId, - kind: IBalancerV2Vault.SwapKind.GIVEN_IN, - assetIn: sellToken, - assetOut: buyToken, - amount: sellAmount, // amount in - userData: "" - }); - - IBalancerV2Vault.FundManagement memory funds = IBalancerV2Vault.FundManagement({ - sender: address(this), - fromInternalBalance: false, - recipient: payable(address(this)), - toInternalBalance: false - }); - - boughtAmount = data.vault.swap( - request, - funds, - 1, // min amount out - block.timestamp // expires after this block - ); - return boughtAmount; - } -} diff --git a/contracts/zero-ex/package.json b/contracts/zero-ex/package.json index fc17bc3084..1342506771 100644 --- a/contracts/zero-ex/package.json +++ b/contracts/zero-ex/package.json @@ -43,7 +43,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", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.", - "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|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|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|MixinAaveV2|MixinBalancer|MixinBalancerV2|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|TestBridge|TestCallTarget|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|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json" + "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|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|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|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|TestBridge|TestCallTarget|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|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json" }, "repository": { "type": "git", diff --git a/contracts/zero-ex/test/artifacts.ts b/contracts/zero-ex/test/artifacts.ts index 28ab81672c..8449d5231b 100644 --- a/contracts/zero-ex/test/artifacts.ts +++ b/contracts/zero-ex/test/artifacts.ts @@ -105,7 +105,6 @@ import * as LogMetadataTransformer from '../test/generated-artifacts/LogMetadata import * as MetaTransactionsFeature from '../test/generated-artifacts/MetaTransactionsFeature.json'; import * as MixinAaveV2 from '../test/generated-artifacts/MixinAaveV2.json'; import * as MixinBalancer from '../test/generated-artifacts/MixinBalancer.json'; -import * as MixinBalancerV2 from '../test/generated-artifacts/MixinBalancerV2.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'; @@ -329,7 +328,6 @@ export const artifacts = { PolygonBridgeAdapter: PolygonBridgeAdapter as ContractArtifact, MixinAaveV2: MixinAaveV2 as ContractArtifact, MixinBalancer: MixinBalancer as ContractArtifact, - MixinBalancerV2: MixinBalancerV2 as ContractArtifact, MixinBalancerV2Batch: MixinBalancerV2Batch as ContractArtifact, MixinBancor: MixinBancor as ContractArtifact, MixinBancorV3: MixinBancorV3 as ContractArtifact, diff --git a/contracts/zero-ex/test/wrappers.ts b/contracts/zero-ex/test/wrappers.ts index 24e9a259c6..5f0cd5bb96 100644 --- a/contracts/zero-ex/test/wrappers.ts +++ b/contracts/zero-ex/test/wrappers.ts @@ -103,7 +103,6 @@ export * from '../test/generated-wrappers/log_metadata_transformer'; export * from '../test/generated-wrappers/meta_transactions_feature'; export * from '../test/generated-wrappers/mixin_aave_v2'; export * from '../test/generated-wrappers/mixin_balancer'; -export * from '../test/generated-wrappers/mixin_balancer_v2'; export * from '../test/generated-wrappers/mixin_balancer_v2_batch'; export * from '../test/generated-wrappers/mixin_bancor'; export * from '../test/generated-wrappers/mixin_bancor_v3'; diff --git a/contracts/zero-ex/tsconfig.json b/contracts/zero-ex/tsconfig.json index 3c8bfdc0a9..47b0d733a8 100644 --- a/contracts/zero-ex/tsconfig.json +++ b/contracts/zero-ex/tsconfig.json @@ -142,7 +142,6 @@ "test/generated-artifacts/MetaTransactionsFeature.json", "test/generated-artifacts/MixinAaveV2.json", "test/generated-artifacts/MixinBalancer.json", - "test/generated-artifacts/MixinBalancerV2.json", "test/generated-artifacts/MixinBalancerV2Batch.json", "test/generated-artifacts/MixinBancor.json", "test/generated-artifacts/MixinBancorV3.json",