Merge branch 'feat/paraswap-v6' of github.com:Instadapp/dsa-connectors-2.0 into feat/paraswap-v6

This commit is contained in:
Samarendra Gouda 2024-06-23 18:57:42 +05:30
commit 54847863bb
7 changed files with 212 additions and 40 deletions

View File

@ -1,55 +1,54 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.2;
import {SafeMath} from "@openzeppelin/contracts/utils/math/SafeMath.sol";
contract DSMath {
uint constant WAD = 10 ** 18;
uint constant RAY = 10 ** 27;
uint constant WAD = 10 ** 18;
uint constant RAY = 10 ** 27;
function add(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(x, y);
}
function add(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(x, y);
}
function sub(uint x, uint y) internal pure virtual returns (uint z) {
z = SafeMath.sub(x, y);
}
function sub(uint x, uint y) internal pure virtual returns (uint z) {
z = SafeMath.sub(x, y);
}
function mul(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.mul(x, y);
}
function mul(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.mul(x, y);
}
function div(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.div(x, y);
}
function div(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.div(x, y);
}
function wmul(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, y), WAD / 2) / WAD;
}
function wmul(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, y), WAD / 2) / WAD;
}
function wdiv(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, WAD), y / 2) / y;
}
function wdiv(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, WAD), y / 2) / y;
}
function rdiv(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, RAY), y / 2) / y;
}
function rdiv(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, RAY), y / 2) / y;
}
function rmul(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, y), RAY / 2) / RAY;
}
function rmul(uint x, uint y) internal pure returns (uint z) {
z = SafeMath.add(SafeMath.mul(x, y), RAY / 2) / RAY;
}
function toInt(uint x) internal pure returns (int y) {
y = int(x);
require(y >= 0, "int-overflow");
}
function toInt(uint x) internal pure returns (int y) {
y = int(x);
require(y >= 0, "int-overflow");
}
function toUint(int256 x) internal pure returns (uint256) {
require(x >= 0, "int-overflow");
return uint256(x);
}
function toUint(int256 x) internal pure returns (uint256) {
require(x >= 0, "int-overflow");
return uint256(x);
}
function toRad(uint wad) internal pure returns (uint rad) {
rad = mul(wad, 10 ** 27);
}
function toRad(uint wad) internal pure returns (uint rad) {
rad = mul(wad, 10 ** 27);
}
}

View File

@ -0,0 +1,10 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
contract Events {
event LogFlashBorrow(address token, uint256 tokenAmt);
event LogFlashPayback(address token, uint256 tokenAmt);
event LogFlashMultiBorrow(address[] token, uint256[] tokenAmts);
event LogFlashMultiPayback(address[] token, uint256[] tokenAmts);
}

View File

@ -0,0 +1,11 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
interface InstaFlashV5Interface {
function flashLoan(address[] memory tokens, uint256[] memory amts, uint route, bytes memory data, bytes memory extraData) external;
}
interface AccountInterface {
function enable(address) external;
function disable(address) external;
}

View File

@ -0,0 +1,138 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
/**
* @title Instapool.
* @dev Inbuilt Flash Loan in DSA
*/
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { TokenInterface } from "../../common/interfaces.sol";
import { AccountInterface } from "./interfaces.sol";
import { Stores } from "../../common/stores.sol";
import { Variables } from "./variables.sol";
import { Events } from "./events.sol";
contract LiquidityResolver is Stores, Variables, Events {
using SafeERC20 for IERC20;
/**
* @dev Borrow Flashloan and Cast spells.
* @notice Borrow Flashloan and Cast spells.
* @param token Token Address.
* @param amt Token Amount.
* @param route Flashloan source route.
* @param data targets & data for cast.
* @param extraData to be kept bytes(0) in most cases. Can be useful to decide data for some particular routes
*/
function flashBorrowAndCast(
address token,
uint amt,
uint route,
bytes memory data,
bytes memory extraData
) external payable returns (string memory _eventName, bytes memory _eventParam) {
AccountInterface(address(this)).enable(address(instaPool));
(string[] memory _targets, bytes[] memory callDatas) = abi.decode(data, (string[], bytes[]));
bytes memory callData_ = abi.encodeWithSignature("cast(string[],bytes[],address)", _targets, callDatas, address(instaPool));
address[] memory tokens_ = new address[](1);
tokens_[0] = token;
uint[] memory amts_ = new uint[](1);
amts_[0] = amt;
instaPool.flashLoan(tokens_, amts_, route, callData_, extraData);
AccountInterface(address(this)).disable(address(instaPool));
_eventName = "LogFlashBorrow(address,uint256)";
_eventParam = abi.encode(token, amt);
}
/**
* @dev Return token to InstaPool.
* @notice Return token to InstaPool.
* @param token Token Address.
* @param amt Token Amount.
* @param getId Get token amount at this ID from `InstaMemory` Contract.
* @param setId Set token amount at this ID in `InstaMemory` Contract.
*/
function flashPayback(
address token,
uint amt,
uint getId,
uint setId
) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt);
IERC20 tokenContract = IERC20(token);
tokenContract.safeTransfer(address(instaPool), _amt);
setUint(setId, _amt);
_eventName = "LogFlashPayback(address,uint256)";
_eventParam = abi.encode(token, amt);
}
/**
* @dev Borrow multi-tokens Flashloan and Cast spells.
* @notice Borrow multi-tokens Flashloan and Cast spells.
* @param tokens_ Array of Token Addresses.
* @param amts_ Array of Token Amounts.
* @param route Flashloan source route.
* @param data targets & data for cast.
* @param extraData to be kept bytes(0) in most cases. Can be useful to decide data for some particular routes
*/
function flashMultiBorrowAndCast(
address[] memory tokens_,
uint[] memory amts_,
uint route,
bytes memory data,
bytes memory extraData
) external payable returns (string memory _eventName, bytes memory _eventParam) {
AccountInterface(address(this)).enable(address(instaPool));
(string[] memory _targets, bytes[] memory callDatas) = abi.decode(data, (string[], bytes[]));
bytes memory callData_ = abi.encodeWithSignature("cast(string[],bytes[],address)", _targets, callDatas, address(instaPool));
instaPool.flashLoan(tokens_, amts_, route, callData_, extraData);
AccountInterface(address(this)).disable(address(instaPool));
_eventName = "LogFlashMultiBorrow(address[],uint256[])";
_eventParam = abi.encode(tokens_, amts_);
}
/**
* @dev Return multi-tokens to InstaPool.
* @notice Return multi-tokens to InstaPool.
* @param tokens_ Array of Token Addresses.
* @param amts_ Array of Token Amounts.
* @param getIds Array of getId token amounts.
* @param setIds Array of setId token amounts.
*/
function flashMultiPayback(
address[] memory tokens_,
uint[] memory amts_,
uint[] memory getIds,
uint[] memory setIds
) external payable returns (string memory _eventName, bytes memory _eventParam) {
for (uint i = 0; i < tokens_.length; i++) {
amts_[i] = getUint(getIds[i], amts_[i]);
IERC20(tokens_[i]).safeTransfer(address(instaPool), amts_[i]);
setUint(setIds[i], amts_[i]);
}
_eventName = "LogFlashMultiPayback(address[],uint256[])";
_eventParam = abi.encode(tokens_, amts_);
}
}
contract ConnectV2InstaPoolV5 is LiquidityResolver {
string public name = "Instapool-v5";
}

View File

@ -0,0 +1,14 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
import { InstaFlashV5Interface } from "./interfaces.sol";
contract Variables {
/**
* @dev Instapool contract proxy
*/
InstaFlashV5Interface public constant instaPool =
InstaFlashV5Interface(0x352423e2fA5D5c99343d371C9e3bC56C87723Cc7);
}

View File

@ -132,5 +132,5 @@ contract LiquidityResolver is Stores, Variables, Events {
}
contract ConnectV2InstaPoolV5 is LiquidityResolver {
string public name = "Instapool-v5";
string public name = "Instapool-v5.1";
}

View File

@ -9,6 +9,6 @@ contract Variables {
* @dev Instapool contract proxy
*/
InstaFlashV5Interface public constant instaPool =
InstaFlashV5Interface(0xAB50Dd1C57938218627Df2311ef65b4e2e84aF48);
InstaFlashV5Interface(0x352423e2fA5D5c99343d371C9e3bC56C87723Cc7);
}