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

feat: move callback testing to usv3 executor

Browse Source
This commit is contained in:
royvardhan
2025-02-14 01:29:30 +05:30
parent 80500e615e
commit 5853de679a
4 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
foundry/src/ExecutionDispatcher.sol
View File

@@ -2,7 +2,6 @@
pragma solidity ^0.8.26; pragma solidity ^0.8.26;
import "@interfaces/IExecutor.sol"; import "@interfaces/IExecutor.sol";
import "forge-std/console.sol";
error ExecutionDispatcher__UnapprovedExecutor(); error ExecutionDispatcher__UnapprovedExecutor();
error ExecutionDispatcher__NonContractExecutor(); error ExecutionDispatcher__NonContractExecutor();

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

@@ -17,9 +17,6 @@ import {Actions} from "@uniswap/v4-periphery/src/libraries/Actions.sol";
import {IV4Router} from "@uniswap/v4-periphery/src/interfaces/IV4Router.sol"; import {IV4Router} from "@uniswap/v4-periphery/src/interfaces/IV4Router.sol";
import {PathKey} from "@uniswap/v4-periphery/src/libraries/PathKey.sol"; import {PathKey} from "@uniswap/v4-periphery/src/libraries/PathKey.sol";
error UniswapV4Executor__InvalidDataLength();
error UniswapV4Executor__SwapFailed();
contract UniswapV4Executor is IExecutor, V4Router { contract UniswapV4Executor is IExecutor, V4Router {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
using CurrencyLibrary for Currency; using CurrencyLibrary for Currency;

18
foundry/test/TychoRouter.t.sol
View File

@@ -626,24 +626,6 @@ contract TychoRouterTest is TychoRouterTestSetup {
vm.stopPrank(); vm.stopPrank();
} }
// function testUSV3Callback() public {
// uint24 poolFee = 3000;
// uint256 amountOwed = 1000000000000000000;
// deal(WETH_ADDR, tychoRouterAddr, amountOwed);
// uint256 initialPoolReserve = IERC20(WETH_ADDR).balanceOf(DAI_WETH_USV3);
// vm.startPrank(DAI_WETH_USV3);
// tychoRouter.uniswapV3SwapCallback(
// -2631245338449998525223,
// int256(amountOwed),
// abi.encodePacked(WETH_ADDR, DAI_ADDR, poolFee)
// );
// vm.stopPrank();
// uint256 finalPoolReserve = IERC20(WETH_ADDR).balanceOf(DAI_WETH_USV3);
// assertEq(finalPoolReserve - initialPoolReserve, amountOwed);
// }
function testSwapSingleUSV3() public { function testSwapSingleUSV3() public {
// Trade 1 WETH for DAI with 1 swap on Uniswap V3 // Trade 1 WETH for DAI with 1 swap on Uniswap V3
// 1 WETH -> DAI // 1 WETH -> DAI

44
foundry/test/executors/UniswapV3Executor.t.sol
View File

@@ -69,4 +69,48 @@ contract UniswapV3ExecutorTest is Test, Constants {
vm.expectRevert(UniswapV3Executor__InvalidDataLength.selector); vm.expectRevert(UniswapV3Executor__InvalidDataLength.selector);
uniswapV3Exposed.decodeData(invalidParams); uniswapV3Exposed.decodeData(invalidParams);
} }
function testUSV3Callback() public {
uint24 poolFee = 3000;
uint256 amountOwed = 1000000000000000000;
deal(WETH_ADDR, address(uniswapV3Exposed), amountOwed);
uint256 initialPoolReserve = IERC20(WETH_ADDR).balanceOf(DAI_WETH_USV3);
vm.startPrank(DAI_WETH_USV3);
bytes memory callbackData = _encodeUSV3CallbackData(
int256(amountOwed), // amount0Delta
int256(0), // amount1Delta
WETH_ADDR,
DAI_ADDR,
poolFee
);
uniswapV3Exposed.handleCallback(callbackData);
vm.stopPrank();
uint256 finalPoolReserve = IERC20(WETH_ADDR).balanceOf(DAI_WETH_USV3);
assertEq(finalPoolReserve - initialPoolReserve, amountOwed);
}
function _encodeUSV3CallbackData(
int256 amount0Delta,
int256 amount1Delta,
address tokenIn,
address tokenOut,
uint24 fee
) internal pure returns (bytes memory) {
// Dummy selector for handleCallback
bytes4 selector =
bytes4(keccak256("handleCallback(int256,int256,bytes)"));
bytes memory tokenData = abi.encodePacked(tokenIn, tokenOut, fee);
// [0:4] - function selector
// [4:68] - abi.encode(amount0Delta, amount1Delta)
// [68:end] - abi.encode(tokenData) where tokenData is the packed bytes
return abi.encodePacked(
selector,
abi.encode(amount0Delta, amount1Delta),
abi.encode(tokenData)
);
}
} }