Replace timelock wrappers with a calldata generator

Author: sunbreak1211

deploy/L2PASSpell.sol

@@ -27,13 +27,11 @@ contract L2PASSpell {
     address public immutable beamState;
     address public immutable configurator;
     address public immutable timelock;
-    address public immutable wrapper;
 
-    constructor(address beamState_, address configurator_, address timelock_, address wrapper_) {
+    constructor(address beamState_, address configurator_, address timelock_) {
         beamState    = beamState_;
         configurator = configurator_;
         timelock     = timelock_;
-        wrapper      = wrapper_;
     }
 
     function init(
@@ -49,6 +47,5 @@ contract L2PASSpell {
         });
 
         PASInit.init(pas, minDelay, coreCouncil, cancellers, pausers);
-        PASInit.initTimelockWrapper(pas, wrapper, coreCouncil);
     }
 }

deploy/PASDeploy.sol

@@ -21,8 +21,7 @@ import { PASInstance } from "./PASInstance.sol";
 import { BeamState } from "src/BeamState.sol";
 import { Configurator } from "src/Configurator.sol";
 import { Timelock } from "src/timelock/Timelock.sol";
-import { TimelockWrapperMainnet } from "src/timelock/TimelockWrapperMainnet.sol";
-import { TimelockWrapperForeign } from "src/timelock/TimelockWrapperForeign.sol";
+import { TimelockCalldataGenerator } from "src/timelock/TimelockCalldataGenerator.sol";
 import { PASMom } from "src/PASMom.sol";
 
 library PASDeploy {
@@ -53,29 +52,13 @@ library PASDeploy {
         PASMom(mom).setOwner(owner);
     }
 
-    function deployTimelockWrapperMainnet(
-        address deployer,
-        address owner,
-        address timelock,
-        address beamState
-    ) internal returns (address timelockWrapperMainnet) {
-        timelockWrapperMainnet = address(new TimelockWrapperMainnet(
-            timelock,
-            beamState
-        ));
-        ScriptTools.switchOwner(timelockWrapperMainnet, deployer, owner);
-    }
-
-    function deployTimelockWrapperForeign(
-        address deployer,
-        address owner,
+    function deployTimelockCalldataGenerator(
         address timelock,
         address beamState
-    ) internal returns (address timelockWrapperForeign) {
-        timelockWrapperForeign = address(new TimelockWrapperForeign(
+    ) internal returns (address timelockCalldataGenerator) {
+        timelockCalldataGenerator = address(new TimelockCalldataGenerator(
             timelock,
             beamState
         ));
-        ScriptTools.switchOwner(timelockWrapperForeign, deployer, owner);
     }
 }

deploy/PASInit.sol

@@ -55,12 +55,6 @@ interface TimelockLike {
     function grantRole(bytes32, address) external;
 }
 
-interface TimelockWrapperLike {
-    function timelock() external view returns (address);
-    function beamState() external view returns (address);
-    function kiss(address) external;
-}
-
 interface PASMomLike {
     function beamState() external view returns (address);
     function timelock() external view returns (address);
@@ -198,24 +192,4 @@ library PASInit {
 
         dss.chainlog.setAddress(key, address(mom));
     }
-
-    function initTimelockWrapper(
-        PASInstance memory pasInstance,
-        address timelockWrapper_,
-        address coreCouncil
-    ) internal {
-        TimelockLike        timelock        = TimelockLike(pasInstance.timelock);
-        TimelockWrapperLike timelockWrapper = TimelockWrapperLike(timelockWrapper_);
-
-        // --- Sanity checks ---
-
-        require(timelockWrapper.timelock()  == pasInstance.timelock,  "PASInit/wrapper-timelock-mismatch");
-        require(timelockWrapper.beamState() == pasInstance.beamState, "PASInit/wrapper-beamState-mismatch");
-
-        // --- Set permissions ---
-
-        // Grant the coreCouncil as the proposer through the wrapper
-        timelock.grantRole(timelock.PROPOSER_ROLE(), address(timelockWrapper));
-        timelockWrapper.kiss(coreCouncil);
-    }
 }