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

chore: remove redundant data from _decodeData

Browse Source
This commit is contained in:
royvardhan
2025-02-11 22:02:59 +05:30
parent a8cc84ddce
commit 120c96215f
2 changed files with 4 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,17 +31,8 @@ contract UniswapV4Executor is IExecutor, V4Router {
payable
returns (uint256 amountOut)
{
(
,
address tokenOut,
,
address receiver,
,
,
bool isExactInput,
,
uint256 amount
) = _decodeData(data);
(address tokenOut, address receiver, bool isExactInput, uint256 amount)
= _decodeData(data);
uint256 balanceBefore = IERC20(tokenOut).balanceOf(receiver);
@@ -71,14 +62,9 @@ contract UniswapV4Executor is IExecutor, V4Router {
internal
pure
returns (
address tokenIn,
address tokenOut,
uint24 fee,
address receiver,
bool zeroForOne,
uint24 tickSpacing,
bool isExactInput,
bool isSingle,
uint256 amount
)
{
@@ -97,60 +83,35 @@ contract UniswapV4Executor is IExecutor, V4Router {
IV4Router.ExactInputSingleParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactInputSingleParams));
tokenIn = swapParams.zeroForOne
? address(uint160(swapParams.poolKey.currency0.toId()))
: address(uint160(swapParams.poolKey.currency1.toId()));
tokenOut = swapParams.zeroForOne
? address(uint160(swapParams.poolKey.currency1.toId()))
: address(uint160(swapParams.poolKey.currency0.toId()));
fee = swapParams.poolKey.fee;
zeroForOne = swapParams.zeroForOne;
tickSpacing = uint24(swapParams.poolKey.tickSpacing);
isExactInput = true;
isSingle = true;
amount = swapParams.amountIn;
} else if (action == uint8(Actions.SWAP_EXACT_OUT_SINGLE)) {
IV4Router.ExactOutputSingleParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactOutputSingleParams));
tokenIn = swapParams.zeroForOne
? address(uint160(swapParams.poolKey.currency0.toId()))
: address(uint160(swapParams.poolKey.currency1.toId()));
tokenOut = swapParams.zeroForOne
? address(uint160(swapParams.poolKey.currency1.toId()))
: address(uint160(swapParams.poolKey.currency0.toId()));
fee = swapParams.poolKey.fee;
zeroForOne = swapParams.zeroForOne;
tickSpacing = uint24(swapParams.poolKey.tickSpacing);
isExactInput = false;
isSingle = true;
amount = swapParams.amountOut;
} else if (action == uint8(Actions.SWAP_EXACT_IN)) {
IV4Router.ExactInputParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactInputParams));
tokenIn = address(uint160(swapParams.currencyIn.toId()));
PathKey memory lastPath =
swapParams.path[swapParams.path.length - 1];
tokenOut = address(uint160(lastPath.intermediateCurrency.toId()));
fee = lastPath.fee;
zeroForOne = tokenIn < tokenOut;
tickSpacing = uint24(lastPath.tickSpacing);
isExactInput = true;
isSingle = false;
amount = swapParams.amountIn;
} else if (action == uint8(Actions.SWAP_EXACT_OUT)) {
IV4Router.ExactOutputParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactOutputParams));
tokenOut = address(uint160(swapParams.currencyOut.toId()));
PathKey memory firstPath = swapParams.path[0];
tokenIn = address(uint160(firstPath.intermediateCurrency.toId()));
fee = firstPath.fee;
zeroForOne = tokenIn < tokenOut;
tickSpacing = uint24(firstPath.tickSpacing);
isExactInput = false;
isSingle = false;
amount = swapParams.amountOut;
}
}

23
foundry/test/executors/UniswapV4Executor.t.sol
View File

@@ -13,14 +13,9 @@ contract UniswapV4ExecutorExposed is UniswapV4Executor {
external
pure
returns (
address tokenIn,
address tokenOut,
uint24 fee,
address receiver,
bool zeroForOne,
uint24 tickSpacing,
bool isExactInput,
bool isSingle,
uint256 amount
)
{
@@ -58,26 +53,12 @@ contract UniswapV4ExecutorTest is Test, Constants {
expectedAmount
);
(
address tokenIn,
address tokenOut,
uint24 fee,
address receiver,
bool zeroForOne,
uint24 tickSpacing,
bool isExactInput,
bool isSingle,
uint256 amount
) = uniswapV4Exposed.decodeData(data);
(address tokenOut, address receiver, bool isExactInput, uint256 amount)
= uniswapV4Exposed.decodeData(data);
assertEq(tokenIn, USDE_ADDR);
assertEq(tokenOut, USDT_ADDR);
assertEq(fee, expectedPoolFee);
assertEq(receiver, expectedReceiver);
assertEq(zeroForOne, false);
assertEq(tickSpacing, 1);
assertTrue(isExactInput);
assertTrue(isSingle);
assertEq(amount, expectedAmount);
}