feat:Add Kyber Elastic mixins (#677)
* add kyber elastic mixins * update changelog * fix changelog
This commit is contained in:
parent
3e939f7780
commit
03ea4e3dba
@ -1,4 +1,12 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.39.1",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Add KyberElastic mixin for Optimism and BSC"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.39.0",
|
"version": "0.39.0",
|
||||||
"changes": [
|
"changes": [
|
||||||
|
@ -21,6 +21,7 @@ import "./mixins/MixinCurve.sol";
|
|||||||
import "./mixins/MixinDodo.sol";
|
import "./mixins/MixinDodo.sol";
|
||||||
import "./mixins/MixinDodoV2.sol";
|
import "./mixins/MixinDodoV2.sol";
|
||||||
import "./mixins/MixinKyberDmm.sol";
|
import "./mixins/MixinKyberDmm.sol";
|
||||||
|
import "./mixins/MixinKyberElastic.sol";
|
||||||
import "./mixins/MixinMooniswap.sol";
|
import "./mixins/MixinMooniswap.sol";
|
||||||
import "./mixins/MixinNerve.sol";
|
import "./mixins/MixinNerve.sol";
|
||||||
import "./mixins/MixinUniswapV2.sol";
|
import "./mixins/MixinUniswapV2.sol";
|
||||||
@ -33,6 +34,7 @@ contract BSCBridgeAdapter is
|
|||||||
MixinDodo,
|
MixinDodo,
|
||||||
MixinDodoV2,
|
MixinDodoV2,
|
||||||
MixinKyberDmm,
|
MixinKyberDmm,
|
||||||
|
MixinKyberElastic,
|
||||||
MixinMooniswap,
|
MixinMooniswap,
|
||||||
MixinNerve,
|
MixinNerve,
|
||||||
MixinUniswapV2,
|
MixinUniswapV2,
|
||||||
@ -84,6 +86,11 @@ contract BSCBridgeAdapter is
|
|||||||
return (0, true);
|
return (0, true);
|
||||||
}
|
}
|
||||||
boughtAmount = _tradeKyberDmm(buyToken, sellAmount, order.bridgeData);
|
boughtAmount = _tradeKyberDmm(buyToken, sellAmount, order.bridgeData);
|
||||||
|
} else if (protocolId == BridgeProtocols.KYBERELASTIC) {
|
||||||
|
if (dryRun) {
|
||||||
|
return (0, true);
|
||||||
|
}
|
||||||
|
boughtAmount = _tradeKyberElastic(sellToken, sellAmount, order.bridgeData);
|
||||||
} else if (protocolId == BridgeProtocols.WOOFI) {
|
} else if (protocolId == BridgeProtocols.WOOFI) {
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
return (0, true);
|
return (0, true);
|
||||||
|
@ -21,6 +21,7 @@ import "./mixins/MixinAaveV3.sol";
|
|||||||
import "./mixins/MixinBalancerV2Batch.sol";
|
import "./mixins/MixinBalancerV2Batch.sol";
|
||||||
import "./mixins/MixinCurve.sol";
|
import "./mixins/MixinCurve.sol";
|
||||||
import "./mixins/MixinCurveV2.sol";
|
import "./mixins/MixinCurveV2.sol";
|
||||||
|
import "./mixins/MixinKyberElastic.sol";
|
||||||
import "./mixins/MixinNerve.sol";
|
import "./mixins/MixinNerve.sol";
|
||||||
import "./mixins/MixinSolidly.sol";
|
import "./mixins/MixinSolidly.sol";
|
||||||
import "./mixins/MixinSynthetix.sol";
|
import "./mixins/MixinSynthetix.sol";
|
||||||
@ -34,6 +35,7 @@ contract OptimismBridgeAdapter is
|
|||||||
MixinBalancerV2Batch,
|
MixinBalancerV2Batch,
|
||||||
MixinCurve,
|
MixinCurve,
|
||||||
MixinCurveV2,
|
MixinCurveV2,
|
||||||
|
MixinKyberElastic,
|
||||||
MixinNerve,
|
MixinNerve,
|
||||||
MixinSynthetix,
|
MixinSynthetix,
|
||||||
MixinUniswapV3,
|
MixinUniswapV3,
|
||||||
@ -102,6 +104,11 @@ contract OptimismBridgeAdapter is
|
|||||||
return (0, true);
|
return (0, true);
|
||||||
}
|
}
|
||||||
boughtAmount = _tradeWOOFi(sellToken, buyToken, sellAmount, order.bridgeData);
|
boughtAmount = _tradeWOOFi(sellToken, buyToken, sellAmount, order.bridgeData);
|
||||||
|
} else if (protocolId == BridgeProtocols.KYBERELASTIC) {
|
||||||
|
if (dryRun) {
|
||||||
|
return (0, true);
|
||||||
|
}
|
||||||
|
boughtAmount = _tradeKyberElastic(sellToken, sellAmount, order.bridgeData);
|
||||||
}
|
}
|
||||||
|
|
||||||
emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);
|
emit BridgeFill(order.source, sellToken, buyToken, sellAmount, boughtAmount);
|
||||||
|
@ -38,8 +38,8 @@ contract SwapERC20ForERC20Test is Test, ForkUtils, TestUtils {
|
|||||||
|
|
||||||
function test_swapERC20ForERC20OnKyberElastic() public {
|
function test_swapERC20ForERC20OnKyberElastic() public {
|
||||||
for (uint256 i = 0; i < chains.length; i++) {
|
for (uint256 i = 0; i < chains.length; i++) {
|
||||||
// kyberelastic mixin not deployed to these chains yet (bsc, fantom, optimism)
|
// kyberelastic mixin not added to fantom yet
|
||||||
if (i == 1 || i == 4 || i == 5) {
|
if (i == 4) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
vm.selectFork(forkIds[chains[i]]);
|
vm.selectFork(forkIds[chains[i]]);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user