feature: new multisig version #19

clauBv23 · 2024-08-21T19:29:16Z

Description

Add condition for create proposal permission.
Define a target that will work as executor instead of DAO
Update the proposal id to be a hash of the proposal's properties.

A couple of things remaining: ???

Task ID: OS-1482, OS-1450

Checklist:

I have selected the correct base branch.
I have performed a self-review of my own code.
I have commented my code, particularly in hard-to-understand areas.
I have made corresponding changes to the documentation.
My changes generate no new warnings.
Any dependent changes have been merged and published in downstream modules.
I created tasks to update dependent repositories (OSx, Plugins)
I ran all tests with success and extended them if necessary.
I have updated the CHANGELOG.md file in the root folder.

…ading

…regresion tests

nivida

We also could generally add FuncDocs to the Solidity contracts.. but this maybe should be done within another PR to keep a narrow scope of changes here :-)

packages/contracts/src/Multisig.sol

packages/contracts/hardhat.config.ts

clauBv23 · 2024-09-13T15:24:02Z

packages/contracts/src/MultisigSetup.sol

+        permissions[1] = PermissionLib.MultiTargetPermission(
+            PermissionLib.Operation.Revoke,
+            _payload.plugin,
+            _dao,
+            PermissionLib.NO_CONDITION,
+            UPGRADE_PLUGIN_PERMISSION_ID
+        );


from v1.3 the UPGRADE_PLUGIN_PERMISSION_ID is not being granted to the DAO, so it doesn’t need to be revoked when uninstalling.
It is already being revoked when upgrading from a previous version

Co-authored-by: Jør∂¡ <[email protected]>

add metadata support

brickpop · 2024-10-08T15:37:34Z

packages/contracts/src/Multisig.sol

@@ -69,15 +74,21 @@ contract Multisig is

    /// @notice The [ERC-165](https://eips.ethereum.org/EIPS/eip-165) interface ID of the contract.
    bytes4 internal constant MULTISIG_INTERFACE_ID =


If this the old interface, I would make it clear by the name.
The new interface is checked via the interface ID

It is not the old one, but in the new code, the IProposal createProposal function was added.

Note that this createProposal function is not needed on the current interface id because it belong to IProposal

brickpop · 2024-10-08T15:41:44Z

packages/contracts/src/Multisig.sol

+        Action[] calldata _actions,
+        bytes memory _metadata


As stated above, createProposal generating the same proposal ID twice for the same data can be a problem for certain cases.

Adding startDate might solve this issue, although my recommendation would be for having a nonce salted with the chain ID and the plugin's address

brickpop · 2024-10-08T15:47:23Z

packages/contracts/src/Multisig.sol

-            _actions: _actions,
-            _allowFailureMap: _allowFailureMap
-        });
+        proposalId = createProposalId(_actions, _metadata);


What happens if I need to submit a recurring proposal each week with identical actions and description?

If I wanted to automate the resubmission from a contract of my own, I wouldn't be able to

I would be forced to append garbage bytes to the metadata URI and corrupt the UI trying to fetch it

Recommendation:

Add the startDate as a salt parameter

Consider having random and unique proposal ID's unless there's a major reason for strong determinism

solved in aragon/osx-commons#106

brickpop · 2024-10-08T15:53:30Z

packages/contracts/src/Multisig.sol

+    }
+
+    /// @inheritdoc IProposal
+    function createProposalParamsABI() external pure override returns (string memory) {


I'm still not sold on the interface name...
Thinking of createProposalDataABI(), customProposalParamsABI() or similar.
Otherwise it sounds as if createProposal() had to have these exact params, instead of talking about data

we ended up agreeing on customProposalParamsABI
aragon/osx-commons#106

brickpop · 2024-10-08T15:58:25Z

packages/contracts/src/MultisigSetup.sol

+    /// @notice The ID of the permission required to call the `upgradeToAndCall` function.
+    bytes32 internal constant UPGRADE_PLUGIN_PERMISSION_ID = keccak256("UPGRADE_PLUGIN_PERMISSION");
+
+    /// @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");
+
+    /// @notice The ID of the permission required to call the `updateMetadata` function.
+    bytes32 public constant UPDATE_METADATA_PERMISSION_ID = keccak256("UPDATE_METADATA_PERMISSION");
+
+    /// @notice The ID of the permission required to call the `updateMultisigSettings` function.
+    bytes32 public constant UPDATE_MULTISIG_SETTINGS_PERMISSION_ID =
+        keccak256("UPDATE_MULTISIG_SETTINGS_PERMISSION");
+


Same as with other plugins, these constants might be better moved as file level constants, living on the lib (osx-common) package

brickpop · 2024-10-08T16:04:14Z

packages/contracts/src/MultisigSetup.sol

+            permissions[1] = PermissionLib.MultiTargetPermission(
+                PermissionLib.Operation.GrantWithCondition,
+                _payload.plugin,
+                address(type(uint160).max), // ANY_ADDR


ANY_ADDR should be imported from PermissionLib, rather than hardcoded

brickpop · 2024-10-08T16:06:03Z

packages/contracts/src/MultisigSetup.sol

@@ -55,10 +82,9 @@ contract MultisigSetup is PluginUpgradeableSetup {
            where: plugin,
            who: _dao,
            condition: PermissionLib.NO_CONDITION,
-            permissionId: Multisig(IMPLEMENTATION).UPDATE_MULTISIG_SETTINGS_PERMISSION_ID()
+            permissionId: UPDATE_MULTISIG_SETTINGS_PERMISSION_ID


Why not importing this from a plugin level library?

brickpop · 2024-10-08T16:06:31Z

packages/contracts/src/MultisigSetup.sol

@@ -67,7 +93,34 @@ contract MultisigSetup is PluginUpgradeableSetup {
            permissionId: EXECUTE_PERMISSION_ID


Why not importing these from OSx common > Executor?

brickpop · 2024-10-08T16:07:14Z

packages/contracts/src/MultisigSetup.sol

+            plugin,
+            address(type(uint160).max), // ANY_ADDR
+            listedCheckCondition,
+            Multisig(IMPLEMENTATION).CREATE_PROPOSAL_PERMISSION_ID()


Why not a file level import from an internal library, rather than calling external instances?

I agree, even when this has not been the pattern so far, I would support your proposal, unless we find a problem with doing it this way

brickpop · 2024-10-08T16:08:48Z

packages/contracts/src/MultisigSetup.sol

+            permissionId: SET_TARGET_CONFIG_PERMISSION_ID
+        });
+
+        permissions[4] = PermissionLib.MultiTargetPermission({
+            operation: PermissionLib.Operation.Grant,
+            where: plugin,
+            who: _dao,
+            condition: PermissionLib.NO_CONDITION,
+            permissionId: UPDATE_METADATA_PERMISSION_ID


Same as above:

file level import from OSx common > IPlugin

file level import from OSx common > IMetadataExtension

packages/contracts/src/Multisig.sol

* fix contracts and test * change * createproposal id include actions * rename

…execute permission

Feature/has succeeded

novaknole and others added 12 commits August 20, 2024 17:51

fix multisig/multisigsetup tests for new implementation

ccb7dee

fix more tests

2ca8113

feat: add unit test for initialize from function

516a532

ci: remove comment

c710d76

feat: add check to ensure the plugin is being reinitialized when upgr…

b2996b6

…ading

fix test

8bfe5d0

ci: remove comment

b80d626

feat: add reinitialization when upgrading plugin and check it on the …

1b24da1

…regresion tests

ci: remove comment

2b679ed

ci: add comment

a50a5c8

ci: update comment

d4e80c0

fix lint

3300d84

nivida reviewed Aug 26, 2024

View reviewed changes

novaknole added 3 commits August 27, 2024 11:02

proposal hash return value

4ef810f

add create proposal id

43ef91e

remove .only

a8c7376

clauBv23 commented Aug 30, 2024

View reviewed changes

packages/contracts/src/Multisig.sol Outdated Show resolved Hide resolved

Merge branch 'feature/multisig-improvements' into feat/add-tests

ae7046c

clauBv23 commented Aug 30, 2024

View reviewed changes

packages/contracts/src/Multisig.sol Outdated Show resolved Hide resolved

novaknole and others added 5 commits September 10, 2024 21:31

initializeFrom and erc165 changes for upgrades

6a2c080

Merge branch 'feature/multisig-improvements' into feat/add-tests

e3cf955

ci: define latest version as constant

31ebac1

feat: fix test for initialize from function

f7ec5fc

fix: upgradeability tests

6f84d88

clauBv23 commented Sep 13, 2024

View reviewed changes

packages/contracts/src/Multisig.sol Outdated Show resolved Hide resolved

clauBv23 commented Sep 13, 2024

View reviewed changes

packages/contracts/src/Multisig.sol Show resolved Hide resolved

clauBv23 commented Sep 13, 2024

View reviewed changes

packages/contracts/hardhat.config.ts Outdated Show resolved Hide resolved

clauBv23 commented Sep 13, 2024

View reviewed changes

novaknole added 2 commits September 19, 2024 13:06

modifier added for safety and target config improved

065802a

add comment

6b6fa6f

novaknole and others added 6 commits October 8, 2024 13:24

Update packages/contracts/src/Multisig.sol

d095f55

Co-authored-by: Jør∂¡ <[email protected]>

Update packages/contracts/src/Multisig.sol

032ea3c

Co-authored-by: Jør∂¡ <[email protected]>

Update packages/contracts/src/Multisig.sol

8e66bfa

Co-authored-by: Jør∂¡ <[email protected]>

permission added

fc1381d

rename

732bf42

Merge pull request #24 from aragon/feature/metadata

eded00b

add metadata support

brickpop requested changes Oct 8, 2024

View reviewed changes

brickpop mentioned this pull request Oct 8, 2024

Build 1.2 new changes aragon/admin-plugin#18

Merged

brickpop reviewed Oct 8, 2024

View reviewed changes

packages/contracts/src/Multisig.sol Show resolved Hide resolved

brickpop mentioned this pull request Oct 8, 2024

WIP 🚧 feat: token voting target improvements aragon/token-voting-plugin#30

Closed

novaknole and others added 18 commits October 9, 2024 17:23

metadata rename

3cea0c5

fix contracts and test (#25)

2141a95

* fix contracts and test * change * createproposal id include actions * rename

feat: add auth to execute() and update Setup & testing

da23965

add test for recording vote with tryExecution when caller don't have …

343b352

…execute permission

comment

7b948f2

remove .only

005aacb

add hassucceeded

c674484

comments in tests

c8a4f3c

reverts

682b074

remove .only

76ee964

Merge pull request #26 from aragon/feature/hasSucceeded

8d3268a

Feature/has succeeded

docgen

a51622d

new line comment

5b5fe64

original comment

752fff1

multi line comment

ceee8fd

comments

42948ff

add docgen

9115d42

reorder comment

2818638

novaknole merged commit af77951 into develop Nov 5, 2024
2 of 7 checks passed

novaknole deleted the feature/multisig-improvements branch November 5, 2024 11:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: new multisig version #19

feature: new multisig version #19

clauBv23 commented Aug 21, 2024 •

edited by jira bot

Loading

nivida left a comment

clauBv23 Sep 13, 2024

brickpop Oct 8, 2024

clauBv23 Oct 14, 2024

brickpop Oct 8, 2024

brickpop Oct 8, 2024

clauBv23 Oct 14, 2024 •

edited

Loading

brickpop Oct 8, 2024

clauBv23 Oct 14, 2024

brickpop Oct 8, 2024

brickpop Oct 8, 2024

brickpop Oct 8, 2024

brickpop Oct 8, 2024

brickpop Oct 8, 2024

clauBv23 Oct 14, 2024 •

edited

Loading

brickpop Oct 8, 2024

		@@ -69,15 +74,21 @@ contract Multisig is

		/// @notice The [ERC-165](https://eips.ethereum.org/EIPS/eip-165) interface ID of the contract.
		bytes4 internal constant MULTISIG_INTERFACE_ID =

		@@ -67,7 +93,34 @@ contract MultisigSetup is PluginUpgradeableSetup {
		permissionId: EXECUTE_PERMISSION_ID

feature: new multisig version #19

feature: new multisig version #19

Conversation

clauBv23 commented Aug 21, 2024 • edited by jira bot Loading

Description

Checklist:

nivida left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

clauBv23 Oct 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

clauBv23 Oct 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

clauBv23 commented Aug 21, 2024 •

edited by jira bot

Loading

clauBv23 Oct 14, 2024 •

edited

Loading

clauBv23 Oct 14, 2024 •

edited

Loading