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

fix: Add input validation size in Uniswapv2SwapExecutor

Browse Source 
--- don't change below this line ---
ENG-4033 Took 12 minutes
This commit is contained in:
Diana Carvalho
2025-01-24 16:43:22 +00:00
parent b9f4451769
commit ed44f4e993
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
foundry/src/executors/Uniswapv2SwapExecutor.sol
View File

@@ -5,6 +5,8 @@ import "@uniswap-v2/contracts/interfaces/IUniswapV2Pair.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {ISwapExecutor} from "../interfaces/ISwapExecutor.sol"; import {ISwapExecutor} from "../interfaces/ISwapExecutor.sol";
error UniswapV2Executor__InvalidDataLength();
contract UniswapV2SwapExecutor is ISwapExecutor { contract UniswapV2SwapExecutor is ISwapExecutor {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
@@ -39,6 +41,9 @@ contract UniswapV2SwapExecutor is ISwapExecutor {
bool zeroForOne bool zeroForOne
) )
{ {
if (data.length != 61) {
revert UniswapV2Executor__InvalidDataLength();
}
inToken = IERC20(address(bytes20(data[0:20]))); inToken = IERC20(address(bytes20(data[0:20])));
target = address(bytes20(data[20:40])); target = address(bytes20(data[20:40]));
receiver = address(bytes20(data[40:60])); receiver = address(bytes20(data[40:60]));

10
foundry/test/executors/UniswapV2SwapExecutor.t.sol
View File

@@ -59,6 +59,14 @@ contract UniswapV2SwapExecutorTest is
assertEq(zeroForOne, false); assertEq(zeroForOne, false);
} }
function testDecodeParamsInvalidDataLength() public {
bytes memory invalidParams =
abi.encodePacked(WETH_ADDR, address(2), address(3));
vm.expectRevert(UniswapV2Executor__InvalidDataLength.selector);
uniswapV2Exposed.decodeParams(invalidParams);
}
function testAmountOut() public view { function testAmountOut() public view {
uint256 amountOut = uint256 amountOut =
uniswapV2Exposed.getAmountOut(WETH_DAI_POOL, 10 ** 18, false); uniswapV2Exposed.getAmountOut(WETH_DAI_POOL, 10 ** 18, false);
@@ -84,10 +92,8 @@ contract UniswapV2SwapExecutorTest is
bytes memory protocolData = bytes memory protocolData =
abi.encodePacked(WETH_ADDR, WETH_DAI_POOL, BOB, zeroForOne); abi.encodePacked(WETH_ADDR, WETH_DAI_POOL, BOB, zeroForOne);
vm.startPrank(ADMIN);
deal(WETH_ADDR, address(uniswapV2Exposed), amountIn); deal(WETH_ADDR, address(uniswapV2Exposed), amountIn);
uniswapV2Exposed.swap(amountIn, protocolData); uniswapV2Exposed.swap(amountIn, protocolData);
vm.stopPrank();
uint256 finalBalance = DAI.balanceOf(BOB); uint256 finalBalance = DAI.balanceOf(BOB);
assertGe(finalBalance, amountOut); assertGe(finalBalance, amountOut);