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

Merge branch 'main' into router/tnl/reset-transient-storage

Browse Source
This commit is contained in:
Tamara
2025-04-28 09:32:35 -04:00
committed by GitHub
parent 1b003dc483 94591339a1
commit b27e6c62ec
6 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foundry/src/Dispatcher.sol
View File

@@ -57,7 +57,7 @@ contract Dispatcher {
* protocol-specific data required by the executor.
*/
// slither-disable-next-line delegatecall-loop,assembly
function _callExecutor(
function _callSwapOnExecutor(
address executor,
uint256 amount,
bytes calldata data
@@ -94,7 +94,7 @@ contract Dispatcher {
}
// slither-disable-next-line assembly
function _handleCallback(bytes calldata data)
function _callHandleCallbackOnExecutor(bytes calldata data)
internal
returns (bytes memory)
{

10
foundry/src/TychoRouter.sol
View File

@@ -482,7 +482,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
swap_.decodeSingleSwap();
uint256 initialBalanceTokenOut = _balanceOf(tokenOut, receiver);
amountOut = _callExecutor(executor, amountIn, protocolData);
amountOut = _callSwapOnExecutor(executor, amountIn, protocolData);
if (amountOut < minAmountOut) {
revert TychoRouter__NegativeSlippage(amountOut, minAmountOut);
@@ -616,7 +616,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
: remainingAmounts[tokenInIndex];
currentAmountOut =
_callExecutor(executor, currentAmountIn, protocolData);
_callSwapOnExecutor(executor, currentAmountIn, protocolData);
// Checks if the output token is the same as the input token
if (tokenOutIndex == 0) {
cyclicSwapAmountOut += currentAmountOut;
@@ -650,7 +650,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
swap.decodeSingleSwap();
calculatedAmount =
_callExecutor(executor, calculatedAmount, protocolData);
_callSwapOnExecutor(executor, calculatedAmount, protocolData);
}
}
@@ -658,7 +658,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
* @dev We use the fallback function to allow flexibility on callback.
*/
fallback() external {
bytes memory result = _handleCallback(msg.data);
bytes memory result = _callHandleCallbackOnExecutor(msg.data);
// slither-disable-next-line assembly
assembly ("memory-safe") {
// Propagate the calculatedAmount
@@ -786,7 +786,7 @@ contract TychoRouter is AccessControl, Dispatcher, Pausable, ReentrancyGuard {
returns (bytes memory)
{
if (data.length < 24) revert TychoRouter__InvalidDataLength();
bytes memory result = _handleCallback(data);
bytes memory result = _callHandleCallbackOnExecutor(data);
return result;
}