[ETHEREUM-CONTRACTS] split DMZForwarder into SimpleForwarder and ERC2771Forwarder (#2037)

* split into SimpleForwarder and ERC2771Forwarder
* rename SuperfluidFrameworkDeployer.sol to SuperfluidFrameworkDeployer.t.sol and FoundrySuperfluidTester.sol to FoundrySuperfluidTester.t.sol
* allow oversized test contracts

Author: d10r

packages/automation-contracts/autowrap/test/Manager.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/superfluid/SuperToken.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { Manager } from "./../contracts/Manager.sol";
 import { IManager } from "./../contracts/interfaces/IManager.sol";
 import { WrapStrategy } from "./../contracts/strategies/WrapStrategy.sol";

packages/automation-contracts/autowrap/test/WrapStrategy.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/superfluid/SuperToken.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { Manager } from "./../contracts/Manager.sol";
 import { WrapStrategy } from "./../contracts/strategies/WrapStrategy.sol";
 import { IStrategy } from "./../contracts/interfaces/IStrategy.sol";

packages/automation-contracts/autowrap/test/WrapUp.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/superfluid/SuperToken.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { Manager } from "./../contracts/Manager.sol";
 import { WrapStrategy } from "./../contracts/strategies/WrapStrategy.sol";
 import { ISETH } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/tokens/ISETH.sol";

packages/automation-contracts/scheduler/test/FlowScheduler.t.sol

@@ -5,7 +5,7 @@ import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/in
 import { FlowOperatorDefinitions } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import { IFlowScheduler } from "./../contracts/interface/IFlowScheduler.sol";
 import { FlowScheduler } from "./../contracts/FlowScheduler.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { SuperToken } from "@superfluid-finance/ethereum-contracts/contracts/superfluid/SuperToken.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 

packages/automation-contracts/scheduler/test/FlowSchedulerResolver.t.sol

@@ -5,7 +5,7 @@ import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/in
 import { FlowOperatorDefinitions } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import { FlowScheduler } from "./../contracts/FlowScheduler.sol";
 import { FlowSchedulerResolver } from "./../contracts/FlowSchedulerResolver.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { SuperToken } from "@superfluid-finance/ethereum-contracts/contracts/superfluid/SuperToken.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 

packages/automation-contracts/scheduler/test/VestingScheduler.t.sol

@@ -5,7 +5,7 @@ import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/in
 import { FlowOperatorDefinitions } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import { IVestingScheduler } from "./../contracts/interface/IVestingScheduler.sol";
 import { VestingScheduler } from "./../contracts/VestingScheduler.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 
 /// @title VestingSchedulerTests

packages/automation-contracts/scheduler/test/VestingSchedulerV2.StatefulFuzz.t.sol

@@ -5,7 +5,7 @@ import {ISuperToken} from "@superfluid-finance/ethereum-contracts/contracts/inte
 import {FlowOperatorDefinitions} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import {IVestingSchedulerV2} from "./../contracts/interface/IVestingSchedulerV2.sol";
 import {VestingSchedulerV2} from "./../contracts/VestingSchedulerV2.sol";
-import {FoundrySuperfluidTester} from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import {FoundrySuperfluidTester} from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import {SuperTokenV1Library} from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 import "forge-std/console2.sol";
 

packages/automation-contracts/scheduler/test/VestingSchedulerV2.t.sol

@@ -5,7 +5,7 @@ import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/in
 import { FlowOperatorDefinitions, ISuperfluid, BatchOperation, ISuperApp } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import { IVestingSchedulerV2 } from "./../contracts/interface/IVestingSchedulerV2.sol";
 import { VestingSchedulerV2 } from "./../contracts/VestingSchedulerV2.sol";
-import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.sol";
+import { FoundrySuperfluidTester } from "@superfluid-finance/ethereum-contracts/test/foundry/FoundrySuperfluidTester.t.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 import { SafeMath } from "@openzeppelin/contracts/utils/math/SafeMath.sol";
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";

packages/ethereum-contracts/CHANGELOG.md

@@ -3,6 +3,18 @@ All notable changes to the ethereum-contracts will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+* `ISuperfluid.getERC2771Forwarder()`: to be used by batch call targets who want to use ERC-2771 for msg sender preservation.
+* Utility contracts for forwarding of calls in the context of batch operations:
+  * `SimpleForwarder`: for forwarding arbitrary calls to arbitrary targets
+  * `ERC2771Forwarder`: for forwarding arbitrary calls to arbitrary targets with msg sender authenticated according to ERC-2771. Requires the target contract to recognize it as trusted forwarder.
+
+### Breaking
+* Source file `SuperfluidFrameworkDeployer.sol` renamed to `SuperfluidFrameworkDeployer.t.sol`
+* Source file `FoundrySuperfluidTester.sol` renamed to `FoundrySuperfluidTester.t.sol`
+
 ## [v1.11.1]
 
 ### Changed

packages/ethereum-contracts/contracts/interfaces/superfluid/Definitions.sol

@@ -231,17 +231,22 @@ library BatchOperation {
      */
     uint32 constant internal OPERATION_TYPE_SUPERFLUID_CALL_APP_ACTION = 2 + 200;
     /**
-     * @dev DMZForwarder.forwardCall batch operation type
+     * @dev SimpleForwarder.forwardCall batch operation type
      *
      * Call spec:
      * forwardCall(
      *     target,
      *     data
      * )
+     * NOTE: This operation allows to make arbitrary calls to arbitrary targets.
+     * The calls are routed through a dedicated utility contract `SimpleForwarder`.
+     * This is important because the host contract has privileged access to other framework contracts,
+     * SuperTokens, SuperApps etc.
+     * Allowing arbitrary calls to arbitrary targets with the host as sender would thus be unsafe.
      */
     uint32 constant internal OPERATION_TYPE_SIMPLE_FORWARD_CALL = 1 + 300;
     /**
-     * @dev DMZForwarder.forward2771Call batch operation type
+     * @dev ERC2771Forwarder.forward2771Call batch operation type
      *
      * Call spec:
      * forward2771Call(
@@ -250,17 +255,17 @@ library BatchOperation {
      *     data
      * )
      *
-     * NOTE: In the context of this operation, the `DZMForwarder` contract acts as the
+     * NOTE: In the context of this operation, the `ERC2771Forwarder` contract acts as the
      * _trusted forwarder_ which must be trusted by the _recipient contract_ (operation target).
-     * It shall do so by dynamically looking up the DMZForwarder used by the host, like this:
+     * It shall do so by dynamically looking up the ERC2771Forwarder used by the host, like this:
      *
      * function isTrustedForwarder(address forwarder) public view returns(bool) {
-     *     return forwarder == address(host.DMZ_FORWARDER());
+     *     return forwarder == address(host.getERC2771Forwarder());
      * }
      *
      * If used in the context of a `forwardBatchCall`, we effectively have a chaining/nesting
      * of ERC-2771 calls where the host acts as _recipient contract_ of the enveloping 2771 call
-     * and the DMZForwarder acts as the _trusted forwarder_ of the nested 2771 call(s).
+     * and the ERC2771Forwarder acts as the _trusted forwarder_ of the nested 2771 call(s).
      * That's why `msgSender` could be either the actual `msg.sender` (if using `batchCall`)
      * or the relayed sender address (if using `forwardBatchCall`).
      */