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

Changed minToken amounts to slippage amounts and updated comments

Browse Source
This commit is contained in:
Thrilok Kumar 2021-01-03 03:26:53 +05:30
parent 24aa86bd90
commit 23c29cfc2e
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
contracts/connectors/uniswap.sol
View File

@ -167,6 +167,13 @@ contract UniswapHelpers is Stores, DSMath {
paths[1] = address(buyAddr); paths[1] = address(buyAddr);
} }
function changeEthToWeth(
address[] memory tokens
) internal pure returns(TokenInterface[] memory _tokens) {
_tokens = new TokenInterface[](2);
_tokens[0] = tokens[0] == getEthAddr() ? TokenInterface(getAddressWETH()) : TokenInterface(tokens[0]);
_tokens[1] = tokens[1] == getEthAddr() ? TokenInterface(getAddressWETH()) : TokenInterface(tokens[1]);
}
function calculateSwapInAmount(uint256 reserveIn, uint256 userIn) function calculateSwapInAmount(uint256 reserveIn, uint256 userIn)
internal internal
@ -184,32 +191,13 @@ contract UniswapHelpers is Stores, DSMath {
} }
contract LiquidityHelpers is UniswapHelpers { contract LiquidityHelpers is UniswapHelpers {
function getMinAmount(
TokenInterface token,
uint amt,
uint slippage
) internal view returns(uint minAmt) {
uint _amt18 = convertTo18(token.decimals(), amt);
minAmt = wmul(_amt18, sub(WAD, slippage));
minAmt = convert18ToDec(token.decimals(), minAmt);
}
function changeEthToWeth(
address[] memory tokens
) internal pure returns(TokenInterface[] memory _tokens) {
_tokens = new TokenInterface[](2);
_tokens[0] = tokens[0] == getEthAddr() ? TokenInterface(getAddressWETH()) : TokenInterface(tokens[0]);
_tokens[1] = tokens[1] == getEthAddr() ? TokenInterface(getAddressWETH()) : TokenInterface(tokens[1]);
}
function _addLiquidity( function _addLiquidity(
address tokenA, address tokenA,
address tokenB, address tokenB,
uint amountADesired, uint amountADesired,
uint amountBDesired, uint amountBDesired,
uint amountAMin, uint slippageA,
uint amountBMin uint slippageB
) internal returns (uint _amtA, uint _amtB, uint _liquidity) { ) internal returns (uint _amtA, uint _amtB, uint _liquidity) {
IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr()); IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr());
(TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB); (TokenInterface _tokenA, TokenInterface _tokenB) = changeEthAddress(tokenA, tokenB);
@ -227,8 +215,8 @@ contract LiquidityHelpers is UniswapHelpers {
address(_tokenB), address(_tokenB),
amountADesired, amountADesired,
amountBDesired, amountBDesired,
amountAMin, wmul(sub(WAD, slippageA), amountADesired),
amountBMin, wmul(sub(WAD, slippageB), amountBDesired),
address(this), address(this),
now + 1 now + 1
); );
@ -397,11 +385,11 @@ contract UniswapLiquidity is LiquidityHelpers {
* @param tokenA tokenA address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param tokenA tokenA address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param tokenB tokenB address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param tokenB tokenB address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param amountADesired tokenA amount. * @param amountADesired tokenA amount.
* @param amountBDesired unit amount of amtB/amtA with slippage. * @param amountBDesired tokenB amount.
* @param amountAMin slippage amount. * @param slippageA slippage amountA.(For 1%: 1e16, 10%: 1e17)
* @param amountBMin slippage amount. * @param slippageB slippage amountB.(For 1%: 1e16, 10%: 1e17)
* @param getIdA Get token amount at this ID from `InstaMemory` Contract. * @param getIdA Get tokenA amount at this ID from `InstaMemory` Contract.
* @param getIdB Get tokens amount at this ID from `InstaMemory` Contract. * @param getIdB Get tokenB amount at this ID from `InstaMemory` Contract.
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function deposit( function deposit(
@ -409,8 +397,8 @@ contract UniswapLiquidity is LiquidityHelpers {
address tokenB, address tokenB,
uint amountADesired, uint amountADesired,
uint amountBDesired, uint amountBDesired,
uint amountAMin, uint slippageA,
uint amountBMin, uint slippageB,
uint getIdA, uint getIdA,
uint getIdB, uint getIdB,
uint setId uint setId
@ -423,8 +411,8 @@ contract UniswapLiquidity is LiquidityHelpers {
tokenB, tokenB,
_amtADesired, _amtADesired,
_amtBDesired, _amtBDesired,
amountAMin, slippageA,
amountBMin slippageB
); );
setUint(setId, _uniAmt); setUint(setId, _uniAmt);
@ -442,6 +430,15 @@ contract UniswapLiquidity is LiquidityHelpers {
} }
/**
* @dev Deposit Liquidity using Single token.
* @param tokenA tokenA address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param tokenB tokenB address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param amountA tokenA amount.
* @param minUniAmount min uni token amount.
* @param getId Get tokenA amount at this ID from `InstaMemory` Contract.
* @param setId Set token amount at this ID in `InstaMemory` Contract.
*/
function singleDeposit( function singleDeposit(
address tokenA, address tokenA,
address tokenB, address tokenB,