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

feat: Change signature of _handleCallback to take only bytes calldata

Browse Source 
The selector and executor are decoded inside this function now.
For Uniswap V3 I had to manually slice the msg.data from uniswapV3SwapCallback to get the data that matters for the callback

Took 3 hours 12 minutes
This commit is contained in:
Diana Carvalho
2025-02-18 11:11:43 +00:00
parent 2604935609
commit 2aa63d7ec0
4 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
foundry/src/TychoRouter.sol
View File

@@ -218,12 +218,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
* @dev We use the fallback function to allow flexibility on callback.
*/
fallback() external {
address executor =
address(uint160(bytes20(msg.data[msg.data.length - 20:])));
bytes4 selector =
bytes4(msg.data[msg.data.length - 24:msg.data.length - 20]);
bytes memory protocolData = msg.data[:msg.data.length - 24];
_handleCallback(selector, executor, protocolData);
_handleCallback(msg.data);
}
/**
@@ -365,19 +360,17 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
* See in IUniswapV3SwapCallback for documentation.
*/
function uniswapV3SwapCallback(
int256 amount0Delta,
int256 amount1Delta,
int256, /* amount0Delta */
int256, /* amount1Delta */
bytes calldata data
) external {
if (data.length < 24) revert TychoRouter__InvalidDataLength();
bytes4 selector = bytes4(data[data.length - 4:]);
address executor = address(uint160(bytes20(data[data.length - 24:])));
bytes memory protocolData = data[:data.length - 24];
_handleCallback(
selector,
executor,
abi.encodePacked(amount0Delta, amount1Delta, protocolData)
);
uint256 dataOffset = 4 + 32 + 32 + 32; // Skip selector + 2 ints + data_offset
uint256 dataLength =
uint256(bytes32(msg.data[dataOffset:dataOffset + 32]));
bytes calldata fullData = msg.data[4:dataOffset + 32 + dataLength];
_handleCallback(fullData);
}
/**
@@ -388,11 +381,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
returns (bytes memory)
{
if (data.length < 24) revert TychoRouter__InvalidDataLength();
bytes4 selector = bytes4(data[data.length - 4:]);
address executor =
address(uint160(bytes20(data[data.length - 24:data.length - 4])));
bytes memory protocolData = data[:data.length - 24];
_handleCallback(selector, executor, protocolData);
_handleCallback(data);
return "";
}
}