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

test: add target verification tests for usv2, usv3

Browse Source
This commit is contained in:
royvardhan
2025-02-21 22:49:10 +05:30
parent 7936ba1c94
commit 2f1507dd0e
5 changed files with 144 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
foundry/src/executors/UniswapV2Executor.sol
View File

@@ -15,10 +15,11 @@ contract UniswapV2Executor is IExecutor {
0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f;
// slither-disable-next-line locked-ether
function swap(
uint256 givenAmount,
bytes calldata data
) external payable returns (uint256 calculatedAmount) {
function swap(uint256 givenAmount, bytes calldata data)
external
payable
returns (uint256 calculatedAmount)
{
address target;
address receiver;
bool zeroForOne;
@@ -40,9 +41,7 @@ contract UniswapV2Executor is IExecutor {
}
}
function _decodeData(
bytes calldata data
)
function _decodeData(bytes calldata data)
internal
pure
returns (
@@ -61,20 +60,20 @@ contract UniswapV2Executor is IExecutor {
zeroForOne = uint8(data[60]) > 0;
}
function _getAmountOut(
address target,
uint256 amountIn,
bool zeroForOne
) internal view returns (uint256 amount) {
function _getAmountOut(address target, uint256 amountIn, bool zeroForOne)
internal
view
returns (uint256 amount)
{
IUniswapV2Pair pair = IUniswapV2Pair(target);
uint112 reserveIn;
uint112 reserveOut;
if (zeroForOne) {
// slither-disable-next-line unused-return
(reserveIn, reserveOut, ) = pair.getReserves();
(reserveIn, reserveOut,) = pair.getReserves();
} else {
// slither-disable-next-line unused-return
(reserveOut, reserveIn, ) = pair.getReserves();
(reserveOut, reserveIn,) = pair.getReserves();
}
require(reserveIn > 0 && reserveOut > 0, "L");
@@ -84,9 +83,11 @@ contract UniswapV2Executor is IExecutor {
amount = numerator / denominator;
}
function _computePairAddress(
address target
) internal view returns (address pair) {
function _computePairAddress(address target)
internal
view
returns (address pair)
{
address token0 = IUniswapV2Pair(target).token0();
address token1 = IUniswapV2Pair(target).token1();
bytes32 salt = keccak256(abi.encodePacked(token0, token1));

83
foundry/src/executors/UniswapV3Executor.sol
View File

@@ -30,10 +30,11 @@ contract UniswapV3Executor is IExecutor, ICallback {
}
// slither-disable-next-line locked-ether
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,
@@ -71,9 +72,10 @@ contract UniswapV3Executor is IExecutor, ICallback {
}
}
function handleCallback(
bytes calldata msgData
) public returns (bytes memory result) {
function handleCallback(bytes calldata msgData)
public
returns (bytes memory result)
{
// The data has the following layout:
// - amount0Delta (32 bytes)
// - amount1Delta (32 bytes)
@@ -81,18 +83,15 @@ contract UniswapV3Executor is IExecutor, ICallback {
// - dataLength (32 bytes)
// - protocolData (variable length)
(int256 amount0Delta, int256 amount1Delta) = abi.decode(
msgData[:64],
(int256, int256)
);
(int256 amount0Delta, int256 amount1Delta) =
abi.decode(msgData[:64], (int256, int256));
address tokenIn = address(bytes20(msgData[128:148]));
verifyCallback(msgData[128:]);
uint256 amountOwed = amount0Delta > 0
? uint256(amount0Delta)
: uint256(amount1Delta);
uint256 amountOwed =
amount0Delta > 0 ? uint256(amount0Delta) : uint256(amount1Delta);
IERC20(tokenIn).safeTransfer(msg.sender, amountOwed);
return abi.encode(amountOwed, tokenIn);
@@ -104,32 +103,24 @@ contract UniswapV3Executor is IExecutor, ICallback {
uint24 poolFee = uint24(bytes3(data[40:43]));
// slither-disable-next-line unused-return
CallbackValidationV2.verifyCallback(
factory,
tokenIn,
tokenOut,
poolFee
);
CallbackValidationV2.verifyCallback(factory, tokenIn, tokenOut, poolFee);
}
function uniswapV3SwapCallback(
int256 /* amount0Delta */,
int256 /* amount1Delta */,
int256, /* amount0Delta */
int256, /* amount1Delta */
bytes calldata /* data */
) external {
uint256 dataOffset = 4 + 32 + 32 + 32; // Skip selector + 2 ints + data_offset
uint256 dataLength = uint256(
bytes32(msg.data[dataOffset:dataOffset + 32])
);
uint256 dataLength =
uint256(bytes32(msg.data[dataOffset:dataOffset + 32]));
bytes calldata fullData = msg.data[4:dataOffset + 32 + dataLength];
handleCallback(fullData);
}
function _decodeData(
bytes calldata data
)
function _decodeData(bytes calldata data)
internal
pure
returns (
@@ -152,29 +143,23 @@ contract UniswapV3Executor is IExecutor, ICallback {
zeroForOne = uint8(data[83]) > 0;
}
function _makeV3CallbackData(
address tokenIn,
address tokenOut,
uint24 fee
) internal view returns (bytes memory) {
return
abi.encodePacked(
tokenIn,
tokenOut,
fee,
self,
ICallback.handleCallback.selector
);
function _makeV3CallbackData(address tokenIn, address tokenOut, uint24 fee)
internal
view
returns (bytes memory)
{
return abi.encodePacked(
tokenIn, tokenOut, fee, self, ICallback.handleCallback.selector
);
}
function _computePairAddress(
address tokenA,
address tokenB,
uint24 fee
) internal view returns (address pool) {
(address token0, address token1) = tokenA < tokenB
? (tokenA, tokenB)
: (tokenB, tokenA);
function _computePairAddress(address tokenA, address tokenB, uint24 fee)
internal
view
returns (address pool)
{
(address token0, address token1) =
tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA);
pool = address(
uint160(
uint256(