Skip to content
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

audit: disable timelock in constructor #224

Merged
merged 3 commits into from
Jun 27, 2023
Merged

audit: disable timelock in constructor #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bfc119
refactor: constructor disables timelock
Jun 26, 2023
242301a
chore: remove non proxy timelock tests
Jun 26, 2023
2f4a178
chore: remove constructor params
Jun 26, 2023
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
19 changes: 5 additions & 14 deletions src/execution-strategies/TimelockExecutionStrategy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,11 @@ contract TimelockExecutionStrategy is SimpleQuorumExecutionStrategy, IERC1155Rec
/// renounce ownership of the contract while still maintaining a veto guardian.
address public vetoGuardian;

/// @notice Constructor
/// @param _owner Address of the owner of this contract.
/// @param _vetoGuardian Address of the veto guardian.
/// @param _spaces Array of whitelisted space contracts.
/// @param _timelockDelay The timelock delay in seconds.
/// @param _quorum The quorum required to execute a proposal.
constructor(
address _owner,
address _vetoGuardian,
address[] memory _spaces,
uint256 _timelockDelay,
uint256 _quorum
) {
setUp(abi.encode(_owner, _vetoGuardian, _spaces, _timelockDelay, _quorum));
/// @notice Constructor.
/// @dev We enforce implementations of this contract to be disabled as a security measure to prevent delegate
/// calls to the SELFDESTRUCT opcode, irrecoverably disabling all the proxies using that implementation.
constructor() {
setUp(abi.encode(address(1), address(1), new address[](0), 0, 0));
}

/// @notice Initialization function, should be called immediately after deploying a new proxy to this contract.
Expand Down
25 changes: 1 addition & 24 deletions test/TimelockExecutionStrategy.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,6 @@ abstract contract TimelockExecutionStrategyTest is SpaceTest {
}

function testSetUp() public {
address[] memory spaces = new address[](1);
spaces[0] = address(space);
timelockExecutionStrategy = new TimelockExecutionStrategy(owner, vetoGuardian, spaces, 1000, quorum);

assertEq(timelockExecutionStrategy.owner(), owner);
assertEq(timelockExecutionStrategy.vetoGuardian(), vetoGuardian);
assertEq(timelockExecutionStrategy.quorum(), quorum);
Expand All @@ -520,33 +516,14 @@ abstract contract TimelockExecutionStrategyTest is SpaceTest {
}
}

contract TimelockExecutionStrategyTestDirect is TimelockExecutionStrategyTest {
function setUp() public override {
super.setUp();

address[] memory spaces = new address[](1);
spaces[0] = address(space);

timelockExecutionStrategy = new TimelockExecutionStrategy(owner, vetoGuardian, spaces, 1000, quorum);
vm.deal(address(owner), 1000);
payable(timelockExecutionStrategy).transfer(1000);
}
}

contract TimelockExecutionStrategyTestProxy is TimelockExecutionStrategyTest {
function setUp() public override {
super.setUp();

address[] memory spaces = new address[](1);
spaces[0] = address(space);
address[] memory emptyArray = new address[](1);
TimelockExecutionStrategy masterExecutionStrategy = new TimelockExecutionStrategy(
address(1),
address(0),
emptyArray,
0,
0
);
TimelockExecutionStrategy masterExecutionStrategy = new TimelockExecutionStrategy();

timelockExecutionStrategy = TimelockExecutionStrategy(
payable(
Expand Down