Merge branch 'develop' into feature/OS-669-dao-refactoring

aragon · Aug 30, 2023 · 8c3f223 · 8c3f223
2 parents 602e22c + e880f89
commit 8c3f223
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 12 deletions.
diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md
@@ -22,6 +22,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed unused `ERC1271Mock` contract.
 - Removed the `setSignatureValidator` function and `signatureValidator` variable in `DAO`. In places, where the function must remain to not alter the `IDAO` interface ID, it will revert and explanatory notes are put in place..
 
+## v1.3.1-rc0
+
+### Added
+
+### Changed
+
+- Added missing `virtual` keyword to `PermissionCondition` and `PermissionConditionUpgradeable`.
+
+### Removed
+
 ## v1.3.0-rc0
 
 ### Added

diff --git a/...-to-guides/02-plugin-development/03-non-upgradeable-plugin/02-implementation.md b/...-to-guides/02-plugin-development/03-non-upgradeable-plugin/02-implementation.md
@@ -1,5 +1,5 @@
 ---
-title: Building the Plugin Implementation Contract
+title: Plugin Implementation Contract
 ---
 
 ## How to Build a Non-Upgradeable Plugin

diff --git a/...sx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/03-setup.md b/...sx/02-how-to-guides/02-plugin-development/03-non-upgradeable-plugin/03-setup.md
@@ -1,5 +1,5 @@
 ---
-title: Building the Plugin Setup Contract
+title: Plugin Setup Contract
 ---
 
 ## What is the Plugin Setup contract?

diff --git a/...-how-to-guides/02-plugin-development/04-upgradeable-plugin/02-implementation.md b/...-how-to-guides/02-plugin-development/04-upgradeable-plugin/02-implementation.md
@@ -1,5 +1,5 @@
 ---
-title: The Plugin Implementation Contract
+title: Plugin Implementation Contract
 ---
 
 ## How to build an Upgradeable Plugin implementation contract

diff --git a/...cs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/03-setup.md b/...cs/osx/02-how-to-guides/02-plugin-development/04-upgradeable-plugin/03-setup.md
@@ -1,5 +1,5 @@
 ---
-title: The Plugin Setup Contract
+title: Plugin Setup Contract
 ---
 
 ## How to build the Plugin Setup Contract for Upgradeable Plugins

diff --git a/...w-to-guides/02-plugin-development/04-upgradeable-plugin/05-updating-versions.md b/...w-to-guides/02-plugin-development/04-upgradeable-plugin/05-updating-versions.md
@@ -1,5 +1,5 @@
 ---
-title: Upgrade the Plugin
+title: Upgrade a DAO Plugin
 ---
 
 ## How to upgrade an Upgradeable Plugin

diff --git a/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/index.md b/packages/contracts/docs/osx/02-how-to-guides/02-plugin-development/index.md
@@ -1,5 +1,5 @@
 ---
-title: Get Started with your DAO Plugin
+title: How to build a DAO Plugin
 ---
 
 ## Plugin Development Quickstart Guide

diff --git a/packages/contracts/src/core/permission/IPermissionCondition.sol b/packages/contracts/src/core/permission/IPermissionCondition.sol
@@ -4,18 +4,19 @@ pragma solidity ^0.8.8;
 
 /// @title IPermissionCondition
 /// @author Aragon Association - 2021-2023
-/// @notice This interface can be implemented to support more customary permissions depending on on- or off-chain state, e.g., by querying token ownershop or a secondary condition, respectively.
+/// @notice An interface to be implemented to support custom permission logic.
+/// @dev To attach a condition to a permission, the `grantWithCondition` function must be used and refer to the implementing contract's address with the `condition` argument.
 interface IPermissionCondition {
-    /// @notice This method is used to check if a call is permitted.
+    /// @notice Checks if a call is permitted.
     /// @param _where The address of the target contract.
     /// @param _who The address (EOA or contract) for which the permissions are checked.
     /// @param _permissionId The permission identifier.
     /// @param _data Optional data passed to the `PermissionCondition` implementation.
-    /// @return allowed Returns true if the call is permitted.
+    /// @return isPermitted Returns true if the call is permitted.
     function isGranted(
         address _where,
         address _who,
         bytes32 _permissionId,
         bytes calldata _data
-    ) external view returns (bool allowed);
+    ) external view returns (bool isPermitted);
 }
diff --git a/packages/contracts/src/core/permission/PermissionCondition.sol b/packages/contracts/src/core/permission/PermissionCondition.sol
@@ -13,7 +13,7 @@ abstract contract PermissionCondition is ERC165, IPermissionCondition {
     /// @notice Checks if an interface is supported by this or its parent contract.
     /// @param _interfaceId The ID of the interface.
     /// @return Returns `true` if the interface is supported.
-    function supportsInterface(bytes4 _interfaceId) public view override returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public view virtual override returns (bool) {
         return
             _interfaceId == type(IPermissionCondition).interfaceId ||
             super.supportsInterface(_interfaceId);

diff --git a/...mission/PermissionConditionUpgdaeable.sol → ...ission/PermissionConditionUpgradeable.sol b/...mission/PermissionConditionUpgdaeable.sol → ...ission/PermissionConditionUpgradeable.sol
@@ -13,7 +13,7 @@ abstract contract PermissionConditionUpgradeable is ERC165Upgradeable, IPermissi
     /// @notice Checks if an interface is supported by this or its parent contract.
     /// @param _interfaceId The ID of the interface.
     /// @return Returns `true` if the interface is supported.
-    function supportsInterface(bytes4 _interfaceId) public view override returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public view virtual override returns (bool) {
         return
             _interfaceId == type(IPermissionCondition).interfaceId ||
             super.supportsInterface(_interfaceId);