Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions contracts/buyback/Buyback.sol
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ contract Buyback is
require(routerWhitelist[_router], "router not whitelisted");

uint256 beforeTokenIn = _getTokenBalance(_tokenIn, address(this));
uint256 beforeTokenOut = _getTokenBalance(_tokenOut, receiver);
uint256 beforeTokenOut = _getTokenBalance(_tokenOut, address(this));

bool isNativeTokenIn = (_tokenIn == SWAP_NATIVE_TOKEN_ADDRESS);
if (!isNativeTokenIn) {
Expand All @@ -188,11 +188,13 @@ contract Buyback is
}

uint256 actualAmountIn = beforeTokenIn - _getTokenBalance(_tokenIn, address(this));
uint256 actualAmountOut = _getTokenBalance(_tokenOut, receiver) - beforeTokenOut;
uint256 actualAmountOut = _getTokenBalance(_tokenOut, address(this)) - beforeTokenOut;

require(actualAmountIn <= _amountIn, "exceed amount in");
require(actualAmountOut >= _amountOutMin, "not enough profit");

IERC20(_tokenOut).safeTransfer(receiver, actualAmountOut);

emit BoughtBack(_router, _tokenIn, _tokenOut, actualAmountIn, actualAmountOut);
}

Expand Down
6 changes: 4 additions & 2 deletions contracts/dao/ListaAutoBuyback.sol
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ contract ListaAutoBuyback is Initializable, AccessControlUpgradeable {
require(routerWhitelist[_router], "router not whitelisted");

uint256 beforeTokenIn = _getTokenBalance(_tokenIn, address(this));
uint256 beforeTokenOut = _getTokenBalance(_tokenOut, defaultReceiver);
uint256 beforeTokenOut = _getTokenBalance(_tokenOut, address(this));

bool isNativeTokenIn = (_tokenIn == SWAP_NATIVE_TOKEN_ADDRESS);
if (!isNativeTokenIn) {
Expand All @@ -163,11 +163,13 @@ contract ListaAutoBuyback is Initializable, AccessControlUpgradeable {
}

uint256 actualAmountIn = beforeTokenIn - _getTokenBalance(_tokenIn, address(this));
uint256 actualAmountOut = _getTokenBalance(_tokenOut, defaultReceiver) - beforeTokenOut;
uint256 actualAmountOut = _getTokenBalance(_tokenOut, address(this)) - beforeTokenOut;

require(actualAmountIn <= _amountIn, "exceed amount in");
require(actualAmountOut >= _amountOutMin, "not enough profit");

IERC20(_tokenOut).safeTransfer(defaultReceiver, actualAmountOut);

emit BoughtBack(_router, _tokenIn, _tokenOut, actualAmountIn, actualAmountOut);
}

Expand Down