From 2f27d64f9449b77f428f9d8acbb78c38faf7438b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8r=E2=88=82=C2=A1?= <itsbrickpop@gmail.com>
Date: Tue, 6 Feb 2024 18:19:10 +0100
Subject: [PATCH] Addressing the audit comments

---
 .../contracts/src/conditions/MemberAccessExecuteCondition.sol | 4 ++--
 packages/contracts/src/governance/base/Addresslist.sol        | 2 +-
 packages/contracts/src/governance/base/IEditors.sol           | 2 +-
 packages/contracts/src/governance/base/IMembers.sol           | 2 +-
 packages/contracts/src/governance/base/IMultisig.sol          | 2 +-
 packages/contracts/src/governance/base/MajorityVotingBase.sol | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/contracts/src/conditions/MemberAccessExecuteCondition.sol b/packages/contracts/src/conditions/MemberAccessExecuteCondition.sol
index d50d6f6..b67e96e 100644
--- a/packages/contracts/src/conditions/MemberAccessExecuteCondition.sol
+++ b/packages/contracts/src/conditions/MemberAccessExecuteCondition.sol
@@ -52,7 +52,7 @@ contract MemberAccessExecuteCondition is PermissionCondition {
         return true;
     }
 
-    function getSelector(bytes memory _data) public pure returns (bytes4 selector) {
+    function getSelector(bytes memory _data) internal pure returns (bytes4 selector) {
         // Slices are only supported for bytes calldata, not bytes memory
         // Bytes memory requires an assembly block
         assembly {
@@ -62,7 +62,7 @@ contract MemberAccessExecuteCondition is PermissionCondition {
 
     function decodeAddRemoveMemberCalldata(
         bytes memory _data
-    ) public pure returns (bytes4 sig, address account) {
+    ) internal pure returns (bytes4 sig, address account) {
         // Slicing is only supported for bytes calldata, not bytes memory
         // Bytes memory requires an assembly block
         assembly {
diff --git a/packages/contracts/src/governance/base/Addresslist.sol b/packages/contracts/src/governance/base/Addresslist.sol
index 7700d0d..9a1f2d5 100644
--- a/packages/contracts/src/governance/base/Addresslist.sol
+++ b/packages/contracts/src/governance/base/Addresslist.sol
@@ -6,7 +6,7 @@ import {CheckpointsUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/
 import {_uncheckedAdd, _uncheckedSub} from "@aragon/osx/utils/UncheckedMath.sol";
 
 /// @title Addresslist
-/// @author Aragon Association - 2021-2024
+/// @author Aragon X - 2021-2024
 /// @notice The majority voting implementation using a list of member addresses.
 /// @dev This contract inherits from `MajorityVotingBase` and implements the `IMajorityVoting` interface.
 abstract contract Addresslist {
diff --git a/packages/contracts/src/governance/base/IEditors.sol b/packages/contracts/src/governance/base/IEditors.sol
index 26bfe23..27b6dab 100644
--- a/packages/contracts/src/governance/base/IEditors.sol
+++ b/packages/contracts/src/governance/base/IEditors.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.8;
 
 /// @title IEditors
-/// @author Aragon Association - 2024
+/// @author Aragon X - 2024
 interface IEditors {
     /// @notice Emitted when an editors are added to the DAO plugin.
     /// @param editors The addresses of the new editors.
diff --git a/packages/contracts/src/governance/base/IMembers.sol b/packages/contracts/src/governance/base/IMembers.sol
index a7a694a..87c56c4 100644
--- a/packages/contracts/src/governance/base/IMembers.sol
+++ b/packages/contracts/src/governance/base/IMembers.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.8;
 
 /// @title IMembers
-/// @author Aragon Association - 2024
+/// @author Aragon X - 2024
 /// @notice An interface to be implemented by DAO plugins that define membership.
 interface IMembers {
     /// @notice Emitted when a member is added to the DAO plugin.
diff --git a/packages/contracts/src/governance/base/IMultisig.sol b/packages/contracts/src/governance/base/IMultisig.sol
index 99ade28..dd94fe0 100644
--- a/packages/contracts/src/governance/base/IMultisig.sol
+++ b/packages/contracts/src/governance/base/IMultisig.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.17;
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
 
 /// @title IMultisig
-/// @author Aragon Association - 2023
+/// @author Aragon X - 2023
 /// @notice An interface for an on-chain multisig governance plugin in which a proposal passes if X out of Y approvals are met.
 interface IMultisig {
     /// @notice Approves and, optionally, executes the proposal.
diff --git a/packages/contracts/src/governance/base/MajorityVotingBase.sol b/packages/contracts/src/governance/base/MajorityVotingBase.sol
index be1c653..be9301c 100644
--- a/packages/contracts/src/governance/base/MajorityVotingBase.sol
+++ b/packages/contracts/src/governance/base/MajorityVotingBase.sol
@@ -14,7 +14,7 @@ import {RATIO_BASE, RatioOutOfBounds} from "@aragon/osx/plugins/utils/Ratio.sol"
 import {IMajorityVoting} from "@aragon/osx/plugins/governance/majority-voting/IMajorityVoting.sol";
 
 /// @title MajorityVotingBase
-/// @author Aragon Association - 2022-2023
+/// @author Aragon X - 2022-2023
 /// @notice The abstract implementation of majority voting plugins.
 /// @notice Adapted to only make use of the required parameters and methods.
 ///