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

Code refactoring

Browse Source
This commit is contained in:
Thrilok Kumar 2020-07-08 16:51:24 +05:30
parent 656ddc98ff
commit f5568f3dbd
1 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
contracts/protocols/uniswapV2.sol
View File

@ -1,25 +1,15 @@
pragma solidity ^0.6.0; pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
interface IUniswapV2Router01 { interface IUniswapV2Router02 {
function factory() external pure returns (address); function factory() external pure returns (address);
function WETH() external pure returns (address); function WETH() external pure returns (address);
function quote(uint amountA, uint reserveA, uint reserveB) external pure returns (uint amountB);
function getAmountOut(uint amountIn, uint reserveIn, uint reserveOut) external pure returns (uint amountOut);
function getAmountIn(uint amountOut, uint reserveIn, uint reserveOut) external pure returns (uint amountIn);
function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts); function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts);
function getAmountsIn(uint amountOut, address[] calldata path) external view returns (uint[] memory amounts); function getAmountsIn(uint amountOut, address[] calldata path) external view returns (uint[] memory amounts);
} }
interface IUniswapV2Factory { interface IUniswapV2Factory {
function getPair(address tokenA, address tokenB) external view returns (address pair); function getPair(address tokenA, address tokenB) external view returns (address pair);
function allPairs(uint) external view returns (address pair);
function allPairsLength() external view returns (uint);
function feeTo() external view returns (address);
function feeToSetter() external view returns (address);
function createPair(address tokenA, address tokenB) external returns (address pair);
} }
interface TokenInterface { interface TokenInterface {
@ -76,10 +66,10 @@ contract UniswapHelpers is Helpers {
} }
/** /**
* @dev Return uniswap v2 router Address * @dev Return uniswap v2 router02 Address
*/ */
function getUniswapAddr() internal pure returns (address) { function getUniswapAddr() internal pure returns (address) {
return 0x794e6e91555438aFc3ccF1c5076A74F42133d08D; //Mainnet return 0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D;
} }
function convert18ToDec(uint _dec, uint256 _amt) internal pure returns (uint256 amt) { function convert18ToDec(uint _dec, uint256 _amt) internal pure returns (uint256 amt) {
@ -100,7 +90,7 @@ contract UniswapHelpers is Helpers {
address sellAddr, address sellAddr,
uint sellAmt uint sellAmt
) internal view returns(uint buyAmt) { ) internal view returns(uint buyAmt) {
IUniswapV2Router01 router = IUniswapV2Router01(getUniswapAddr()); IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr());
address[] memory paths = new address[](2); address[] memory paths = new address[](2);
paths[0] = address(sellAddr); paths[0] = address(sellAddr);
paths[1] = address(buyAddr); paths[1] = address(buyAddr);
@ -116,25 +106,17 @@ contract UniswapHelpers is Helpers {
address sellAddr, address sellAddr,
uint buyAmt uint buyAmt
) internal view returns(uint sellAmt) { ) internal view returns(uint sellAmt) {
IUniswapV2Router01 router = IUniswapV2Router01(getUniswapAddr()); IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr());
address[] memory paths = new address[](2); address[] memory paths = new address[](2);
paths[0] = address(sellAddr); paths[0] = address(sellAddr);
paths[1] = address(buyAddr); paths[1] = address(buyAddr);
uint[] memory amts = router.getAmountsOut( uint[] memory amts = router.getAmountsIn(
buyAmt, buyAmt,
paths paths
); );
sellAmt = amts[0]; sellAmt = amts[0];
} }
function checkPair(
IUniswapV2Router01 router,
address[] memory paths
) internal view {
address pair = IUniswapV2Factory(router.factory()).getPair(paths[0], paths[1]);
require(pair != address(0), "No-exchange-address");
}
function getBuyUnitAmt( function getBuyUnitAmt(
TokenInterface buyAddr, TokenInterface buyAddr,
uint expectedAmt, uint expectedAmt,
@ -191,10 +173,9 @@ contract UniswapHelpers is Helpers {
TokenInterface _tokenA, TokenInterface _tokenA,
TokenInterface _tokenB, TokenInterface _tokenB,
uint uniAmt uint uniAmt
) ) internal view returns (uint amtA, uint amtB)
public view returns (uint amtA, uint amtB)
{ {
IUniswapV2Router01 router = IUniswapV2Router01(getUniswapAddr()); IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr());
address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB)); address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB));
require(exchangeAddr != address(0), "pair-not-found."); require(exchangeAddr != address(0), "pair-not-found.");
TokenInterface uniToken = TokenInterface(exchangeAddr); TokenInterface uniToken = TokenInterface(exchangeAddr);
@ -227,11 +208,10 @@ contract Resolver is UniswapHelpers {
address tokenA, address tokenA,
address tokenB, address tokenB,
uint amtA uint amtA
) ) public view returns (uint amtB, uint unitAmt)
public view returns (uint amtB, uint unitAmt)
{ {
(TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB); (TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB);
IUniswapV2Router01 router = IUniswapV2Router01(getUniswapAddr()); IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr());
address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB)); address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB));
require(exchangeAddr != address(0), "pair-not-found."); require(exchangeAddr != address(0), "pair-not-found.");
uint _amtA18 = convertTo18(_tokenA.decimals(), _tokenA.balanceOf(exchangeAddr)); uint _amtA18 = convertTo18(_tokenA.decimals(), _tokenA.balanceOf(exchangeAddr));
@ -246,11 +226,10 @@ contract Resolver is UniswapHelpers {
address tokenB, address tokenB,
uint amtA, uint amtA,
uint amtB uint amtB
) ) public view returns (uint unitAmt)
public view returns (uint unitAmt)
{ {
(TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB); (TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB);
IUniswapV2Router01 router = IUniswapV2Router01(getUniswapAddr()); IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr());
address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB)); address exchangeAddr = IUniswapV2Factory(router.factory()).getPair(address(_tokenA), address(_tokenB));
require(exchangeAddr == address(0), "pair-found."); require(exchangeAddr == address(0), "pair-found.");
uint _amtA18 = convertTo18(_tokenA.decimals(), amtA); uint _amtA18 = convertTo18(_tokenA.decimals(), amtA);
@ -263,8 +242,7 @@ contract Resolver is UniswapHelpers {
address tokenB, address tokenB,
uint uniAmt, uint uniAmt,
uint slippage uint slippage
) ) public view returns (uint amtA, uint amtB, uint unitAmtA, uint unitAmtB)
public view returns (uint amtA, uint amtB, uint unitAmtA, uint unitAmtB)
{ {
(TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB); (TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB);
(amtA, amtB) = _getWithdrawAmts( (amtA, amtB) = _getWithdrawAmts(