c

Author: hazim-j

test/ForwardingAddressFactory.t.sol

@@ -8,6 +8,8 @@ import {Test} from "forge-std/Test.sol";
 import {ForwardingAddress} from "../src/ForwardingAddress.sol";
 import {ForwardingAddressFactory} from "../src/ForwardingAddressFactory.sol";
 
+contract NonPayableReceiver {}
+
 contract ForwardingAddressFactoryTest is Test {
     ForwardingAddressFactory public factory;
     ERC20Mock public erc20Mock;
@@ -24,6 +26,7 @@ contract ForwardingAddressFactoryTest is Test {
         address actualAddress = address(factory.createForwardingAddress(payable(receiver), salt));
 
         assertEq(expectedAddr, actualAddress);
+        assertEq(ForwardingAddress(payable(actualAddress)).receiver(), receiver);
     }
 
     function testFuzz_createForwardingAddressAlreadyDeployed(bytes32 salt) public {
@@ -36,37 +39,57 @@ contract ForwardingAddressFactoryTest is Test {
         assertEq(expectedAddr, actualAddress);
     }
 
+    function testFuzz_saltUniqueness(bytes32 salt1, bytes32 salt2) public {
+        vm.assume(salt1 != salt2);
+        (address receiver,) = makeAddrAndKey("receiver");
+
+        ForwardingAddress f1 = factory.createForwardingAddress(payable(receiver), salt1);
+        ForwardingAddress f2 = factory.createForwardingAddress(payable(receiver), salt2);
+
+        assertNotEq(address(f1), address(f2));
+        assertEq(f1.receiver(), f2.receiver());
+    }
+
+    function testFuzz_receiverUniqueness(bytes32 salt) public {
+        (address r1,) = makeAddrAndKey("r1");
+        (address r2,) = makeAddrAndKey("r2");
+        vm.assume(r1 != r2);
+
+        ForwardingAddress f1 = factory.createForwardingAddress(payable(r1), salt);
+        ForwardingAddress f2 = factory.createForwardingAddress(payable(r2), salt);
+
+        assertNotEq(address(f1), address(f2));
+        assertNotEq(f1.receiver(), f2.receiver());
+    }
+
     function testFuzz_sweepForETH(bytes32 salt, uint256 amount) public {
         (address receiver,) = makeAddrAndKey("receiver");
 
         address forwarder = factory.getAddress(receiver, salt);
-        uint256 initBalance = receiver.balance;
         vm.deal(forwarder, amount);
-        assertEq(receiver.balance, initBalance);
+        assertEq(receiver.balance, 0);
         assertEq(forwarder.balance, amount);
 
         address[] memory tokens = new address[](1);
         tokens[0] = address(0);
         factory.sweepFor(payable(receiver), salt, tokens);
-        assertEq(receiver.balance, initBalance + amount);
+        assertEq(receiver.balance, amount);
         assertEq(forwarder.balance, 0);
     }
 
     function testFuzz_sweepForFailedETHWithdraw(bytes32 salt, uint256 amount) public {
-        // create2Deployer address, a known non payable contract
-        address receiver = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
+        address receiver = address(new NonPayableReceiver());
 
         address forwarder = factory.getAddress(receiver, salt);
-        uint256 initBalance = receiver.balance;
         vm.deal(forwarder, amount);
-        assertEq(receiver.balance, initBalance);
+        assertEq(receiver.balance, 0);
         assertEq(forwarder.balance, amount);
 
         address[] memory tokens = new address[](1);
         tokens[0] = address(0);
         vm.expectRevert(abi.encodeWithSelector(ForwardingAddress.FailedETHWithdraw.selector, receiver, tokens[0]));
         factory.sweepFor(payable(receiver), salt, tokens);
-        assertEq(receiver.balance, initBalance);
+        assertEq(receiver.balance, 0);
         assertEq(forwarder.balance, amount);
     }
 
@@ -89,10 +112,9 @@ contract ForwardingAddressFactoryTest is Test {
         (address receiver,) = makeAddrAndKey("receiver");
 
         address forwarder = factory.getAddress(receiver, salt);
-        uint256 initBalance = receiver.balance;
         vm.deal(forwarder, amount);
         erc20Mock.mint(forwarder, amount);
-        assertEq(receiver.balance, initBalance);
+        assertEq(receiver.balance, 0);
         assertEq(forwarder.balance, amount);
         assertEq(IERC20(address(erc20Mock)).balanceOf(receiver), 0);
         assertEq(IERC20(address(erc20Mock)).balanceOf(forwarder), amount);
@@ -101,7 +123,7 @@ contract ForwardingAddressFactoryTest is Test {
         tokens[0] = address(0);
         tokens[1] = address(erc20Mock);
         factory.sweepFor(payable(receiver), salt, tokens);
-        assertEq(receiver.balance, initBalance + amount);
+        assertEq(receiver.balance, amount);
         assertEq(forwarder.balance, 0);
         assertEq(IERC20(address(erc20Mock)).balanceOf(receiver), amount);
         assertEq(IERC20(address(erc20Mock)).balanceOf(forwarder), 0);