diff --git a/contracts/zero-ex/CHANGELOG.json b/contracts/zero-ex/CHANGELOG.json index 9dce7d39b9..019b76c3bc 100644 --- a/contracts/zero-ex/CHANGELOG.json +++ b/contracts/zero-ex/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.33.0", + "changes": [ + { + "note": "Add support for GMX and Platypus to bridge adapter", + "pr": 478 + } + ] + }, { "version": "0.32.0", "changes": [ diff --git a/contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol b/contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol index c8020cd5af..63670ffc49 100644 --- a/contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol +++ b/contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol @@ -27,7 +27,6 @@ import "./mixins/MixinBalancer.sol"; import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2Batch.sol"; import "./mixins/MixinBancor.sol"; -import "./mixins/MixinCoFiX.sol"; import "./mixins/MixinCompound.sol"; import "./mixins/MixinCurve.sol"; import "./mixins/MixinCurveV2.sol"; @@ -35,7 +34,6 @@ import "./mixins/MixinCryptoCom.sol"; import "./mixins/MixinDodo.sol"; import "./mixins/MixinDodoV2.sol"; import "./mixins/MixinGMX.sol"; -import "./mixins/MixinKyber.sol"; import "./mixins/MixinKyberDmm.sol"; import "./mixins/MixinLido.sol"; import "./mixins/MixinMakerPSM.sol"; @@ -57,7 +55,6 @@ contract BridgeAdapter is MixinBalancerV2, MixinBalancerV2Batch, MixinBancor, - MixinCoFiX, MixinCompound, MixinCurve, MixinCurveV2, @@ -65,7 +62,6 @@ contract BridgeAdapter is MixinDodo, MixinDodoV2, MixinGMX, - MixinKyber, MixinKyberDmm, MixinLido, MixinMakerPSM, @@ -86,7 +82,6 @@ contract BridgeAdapter is MixinBalancer() MixinBalancerV2() MixinBancor(weth) - MixinCoFiX() MixinCompound(weth) MixinCurve(weth) MixinCurveV2() @@ -94,7 +89,6 @@ contract BridgeAdapter is MixinDodo() MixinDodoV2() MixinGMX() - MixinKyber(weth) MixinLido(weth) MixinMakerPSM() MixinMooniswap(weth) @@ -172,14 +166,7 @@ contract BridgeAdapter is sellAmount, order.bridgeData ); - } else if (protocolId == BridgeProtocols.KYBER) { - boughtAmount = _tradeKyber( - sellToken, - buyToken, - sellAmount, - order.bridgeData - ); - } else if (protocolId == BridgeProtocols.MAKERPSM) { + }else if (protocolId == BridgeProtocols.MAKERPSM) { boughtAmount = _tradeMakerPsm( sellToken, buyToken, @@ -238,13 +225,6 @@ contract BridgeAdapter is sellAmount, order.bridgeData ); - } else if (protocolId == BridgeProtocols.COFIX) { - boughtAmount = _tradeCoFiX( - sellToken, - buyToken, - sellAmount, - order.bridgeData - ); } else if (protocolId == BridgeProtocols.NERVE) { boughtAmount = _tradeNerve( sellToken, diff --git a/packages/asset-swapper/CHANGELOG.json b/packages/asset-swapper/CHANGELOG.json index 398f66a1f7..55a07cb107 100644 --- a/packages/asset-swapper/CHANGELOG.json +++ b/packages/asset-swapper/CHANGELOG.json @@ -8,7 +8,7 @@ "pr": 467 }, { - "note": "Add GMX and Platypus on Avalanche", + "note": "Add GMX and Platypus on Avalanche and Enable KyberDMM on bsc", "pr": 478 } ] diff --git a/packages/asset-swapper/src/utils/market_operation_utils/types.ts b/packages/asset-swapper/src/utils/market_operation_utils/types.ts index 70f7a08901..c25baebdba 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/types.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/types.ts @@ -93,6 +93,7 @@ export enum ERC20BridgeSource { Pangolin = 'Pangolin', TraderJoe = 'TraderJoe', Platypus = 'Platypus', + // tslint:disable: enum-naming GMX = 'GMX', // Celo only UbeSwap = 'UbeSwap', diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index 2ea339d2dd..5ed2e43b06 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "6.14.0", + "changes": [ + { + "note": "Redeploy FQT on Avalanche and BSC" + } + ] + }, { "version": "6.13.0", "changes": [ diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index 4c0d8a5401..d6bd6b5402 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -205,7 +205,7 @@ "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f", "payTakerTransformer": "0x4f5e8ca2cadecd4a467ae441e4b03de4278a4574", "affiliateFeeTransformer": "0x1be34ab9b2acb5c4ddd89454bdce637967e65230", - "fillQuoteTransformer": "0xfa8ca57cb24cd59e74ae1659a00104188e7e8a3e", + "fillQuoteTransformer": "0x0b72d55485e8d877f73cc8b14ea3e010b3e804fd", "positiveSlippageFeeTransformer": "0x7f5c79ad1788573b1145f4651a248523c54f5d1f" } }, @@ -373,7 +373,7 @@ "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c", "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3", "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c", - "fillQuoteTransformer": "0xd421f50b3ae27f223aa35a04944236d257235412", + "fillQuoteTransformer": "0xb6c9c52ce7094fc96d8bd5d3ecd0c6feeafe3457", "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857" } }, diff --git a/packages/protocol-utils/CHANGELOG.json b/packages/protocol-utils/CHANGELOG.json index f5e4e4f71a..19a1dcf36d 100644 --- a/packages/protocol-utils/CHANGELOG.json +++ b/packages/protocol-utils/CHANGELOG.json @@ -1,9 +1,10 @@ [ { - "version": "1.12.0", + "version": "11.13.0", "changes": [ { - "note": "Added Support for GMX and Platypus on Avalanche" + "note": "Added Support for GMX and Platypus on Avalanche", + "pr": 478 } ] },