Liquidity.Party/tycho-protocol-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed submit deadline and transfers on sell and buy functions

Browse Source
This commit is contained in:
domenicodev
2023-12-21 10:08:22 +01:00
parent 2565b3eba5
commit 5e7d39fa7a
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
evm/src/integral/IntegralSwapAdapter.sol
View File

@@ -4,8 +4,8 @@ pragma solidity ^0.8.13;
import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol"; import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol";
/// @dev Integral submitted deadline of 3600 seconds (1 hour) to Paraswap, but it is not strictly necessary to be this long /// @dev Integral submitted deadline of 3600 seconds (1 hour) to Paraswap, but it is not strictly necessary to be this long
/// as the contract allows less durations, we use 1000 seconds (15 minutes) as deadline /// as the contract allows less durations, we use 1000 seconds (15 minutes) as a deadline
uint32 constant SWAP_DEADLINE_SEC = 1000; uint256 constant SWAP_DEADLINE_SEC = 1000;
/// @title Integral Swap Adapter /// @title Integral Swap Adapter
contract IntegralSwapAdapter is ISwapAdapter { contract IntegralSwapAdapter is ISwapAdapter {
@@ -85,9 +85,11 @@ contract IntegralSwapAdapter is ISwapAdapter {
uint256 limitMax1 uint256 limitMax1
) = relayer.getPoolState(address(sellToken), address(buyToken)); ) = relayer.getPoolState(address(sellToken), address(buyToken));
limits = new uint256[](2); limits = new uint256[](4);
limits[0] = limitMax0; limits[0] = limitMax0;
limits[1] = limitMax1; limits[1] = limitMax1;
limits[2] = limitMin0;
limits[3] = limitMin1;
} }
/// @inheritdoc ISwapAdapter /// @inheritdoc ISwapAdapter
@@ -182,12 +184,16 @@ contract IntegralSwapAdapter is ISwapAdapter {
if (amountOut == 0) { if (amountOut == 0) {
revert Unavailable("AmountOut is zero!"); revert Unavailable("AmountOut is zero!");
} }
IERC20(sellToken).transferFrom(msg.sender, address(this), amount);
IERC20(sellToken).approve(address(relayer), amount);
relayer.sell(ITwapRelayer.SellParams({ relayer.sell(ITwapRelayer.SellParams({
tokenIn: sellToken, tokenIn: sellToken,
tokenOut: buyToken, tokenOut: buyToken,
wrapUnwrap: false, wrapUnwrap: false,
to: swapper, to: swapper,
submitDeadline: SWAP_DEADLINE_SEC, submitDeadline: uint32(block.timestamp + SWAP_DEADLINE_SEC),
amountIn: amount, amountIn: amount,
amountOutMin: amountOut amountOutMin: amountOut
})); }));
@@ -211,12 +217,16 @@ contract IntegralSwapAdapter is ISwapAdapter {
if (amountIn == 0) { if (amountIn == 0) {
revert Unavailable("AmountIn is zero!"); revert Unavailable("AmountIn is zero!");
} }
IERC20(sellToken).transferFrom(msg.sender, address(this), amountIn);
IERC20(sellToken).approve(address(relayer), amountIn);
relayer.buy(ITwapRelayer.BuyParams({ relayer.buy(ITwapRelayer.BuyParams({
tokenIn: sellToken, tokenIn: sellToken,
tokenOut: buyToken, tokenOut: buyToken,
wrapUnwrap: false, wrapUnwrap: false,
to: swapper, to: swapper,
submitDeadline: SWAP_DEADLINE_SEC, submitDeadline: uint32(block.timestamp + SWAP_DEADLINE_SEC),
amountInMax: amountIn, amountInMax: amountIn,
amountOut: amountBought amountOut: amountBought
})); }));