Remove TransferFrom Functionality, Rename

Author: agureev

contracts/src/forwarders/ERC20Forwarder.sol

@@ -54,40 +54,27 @@ contract ERC20Forwarder is EmergencyMigratableForwarderBase {
     function _forwardCall(bytes calldata input) internal override returns (bytes memory output) {
         ERC20ForwarderInput.CallType callType = ERC20ForwarderInput.CallType(uint8(input[31]));
 
-        if (callType == ERC20ForwarderInput.CallType.Transfer) {
+        if (callType == ERC20ForwarderInput.CallType.Unwrap) {
             // slither-disable-next-line unused-return
             (
                 , // CallType
                 address token,
                 address to,
                 uint256 value
-            ) = input.decodeTransfer();
+            ) = input.decodeUnwrap();
 
             emit Unwrapped({token: token, to: to, value: value});
 
             IERC20(token).safeTransfer({to: to, value: value});
-        } else if (callType == ERC20ForwarderInput.CallType.TransferFrom) {
-            // slither-disable-next-line unused-return
-            (
-                , // CallType
-                address token,
-                address from,
-                uint256 value
-            ) = input.decodeTransferFrom();
-
-            emit Wrapped({token: token, from: from, value: value});
-
-            // slither-disable-next-line arbitrary-send-erc20
-            IERC20(token).safeTransferFrom({from: from, to: address(this), value: value});
-        } else if (callType == ERC20ForwarderInput.CallType.PermitWitnessTransferFrom) {
+        } else if (callType == ERC20ForwarderInput.CallType.Wrap) {
             // slither-disable-next-line unused-return
             (
                 , // CallType
                 address from,
                 ISignatureTransfer.PermitTransferFrom memory permit,
                 bytes32 witness,
                 bytes memory signature
-            ) = input.decodePermitWitnessTransferFrom();
+            ) = input.decodeWrap();
 
             if (permit.permitted.amount > type(uint128).max) {
                 revert TypeOverflow({limit: type(uint128).max, actual: permit.permitted.amount});

contracts/src/forwarders/ERC20ForwarderInput.sol

@@ -10,18 +10,17 @@ import {ISignatureTransfer} from "@permit2/src/interfaces/IPermit2.sol";
 /// @custom:security-contact security@anoma.foundation
 library ERC20ForwarderInput {
     enum CallType {
-        Transfer,
-        TransferFrom,
-        PermitWitnessTransferFrom
+        Unwrap,
+        Wrap
     }
 
     /// @notice Encodes the input for the ERC-20 transfer call.
     /// @param token The ERC-20 token.
     /// @param to The address receiving the tokens.
     /// @param value The value to send.
     /// @return input The encoded input.
-    function encodeTransfer(address token, address to, uint128 value) public pure returns (bytes memory input) {
-        input = abi.encode(CallType.Transfer, token, to, value);
+    function encodeUnwrap(address token, address to, uint128 value) public pure returns (bytes memory input) {
+        input = abi.encode(CallType.Unwrap, token, to, value);
     }
 
     /// @notice Decodes the input for the ERC-20 transfer call.
@@ -31,51 +30,27 @@ library ERC20ForwarderInput {
     /// @return to The address receiving the tokens.
     /// @return value The value to send. Note that value is limited to `uint128` to fit the in the
     /// `Resource.quantity` field.
-    function decodeTransfer(bytes calldata input)
+    function decodeUnwrap(bytes calldata input)
         public
         pure
         returns (CallType callType, address token, address to, uint128 value)
     {
         (callType, token, to, value) = abi.decode(input, (CallType, address, address, uint128));
     }
 
-    /// @notice Encodes the input for the ERC-20 `transferFrom` call.
-    /// @param token The ERC-20 token.
-    /// @param from The address to withdraw the tokens from.
-    /// @param value The value to send.
-    /// @return input The encoded input.
-    function encodeTransferFrom(address token, address from, uint256 value) public pure returns (bytes memory input) {
-        input = abi.encode(CallType.TransferFrom, token, from, value);
-    }
-
-    /// @notice Decodes the input for the ERC-20 `transferFrom` call.
-
-    /// @param input The encoded input.
-    /// @return callType The call type.
-    /// @return token The ERC-20 token.
-    /// @return from The address to withdraw the tokens from.
-    /// @return value The value to send.
-    function decodeTransferFrom(bytes calldata input)
-        public
-        pure
-        returns (CallType callType, address token, address from, uint128 value)
-    {
-        (callType, token, from, value) = abi.decode(input, (CallType, address, address, uint128));
-    }
-
     /// @notice Encodes the input for the Permit2 `permitWitnessTransferFrom` call.
     /// @param from The address to withdraw the tokens from.
     /// @param permit The permit data constituted by the token address, token amount, nonce, and deadline.
     /// @param witness The witness information.
     /// @param signature The signature over the `PermitWitnessTransferFrom` message.
     /// @return input The encoded input.
-    function encodePermitWitnessTransferFrom(
+    function encodeWrap(
         address from,
         ISignatureTransfer.PermitTransferFrom memory permit,
         bytes32 witness,
         bytes memory signature
     ) public pure returns (bytes memory input) {
-        input = abi.encode(CallType.PermitWitnessTransferFrom, from, permit, witness, signature);
+        input = abi.encode(CallType.Wrap, from, permit, witness, signature);
     }
 
     /// @notice Decodes the input for the Permit2 `permitWitnessTransferFrom` call.
@@ -85,7 +60,7 @@ library ERC20ForwarderInput {
     /// @return permit The permit data constituted by the token address, token amount, nonce, and deadline.
     /// @return witness The witness information.
     /// @return signature The signature over the `PermitWitnessTransferFrom` message.
-    function decodePermitWitnessTransferFrom(bytes calldata input)
+    function decodeWrap(bytes calldata input)
         public
         pure
         returns (

contracts/test/ERC20Forwarder.t.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.30;
 
-import {IERC20Errors} from "@openzeppelin-contracts/interfaces/draft-IERC6093.sol";
 import {ERC20} from "@openzeppelin-contracts/token/ERC20/ERC20.sol";
 import {Time} from "@openzeppelin-contracts/utils/types/Time.sol";
 import {IPermit2, ISignatureTransfer} from "@permit2/src/interfaces/IPermit2.sol";
@@ -95,13 +94,13 @@ contract ERC20ForwarderTest is Test {
         }
     }
 
-    function test_forwardCall_Transfer_call_sends_funds_to_the_user() public {
+    function test_forwardCall_Unwrap_call_sends_funds_to_the_user() public {
         _erc20.mint({to: _fwd, value: _TRANSFER_AMOUNT});
         uint256 startBalanceAlice = _erc20.balanceOf(_alice);
         uint256 startBalanceForwarder = _erc20.balanceOf(_fwd);
 
         bytes memory input =
-            ERC20ForwarderInput.encodeTransfer({token: address(_erc20), to: _alice, value: _TRANSFER_AMOUNT});
+            ERC20ForwarderInput.encodeUnwrap({token: address(_erc20), to: _alice, value: _TRANSFER_AMOUNT});
 
         vm.prank(_pa);
         bytes memory output = ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
@@ -111,76 +110,25 @@ contract ERC20ForwarderTest is Test {
         assertEq(_erc20.balanceOf(_fwd), startBalanceForwarder - _TRANSFER_AMOUNT);
     }
 
-    function test_forwardCall_Transfer_call_emits_the_Unwrapped_event() public {
+    function test_forwardCall_Unwrap_call_emits_the_Unwrapped_event() public {
         _erc20.mint({to: _fwd, value: _TRANSFER_AMOUNT});
         bytes memory input =
-            ERC20ForwarderInput.encodeTransfer({token: address(_erc20), to: _alice, value: _TRANSFER_AMOUNT});
+            ERC20ForwarderInput.encodeUnwrap({token: address(_erc20), to: _alice, value: _TRANSFER_AMOUNT});
 
         vm.prank(_pa);
         vm.expectEmit(address(_fwd));
         emit ERC20Forwarder.Unwrapped({token: address(_erc20), to: _alice, value: _TRANSFER_AMOUNT});
         ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
     }
 
-    function test_forwardCall_TransferFrom_call_reverts_if_user_did_not_approve_the_forwarder() public {
+    function test_forwardCall_Wrap_call_reverts_if_user_did_not_approve_permit2() public {
         _erc20.mint({to: _alice, value: _TRANSFER_AMOUNT});
 
-        bytes memory input =
-            ERC20ForwarderInput.encodeTransferFrom({token: address(_erc20), from: _alice, value: _TRANSFER_AMOUNT});
-
-        uint256 allowance = _erc20.allowance({owner: _alice, spender: _fwd});
-
-        vm.prank(_pa);
-        vm.expectRevert(
-            abi.encodeWithSelector(
-                IERC20Errors.ERC20InsufficientAllowance.selector, address(_fwd), allowance, _TRANSFER_AMOUNT
-            ),
-            address(_erc20)
-        );
-        ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
-    }
-
-    function test_forwardCall_TransferFrom_call_pulls_funds_from_user() public {
-        _erc20.mint({to: _alice, value: _TRANSFER_AMOUNT});
-        uint256 startBalanceAlice = _erc20.balanceOf(_alice);
-        uint256 startBalanceForwarder = _erc20.balanceOf(_fwd);
-
-        vm.prank(_alice);
-        _erc20.approve(_fwd, type(uint256).max);
-
-        bytes memory input =
-            ERC20ForwarderInput.encodeTransferFrom({token: address(_erc20), from: _alice, value: _TRANSFER_AMOUNT});
-
-        vm.prank(_pa);
-        bytes memory output = ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
-
-        assertEq(keccak256(output), keccak256(_EXPECTED_OUTPUT));
-        assertEq(_erc20.balanceOf(_alice), startBalanceAlice - _TRANSFER_AMOUNT);
-        assertEq(_erc20.balanceOf(_fwd), startBalanceForwarder + _TRANSFER_AMOUNT);
-    }
-
-    function test_forwardCall_TransferFrom_call_emits_the_Wrapped_event() public {
-        _erc20.mint({to: _alice, value: _TRANSFER_AMOUNT});
-        vm.prank(_alice);
-        _erc20.approve(_fwd, type(uint256).max);
-
-        bytes memory input =
-            ERC20ForwarderInput.encodeTransferFrom({token: address(_erc20), from: _alice, value: _TRANSFER_AMOUNT});
-
-        vm.prank(_pa);
-        vm.expectEmit(address(_fwd));
-        emit ERC20Forwarder.Wrapped({token: address(_erc20), from: _alice, value: _TRANSFER_AMOUNT});
-        ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
-    }
-
-    function test_forwardCall_PermitTransferFrom_call_reverts_if_user_did_not_approve_permit2() public {
-        _erc20.mint({to: _alice, value: _TRANSFER_AMOUNT});
-
-        bytes memory input = ERC20ForwarderInput.encodePermitWitnessTransferFrom({
+        bytes memory input = ERC20ForwarderInput.encodeWrap({
             from: _alice,
             permit: _defaultPermit,
             witness: _ACTION_TREE_ROOT,
-            signature: _createPermitWitnessTransferFromSignature({
+            signature: _createWrapSignature({
                 permit: _defaultPermit,
                 privateKey: _ALICE_PRIVATE_KEY,
                 spender: _fwd,
@@ -193,16 +141,16 @@ contract ERC20ForwarderTest is Test {
         ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
     }
 
-    function test_forwardCall_PermitTransferFrom_call_reverts_if_the_signature_expired() public {
+    function test_forwardCall_Wrap_call_reverts_if_the_signature_expired() public {
         _erc20.mint({to: _alice, value: _TRANSFER_AMOUNT});
         vm.prank(_alice);
         _erc20.approve(address(_permit2), type(uint256).max);
 
-        bytes memory input = ERC20ForwarderInput.encodePermitWitnessTransferFrom({
+        bytes memory input = ERC20ForwarderInput.encodeWrap({
             from: _alice,
             permit: _defaultPermit,
             witness: _ACTION_TREE_ROOT,
-            signature: _createPermitWitnessTransferFromSignature({
+            signature: _createWrapSignature({
                 permit: _defaultPermit,
                 privateKey: _ALICE_PRIVATE_KEY,
                 spender: _fwd,
@@ -218,16 +166,16 @@ contract ERC20ForwarderTest is Test {
         ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
     }
 
-    function test_forwardCall_PermitTransferFrom_call_reverts_if_the_signature_was_already_used() public {
+    function test_forwardCall_Wrap_call_reverts_if_the_signature_was_already_used() public {
         _erc20.mint({to: _alice, value: 2 * _TRANSFER_AMOUNT});
         vm.prank(_alice);
         _erc20.approve(address(_permit2), type(uint256).max);
 
-        bytes memory input = ERC20ForwarderInput.encodePermitWitnessTransferFrom({
+        bytes memory input = ERC20ForwarderInput.encodeWrap({
             from: _alice,
             permit: _defaultPermit,
             witness: _ACTION_TREE_ROOT,
-            signature: _createPermitWitnessTransferFromSignature({
+            signature: _createWrapSignature({
                 permit: _defaultPermit,
                 privateKey: _ALICE_PRIVATE_KEY,
                 spender: _fwd,
@@ -244,7 +192,7 @@ contract ERC20ForwarderTest is Test {
         ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
     }
 
-    function test_forwardCall_PermitWitnessTransferFrom_call_reverts_if_the_amount_to_be_wrapped_overflows() public {
+    function test_forwardCall_Wrap_call_reverts_if_the_amount_to_be_wrapped_overflows() public {
         uint256 maxAmount = type(uint128).max;
 
         _erc20.mint({to: _alice, value: maxAmount + 1});
@@ -257,11 +205,11 @@ contract ERC20ForwarderTest is Test {
             deadline: Time.timestamp() + 5 minutes
         });
 
-        bytes memory input = ERC20ForwarderInput.encodePermitWitnessTransferFrom({
+        bytes memory input = ERC20ForwarderInput.encodeWrap({
             from: _alice,
             permit: permit,
             witness: _ACTION_TREE_ROOT,
-            signature: _createPermitWitnessTransferFromSignature({
+            signature: _createWrapSignature({
                 permit: permit,
                 privateKey: _ALICE_PRIVATE_KEY,
                 spender: _fwd,
@@ -284,11 +232,11 @@ contract ERC20ForwarderTest is Test {
         vm.prank(_alice);
         _erc20.approve(address(_permit2), type(uint256).max);
 
-        bytes memory input = ERC20ForwarderInput.encodePermitWitnessTransferFrom({
+        bytes memory input = ERC20ForwarderInput.encodeWrap({
             from: _alice,
             permit: _defaultPermit,
             witness: _ACTION_TREE_ROOT,
-            signature: _createPermitWitnessTransferFromSignature({
+            signature: _createWrapSignature({
                 permit: _defaultPermit,
                 privateKey: _ALICE_PRIVATE_KEY,
                 spender: _fwd,
@@ -310,11 +258,11 @@ contract ERC20ForwarderTest is Test {
         vm.prank(_alice);
         _erc20.approve(address(_permit2), type(uint256).max);
 
-        bytes memory input = ERC20ForwarderInput.encodePermitWitnessTransferFrom({
+        bytes memory input = ERC20ForwarderInput.encodeWrap({
             from: _alice,
             permit: _defaultPermit,
             witness: _ACTION_TREE_ROOT,
-            signature: _createPermitWitnessTransferFromSignature({
+            signature: _createWrapSignature({
                 permit: _defaultPermit,
                 privateKey: _ALICE_PRIVATE_KEY,
                 spender: _fwd,
@@ -328,13 +276,13 @@ contract ERC20ForwarderTest is Test {
         ERC20Forwarder(_fwd).forwardCall({logicRef: _CALLDATA_CARRIER_LOGIC_REF, input: input});
     }
 
-    function _createPermitWitnessTransferFromSignature(
+    function _createWrapSignature(
         ISignatureTransfer.PermitTransferFrom memory permit,
         address spender,
         uint256 privateKey,
         bytes32 witness
     ) internal view returns (bytes memory signature) {
-        bytes32 digest = _computePermitWitnessTransferFromDigest({permit: permit, spender: spender, witness: witness});
+        bytes32 digest = _computeWrapDigest({permit: permit, spender: spender, witness: witness});
 
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(privateKey, digest);
         return abi.encodePacked(r, s, v);
@@ -345,11 +293,11 @@ contract ERC20ForwarderTest is Test {
     /// @param spender The address being allowed to execute the `permitWitnessTransferFrom` call.
     /// @param witness The witness information.
     /// @return digest The digest.
-    function _computePermitWitnessTransferFromDigest(
-        ISignatureTransfer.PermitTransferFrom memory permit,
-        address spender,
-        bytes32 witness
-    ) internal view returns (bytes32 digest) {
+    function _computeWrapDigest(ISignatureTransfer.PermitTransferFrom memory permit, address spender, bytes32 witness)
+        internal
+        view
+        returns (bytes32 digest)
+    {
         string memory witnessTypeString = "bytes32 witness";
 
         bytes32 structHash = keccak256(