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

fix: reciever issue

Browse Source
This commit is contained in:
royvardhan
2025-02-11 18:39:12 +05:30
parent 7ca647f009
commit ae0b07b2a4
2 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
foundry/src/executors/UniswapV4Executor.sol
View File

@@ -2,14 +2,20 @@
pragma solidity ^0.8.26;
import "@interfaces/IExecutor.sol";
import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {
IERC20,
SafeERC20
} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
import {
Currency, CurrencyLibrary
} from "@uniswap/v4-core/src/types/Currency.sol";
import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol";
import {V4Router} from "@uniswap/v4-periphery/src/V4Router.sol";
import {Actions} from "@uniswap/v4-periphery/src/libraries/Actions.sol";
import {IV4Router} from "@uniswap/v4-periphery/src/interfaces/IV4Router.sol";
import "forge-std/console.sol";
error UniswapV4Executor__InvalidDataLength();
error UniswapV4Executor__SwapFailed();
@@ -20,21 +26,23 @@ contract UniswapV4Executor is IExecutor, V4Router {
constructor(IPoolManager _poolManager) V4Router(_poolManager) {}
function swap(
uint256 amountIn,
bytes calldata data
) external payable returns (uint256 amountOut) {
function swap(uint256 amountIn, bytes calldata data)
external
payable
returns (uint256 amountOut)
{
(
address tokenIn,
address tokenOut,
uint24 fee,
address receiver, // TODO: This is not used right now
address receiver,
bool zeroForOne,
uint24 tickSpacing
) = _decodeData(data);
uint128 amountIn128 = uint128(amountIn);
uint128 amountOut128 = uint128(amountOut);
uint256 balanceBefore = IERC20(tokenOut).balanceOf(receiver);
PoolKey memory key = PoolKey({
currency0: Currency.wrap(zeroForOne ? tokenIn : tokenOut),
currency1: Currency.wrap(zeroForOne ? tokenOut : tokenIn),
@@ -46,7 +54,7 @@ contract UniswapV4Executor is IExecutor, V4Router {
bytes memory actions = abi.encodePacked(
uint8(Actions.SWAP_EXACT_IN_SINGLE),
uint8(Actions.SETTLE_ALL),
uint8(Actions.TAKE_ALL)
uint8(Actions.TAKE)
);
bytes[] memory params = new bytes[](3);
@@ -56,17 +64,20 @@ contract UniswapV4Executor is IExecutor, V4Router {
poolKey: key,
zeroForOne: zeroForOne,
amountIn: amountIn128,
amountOutMinimum: amountOut128,
amountOutMinimum: 0,
hookData: bytes("")
})
);
params[1] = abi.encode(key.currency0, amountIn128);
params[2] = abi.encode(key.currency1, amountOut128);
params[2] = abi.encode(key.currency1, receiver, 0);
this.executeActions(abi.encode(actions, params));
// TODO: This is still hardcode to zero, find a way to return the actual amount out
amountOut = IERC20(tokenOut).balanceOf(receiver) - balanceBefore;
if (amountOut == 0) revert UniswapV4Executor__SwapFailed();
return amountOut;
}
@@ -74,9 +85,7 @@ contract UniswapV4Executor is IExecutor, V4Router {
_executeActions(actions);
}
function _decodeData(
bytes calldata data
)
function _decodeData(bytes calldata data)
internal
pure
returns (
@@ -100,11 +109,10 @@ contract UniswapV4Executor is IExecutor, V4Router {
tickSpacing = uint24(bytes3(data[64:67]));
}
function _pay(
Currency token,
address payer,
uint256 amount
) internal override {
function _pay(Currency token, address payer, uint256 amount)
internal
override
{
token.transfer(payer, amount);
}