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

refactor: rm callback verifier dispatcher

Browse Source
This commit is contained in:
royvardhan
2025-02-14 23:11:01 +05:30
parent 260f9d866f
commit d0027e6cf2
11 changed files with 216 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
foundry/src/CallbackVerificationDispatcher.sol
View File

@@ -1,99 +0,0 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.26;
import "@interfaces/ICallbackVerifier.sol";
error CallbackVerificationDispatcher__UnapprovedVerifier();
error CallbackVerificationDispatcher__NonContractVerifier();
/**
* @title Dispatch callback verification to external contracts
* @author PropellerHeads Devs
* @dev Provides the ability call external contracts to perform callback
* verification. This allows dynamically adding new supported protocols
* without needing to upgrade any contracts.
*
* Note: Verifier contracts need to implement the ICallbackVerifier interface
*/
contract CallbackVerificationDispatcher {
mapping(address => bool) public callbackVerifiers;
event CallbackVerifierSet(address indexed callbackVerifier);
event CallbackVerifierRemoved(address indexed callbackVerifier);
/**
* @dev Adds or replaces an approved callback verifier contract address if it is a
* contract.
* @param target address of the callback verifier contract
*/
function _setCallbackVerifier(address target) internal {
if (target.code.length == 0) {
revert CallbackVerificationDispatcher__NonContractVerifier();
}
callbackVerifiers[target] = true;
emit CallbackVerifierSet(target);
}
/**
* @dev Removes an approved callback verifier contract address
* @param target address of the callback verifier contract
*/
function _removeCallbackVerifier(address target) internal {
delete callbackVerifiers[target];
emit CallbackVerifierRemoved(target);
}
/**
* @dev Calls a callback verifier. This should revert if the callback verification fails.
*/
// slither-disable-next-line dead-code
function _callVerifyCallback(bytes calldata data)
internal
view
returns (uint256 amountOwed, address tokenOwed)
{
address verifier;
bytes4 decodedSelector;
bytes memory verifierData;
(verifier, decodedSelector, verifierData) =
_decodeVerifierAndSelector(data);
if (!callbackVerifiers[verifier]) {
revert CallbackVerificationDispatcher__UnapprovedVerifier();
}
bytes4 selector = decodedSelector == bytes4(0)
? ICallbackVerifier.verifyCallback.selector
: decodedSelector;
address sender = msg.sender;
// slither-disable-next-line low-level-calls
(bool success, bytes memory result) = verifier.staticcall(
abi.encodeWithSelector(selector, sender, verifierData)
);
if (!success) {
if (result.length > 0) {
revert(string(result));
} else {
revert("Callback verification failed");
}
}
(amountOwed, tokenOwed) = abi.decode(result, (uint256, address));
}
// slither-disable-next-line dead-code
function _decodeVerifierAndSelector(bytes calldata data)
internal
pure
returns (address verifier, bytes4 selector, bytes memory verifierData)
{
require(data.length >= 20, "Invalid data length");
verifier = address(uint160(bytes20(data[:20])));
selector = bytes4(data[20:24]);
verifierData = data[24:];
}
}

11
foundry/src/ExecutionDispatcher.sol
View File

@@ -2,6 +2,7 @@
pragma solidity ^0.8.26;
import "@interfaces/IExecutor.sol";
import "@interfaces/ICallback.sol";
import "forge-std/console.sol";
error ExecutionDispatcher__UnapprovedExecutor();
@@ -95,11 +96,13 @@ contract ExecutionDispatcher {
revert ExecutionDispatcher__UnapprovedExecutor();
}
selector =
selector == bytes4(0) ? IExecutor.handleCallback.selector : selector;
selector = selector == bytes4(0)
? ICallback.handleCallback.selector
: selector;
// slither-disable-next-line controlled-delegatecall,low-level-calls
(bool success, bytes memory result) =
executor.delegatecall(abi.encodeWithSelector(selector, data));
(bool success, bytes memory result) = executor.delegatecall(
abi.encodeWithSelector(selector, data)
);
if (!success) {
revert(

111
foundry/src/TychoRouter.sol
View File

@@ -3,7 +3,7 @@ pragma solidity ^0.8.26;
import "../lib/IWETH.sol";
import "../lib/bytes/LibPrefixLengthEncodedByteArray.sol";
import "./CallbackVerificationDispatcher.sol";
import "@openzeppelin/contracts/access/AccessControl.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
@@ -27,7 +27,6 @@ error TychoRouter__MessageValueMismatch(uint256 value, uint256 amount);
contract TychoRouter is
AccessControl,
ExecutionDispatcher,
CallbackVerificationDispatcher,
Pausable,
ReentrancyGuard,
SafeCallback
@@ -58,16 +57,21 @@ contract TychoRouter is
uint256 public fee;
event Withdrawal(
address indexed token, uint256 amount, address indexed receiver
address indexed token,
uint256 amount,
address indexed receiver
);
event FeeReceiverSet(
address indexed oldFeeReceiver, address indexed newFeeReceiver
address indexed oldFeeReceiver,
address indexed newFeeReceiver
);
event FeeSet(uint256 indexed oldFee, uint256 indexed newFee);
constructor(IPoolManager _poolManager, address _permit2, address weth)
SafeCallback(_poolManager)
{
constructor(
IPoolManager _poolManager,
address _permit2,
address weth
) SafeCallback(_poolManager) {
if (_permit2 == address(0) || weth == address(0)) {
revert TychoRouter__AddressZero();
}
@@ -181,10 +185,11 @@ contract TychoRouter is
*
* @return The total amount of the buy token obtained after all swaps have been executed.
*/
function _swap(uint256 amountIn, uint256 nTokens, bytes calldata swaps_)
internal
returns (uint256)
{
function _swap(
uint256 amountIn,
uint256 nTokens,
bytes calldata swaps_
) internal returns (uint256) {
if (swaps_.length == 0) {
revert TychoRouter__EmptySwaps();
}
@@ -251,10 +256,10 @@ contract TychoRouter is
/**
* @dev Allows granting roles to multiple accounts in a single call.
*/
function batchGrantRole(bytes32 role, address[] memory accounts)
external
onlyRole(DEFAULT_ADMIN_ROLE)
{
function batchGrantRole(
bytes32 role,
address[] memory accounts
) external onlyRole(DEFAULT_ADMIN_ROLE) {
for (uint256 i = 0; i < accounts.length; i++) {
_grantRole(role, accounts[i]);
}
@@ -264,10 +269,9 @@ contract TychoRouter is
* @dev Entrypoint to add or replace an approved executor contract address
* @param targets address of the executor contract
*/
function setExecutors(address[] memory targets)
external
onlyRole(EXECUTOR_SETTER_ROLE)
{
function setExecutors(
address[] memory targets
) external onlyRole(EXECUTOR_SETTER_ROLE) {
for (uint256 i = 0; i < targets.length; i++) {
_setExecutor(targets[i]);
}
@@ -277,42 +281,18 @@ contract TychoRouter is
* @dev Entrypoint to remove an approved executor contract address
* @param target address of the executor contract
*/
function removeExecutor(address target)
external
onlyRole(EXECUTOR_SETTER_ROLE)
{
function removeExecutor(
address target
) external onlyRole(EXECUTOR_SETTER_ROLE) {
_removeExecutor(target);
}
/**
* @dev Entrypoint to add or replace an approved callback verifier contract address
* @param target address of the callback verifier contract
*/
function setCallbackVerifier(address target)
external
onlyRole(EXECUTOR_SETTER_ROLE)
{
_setCallbackVerifier(target);
}
/**
* @dev Entrypoint to remove an approved callback verifier contract address
* @param target address of the callback verifier contract
*/
function removeCallbackVerifier(address target)
external
onlyRole(EXECUTOR_SETTER_ROLE)
{
_removeCallbackVerifier(target);
}
/**
* @dev Allows setting the fee receiver.
*/
function setFeeReceiver(address newfeeReceiver)
external
onlyRole(FEE_SETTER_ROLE)
{
function setFeeReceiver(
address newfeeReceiver
) external onlyRole(FEE_SETTER_ROLE) {
if (newfeeReceiver == address(0)) revert TychoRouter__AddressZero();
emit FeeReceiverSet(feeReceiver, newfeeReceiver);
feeReceiver = newfeeReceiver;
@@ -329,10 +309,10 @@ contract TychoRouter is
/**
* @dev Allows withdrawing any ERC20 funds if funds get stuck in case of a bug.
*/
function withdraw(IERC20[] memory tokens, address receiver)
external
onlyRole(FUND_RESCUER_ROLE)
{
function withdraw(
IERC20[] memory tokens,
address receiver
) external onlyRole(FUND_RESCUER_ROLE) {
if (receiver == address(0)) revert TychoRouter__AddressZero();
for (uint256 i = 0; i < tokens.length; i++) {
@@ -349,10 +329,9 @@ contract TychoRouter is
* @dev Allows withdrawing any NATIVE funds if funds get stuck in case of a bug.
* The contract should never hold any NATIVE tokens for security reasons.
*/
function withdrawNative(address receiver)
external
onlyRole(FUND_RESCUER_ROLE)
{
function withdrawNative(
address receiver
) external onlyRole(FUND_RESCUER_ROLE) {
if (receiver == address(0)) revert TychoRouter__AddressZero();
uint256 amount = address(this).balance;
@@ -380,8 +359,9 @@ contract TychoRouter is
* @param amount of WETH to unwrap.
*/
function _unwrapETH(uint256 amount) internal {
uint256 unwrapAmount =
amount == 0 ? _weth.balanceOf(address(this)) : amount;
uint256 unwrapAmount = amount == 0
? _weth.balanceOf(address(this))
: amount;
_weth.withdraw(unwrapAmount);
}
@@ -400,15 +380,14 @@ contract TychoRouter is
bytes calldata msgData
) external {
_handleCallback(
bytes4(0), abi.encodePacked(amount0Delta, amount1Delta, msgData)
bytes4(0),
abi.encodePacked(amount0Delta, amount1Delta, msgData)
);
}
function _unlockCallback(bytes calldata data)
internal
override
returns (bytes memory)
{
function _unlockCallback(
bytes calldata data
) internal override returns (bytes memory) {
require(data.length >= 20, "Invalid data length");
bytes4 selector = bytes4(data[data.length - 24:data.length - 20]);
address executor = address(uint160(bytes20(data[data.length - 20:])));
@@ -419,7 +398,7 @@ contract TychoRouter is
}
// slither-disable-next-line controlled-delegatecall,low-level-calls
(bool success,) = executor.delegatecall(
(bool success, ) = executor.delegatecall(
abi.encodeWithSelector(selector, protocolData)
);
require(success, "delegatecall to uniswap v4 callback failed");

31
foundry/src/executors/BalancerV2Executor.sol
View File

@@ -2,10 +2,7 @@
pragma solidity ^0.8.26;
import "@interfaces/IExecutor.sol";
import {
IERC20,
SafeERC20
} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
// slither-disable-next-line solc-version
import {IAsset} from "@balancer-labs/v2-interfaces/contracts/vault/IAsset.sol";
// slither-disable-next-line solc-version
@@ -19,11 +16,10 @@ contract BalancerV2Executor is IExecutor {
address private constant VAULT = 0xBA12222222228d8Ba445958a75a0704d566BF2C8;
// slither-disable-next-line locked-ether
function swap(uint256 givenAmount, bytes calldata data)
external
payable
returns (uint256 calculatedAmount)
{
function swap(
uint256 givenAmount,
bytes calldata data
) external payable returns (uint256 calculatedAmount) {
(
IERC20 tokenIn,
IERC20 tokenOut,
@@ -55,16 +51,17 @@ contract BalancerV2Executor is IExecutor {
uint256 limit = 0;
calculatedAmount =
IVault(VAULT).swap(singleSwap, funds, limit, block.timestamp);
calculatedAmount = IVault(VAULT).swap(
singleSwap,
funds,
limit,
block.timestamp
);
}
function handleCallback(bytes calldata data)
external
returns (bytes memory result)
{}
function _decodeData(bytes calldata data)
function _decodeData(
bytes calldata data
)
internal
pure
returns (

32
foundry/src/executors/UniswapV2Executor.sol
View File

@@ -11,11 +11,10 @@ contract UniswapV2Executor is IExecutor {
using SafeERC20 for IERC20;
// slither-disable-next-line locked-ether
function swap(uint256 givenAmount, bytes calldata data)
external
payable
returns (uint256 calculatedAmount)
{
function swap(
uint256 givenAmount,
bytes calldata data
) external payable returns (uint256 calculatedAmount) {
address target;
address receiver;
bool zeroForOne;
@@ -33,12 +32,9 @@ contract UniswapV2Executor is IExecutor {
}
}
function handleCallback(bytes calldata data)
external
returns (bytes memory result)
{}
function _decodeData(bytes calldata data)
function _decodeData(
bytes calldata data
)
internal
pure
returns (
@@ -57,20 +53,20 @@ contract UniswapV2Executor is IExecutor {
zeroForOne = uint8(data[60]) > 0;
}
function _getAmountOut(address target, uint256 amountIn, bool zeroForOne)
internal
view
returns (uint256 amount)
{
function _getAmountOut(
address target,
uint256 amountIn,
bool zeroForOne
) internal view returns (uint256 amount) {
IUniswapV2Pair pair = IUniswapV2Pair(target);
uint112 reserveIn;
uint112 reserveOut;
if (zeroForOne) {
// slither-disable-next-line unused-return
(reserveIn, reserveOut,) = pair.getReserves();
(reserveIn, reserveOut, ) = pair.getReserves();
} else {
// slither-disable-next-line unused-return
(reserveOut, reserveIn,) = pair.getReserves();
(reserveOut, reserveIn, ) = pair.getReserves();
}
require(reserveIn > 0 && reserveOut > 0, "L");

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

@@ -2,14 +2,9 @@
pragma solidity ^0.8.26;
import "@interfaces/IExecutor.sol";
import {
IERC20,
SafeERC20
} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {IERC20, SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
import {
Currency, CurrencyLibrary
} from "@uniswap/v4-core/src/types/Currency.sol";
import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol";
import {V4Router} from "@uniswap/v4-periphery/src/V4Router.sol";
@@ -23,13 +18,16 @@ contract UniswapV4Executor is IExecutor, V4Router {
constructor(IPoolManager _poolManager) V4Router(_poolManager) {}
function swap(uint256, bytes calldata data)
external
payable
returns (uint256 calculatedAmount)
{
(address tokenIn, address tokenOut, bool isExactInput, uint256 amount) =
_decodeData(data);
function swap(
uint256,
bytes calldata data
) external payable returns (uint256 calculatedAmount) {
(
address tokenIn,
address tokenOut,
bool isExactInput,
uint256 amount
) = _decodeData(data);
uint256 tokenOutBalanceBefore;
uint256 tokenInBalanceBefore;
@@ -64,7 +62,9 @@ contract UniswapV4Executor is IExecutor, V4Router {
return calculatedAmount;
}
function _decodeData(bytes calldata data)
function _decodeData(
bytes calldata data
)
internal
pure
returns (
@@ -74,15 +74,19 @@ contract UniswapV4Executor is IExecutor, V4Router {
uint256 amount
)
{
(bytes memory actions, bytes[] memory params) =
abi.decode(data, (bytes, bytes[]));
(bytes memory actions, bytes[] memory params) = abi.decode(
data,
(bytes, bytes[])
);
// First byte of actions determines the swap type
uint8 action = uint8(bytes1(actions[0]));
if (action == uint8(Actions.SWAP_EXACT_IN_SINGLE)) {
IV4Router.ExactInputSingleParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactInputSingleParams));
IV4Router.ExactInputSingleParams memory swapParams = abi.decode(
params[0],
(IV4Router.ExactInputSingleParams)
);
tokenIn = swapParams.zeroForOne
? address(uint160(swapParams.poolKey.currency0.toId()))
@@ -93,8 +97,10 @@ contract UniswapV4Executor is IExecutor, V4Router {
isExactInput = true;
amount = swapParams.amountIn;
} else if (action == uint8(Actions.SWAP_EXACT_OUT_SINGLE)) {
IV4Router.ExactOutputSingleParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactOutputSingleParams));
IV4Router.ExactOutputSingleParams memory swapParams = abi.decode(
params[0],
(IV4Router.ExactOutputSingleParams)
);
tokenIn = swapParams.zeroForOne
? address(uint160(swapParams.poolKey.currency0.toId()))
@@ -105,18 +111,23 @@ contract UniswapV4Executor is IExecutor, V4Router {
isExactInput = false;
amount = swapParams.amountOut;
} else if (action == uint8(Actions.SWAP_EXACT_IN)) {
IV4Router.ExactInputParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactInputParams));
IV4Router.ExactInputParams memory swapParams = abi.decode(
params[0],
(IV4Router.ExactInputParams)
);
tokenIn = address(uint160(swapParams.currencyIn.toId()));
PathKey memory lastPath =
swapParams.path[swapParams.path.length - 1];
PathKey memory lastPath = swapParams.path[
swapParams.path.length - 1
];
tokenOut = address(uint160(lastPath.intermediateCurrency.toId()));
isExactInput = true;
amount = swapParams.amountIn;
} else if (action == uint8(Actions.SWAP_EXACT_OUT)) {
IV4Router.ExactOutputParams memory swapParams =
abi.decode(params[0], (IV4Router.ExactOutputParams));
IV4Router.ExactOutputParams memory swapParams = abi.decode(
params[0],
(IV4Router.ExactOutputParams)
);
PathKey memory firstPath = swapParams.path[0];
tokenIn = address(uint160(firstPath.intermediateCurrency.toId()));
@@ -126,21 +137,18 @@ contract UniswapV4Executor is IExecutor, V4Router {
}
}
function _pay(Currency token, address payer, uint256 amount)
internal
override
{
function _pay(
Currency token,
address payer,
uint256 amount
) internal override {
IERC20(Currency.unwrap(token)).safeTransfer(
address(poolManager), amount
address(poolManager),
amount
);
}
function msgSender() public view override returns (address) {
return address(this);
}
function handleCallback(bytes calldata data)
external
returns (bytes memory result)
{}
}