Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Add middle usdc swap to EthPiptSwap.sol #148

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add middle usdc swap to EthPiptSwap.sol #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
89e2678
add middle usdc swap to EthPiptSwap.sol
defi-dev Sep 2, 2021
a5ab02a
fix EthPiptSwap.test.js
defi-dev Sep 2, 2021
36c1681
add simple swap pairs exception
defi-dev Sep 2, 2021
262e536
fix tests
defi-dev Sep 2, 2021
34caff3
improve _swapPiptToWeth
defi-dev Sep 3, 2021
ca26285
improve uniswap pair fee
defi-dev Sep 3, 2021
cc5e1cf
fix swap amounts estimation
defi-dev Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions contracts/Erc20PiptSwap.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ contract Erc20PiptSwap is EthPiptSwap {

constructor(
address _weth,
address _usdc,
address _cvp,
address _pipt,
address _piptWrapper,
address _feeManager
) public EthPiptSwap(_weth, _cvp, _pipt, _piptWrapper, _feeManager) {}
) public EthPiptSwap(_weth, _usdc, _cvp, _pipt, _piptWrapper, _feeManager) {}

function swapErc20ToPipt(
address _swapToken,
Expand Down Expand Up @@ -89,7 +90,8 @@ contract Erc20PiptSwap is EthPiptSwap {
uint256 poolOut
)
{
uint256 ethAmount = getAmountOutForUniswapValue(_uniswapPairFor(_swapToken), _swapAmount, true);
uint256 ethAmount =
getAmountOutForUniswapValue(_uniswapPairFor(address(weth), _swapToken), address(weth), _swapAmount, true);

if (_withFee) {
(, ethAmount) = calcEthFee(ethAmount, getWrapFee(_tokens));
Expand All @@ -104,12 +106,13 @@ contract Erc20PiptSwap is EthPiptSwap {
) external view returns (uint256) {
uint256 resultEth = calcNeedEthToPoolOut(_poolAmountOut, _slippage);

IUniswapV2Pair tokenPair = _uniswapPairFor(_swapToken);
IUniswapV2Pair tokenPair = _uniswapPairFor(address(weth), _swapToken);
uint256 fee = getPairSwapFee(tokenPair);
(uint256 token1Reserve, uint256 token2Reserve, ) = tokenPair.getReserves();
if (tokenPair.token0() == address(weth)) {
return UniswapV2Library.getAmountIn(resultEth.mul(1003).div(1000), token2Reserve, token1Reserve);
return UniswapV2Library.getAmountIn(resultEth.mul(1e4 + fee).div(1e4), token2Reserve, token1Reserve);
} else {
return UniswapV2Library.getAmountIn(resultEth.mul(1003).div(1000), token1Reserve, token2Reserve);
return UniswapV2Library.getAmountIn(resultEth.mul(1e4 + fee).div(1e4), token1Reserve, token2Reserve);
}
}

Expand All @@ -124,17 +127,27 @@ contract Erc20PiptSwap is EthPiptSwap {
returns (
uint256[] memory tokensOutPipt,
uint256[] memory ethOutUniswap,
uint256[] memory usdcOutUniswap,
uint256 totalErc20Out,
uint256 poolAmountFee
)
{
uint256 totalEthOut;

(tokensOutPipt, ethOutUniswap, totalEthOut, poolAmountFee) = calcSwapPiptToEthInputs(_poolAmountIn, _tokens);
(tokensOutPipt, ethOutUniswap, usdcOutUniswap, totalEthOut, poolAmountFee) = calcSwapPiptToEthInputs(
_poolAmountIn,
_tokens
);

if (_withFee) {
(, totalEthOut) = calcEthFee(totalEthOut, getWrapFee(_tokens));
}
totalErc20Out = getAmountOutForUniswapValue(_uniswapPairFor(_swapToken), totalEthOut, false);
totalErc20Out = getAmountOutForUniswapValue(
_uniswapPairFor(address(weth), _swapToken),
address(weth),
totalEthOut,
false
);
}

function calcErc20Fee(address _swapToken, uint256 _swapAmount)
Expand All @@ -147,15 +160,15 @@ contract Erc20PiptSwap is EthPiptSwap {
uint256 ethAfterFee
)
{
IUniswapV2Pair tokenPair = _uniswapPairFor(_swapToken);
IUniswapV2Pair tokenPair = _uniswapPairFor(address(weth), _swapToken);

uint256 ethAmount = getAmountOutForUniswapValue(tokenPair, _swapAmount, true);
uint256 ethAmount = getAmountOutForUniswapValue(tokenPair, address(weth), _swapAmount, true);

(ethFee, ethAfterFee) = calcEthFee(ethAmount, getWrapFee(getPiptTokens()));

if (ethFee != 0) {
erc20Fee = getAmountOutForUniswapValue(tokenPair, ethFee, false);
erc20Fee = getAmountOutForUniswapValue(tokenPair, address(weth), ethFee, false);
}
erc20AfterFee = getAmountOutForUniswapValue(tokenPair, ethAfterFee, false);
erc20AfterFee = getAmountOutForUniswapValue(tokenPair, address(weth), ethAfterFee, false);
}
}
Loading