Skip to content

Commit

Permalink
feat: add OptimisticTimelockExecutionStrategy
Browse files Browse the repository at this point in the history
  • Loading branch information
pscott committed Jun 29, 2023
1 parent a98c311 commit e1d55c5
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.18;

import { SimpleQuorumExecutionStrategy } from "../SimpleQuorumExecutionStrategy.sol";
import { OptimisticQuorumExecutionStrategy } from "../OptimisticQuorumExecutionStrategy.sol";
import { SpaceManager } from "../../utils/SpaceManager.sol";
import { MetaTransaction, Proposal, ProposalStatus } from "../../types.sol";
import { Enum } from "@gnosis.pm/safe-contracts/contracts/common/Enum.sol";
Expand All @@ -12,7 +12,7 @@ import { IERC165 } from "@openzeppelin/contracts/interfaces/IERC165.sol";

/// @title Timelock Execution Strategy
/// @notice Used to execute proposal transactions according to a timelock delay.
contract TimelockExecutionStrategy is SimpleQuorumExecutionStrategy, IERC1155Receiver, IERC721Receiver {
contract OptimisticTimelockExecutionStrategy is OptimisticQuorumExecutionStrategy, IERC1155Receiver, IERC721Receiver {
/// @notice Thrown if timelock delay is in the future.
error TimelockDelayNotMet();

Expand Down Expand Up @@ -97,7 +97,7 @@ contract TimelockExecutionStrategy is SimpleQuorumExecutionStrategy, IERC1155Rec
transferOwnership(_owner);
vetoGuardian = _vetoGuardian;
__SpaceManager_init(_spaces);
__SimpleQuorumExecutionStrategy_init(_quorum);
__OptimisticQuorumExecutionStrategy_init(_quorum);
timelockDelay = _timelockDelay;
emit TimelockExecutionStrategySetUp(_owner, _vetoGuardian, _spaces, _quorum, _timelockDelay);
}
Expand Down Expand Up @@ -194,7 +194,7 @@ contract TimelockExecutionStrategy is SimpleQuorumExecutionStrategy, IERC1155Rec

/// @notice Returns the strategy type string.
function getStrategyType() external pure override returns (string memory) {
return "SimpleQuorumTimelock";
return "OptimsticQuorumTimelock";
}

// solhint-disable-next-line no-empty-blocks
Expand Down

0 comments on commit e1d55c5

Please sign in to comment.