Skip to content

Use SafeERC20 operations #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hazim-j merged 1 commit into from
Sep 9, 2025
Merged

Use SafeERC20 operations #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/ForwardingAddress.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.28;

import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {ReentrancyGuardTransient} from "@openzeppelin/contracts/utils/ReentrancyGuardTransient.sol";
import {Initializable} from "solady/utils/Initializable.sol";
import {IERC20} from "forge-std/interfaces/IERC20.sol";

contract ForwardingAddress is ReentrancyGuardTransient, Initializable {
using SafeERC20 for IERC20;

error FailedETHWithdraw(address receiver, address token);

address payable public receiver;
Expand All @@ -25,7 +28,7 @@ contract ForwardingAddress is ReentrancyGuardTransient, Initializable {
(bool success,) = receiver.call{value: address(this).balance}("");
require(success, FailedETHWithdraw(receiver, token));
} else {
IERC20(token).transfer(receiver, IERC20(token).balanceOf(address(this)));
IERC20(token).safeTransfer(receiver, IERC20(token).balanceOf(address(this)));
}
}
}
57 changes: 56 additions & 1 deletion test/ForwardingAddressFactory.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,45 @@
pragma solidity ^0.8.28;

import {ERC20Mock} from "@openzeppelin/contracts/mocks/token/ERC20Mock.sol";
import {IERC20} from "forge-std/interfaces/IERC20.sol";
import {ERC20NoReturnMock} from "@openzeppelin/contracts/mocks/token/ERC20NoReturnMock.sol";
import {ERC20ReturnFalseMock} from "@openzeppelin/contracts/mocks/token/ERC20ReturnFalseMock.sol";
import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {Test} from "forge-std/Test.sol";

import {ForwardingAddress} from "../src/ForwardingAddress.sol";
import {ForwardingAddressFactory} from "../src/ForwardingAddressFactory.sol";

contract NonPayableReceiver {}

contract ERC20NoReturn is ERC20NoReturnMock {
constructor() ERC20("ERC20Mock", "E20M") {}

function mint(address account, uint256 amount) external {
_mint(account, amount);
}
}

contract ERC20ReturnFalse is ERC20ReturnFalseMock {
constructor() ERC20("ERC20Mock", "E20M") {}

function mint(address account, uint256 amount) external {
_mint(account, amount);
}
}

contract ForwardingAddressFactoryTest is Test {
ForwardingAddressFactory public factory;
ERC20Mock public erc20Mock;
ERC20NoReturn public erc20NoReturn;
ERC20ReturnFalse public erc20ReturnFalse;

function setUp() public {
factory = new ForwardingAddressFactory();
erc20Mock = new ERC20Mock();
erc20NoReturn = new ERC20NoReturn();
erc20ReturnFalse = new ERC20ReturnFalse();
}

function testFuzz_createForwardingAddress(bytes32 salt) public {
Expand Down Expand Up @@ -108,6 +132,37 @@ contract ForwardingAddressFactoryTest is Test {
assertEq(IERC20(address(erc20Mock)).balanceOf(forwarder), 0);
}

function testFuzz_sweepForERC20NoReturn(bytes32 salt, uint256 amount) public {
(address receiver,) = makeAddrAndKey("receiver");

address forwarder = factory.getAddress(receiver, salt);
erc20NoReturn.mint(forwarder, amount);
assertEq(IERC20(address(erc20NoReturn)).balanceOf(receiver), 0);
assertEq(IERC20(address(erc20NoReturn)).balanceOf(forwarder), amount);

address[] memory tokens = new address[](1);
tokens[0] = address(erc20NoReturn);
factory.sweepFor(payable(receiver), salt, tokens);
assertEq(IERC20(address(erc20NoReturn)).balanceOf(receiver), amount);
assertEq(IERC20(address(erc20NoReturn)).balanceOf(forwarder), 0);
}

function testFuzz_sweepForERC20ReturnFalse(bytes32 salt, uint256 amount) public {
(address receiver,) = makeAddrAndKey("receiver");

address forwarder = factory.getAddress(receiver, salt);
erc20ReturnFalse.mint(forwarder, amount);
assertEq(IERC20(address(erc20ReturnFalse)).balanceOf(receiver), 0);
assertEq(IERC20(address(erc20ReturnFalse)).balanceOf(forwarder), amount);

address[] memory tokens = new address[](1);
tokens[0] = address(erc20ReturnFalse);
vm.expectRevert(abi.encodeWithSelector(SafeERC20.SafeERC20FailedOperation.selector, tokens[0]));
factory.sweepFor(payable(receiver), salt, tokens);
assertEq(IERC20(address(erc20ReturnFalse)).balanceOf(receiver), 0);
assertEq(IERC20(address(erc20ReturnFalse)).balanceOf(forwarder), amount);
}

function testFuzz_sweepForMulti(bytes32 salt, uint256 amount) public {
(address receiver,) = makeAddrAndKey("receiver");

Expand Down