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

fix: remove amountIn addition to amountOut in _swap for cyclic swaps, add testCyclicSwapWithTwoPools test to verify

Browse Source
This commit is contained in:
royvardhan
2025-03-06 19:10:45 +05:30
parent 5532c64d87
commit 57acbd58c5
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foundry/src/TychoRouter.sol
View File

@@ -345,7 +345,9 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
currentAmountOut = _callExecutor( currentAmountOut = _callExecutor(
swapData.executor(), currentAmountIn, swapData.protocolData() swapData.executor(), currentAmountIn, swapData.protocolData()
); );
amounts[tokenOutIndex] += currentAmountOut; amounts[tokenOutIndex] = tokenOutIndex == 0
? currentAmountOut
: amounts[tokenOutIndex] + currentAmountOut;
remainingAmounts[tokenOutIndex] += currentAmountOut; remainingAmounts[tokenOutIndex] += currentAmountOut;
remainingAmounts[tokenInIndex] -= currentAmountIn; remainingAmounts[tokenInIndex] -= currentAmountIn;
} }

2
foundry/test/Constants.sol
View File

@@ -50,6 +50,8 @@ contract Constants is Test, BaseConstants {
address USV3_FACTORY_ETHEREUM = 0x1F98431c8aD98523631AE4a59f267346ea31F984; address USV3_FACTORY_ETHEREUM = 0x1F98431c8aD98523631AE4a59f267346ea31F984;
address USV2_FACTORY_ETHEREUM = 0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f; address USV2_FACTORY_ETHEREUM = 0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f;
address DAI_WETH_USV3 = 0xC2e9F25Be6257c210d7Adf0D4Cd6E3E881ba25f8; address DAI_WETH_USV3 = 0xC2e9F25Be6257c210d7Adf0D4Cd6E3E881ba25f8;
address USDC_WETH_USV3 = 0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640; // 0.05% fee
address USDC_WETH_USV3_2 = 0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8; // 0.3% fee
// Uniswap universal router // Uniswap universal router
address UNIVERSAL_ROUTER = 0x66a9893cC07D91D95644AEDD05D03f95e1dBA8Af; address UNIVERSAL_ROUTER = 0x66a9893cC07D91D95644AEDD05D03f95e1dBA8Af;

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

@@ -1192,6 +1192,45 @@ contract TychoRouterTest is TychoRouterTestSetup {
assertEq(IERC20(WBTC_ADDR).balanceOf(tychoRouterAddr), 102718); assertEq(IERC20(WBTC_ADDR).balanceOf(tychoRouterAddr), 102718);
} }
function testCyclicSwapWithTwoPools() public {
// This test has start and end tokens that are the same
// The flow is:
// USDC -> WETH -> USDC -> WETH -> USDC using two pools, and four swaps
uint256 amountIn = 100 * 10 ** 6;
deal(USDC_ADDR, tychoRouterAddr, amountIn);
// First pool: USDC -> WETH, in uniswap v3
bytes memory usdcWethData = encodeUniswapV3Swap(
USDC_ADDR, WETH_ADDR, tychoRouterAddr, USDC_WETH_USV3, true
);
// Second pool: WETH -> USDC, in uniswap v3
bytes memory wethUsdcData = encodeUniswapV3Swap(
WETH_ADDR, USDC_ADDR, tychoRouterAddr, USDC_WETH_USV3_2, false
);
bytes[] memory swaps = new bytes[](4);
// USDC -> WETH
swaps[0] = encodeSwap(
uint8(0), uint8(1), uint24(0), address(usv3Executor), usdcWethData
);
// WETH -> USDC
swaps[1] = encodeSwap(
uint8(1), uint8(0), uint24(0), address(usv3Executor), wethUsdcData
);
// USDC -> WETH
swaps[2] = encodeSwap(
uint8(0), uint8(1), uint24(0), address(usv3Executor), usdcWethData
);
// WETH -> USDC
swaps[3] = encodeSwap(
uint8(1), uint8(0), uint24(0), address(usv3Executor), wethUsdcData
);
tychoRouter.exposedSwap(amountIn, 2, pleEncode(swaps));
assertEq(IERC20(USDC_ADDR).balanceOf(tychoRouterAddr), 99778590);
}
// Base Network Tests // Base Network Tests
// Make sure to set the RPC_URL to base network // Make sure to set the RPC_URL to base network
function testSwapSingleBase() public { function testSwapSingleBase() public {