Skip to content

TEST - CLOSE ME #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
luis-immunefi wants to merge 2 commits into from
Closed

TEST - CLOSE ME #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
133fee6
Update Timelock.sol
luis-immunefi Jul 16, 2025
aed5c0c
Update ImmunefiModule.sol
luis-immunefi Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/ImmunefiModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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");
}
Expand Down
8 changes: 2 additions & 6 deletions src/Timelock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
}