refactor: centralize swap logic to reduce duplication between swap and swapPermit2
This commit is contained in:
@@ -151,37 +151,16 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
|
|||||||
tokenIn = address(_weth);
|
tokenIn = address(_weth);
|
||||||
}
|
}
|
||||||
|
|
||||||
amountOut = _swap(amountIn, nTokens, swaps);
|
return _executeSwap(
|
||||||
|
amountIn,
|
||||||
if (fee > 0) {
|
tokenIn,
|
||||||
uint256 feeAmount = (amountOut * fee) / 10000;
|
tokenOut,
|
||||||
amountOut -= feeAmount;
|
minAmountOut,
|
||||||
IERC20(tokenOut).safeTransfer(feeReceiver, feeAmount);
|
unwrapEth,
|
||||||
}
|
nTokens,
|
||||||
|
receiver,
|
||||||
if (minAmountOut > 0 && amountOut < minAmountOut) {
|
swaps
|
||||||
revert TychoRouter__NegativeSlippage(amountOut, minAmountOut);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
uint256 leftoverAmountIn;
|
|
||||||
if (tokenIn == address(0)) {
|
|
||||||
leftoverAmountIn = address(this).balance;
|
|
||||||
} else {
|
|
||||||
leftoverAmountIn = IERC20(tokenIn).balanceOf(address(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (leftoverAmountIn > 0) {
|
|
||||||
revert TychoRouter__AmountInNotFullySpent(leftoverAmountIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (unwrapEth) {
|
|
||||||
_unwrapETH(amountOut);
|
|
||||||
}
|
|
||||||
if (tokenOut == address(0)) {
|
|
||||||
Address.sendValue(payable(receiver), amountOut);
|
|
||||||
} else {
|
|
||||||
IERC20(tokenOut).safeTransfer(receiver, amountOut);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -242,6 +221,36 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return _executeSwap(
|
||||||
|
amountIn,
|
||||||
|
tokenIn,
|
||||||
|
tokenOut,
|
||||||
|
minAmountOut,
|
||||||
|
unwrapEth,
|
||||||
|
nTokens,
|
||||||
|
receiver,
|
||||||
|
swaps
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @notice Internal implementation of the core swap logic shared between swap() and swapPermit2().
|
||||||
|
*
|
||||||
|
* @notice This function centralizes the swap execution logic.
|
||||||
|
* @notice For detailed documentation on parameters and behavior, see the documentation for
|
||||||
|
* swap() and swapPermit2() functions.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
function _executeSwap(
|
||||||
|
uint256 amountIn,
|
||||||
|
address tokenIn,
|
||||||
|
address tokenOut,
|
||||||
|
uint256 minAmountOut,
|
||||||
|
bool unwrapEth,
|
||||||
|
uint256 nTokens,
|
||||||
|
address receiver,
|
||||||
|
bytes calldata swaps
|
||||||
|
) internal returns (uint256 amountOut) {
|
||||||
amountOut = _swap(amountIn, nTokens, swaps);
|
amountOut = _swap(amountIn, nTokens, swaps);
|
||||||
|
|
||||||
if (fee > 0) {
|
if (fee > 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user