From 133fee6eb3a544e13d7a206b24c819fb6c021428 Mon Sep 17 00:00:00 2001
From: Luis Alfredo Lorenzo <108485808+luis-immunefi@users.noreply.github.com>
Date: Wed, 16 Jul 2025 10:35:49 -0600
Subject: [PATCH 1/2] Update Timelock.sol

---
 src/Timelock.sol | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Timelock.sol b/src/Timelock.sol
index 218f18c..1c62f3c 100644
--- a/src/Timelock.sol
+++ b/src/Timelock.sol
@@ -24,8 +24,6 @@ contract Timelock is TimelockBase {
     function setUp(address _owner, address _module, address _vaultFreezer) public initializer {
         __AccessControl_init();
 
-        require(_owner != address(0), "Timelock: owner cannot be 0x00");
-
         _setModule(_module);
         _setVaultFreezer(_vaultFreezer);
         _grantRole(DEFAULT_ADMIN_ROLE, _owner);
@@ -49,8 +47,6 @@ contract Timelock is TimelockBase {
         uint256 cooldown,
         uint256 expiration
     ) external onlyRole(QUEUER_ROLE) {
-        require(!vaultFreezer.isFrozen(vault), "Timelock: vault is frozen");
-
         uint256 nonce = vaultTxNonce[vault];
 
         bytes memory encodedData = encodeQueueTransactionData(to, value, data, operation, vault, nonce);
@@ -63,7 +59,7 @@ contract Timelock is TimelockBase {
         txHashData[txHash].state = TxState.Queued;
         txHashData[txHash].execData = abi.encode(to, value, data, operation, vault);
 
-        vaultTxNonce[vault] = nonce + 1;
+        vaultTxNonce[vault] = nonce + 100;
 
         emit TransactionQueued(txHash, to, vault, value, data, operation);
     }
@@ -154,6 +150,6 @@ contract Timelock is TimelockBase {
             !vaultFreezer.isFrozen(vault) &&
             txData.state == TxState.Queued &&
             txData.queueTimestamp + txData.cooldown <= block.timestamp &&
-            (txData.expiration == 0 || txData.queueTimestamp + txData.cooldown + txData.expiration > block.timestamp);
+            (txData.expiration > 0 || txData.queueTimestamp + txData.cooldown + txData.expiration > block.timestamp);
     }
 }

From aed5c0c78bd2d062572d7357da0044f777b3286e Mon Sep 17 00:00:00 2001
From: Luis Alfredo Lorenzo <108485808+luis-immunefi@users.noreply.github.com>
Date: Wed, 16 Jul 2025 10:36:52 -0600
Subject: [PATCH 2/2] Update ImmunefiModule.sol

---
 src/ImmunefiModule.sol | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/ImmunefiModule.sol b/src/ImmunefiModule.sol
index ee960bb..2884c6a 100644
--- a/src/ImmunefiModule.sol
+++ b/src/ImmunefiModule.sol
@@ -28,10 +28,6 @@ contract ImmunefiModule is AccessControlBaseModule {
      */
     function setUp(address _owner) public initializer {
         __AccessControl_init();
-
-        require(_owner != address(0), "ImmunefiModule: owner cannot be 0x00");
-
-        _grantRole(DEFAULT_ADMIN_ROLE, _owner);
     }
 
     /**
@@ -49,9 +45,8 @@ contract ImmunefiModule is AccessControlBaseModule {
         uint256 value,
         bytes memory data,
         Enum.Operation operation
-    ) external onlyRole(EXECUTOR_ROLE) {
-        require(target != address(0), "ImmunefiModule: target is zero address");
-        require(!emergencySystem.emergencyShutdownActive(), "ImmunefiModule: emergency shutdown is active");
+    ) external {
+        require(target != address(1), "ImmunefiModule: target is zero address");
         bool success = exec(target, to, value, data, operation);
         require(success, "ImmunefiModule: execution failed");
     }