bytes param added

aragon · Sep 19, 2024 · 96bf27b · 96bf27b
1 parent b2eef30
commit 96bf27b
Show file tree

Hide file tree

Showing 11 changed files with 375 additions and 149 deletions.
diff --git a/packages/contracts/src/MajorityVotingBase.sol b/packages/contracts/src/MajorityVotingBase.sol
@@ -377,7 +377,9 @@ abstract contract MajorityVotingBase is
     }
 
     /// @inheritdoc IMajorityVoting
-    function canExecute(uint256 _proposalId) public view virtual override(IMajorityVoting, IProposal) returns (bool) {
+    function canExecute(
+        uint256 _proposalId
+    ) public view virtual override(IMajorityVoting, IProposal) returns (bool) {
         return _canExecute(_proposalId);
     }
 

diff --git a/packages/contracts/src/TokenVoting.sol b/packages/contracts/src/TokenVoting.sol
@@ -11,6 +11,7 @@ import {_applyRatioCeiled} from "@aragon/osx-commons-contracts/src/utils/math/Ra
 
 import {IDAO} from "@aragon/osx-commons-contracts/src/dao/IDAO.sol";
 import {MajorityVotingBase} from "./MajorityVotingBase.sol";
+import {IProposal} from "@aragon/osx-commons-contracts/src/plugin/extensions/proposal/IProposal.sol";
 
 /// @title TokenVoting
 /// @author Aragon X - 2021-2023
@@ -68,12 +69,12 @@ contract TokenVoting is IMembership, MajorityVotingBase {
     /// @dev WARNING: The contract should only be upgradeable through PSP to ensure that _fromBuild is not incorrectly passed, and that the appropriate permissions for the upgrade are properly configured.
     /// @param _fromBuild The build version number of the previous implementation contract this upgrade is transitioning from.
     /// @param _initData The initialization data to be passed to via `upgradeToAndCall` (see [ERC-1967](https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Upgrade)).
-    function initializeFrom(
-        uint16 _fromBuild,
-        bytes calldata _initData
-    ) external reinitializer(2) {
-        if(_fromBuild < 3) {
-            (uint256 minApprovals, TargetConfig memory targetConfig) = abi.decode(_initData, (uint256, TargetConfig));
+    function initializeFrom(uint16 _fromBuild, bytes calldata _initData) external reinitializer(2) {
+        if (_fromBuild < 3) {
+            (uint256 minApprovals, TargetConfig memory targetConfig) = abi.decode(
+                _initData,
+                (uint256, TargetConfig)
+            );
             _updateMinApprovals(minApprovals);
 
             _setTargetConfig(targetConfig);
@@ -178,14 +179,46 @@ contract TokenVoting is IMembership, MajorityVotingBase {
         );
     }
 
+    /// @inheritdoc IProposal
     function createProposal(
         bytes calldata _metadata,
         IDAO.Action[] calldata _actions,
         uint64 _startDate,
-        uint64 _endDate
+        uint64 _endDate,
+        bytes memory _data
     ) external override returns (uint256 proposalId) {
-        // Calls public function for permission check.
-        proposalId = createProposal(_metadata, _actions, 0, _startDate, _endDate, VoteOption.None, false);
+        // Note that this calls public function for permission check.
+        if (_data.length == 0) {
+            // Proposal can still be created with default values.
+            proposalId = createProposal(
+                _metadata,
+                _actions,
+                0,
+                _startDate,
+                _endDate,
+                VoteOption.None,
+                false
+            );
+        } else {
+            (uint256 allowFailureMap, VoteOption _voteOption, bool tryEarlyExecution) = abi.decode(
+                _data,
+                (uint256, VoteOption, bool)
+            );
+            proposalId = createProposal(
+                _metadata,
+                _actions,
+                allowFailureMap,
+                _startDate,
+                _endDate,
+                _voteOption,
+                tryEarlyExecution
+            );
+        }
+    }
+
+    /// @inheritdoc IProposal
+    function createProposalParams() external pure override returns (string memory) {
+        return "[uint256 allowFailureMap, uint8 voteOption, bool tryEarlyExecution]";
     }
 
     /// @inheritdoc IMembership

diff --git a/packages/contracts/src/TokenVotingSetup.sol b/packages/contracts/src/TokenVotingSetup.sol
@@ -40,7 +40,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
     /// @dev TODO: Migrate this constant to a common library that can be shared across plugins.
     bytes32 public constant EXECUTE_PERMISSION_ID = keccak256("EXECUTE_PERMISSION");
 
-     /// @notice The ID of the permission required to call the `setTargetConfig` function.
+    /// @notice The ID of the permission required to call the `setTargetConfig` function.
     bytes32 public constant SET_TARGET_CONFIG_PERMISSION_ID =
         keccak256("SET_TARGET_CONFIG_PERMISSION");
 
@@ -283,10 +283,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
             preparedSetupData.helpers = new address[](1);
             preparedSetupData.helpers[0] = votingPowerCondition;
 
-            initData = abi.encodeCall(
-                TokenVoting.initializeFrom,
-                (_fromBuild, _payload.data)
-            );
+            initData = abi.encodeCall(TokenVoting.initializeFrom, (_fromBuild, _payload.data));
         }
     }
 

diff --git a/packages/contracts/src/VotingPowerCondition.sol b/packages/contracts/src/VotingPowerCondition.sol
@@ -27,7 +27,7 @@ contract VotingPowerCondition is PermissionCondition {
         (_where, _data, _permissionId);
 
         uint256 minProposerVotingPower_ = TOKEN_VOTING.minProposerVotingPower();
-    
+
         if (minProposerVotingPower_ != 0) {
             if (
                 VOTING_TOKEN.getVotes(_who) < minProposerVotingPower_ &&

diff --git a/packages/contracts/src/mocks/MajorityVotingMock.sol b/packages/contracts/src/mocks/MajorityVotingMock.sol
@@ -33,14 +33,27 @@ contract MajorityVotingMock is MajorityVotingBase {
         return 0;
     }
 
-     function createProposal(
+    function createProposal(
         bytes calldata _metadata,
         IDAO.Action[] calldata _actions,
         uint64 _startDate,
-        uint64 _endDate
+        uint64 _endDate,
+        bytes memory
     ) external pure override returns (uint256 proposalId) {
         // Calls public function for permission check.
-        proposalId = createProposal(_metadata, _actions, 0, _startDate, _endDate, VoteOption.None, false);
+        proposalId = createProposal(
+            _metadata,
+            _actions,
+            0,
+            _startDate,
+            _endDate,
+            VoteOption.None,
+            false
+        );
+    }
+
+    function createProposalParams() external pure override returns (string memory) {
+        return "[uint256 allowFailureMap, uint8 voteOption, bool tryEarlyExecution]";
     }
 
     function totalVotingPower(uint256 /* _blockNumber */) public pure override returns (uint256) {