Do Governance Proposals with Signatures (#429)

* Deployment with Governance proposal * Fix launch date * Split proposal * Full proposal execution flow * Get rid of hardcoded timestamps * Update readme * Tweaks * Fix rewards fork test * Round up * Fix tests * Make proposal desc more detailed * Do governance proposals using plain text signatures * Handle vote casting * Fix syntax * Prettify --------- Co-authored-by: Shahul Hameed <[email protected]>
OriginProtocol · Jun 7, 2024 · 9076abb · 9076abb
1 parent 1d7d90e
commit 9076abb
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/contracts/utils/GovProposalHelper.sol b/contracts/utils/GovProposalHelper.sol
@@ -25,28 +25,34 @@ struct GovProposal {
 library GovProposalHelper {
     function id(GovProposal memory prop) internal view returns (uint256 proposalId) {
         bytes32 descriptionHash = keccak256(bytes(prop.description));
-        (address[] memory targets, uint256[] memory values, bytes[] memory calldatas) = getParams(prop);
+        (address[] memory targets, uint256[] memory values,,, bytes[] memory calldatas) = getParams(prop);
 
         proposalId = uint256(keccak256(abi.encode(targets, values, calldatas, descriptionHash)));
     }
 
     function getParams(GovProposal memory prop)
         internal
         view
-        returns (address[] memory targets, uint256[] memory values, bytes[] memory calldatas)
+        returns (
+            address[] memory targets,
+            uint256[] memory values,
+            string[] memory sigs,
+            bytes[] memory data,
+            bytes[] memory calldatas
+        )
     {
         uint256 actionLen = prop.actions.length;
         targets = new address[](actionLen);
         values = new uint256[](actionLen);
 
-        string[] memory sigs = new string[](actionLen);
-        bytes[] memory data = new bytes[](actionLen);
+        sigs = new string[](actionLen);
+        data = new bytes[](actionLen);
 
         for (uint256 i = 0; i < actionLen; ++i) {
             targets[i] = prop.actions[i].target;
+            values[i] = prop.actions[i].value;
             sigs[i] = prop.actions[i].fullsig;
             data[i] = prop.actions[i].data;
-            values[i] = prop.actions[i].value;
         }
 
         calldatas = _encodeCalldata(sigs, data);
@@ -77,10 +83,11 @@ library GovProposalHelper {
     }
 
     function getProposeCalldata(GovProposal memory prop) internal view returns (bytes memory proposeCalldata) {
-        (address[] memory targets, uint256[] memory values, bytes[] memory calldatas) = getParams(prop);
+        (address[] memory targets, uint256[] memory values, string[] memory sigs, bytes[] memory data,) =
+            getParams(prop);
 
         proposeCalldata = abi.encodeWithSignature(
-            "propose(address[],uint256[],bytes[],string)", targets, values, calldatas, prop.description
+            "propose(address[],uint256[],string[], bytes[],string)", targets, values, sigs, data, prop.description
         );
     }
 
@@ -148,7 +155,7 @@ library GovProposalHelper {
         if (state == IGovernor.ProposalState.Active) {
             console.log("Voting on proposal...");
             // Vote on proposal
-            governance.castVote(proposalId, 1);
+            try governance.castVote(proposalId, 1) {} catch {}
             // Wait for voting to end
             vm.roll(governance.proposalDeadline(proposalId) + 20);
             vm.warp(block.timestamp + 2 days);