- Properly decode, update tests with proper decoding - Added test case for each transfer method - Also fully tested permit2 transferFrom and it works perfectly. NOTE: UniswapV3 doesn't support NONE as a transfer method. TODO: - Fix integration tests once encoding is implemented.
54 lines
1.7 KiB
Solidity
54 lines
1.7 KiB
Solidity
// SPDX-License-Identifier: BUSL-1.1
|
|
pragma solidity ^0.8.26;
|
|
|
|
import "@interfaces/IExecutor.sol";
|
|
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
|
import "@permit2/src/interfaces/IAllowanceTransfer.sol";
|
|
|
|
error ExecutorTransferMethods__InvalidPermit2();
|
|
|
|
contract ExecutorTransferMethods {
|
|
using SafeERC20 for IERC20;
|
|
|
|
IAllowanceTransfer public immutable permit2;
|
|
|
|
enum TransferMethod {
|
|
// Assume funds are in the TychoRouter - transfer into the pool
|
|
TRANSFER,
|
|
// Assume funds are in msg.sender's wallet - transferFrom into the pool
|
|
TRANSFERFROM,
|
|
// Assume funds are in msg.sender's wallet - permit2TransferFrom into the pool
|
|
TRANSFERPERMIT2,
|
|
// Assume funds have already been transferred into the pool. Do nothing.
|
|
NONE
|
|
}
|
|
|
|
constructor(address _permit2) {
|
|
if (_permit2 == address(0)) {
|
|
revert ExecutorTransferMethods__InvalidPermit2();
|
|
}
|
|
permit2 = IAllowanceTransfer(_permit2);
|
|
}
|
|
|
|
function _transfer(
|
|
IERC20 tokenIn,
|
|
address sender,
|
|
address receiver,
|
|
uint256 amount,
|
|
TransferMethod method
|
|
) internal {
|
|
if (method == TransferMethod.TRANSFER) {
|
|
tokenIn.safeTransfer(receiver, amount);
|
|
} else if (method == TransferMethod.TRANSFERFROM) {
|
|
tokenIn.safeTransferFrom(sender, receiver, amount);
|
|
} else if (method == TransferMethod.TRANSFERPERMIT2) {
|
|
// Permit2.permit is already called from the TychoRouter
|
|
permit2.transferFrom(
|
|
sender, receiver, uint160(amount), address(tokenIn)
|
|
);
|
|
} else {
|
|
// Funds are likely already in pool. Do nothing.
|
|
}
|
|
}
|
|
}
|