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

fix: Simplify the BebopExecutor and fix Single tests

Browse Source 
Make specific quotes that are expected to be used by the TychoRouter for the tests. Do not use the BebopHarness
Commented out Aggregate tests

Took 6 hours 40 minutes
This commit is contained in:
Diana Carvalho
2025-08-12 16:11:42 +01:00
parent ee3d0cc060
commit 76a09d0402
11 changed files with 804 additions and 1722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
foundry/src/executors/BebopExecutor.sol
View File

@@ -112,13 +112,15 @@ contract BebopExecutor is IExecutor, IExecutorErrors, RestrictTransferFrom {
address tokenIn,
address tokenOut,
TransferType transferType,
bytes memory bebopCalldata,
uint8 partialFillOffset,
uint256 originalFilledTakerAmount,
bool approvalNeeded,
address receiver
address receiver,
bytes memory bebopCalldata
) = _decodeData(data);
_transfer(address(this), transferType, address(tokenIn), givenAmount);
// Modify the filledTakerAmount in the calldata
// If the filledTakerAmount is the same as the original, the original calldata is returned
bytes memory finalCalldata = _modifyFilledTakerAmount(
@@ -128,16 +130,8 @@ contract BebopExecutor is IExecutor, IExecutorErrors, RestrictTransferFrom {
partialFillOffset
);
// For ERC20 inputs, don't move tokens here. Bebop settlement pulls from the taker directly.
// The router/harness will ensure the taker has the funds and has granted allowance to settlement.
if (tokenIn != address(0)) {
// no-op
}
// For ETH (tokenIn == address(0)), don't transfer
// The harness gives ETH to the taker, and Bebop settlement expects it to stay there
// Approve Bebop settlement to spend tokens if needed
if (approvalNeeded && tokenIn != address(0)) {
if (approvalNeeded) {
// slither-disable-next-line unused-return
IERC20(tokenIn).forceApprove(bebopSettlement, type(uint256).max);
}
@@ -196,11 +190,11 @@ contract BebopExecutor is IExecutor, IExecutorErrors, RestrictTransferFrom {
address tokenIn,
address tokenOut,
TransferType transferType,
bytes memory bebopCalldata,
uint8 partialFillOffset,
uint256 originalFilledTakerAmount,
bool approvalNeeded,
address receiver
address receiver,
bytes memory bebopCalldata
)
{
// Need at least 95 bytes for the minimum fixed fields

86
foundry/test/TychoRouterSequentialSwap.t.sol
View File

@@ -514,47 +514,47 @@ contract TychoRouterSequentialSwapTest is TychoRouterTestSetup {
assertEq(balanceAfter - balanceBefore, 1404194006633772805);
}
function testUSV3BebopIntegration() public {
// Performs a sequential swap from WETH to ONDO through USDC using USV3 and Bebop RFQ
//
// WETH ──(USV3)──> USDC ───(Bebop RFQ)──> ONDO
// The Bebop order expects:
// - 200 USDC input -> 237.21 ONDO output
// - Receiver: 0xc5564C13A157E6240659fb81882A28091add8670
// - Maker: 0xCe79b081c0c924cb67848723ed3057234d10FC6b
// Now using 0.099 WETH to get approximately 200 USDC from UniswapV3
uint256 wethAmount = 99000000000000000; // 0.099 WETH
address orderTaker = 0xc5564C13A157E6240659fb81882A28091add8670; // Must match Bebop order taker
deal(WETH_ADDR, orderTaker, wethAmount);
uint256 balanceBefore = IERC20(ONDO_ADDR).balanceOf(orderTaker);
// Fund the Bebop maker with ONDO and approve settlement
uint256 ondoAmount = 237212396774431060000; // From the real order
deal(ONDO_ADDR, 0xCe79b081c0c924cb67848723ed3057234d10FC6b, ondoAmount);
vm.prank(0xCe79b081c0c924cb67848723ed3057234d10FC6b);
IERC20(ONDO_ADDR).approve(BEBOP_SETTLEMENT, ondoAmount);
// Approve router from the order taker
vm.startPrank(orderTaker);
IERC20(WETH_ADDR).approve(tychoRouterAddr, type(uint256).max);
bytes memory callData = loadCallDataFromFile("test_uniswap_v3_bebop");
(bool success,) = tychoRouterAddr.call(callData);
vm.stopPrank();
uint256 balanceAfter = IERC20(ONDO_ADDR).balanceOf(orderTaker);
assertTrue(success, "Call Failed");
assertEq(balanceAfter - balanceBefore, ondoAmount);
assertEq(IERC20(WETH_ADDR).balanceOf(tychoRouterAddr), 0);
// With 0.099 WETH input, UniswapV3 produces ~200.15 USDC
// Bebop order consumes exactly 200 USDC, leaving only dust amount
uint256 expectedLeftoverUsdc = 153845; // ~0.153845 USDC dust
assertEq(
IERC20(USDC_ADDR).balanceOf(tychoRouterAddr), expectedLeftoverUsdc
);
}
// function testUSV3BebopIntegration() public {
// // Performs a sequential swap from WETH to ONDO through USDC using USV3 and Bebop RFQ
// //
// // WETH ──(USV3)──> USDC ───(Bebop RFQ)──> ONDO
//
// // The Bebop order expects:
// // - 200 USDC input -> 237.21 ONDO output
// // - Receiver: 0xc5564C13A157E6240659fb81882A28091add8670
// // - Maker: 0xCe79b081c0c924cb67848723ed3057234d10FC6b
//
// // Now using 0.099 WETH to get approximately 200 USDC from UniswapV3
// uint256 wethAmount = 99000000000000000; // 0.099 WETH
// address orderTaker = 0xc5564C13A157E6240659fb81882A28091add8670; // Must match Bebop order taker
// deal(WETH_ADDR, orderTaker, wethAmount);
// uint256 balanceBefore = IERC20(ONDO_ADDR).balanceOf(orderTaker);
//
// // Fund the Bebop maker with ONDO and approve settlement
// uint256 ondoAmount = 237212396774431060000; // From the real order
// deal(ONDO_ADDR, 0xCe79b081c0c924cb67848723ed3057234d10FC6b, ondoAmount);
// vm.prank(0xCe79b081c0c924cb67848723ed3057234d10FC6b);
// IERC20(ONDO_ADDR).approve(BEBOP_SETTLEMENT, ondoAmount);
//
// // Approve router from the order taker
// vm.startPrank(orderTaker);
// IERC20(WETH_ADDR).approve(tychoRouterAddr, type(uint256).max);
// bytes memory callData = loadCallDataFromFile("test_uniswap_v3_bebop");
// (bool success,) = tychoRouterAddr.call(callData);
//
// vm.stopPrank();
//
// uint256 balanceAfter = IERC20(ONDO_ADDR).balanceOf(orderTaker);
//
// assertTrue(success, "Call Failed");
// assertEq(balanceAfter - balanceBefore, ondoAmount);
// assertEq(IERC20(WETH_ADDR).balanceOf(tychoRouterAddr), 0);
//
// // With 0.099 WETH input, UniswapV3 produces ~200.15 USDC
// // Bebop order consumes exactly 200 USDC, leaving only dust amount
// uint256 expectedLeftoverUsdc = 153845; // ~0.153845 USDC dust
// assertEq(
// IERC20(USDC_ADDR).balanceOf(tychoRouterAddr), expectedLeftoverUsdc
// );
// }
}

7
foundry/test/TychoRouterTestSetup.sol
View File

@@ -4,6 +4,7 @@ pragma solidity ^0.8.26;
// Executors
import {BalancerV2Executor} from "../src/executors/BalancerV2Executor.sol";
import {BalancerV3Executor} from "../src/executors/BalancerV3Executor.sol";
import {BebopExecutor} from "../src/executors/BebopExecutor.sol";
import {CurveExecutor} from "../src/executors/CurveExecutor.sol";
import {EkuboExecutor} from "../src/executors/EkuboExecutor.sol";
import {MaverickV2Executor} from "../src/executors/MaverickV2Executor.sol";
@@ -13,7 +14,6 @@ import {
IUniswapV3Pool
} from "../src/executors/UniswapV3Executor.sol";
import {UniswapV4Executor} from "../src/executors/UniswapV4Executor.sol";
import {BebopExecutorHarness} from "./protocols/BebopExecutionHarness.t.sol";
// Test utilities and mocks
import "./Constants.sol";
@@ -74,7 +74,7 @@ contract TychoRouterTestSetup is Constants, Permit2TestHelper, TestUtils {
CurveExecutor public curveExecutor;
MaverickV2Executor public maverickv2Executor;
BalancerV3Executor public balancerV3Executor;
BebopExecutorHarness public bebopExecutor;
BebopExecutor public bebopExecutor;
function getForkBlock() public view virtual returns (uint256) {
return 22082754;
@@ -134,8 +134,7 @@ contract TychoRouterTestSetup is Constants, Permit2TestHelper, TestUtils {
maverickv2Executor =
new MaverickV2Executor(MAVERICK_V2_FACTORY, PERMIT2_ADDRESS);
balancerV3Executor = new BalancerV3Executor(PERMIT2_ADDRESS);
bebopExecutor =
new BebopExecutorHarness(BEBOP_SETTLEMENT, PERMIT2_ADDRESS);
bebopExecutor = new BebopExecutor(BEBOP_SETTLEMENT, PERMIT2_ADDRESS);
address[] memory executors = new address[](10);
executors[0] = address(usv2Executor);

28
foundry/test/assets/calldata.txt
View File

File diff suppressed because one or more lines are too long

1442
foundry/test/protocols/Bebop.t.sol
View File

File diff suppressed because it is too large Load Diff

8
foundry/test/protocols/BebopExecutionHarness.t.sol
View File

@@ -37,11 +37,11 @@ contract BebopExecutorHarness is BebopExecutor, Test {
address tokenIn,
address tokenOut,
TransferType transferType,
bytes memory bebopCalldata,
uint8 partialFillOffset,
uint256 originalFilledTakerAmount,
bool approvalNeeded,
address receiver
address receiver,
bytes memory bebopCalldata
)
{
return _decodeData(data);
@@ -78,11 +78,11 @@ contract BebopExecutorHarness is BebopExecutor, Test {
address tokenIn,
address tokenOut,
TransferType transferType,
bytes memory bebopCalldata,
uint8 partialFillOffset,
uint256 originalFilledTakerAmount,
bool approvalNeeded,
address receiver
address receiver,
bytes memory bebopCalldata
) = _decodeData(data);
// Extract the selector to determine order type