Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply changes to Kyber contracts

Browse Source
This commit is contained in:
Shriya Tyagi 2023-06-15 01:04:18 +05:30
parent 59aa71214f
commit 3450ab0ffc
24 changed files with 40 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
contracts/arbitrum/connectors/kyber_v3/events.sol → contracts/arbitrum/connectors/kyber_aggregator/events.sol
View File

4
contracts/arbitrum/connectors/kyber_v3/helpers.sol → contracts/arbitrum/connectors/kyber_aggregator/helpers.sol
View File

@ -18,7 +18,7 @@ abstract contract Helpers is DSMath, Basic {
address internal constant kyberswap =
0x6131B5fae19EA4f9D964eAc0408E4408b66337b5;
function _swapHelper(SwapData memory swapData, uint256 wethAmt)
function _swapHelper(SwapData memory swapData, uint256 ethAmt)
internal
returns (uint256 buyAmt)
{
@ -34,7 +34,7 @@ abstract contract Helpers is DSMath, Basic {
);
uint256 initalBal = getTokenBal(buyToken);
(bool success, ) = kyberswap.call{value: wethAmt}(swapData.callData);
(bool success, ) = kyberswap.call{value: ethAmt}(swapData.callData);
if (!success) revert("kyberswap-failed");
uint256 finalBal = getTokenBal(buyToken);

4
contracts/arbitrum/connectors/kyber_v3/main.sol → contracts/arbitrum/connectors/kyber_aggregator/main.sol
View File

@ -54,6 +54,6 @@ abstract contract KyberArbitrumResolver is Helpers {
}
}
contract ConnectV2KyberV3Arbitrum is KyberArbitrumResolver {
string public name = "Kyber-v3";
contract ConnectV2KyberAggregatorArbitrum is KyberArbitrumResolver {
string public name = "Kyber-aggregator-v1.0";
}

6
contracts/arbitrum/connectors/kyber_v3/interface.sol
View File

@ -1,6 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
interface AugustusSwapperInterface {
function getTokenTransferProxy() external view returns (address);
}

0
contracts/avalanche/connectors/kyber_v3/events.sol → contracts/avalanche/connectors/kyber_aggregator/events.sol
View File

10
contracts/avalanche/connectors/kyber_v3/helpers.sol → contracts/avalanche/connectors/kyber_aggregator/helpers.sol
View File

@ -18,7 +18,7 @@ abstract contract Helpers is DSMath, Basic {
address internal constant kyberswap =
0x6131B5fae19EA4f9D964eAc0408E4408b66337b5;
function _swapHelper(SwapData memory swapData, uint256 wethAmt)
function _swapHelper(SwapData memory swapData, uint256 avaxAmt)
internal
returns (uint256 buyAmt)
{
@ -34,7 +34,7 @@ abstract contract Helpers is DSMath, Basic {
);
uint256 initalBal = getTokenBal(buyToken);
(bool success, ) = kyberswap.call{value: wethAmt}(swapData.callData);
(bool success, ) = kyberswap.call{value: avaxAmt}(swapData.callData);
if (!success) revert("kyberswap-failed");
uint256 finalBal = getTokenBal(buyToken);
@ -50,14 +50,14 @@ abstract contract Helpers is DSMath, Basic {
{
TokenInterface _sellAddr = swapData.sellToken;
uint256 ethAmt;
uint256 avaxAmt;
if (address(_sellAddr) == avaxAddr) {
ethAmt = swapData._sellAmt;
avaxAmt = swapData._sellAmt;
} else {
approve(TokenInterface(_sellAddr), kyberswap, swapData._sellAmt);
}
swapData._buyAmt = _swapHelper(swapData, ethAmt);
swapData._buyAmt = _swapHelper(swapData, avaxAmt);
setUint(setId, swapData._buyAmt);

10
contracts/avalanche/connectors/kyber_v3/main.sol → contracts/avalanche/connectors/kyber_aggregator/main.sol
View File

@ -12,10 +12,10 @@ import {Helpers} from "./helpers.sol";
abstract contract KyberAvalancheResolver is Helpers {
/**
* @dev Sell ETH/ERC20_Token using KyberSwap.
* @dev Sell AVAX/ERC20_Token using KyberSwap.
* @notice Swap tokens from exchanges like kyber, 0x etc, with calculation done off-chain.
* @param buyAddr The address of the token to buy.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAddr The address of the token to sell.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param buyAddr The address of the token to buy.(For AVAX: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAddr The address of the token to sell.(For AVAX: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAmt The amount of the token to sell.
* @param unitAmt The amount of buyAmt/sellAmt with slippage.
* @param callData Data from kyberswap API.
@ -54,6 +54,6 @@ abstract contract KyberAvalancheResolver is Helpers {
}
}
contract ConnectV2KyberV3Avalanche is KyberAvalancheResolver {
string public name = "Kyber-v3";
contract ConnectV2KyberAggregatorAvalanche is KyberAvalancheResolver {
string public name = "Kyber-aggregator-v1.0";
}

6
contracts/avalanche/connectors/kyber_v3/interface.sol
View File

@ -1,6 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
interface AugustusSwapperInterface {
function getTokenTransferProxy() external view returns (address);
}

0
contracts/fantom/connectors/kyber_v3/events.sol → contracts/fantom/connectors/kyber_aggregator/events.sol
View File

10
contracts/fantom/connectors/kyber_v3/helpers.sol → contracts/fantom/connectors/kyber_aggregator/helpers.sol
View File

@ -18,7 +18,7 @@ abstract contract Helpers is DSMath, Basic {
address internal constant kyberswap =
0x6131B5fae19EA4f9D964eAc0408E4408b66337b5;
function _swapHelper(SwapData memory swapData, uint256 wethAmt)
function _swapHelper(SwapData memory swapData, uint256 ftmAmt)
internal
returns (uint256 buyAmt)
{
@ -34,7 +34,7 @@ abstract contract Helpers is DSMath, Basic {
);
uint256 initalBal = getTokenBal(buyToken);
(bool success, ) = kyberswap.call{value: wethAmt}(swapData.callData);
(bool success, ) = kyberswap.call{value: ftmAmt}(swapData.callData);
if (!success) revert("kyberswap-failed");
uint256 finalBal = getTokenBal(buyToken);
@ -50,14 +50,14 @@ abstract contract Helpers is DSMath, Basic {
{
TokenInterface _sellAddr = swapData.sellToken;
uint256 ethAmt;
uint256 ftmAmt;
if (address(_sellAddr) == ftmAddr) {
ethAmt = swapData._sellAmt;
ftmAmt = swapData._sellAmt;
} else {
approve(TokenInterface(_sellAddr), kyberswap, swapData._sellAmt);
}
swapData._buyAmt = _swapHelper(swapData, ethAmt);
swapData._buyAmt = _swapHelper(swapData, ftmAmt);
setUint(setId, swapData._buyAmt);

10
contracts/fantom/connectors/kyber_v3/main.sol → contracts/fantom/connectors/kyber_aggregator/main.sol
View File

@ -12,10 +12,10 @@ import {Helpers} from "./helpers.sol";
abstract contract KyberFantomResolver is Helpers {
/**
* @dev Sell ETH/ERC20_Token using KyberSwap.
* @dev Sell ftm/ERC20_Token using KyberSwap.
* @notice Swap tokens from exchanges like kyber, 0x etc, with calculation done off-chain.
* @param buyAddr The address of the token to buy.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAddr The address of the token to sell.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param buyAddr The address of the token to buy.(For FTM: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAddr The address of the token to sell.(For FTM: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAmt The amount of the token to sell.
* @param unitAmt The amount of buyAmt/sellAmt with slippage.
* @param callData Data from kyberswap API.
@ -54,6 +54,6 @@ abstract contract KyberFantomResolver is Helpers {
}
}
contract ConnectV2KyberV3Fantom is KyberFantomResolver {
string public name = "Kyber-v3";
contract ConnectV2KyberAggregatorFantom is KyberFantomResolver {
string public name = "Kyber-aggregator-v1.0";
}

6
contracts/fantom/connectors/kyber_v3/interface.sol
View File

@ -1,6 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
interface AugustusSwapperInterface {
function getTokenTransferProxy() external view returns (address);
}

0
contracts/mainnet/connectors/kyber/kyber_v3/events.sol → contracts/mainnet/connectors/kyber/kyber_aggregator/events.sol
View File

4
contracts/mainnet/connectors/kyber/kyber_v3/helpers.sol → contracts/mainnet/connectors/kyber/kyber_aggregator/helpers.sol
View File

@ -18,7 +18,7 @@ abstract contract Helpers is DSMath, Basic {
address internal constant kyberswap =
0x6131B5fae19EA4f9D964eAc0408E4408b66337b5;
function _swapHelper(SwapData memory swapData, uint256 wethAmt)
function _swapHelper(SwapData memory swapData, uint256 ethAmt)
internal
returns (uint256 buyAmt)
{
@ -34,7 +34,7 @@ abstract contract Helpers is DSMath, Basic {
);
uint256 initalBal = getTokenBal(buyToken);
(bool success, ) = kyberswap.call{value: wethAmt}(swapData.callData);
(bool success, ) = kyberswap.call{value: ethAmt}(swapData.callData);
if (!success) revert("kyberswap-failed");
uint256 finalBal = getTokenBal(buyToken);

0
contracts/mainnet/connectors/kyber/kyber_v3/main.sol → contracts/mainnet/connectors/kyber/kyber_aggregator/main.sol
View File

6
contracts/mainnet/connectors/kyber/kyber_v3/interface.sol
View File

@ -1,6 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
interface AugustusSwapperInterface {
function getTokenTransferProxy() external view returns (address);
}

0
contracts/optimism/connectors/kyber_v3/events.sol → contracts/optimism/connectors/kyber_aggregator/events.sol
View File

4
contracts/optimism/connectors/kyber_v3/helpers.sol → contracts/optimism/connectors/kyber_aggregator/helpers.sol
View File

@ -18,7 +18,7 @@ abstract contract Helpers is DSMath, Basic {
address internal constant kyberswap =
0x6131B5fae19EA4f9D964eAc0408E4408b66337b5;
function _swapHelper(SwapData memory swapData, uint256 wethAmt)
function _swapHelper(SwapData memory swapData, uint256 ethAmt)
internal
returns (uint256 buyAmt)
{
@ -34,7 +34,7 @@ abstract contract Helpers is DSMath, Basic {
);
uint256 initalBal = getTokenBal(buyToken);
(bool success, ) = kyberswap.call{value: wethAmt}(swapData.callData);
(bool success, ) = kyberswap.call{value: ethAmt}(swapData.callData);
if (!success) revert("kyberswap-failed");
uint256 finalBal = getTokenBal(buyToken);

4
contracts/optimism/connectors/kyber_v3/main.sol → contracts/optimism/connectors/kyber_aggregator/main.sol
View File

@ -54,6 +54,6 @@ abstract contract KyberOptimismResolver is Helpers {
}
}
contract ConnectV2KyberV3Optimism is KyberOptimismResolver {
string public name = "Kyber-v3";
contract ConnectV2KyberAggregatorOptimism is KyberOptimismResolver {
string public name = "Kyber-aggregator-v1.0";
}

6
contracts/optimism/connectors/kyber_v3/interface.sol
View File

@ -1,6 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
interface AugustusSwapperInterface {
function getTokenTransferProxy() external view returns (address);
}

0
contracts/polygon/connectors/kyber_v3/events.sol → contracts/polygon/connectors/kyber_aggregator/events.sol
View File

10
contracts/polygon/connectors/kyber_v3/helpers.sol → contracts/polygon/connectors/kyber_aggregator/helpers.sol
View File

@ -18,7 +18,7 @@ abstract contract Helpers is DSMath, Basic {
address internal constant kyberswap =
0x6131B5fae19EA4f9D964eAc0408E4408b66337b5;
function _swapHelper(SwapData memory swapData, uint256 wethAmt)
function _swapHelper(SwapData memory swapData, uint256 maticAmt)
internal
returns (uint256 buyAmt)
{
@ -34,7 +34,7 @@ abstract contract Helpers is DSMath, Basic {
);
uint256 initalBal = getTokenBal(buyToken);
(bool success, ) = kyberswap.call{value: wethAmt}(swapData.callData);
(bool success, ) = kyberswap.call{value: maticAmt}(swapData.callData);
if (!success) revert("kyberswap-failed");
uint256 finalBal = getTokenBal(buyToken);
@ -50,14 +50,14 @@ abstract contract Helpers is DSMath, Basic {
{
TokenInterface _sellAddr = swapData.sellToken;
uint256 ethAmt;
uint256 maticAmt;
if (address(_sellAddr) == maticAddr) {
ethAmt = swapData._sellAmt;
maticAmt = swapData._sellAmt;
} else {
approve(TokenInterface(_sellAddr), kyberswap, swapData._sellAmt);
}
swapData._buyAmt = _swapHelper(swapData, ethAmt);
swapData._buyAmt = _swapHelper(swapData, maticAmt);
setUint(setId, swapData._buyAmt);

10
contracts/polygon/connectors/kyber_v3/main.sol → contracts/polygon/connectors/kyber_aggregator/main.sol
View File

@ -12,10 +12,10 @@ import {Helpers} from "./helpers.sol";
abstract contract KyberPolygonResolver is Helpers {
/**
* @dev Sell ETH/ERC20_Token using KyberSwap.
* @dev Sell MATIC/ERC20_Token using KyberSwap.
* @notice Swap tokens from exchanges like kyber, 0x etc, with calculation done off-chain.
* @param buyAddr The address of the token to buy.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAddr The address of the token to sell.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param buyAddr The address of the token to buy.(For MATIC: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAddr The address of the token to sell.(For MATIC: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param sellAmt The amount of the token to sell.
* @param unitAmt The amount of buyAmt/sellAmt with slippage.
* @param callData Data from kyberswap API.
@ -54,6 +54,6 @@ abstract contract KyberPolygonResolver is Helpers {
}
}
contract ConnectV2KyberV3Polygon is KyberPolygonResolver {
string public name = "Kyber-v3";
contract ConnectV2KyberAggregatorPolygon is KyberPolygonResolver {
string public name = "Kyber-aggregator-v1.0";
}

6
contracts/polygon/connectors/kyber_v3/interface.sol
View File

@ -1,6 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
interface AugustusSwapperInterface {
function getTokenTransferProxy() external view returns (address);
}