Skip to content

Feat/virtual #68

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.

Sign up for GitHub

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

Merged
brickpop merged 3 commits into from
Jul 21, 2026
Merged

Feat/virtual #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ddb05a
add virtual keywords to multisig
giorgilagidze Jul 20, 2026
4fda69b
prettier fix
giorgilagidze Jul 20, 2026
70a69cb
update build to 4
giorgilagidze Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/contracts/plugin-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const LISTED_CHECK_CONDITION_CONTRACT_NAME = 'ListedCheckCondition';
// For more details, visit https://devs.aragon.org/docs/osx/how-it-works/framework/plugin-management/plugin-repo.
export const VERSION: VersionTag = {
release: 1, // Increment this number ONLY if breaking/incompatible changes were made. Updates between releases are NOT possible.
build: 3, // Increment this number if non-breaking/compatible changes were made. Updates to newer builds are possible.
build: 4, // Increment this number if non-breaking/compatible changes were made. Updates to newer builds are possible.
};

export const METADATA = {
Expand Down
38 changes: 21 additions & 17 deletions packages/contracts/src/Multisig.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ contract Multisig is
/// @dev Requires the `UPDATE_MULTISIG_SETTINGS_PERMISSION_ID` permission.
function addAddresses(
address[] calldata _members
) external auth(UPDATE_MULTISIG_SETTINGS_PERMISSION_ID) {
) public virtual auth(UPDATE_MULTISIG_SETTINGS_PERMISSION_ID) {
uint256 newAddresslistLength = addresslistLength() + _members.length;

// Check if the new address list length would be greater than `type(uint16).max`, the maximal number of
Expand All @@ -258,7 +258,7 @@ contract Multisig is
/// @dev Requires the `UPDATE_MULTISIG_SETTINGS_PERMISSION_ID` permission.
function removeAddresses(
address[] calldata _members
) external auth(UPDATE_MULTISIG_SETTINGS_PERMISSION_ID) {
) public virtual auth(UPDATE_MULTISIG_SETTINGS_PERMISSION_ID) {
uint16 newAddresslistLength = uint16(addresslistLength() - _members.length);

// Check if the new address list length would become less than the current minimum number of approvals required.
Expand All @@ -279,7 +279,7 @@ contract Multisig is
/// @param _multisigSettings The new settings.
function updateMultisigSettings(
MultisigSettings calldata _multisigSettings
) external auth(UPDATE_MULTISIG_SETTINGS_PERMISSION_ID) {
) public virtual auth(UPDATE_MULTISIG_SETTINGS_PERMISSION_ID) {
_updateMultisigSettings(_multisigSettings);
}

Expand All @@ -305,7 +305,7 @@ contract Multisig is
bool _tryExecution,
uint64 _startDate,
uint64 _endDate
) public auth(CREATE_PROPOSAL_PERMISSION_ID) returns (uint256 proposalId) {
) public virtual auth(CREATE_PROPOSAL_PERMISSION_ID) returns (uint256 proposalId) {
uint64 snapshotBlock;
unchecked {
// The snapshot block must be mined already to protect the transaction against backrunning transactions
Expand Down Expand Up @@ -380,7 +380,7 @@ contract Multisig is
uint64 _startDate,
uint64 _endDate,
bytes memory _data
) external override returns (uint256 proposalId) {
) public virtual override returns (uint256 proposalId) {
// Custom parameters
uint256 _allowFailureMap;
bool _approveProposal;
Expand All @@ -406,7 +406,7 @@ contract Multisig is
}

/// @inheritdoc IProposal
function customProposalParamsABI() external pure override returns (string memory) {
function customProposalParamsABI() public pure virtual override returns (string memory) {
return "(uint256 allowFailureMap, bool approveProposal, bool tryExecution)";
}

Expand All @@ -415,7 +415,7 @@ contract Multisig is
/// Execution will only proceed if the proposal is no longer open, the minimum approval requirements are met,
/// and the caller has been granted execution permission. If execution conditions are not met,
/// the function does not revert.
function approve(uint256 _proposalId, bool _tryExecution) public {
function approve(uint256 _proposalId, bool _tryExecution) public virtual {
address approver = _msgSender();
if (!_canApprove(_proposalId, approver)) {
revert ApprovalCastForbidden(_proposalId, approver);
Expand Down Expand Up @@ -447,7 +447,7 @@ contract Multisig is

/// @inheritdoc IMultisig
/// @dev Reverts if the proposal with the given `_proposalId` does not exist.
function canApprove(uint256 _proposalId, address _account) external view returns (bool) {
function canApprove(uint256 _proposalId, address _account) public view virtual returns (bool) {
if (!_proposalExists(_proposalId)) {
revert NonexistentProposal(_proposalId);
}
Expand All @@ -459,7 +459,7 @@ contract Multisig is
/// @dev Reverts if the proposal with the given `_proposalId` does not exist.
function canExecute(
uint256 _proposalId
) external view virtual override(IMultisig, IProposal) returns (bool) {
) public view virtual override(IMultisig, IProposal) returns (bool) {
if (!_proposalExists(_proposalId)) {
revert NonexistentProposal(_proposalId);
}
Expand All @@ -468,7 +468,7 @@ contract Multisig is
}

/// @inheritdoc IProposal
function hasSucceeded(uint256 _proposalId) external view virtual override returns (bool) {
function hasSucceeded(uint256 _proposalId) public view virtual override returns (bool) {
if (!_proposalExists(_proposalId)) {
revert NonexistentProposal(_proposalId);
}
Expand All @@ -493,6 +493,7 @@ contract Multisig is
)
public
view
virtual
returns (
bool executed,
uint16 approvals,
Expand All @@ -515,7 +516,7 @@ contract Multisig is
/// @inheritdoc IMultisig
/// @dev May return false if the `_proposalId` or `_account` do not exist,
/// as the function does not verify their existence.
function hasApproved(uint256 _proposalId, address _account) public view returns (bool) {
function hasApproved(uint256 _proposalId, address _account) public view virtual returns (bool) {
return proposals[_proposalId].approvers[_account];
}

Expand All @@ -524,7 +525,7 @@ contract Multisig is
/// @dev Reverts if the proposal is still open or if the minimum approval threshold has not been met.
function execute(
uint256 _proposalId
) public override(IMultisig, IProposal) auth(EXECUTE_PROPOSAL_PERMISSION_ID) {
) public virtual override(IMultisig, IProposal) auth(EXECUTE_PROPOSAL_PERMISSION_ID) {
if (!_canExecute(_proposalId)) {
revert ProposalExecutionForbidden(_proposalId);
}
Expand All @@ -533,14 +534,14 @@ contract Multisig is
}

/// @inheritdoc IMembership
function isMember(address _account) external view returns (bool) {
function isMember(address _account) public view virtual returns (bool) {
return isListed(_account);
}

/// @notice Internal function to execute a proposal.
/// @dev It assumes the queried proposal exists.
/// @param _proposalId The ID of the proposal.
function _execute(uint256 _proposalId) internal {
function _execute(uint256 _proposalId) internal virtual {
Proposal storage proposal_ = proposals[_proposalId];

proposal_.executed = true;
Expand Down Expand Up @@ -569,7 +570,10 @@ contract Multisig is
/// @param _proposalId The ID of the proposal.
/// @param _account The account to check.
/// @return Returns `true` if the given account can approve on a certain proposal and `false` otherwise.
function _canApprove(uint256 _proposalId, address _account) internal view returns (bool) {
function _canApprove(
uint256 _proposalId,
address _account
) internal view virtual returns (bool) {
Proposal storage proposal_ = proposals[_proposalId];

if (!_isProposalOpen(proposal_)) {
Expand All @@ -594,7 +598,7 @@ contract Multisig is
/// @dev It assumes the queried proposal exists.
/// @param _proposalId The ID of the proposal.
/// @return Returns `true` if the proposal can be executed and `false` otherwise.
function _canExecute(uint256 _proposalId) internal view returns (bool) {
function _canExecute(uint256 _proposalId) internal view virtual returns (bool) {
Proposal storage proposal_ = proposals[_proposalId];

// Verify that the proposal has not been executed or expired.
Expand All @@ -618,7 +622,7 @@ contract Multisig is

/// @notice Internal function to update the plugin settings.
/// @param _multisigSettings The new settings.
function _updateMultisigSettings(MultisigSettings calldata _multisigSettings) internal {
function _updateMultisigSettings(MultisigSettings calldata _multisigSettings) internal virtual {
uint16 addresslistLength_ = uint16(addresslistLength());

if (_multisigSettings.minApprovals > addresslistLength_) {
Expand Down
Loading