From e5e1393f0e45496f9c04127157d318faaff89a96 Mon Sep 17 00:00:00 2001 From: Kyu Date: Tue, 6 Jun 2023 11:49:44 +0900 Subject: [PATCH] Offboard Shell and MStable (#726) * Offboard Shell and MStable * Update README --- contracts/zero-ex/CHANGELOG.json | 3 + contracts/zero-ex/compiler.json | 2 - .../bridges/EthereumBridgeAdapter.sol | 14 ----- .../bridges/PolygonBridgeAdapter.sol | 7 --- .../bridges/mixins/MixinShell.sol | 57 ------------------- contracts/zero-ex/package.json | 2 +- contracts/zero-ex/test/artifacts.ts | 6 -- contracts/zero-ex/test/wrappers.ts | 3 - contracts/zero-ex/tsconfig.json | 3 - 9 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol diff --git a/contracts/zero-ex/CHANGELOG.json b/contracts/zero-ex/CHANGELOG.json index 8717dd6316..941af42efd 100644 --- a/contracts/zero-ex/CHANGELOG.json +++ b/contracts/zero-ex/CHANGELOG.json @@ -4,6 +4,9 @@ "changes": [ { "note": "Remove Bancor V1 support" + }, + { + "note": "Remove Shell and MStable support" } ] }, diff --git a/contracts/zero-ex/compiler.json b/contracts/zero-ex/compiler.json index e493c7e223..23ef6ed955 100644 --- a/contracts/zero-ex/compiler.json +++ b/contracts/zero-ex/compiler.json @@ -135,12 +135,10 @@ "./contracts/src/transformers/bridges/mixins/MixinGMX.sol", "./contracts/src/transformers/bridges/mixins/MixinKyberDmm.sol", "./contracts/src/transformers/bridges/mixins/MixinLido.sol", - "./contracts/src/transformers/bridges/mixins/MixinMStable.sol", "./contracts/src/transformers/bridges/mixins/MixinMakerPSM.sol", "./contracts/src/transformers/bridges/mixins/MixinMooniswap.sol", "./contracts/src/transformers/bridges/mixins/MixinNerve.sol", "./contracts/src/transformers/bridges/mixins/MixinPlatypus.sol", - "./contracts/src/transformers/bridges/mixins/MixinShell.sol", "./contracts/src/transformers/bridges/mixins/MixinSolidly.sol", "./contracts/src/transformers/bridges/mixins/MixinSynthetix.sol", "./contracts/src/transformers/bridges/mixins/MixinUniswap.sol", diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol index f73839b494..ea5be816b0 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol @@ -32,9 +32,7 @@ import "./mixins/MixinKyberDmm.sol"; import "./mixins/MixinKyberElastic.sol"; import "./mixins/MixinLido.sol"; import "./mixins/MixinMakerPSM.sol"; -import "./mixins/MixinMStable.sol"; import "./mixins/MixinNerve.sol"; -import "./mixins/MixinShell.sol"; import "./mixins/MixinSynthetix.sol"; import "./mixins/MixinUniswap.sol"; import "./mixins/MixinUniswapV2.sol"; @@ -58,9 +56,7 @@ contract EthereumBridgeAdapter is MixinKyberElastic, MixinLido, MixinMakerPSM, - MixinMStable, MixinNerve, - MixinShell, MixinSynthetix, MixinUniswap, MixinUniswapV2, @@ -119,16 +115,6 @@ contract EthereumBridgeAdapter is return (0, true); } boughtAmount = _tradeMakerPsm(sellToken, buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.MSTABLE) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeMStable(sellToken, buyToken, sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.SHELL) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeShell(sellToken, buyToken, sellAmount, order.bridgeData); } else if (protocolId == BridgeProtocols.DODO) { if (dryRun) { return (0, true); diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol index f59c02199e..65983236d1 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/PolygonBridgeAdapter.sol @@ -26,7 +26,6 @@ import "./mixins/MixinDodo.sol"; import "./mixins/MixinDodoV2.sol"; import "./mixins/MixinKyberDmm.sol"; import "./mixins/MixinKyberElastic.sol"; -import "./mixins/MixinMStable.sol"; import "./mixins/MixinNerve.sol"; import "./mixins/MixinSolidly.sol"; import "./mixins/MixinUniswapV2.sol"; @@ -45,7 +44,6 @@ contract PolygonBridgeAdapter is MixinDodoV2, MixinKyberDmm, MixinKyberElastic, - MixinMStable, MixinNerve, MixinUniswapV2, MixinUniswapV3, @@ -88,11 +86,6 @@ contract PolygonBridgeAdapter is return (0, true); } boughtAmount = _tradeBalancerV2Batch(sellAmount, order.bridgeData); - } else if (protocolId == BridgeProtocols.MSTABLE) { - if (dryRun) { - return (0, true); - } - boughtAmount = _tradeMStable(sellToken, buyToken, sellAmount, order.bridgeData); } else if (protocolId == BridgeProtocols.DODO) { if (dryRun) { return (0, true); diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol deleted file mode 100644 index a65d6c9634..0000000000 --- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol +++ /dev/null @@ -1,57 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -/* - Copyright 2023 ZeroEx Intl. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -pragma solidity ^0.6.5; -pragma experimental ABIEncoderV2; - -import "@0x/contracts-erc20/src/v06/LibERC20TokenV06.sol"; -import "@0x/contracts-erc20/src/IERC20Token.sol"; - -interface IShell { - function originSwap( - IERC20Token from, - IERC20Token to, - uint256 fromAmount, - uint256 minTargetAmount, - uint256 deadline - ) external returns (uint256 toAmount); -} - -contract MixinShell { - using LibERC20TokenV06 for IERC20Token; - - function _tradeShell( - IERC20Token sellToken, - IERC20Token buyToken, - uint256 sellAmount, - bytes memory bridgeData - ) internal returns (uint256 boughtAmount) { - IShell pool = abi.decode(bridgeData, (IShell)); - - // Grant the Shell contract an allowance to sell the first token. - IERC20Token(sellToken).approveIfBelow(address(pool), sellAmount); - - boughtAmount = pool.originSwap( - sellToken, - buyToken, - // Sell all tokens we hold. - sellAmount, - // Minimum buy amount. - 1, - // deadline - block.timestamp + 1 - ); - return boughtAmount; - } -} diff --git a/contracts/zero-ex/package.json b/contracts/zero-ex/package.json index 0ea4bf242d..06530d1b7b 100644 --- a/contracts/zero-ex/package.json +++ b/contracts/zero-ex/package.json @@ -38,7 +38,7 @@ "config": { "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,PositiveSlippageFeeTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,AffiliateFeeTransformer,MetaTransactionsFeature,LogMetadataTransformer,LiquidityProviderFeature,ILiquidityProviderFeature,NativeOrdersFeature,INativeOrdersFeature,FeeCollectorController,FeeCollector,CurveLiquidityProvider,BatchFillNativeOrdersFeature,IBatchFillNativeOrdersFeature,MultiplexFeature,IMultiplexFeature,OtcOrdersFeature,IOtcOrdersFeature,AvalancheBridgeAdapter,BSCBridgeAdapter,CeloBridgeAdapter,EthereumBridgeAdapter,FantomBridgeAdapter,OptimismBridgeAdapter,PolygonBridgeAdapter,MetaTransactionsFeatureV2", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.", - "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|ArbitrumBridgeAdapter|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMetaTransactionsFeatureV2|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MetaTransactionsFeatureV2|MixinAaveV2|MixinBalancer|MixinBalancerV2Batch|MixinBancor|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinShell|MixinSolidly|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json" + "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|ArbitrumBridgeAdapter|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMetaTransactionsFeatureV2|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MetaTransactionsFeatureV2|MixinAaveV2|MixinBalancer|MixinBalancerV2Batch|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinSolidly|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json" }, "repository": { "type": "git", diff --git a/contracts/zero-ex/test/artifacts.ts b/contracts/zero-ex/test/artifacts.ts index adafc829c2..ec9e2389a2 100644 --- a/contracts/zero-ex/test/artifacts.ts +++ b/contracts/zero-ex/test/artifacts.ts @@ -109,7 +109,6 @@ import * as MetaTransactionsFeatureV2 from '../test/generated-artifacts/MetaTran import * as MixinAaveV2 from '../test/generated-artifacts/MixinAaveV2.json'; import * as MixinBalancer from '../test/generated-artifacts/MixinBalancer.json'; import * as MixinBalancerV2Batch from '../test/generated-artifacts/MixinBalancerV2Batch.json'; -import * as MixinBancor from '../test/generated-artifacts/MixinBancor.json'; import * as MixinBancorV3 from '../test/generated-artifacts/MixinBancorV3.json'; import * as MixinCompound from '../test/generated-artifacts/MixinCompound.json'; import * as MixinCryptoCom from '../test/generated-artifacts/MixinCryptoCom.json'; @@ -122,10 +121,8 @@ import * as MixinKyberDmm from '../test/generated-artifacts/MixinKyberDmm.json'; import * as MixinLido from '../test/generated-artifacts/MixinLido.json'; import * as MixinMakerPSM from '../test/generated-artifacts/MixinMakerPSM.json'; import * as MixinMooniswap from '../test/generated-artifacts/MixinMooniswap.json'; -import * as MixinMStable from '../test/generated-artifacts/MixinMStable.json'; import * as MixinNerve from '../test/generated-artifacts/MixinNerve.json'; import * as MixinPlatypus from '../test/generated-artifacts/MixinPlatypus.json'; -import * as MixinShell from '../test/generated-artifacts/MixinShell.json'; import * as MixinSolidly from '../test/generated-artifacts/MixinSolidly.json'; import * as MixinSynthetix from '../test/generated-artifacts/MixinSynthetix.json'; import * as MixinUniswap from '../test/generated-artifacts/MixinUniswap.json'; @@ -332,7 +329,6 @@ export const artifacts = { MixinAaveV2: MixinAaveV2 as ContractArtifact, MixinBalancer: MixinBalancer as ContractArtifact, MixinBalancerV2Batch: MixinBalancerV2Batch as ContractArtifact, - MixinBancor: MixinBancor as ContractArtifact, MixinBancorV3: MixinBancorV3 as ContractArtifact, MixinCompound: MixinCompound as ContractArtifact, MixinCryptoCom: MixinCryptoCom as ContractArtifact, @@ -343,12 +339,10 @@ export const artifacts = { MixinGMX: MixinGMX as ContractArtifact, MixinKyberDmm: MixinKyberDmm as ContractArtifact, MixinLido: MixinLido as ContractArtifact, - MixinMStable: MixinMStable as ContractArtifact, MixinMakerPSM: MixinMakerPSM as ContractArtifact, MixinMooniswap: MixinMooniswap as ContractArtifact, MixinNerve: MixinNerve as ContractArtifact, MixinPlatypus: MixinPlatypus as ContractArtifact, - MixinShell: MixinShell as ContractArtifact, MixinSolidly: MixinSolidly as ContractArtifact, MixinSynthetix: MixinSynthetix as ContractArtifact, MixinUniswap: MixinUniswap as ContractArtifact, diff --git a/contracts/zero-ex/test/wrappers.ts b/contracts/zero-ex/test/wrappers.ts index 7f703bc267..0956860c25 100644 --- a/contracts/zero-ex/test/wrappers.ts +++ b/contracts/zero-ex/test/wrappers.ts @@ -107,7 +107,6 @@ export * from '../test/generated-wrappers/meta_transactions_feature_v2'; export * from '../test/generated-wrappers/mixin_aave_v2'; export * from '../test/generated-wrappers/mixin_balancer'; export * from '../test/generated-wrappers/mixin_balancer_v2_batch'; -export * from '../test/generated-wrappers/mixin_bancor'; export * from '../test/generated-wrappers/mixin_bancor_v3'; export * from '../test/generated-wrappers/mixin_compound'; export * from '../test/generated-wrappers/mixin_crypto_com'; @@ -118,12 +117,10 @@ export * from '../test/generated-wrappers/mixin_dodo_v2'; export * from '../test/generated-wrappers/mixin_g_m_x'; export * from '../test/generated-wrappers/mixin_kyber_dmm'; export * from '../test/generated-wrappers/mixin_lido'; -export * from '../test/generated-wrappers/mixin_m_stable'; export * from '../test/generated-wrappers/mixin_maker_p_s_m'; export * from '../test/generated-wrappers/mixin_mooniswap'; export * from '../test/generated-wrappers/mixin_nerve'; export * from '../test/generated-wrappers/mixin_platypus'; -export * from '../test/generated-wrappers/mixin_shell'; export * from '../test/generated-wrappers/mixin_solidly'; export * from '../test/generated-wrappers/mixin_synthetix'; export * from '../test/generated-wrappers/mixin_uniswap'; diff --git a/contracts/zero-ex/tsconfig.json b/contracts/zero-ex/tsconfig.json index 55d3158d27..ab33e86988 100644 --- a/contracts/zero-ex/tsconfig.json +++ b/contracts/zero-ex/tsconfig.json @@ -147,7 +147,6 @@ "test/generated-artifacts/MixinAaveV2.json", "test/generated-artifacts/MixinBalancer.json", "test/generated-artifacts/MixinBalancerV2Batch.json", - "test/generated-artifacts/MixinBancor.json", "test/generated-artifacts/MixinBancorV3.json", "test/generated-artifacts/MixinCompound.json", "test/generated-artifacts/MixinCryptoCom.json", @@ -158,12 +157,10 @@ "test/generated-artifacts/MixinGMX.json", "test/generated-artifacts/MixinKyberDmm.json", "test/generated-artifacts/MixinLido.json", - "test/generated-artifacts/MixinMStable.json", "test/generated-artifacts/MixinMakerPSM.json", "test/generated-artifacts/MixinMooniswap.json", "test/generated-artifacts/MixinNerve.json", "test/generated-artifacts/MixinPlatypus.json", - "test/generated-artifacts/MixinShell.json", "test/generated-artifacts/MixinSolidly.json", "test/generated-artifacts/MixinSynthetix.json", "test/generated-artifacts/MixinUniswap.json",