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.

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

Enable Transfer ETH from Timelock #177

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
6 changes: 3 additions & 3 deletions contracts/Governance/GovernorBravoDelegate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ contract GovernorBravoDelegate is GovernorBravoDelegateStorageV2, GovernorBravoE
string public constant name = "Compound Governor Bravo";

/// @notice The minimum setable proposal threshold
uint public constant MIN_PROPOSAL_THRESHOLD = 50000e18; // 50,000 Comp
uint public constant MIN_PROPOSAL_THRESHOLD = 1000e18; // 1,000 Comp

/// @notice The maximum setable proposal threshold
uint public constant MAX_PROPOSAL_THRESHOLD = 100000e18; //100,000 Comp
Expand Down Expand Up @@ -139,12 +139,12 @@ contract GovernorBravoDelegate is GovernorBravoDelegateStorageV2, GovernorBravoE
* @notice Executes a queued proposal if eta has passed
* @param proposalId The id of the proposal to execute
*/
function execute(uint proposalId) external payable {
function execute(uint proposalId) external {
require(state(proposalId) == ProposalState.Queued, "GovernorBravo::execute: proposal can only be executed if it is queued");
Proposal storage proposal = proposals[proposalId];
proposal.executed = true;
for (uint i = 0; i < proposal.targets.length; i++) {
timelock.executeTransaction.value(proposal.values[i])(proposal.targets[i], proposal.values[i], proposal.signatures[i], proposal.calldatas[i], proposal.eta);
timelock.executeTransaction(proposal.targets[i], proposal.values[i], proposal.signatures[i], proposal.calldatas[i], proposal.eta);
}
emit ProposalExecuted(proposalId);
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/Governance/GovernorBravoDelegateG1.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma experimental ABIEncoderV2;

import "./GovernorBravoInterfaces.sol";

contract GovernorBravoDelegate is GovernorBravoDelegateStorageV1, GovernorBravoEvents {
contract GovernorBravoDelegateG1 is GovernorBravoDelegateStorageV1, GovernorBravoEvents {

/// @notice The name of this contract
string public constant name = "Compound Governor Bravo";
Expand Down
432 changes: 432 additions & 0 deletions contracts/Governance/GovernorBravoDelegateG2.sol

Large diffs are not rendered by default.

Loading