Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/contracts-…
Browse files Browse the repository at this point in the history
…sync
  • Loading branch information
heueristik committed Apr 23, 2024
2 parents fd78ff1 + 78b5d72 commit 06f5301
Show file tree
Hide file tree
Showing 26 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion configs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aragon/osx-commons-configs",
"author": "Aragon Association",
"author": "Aragon X",
"version": "0.4.0",
"license": "AGPL-3.0-or-later",
"typings": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/dao/IDAO.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title IDAO
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice The interface required for DAOs within the Aragon App DAO framework.
/// @custom:security-contact [email protected]
interface IDAO {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/permission/PermissionLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title PermissionLib
/// @author Aragon Association - 2021-2023
/// @author Aragon X - 2021-2023
/// @notice A library containing objects for permission processing.
/// @custom:security-contact [email protected]
library PermissionLib {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/permission/auth/DaoAuthorizable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {IDAO} from "../../dao/IDAO.sol";
import {_auth} from "./auth.sol";

/// @title DaoAuthorizable
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract contract providing a meta-transaction compatible modifier for non-upgradeable contracts instantiated via the `new` keyword to authorize function calls through an associated DAO.
/// @custom:security-contact [email protected]
abstract contract DaoAuthorizable is Context {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {IDAO} from "../../dao/IDAO.sol";
import {_auth} from "./auth.sol";

/// @title DaoAuthorizableUpgradeable
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract contract providing a meta-transaction compatible modifier for upgradeable or cloneable contracts to authorize function calls through an associated DAO.
/// @dev Make sure to call `__DaoAuthorizableUpgradeable_init` during initialization of the inheriting contract.
/// @custom:security-contact [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title IPermissionCondition
/// @author Aragon Association - 2021-2023
/// @author Aragon X - 2021-2023
/// @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.
/// @custom:security-contact [email protected]
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/permission/condition/PermissionCondition.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {ProtocolVersion} from "../../utils/versioning/ProtocolVersion.sol";
import {IPermissionCondition} from "./IPermissionCondition.sol";

/// @title PermissionCondition
/// @author Aragon Association - 2023
/// @author Aragon X - 2023
/// @notice An abstract contract for non-upgradeable contracts instantiated via the `new` keyword to inherit from to support customary permissions depending on arbitrary on-chain state.
/// @custom:security-contact [email protected]
abstract contract PermissionCondition is ERC165, IPermissionCondition, ProtocolVersion {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {ProtocolVersion} from "../../utils/versioning/ProtocolVersion.sol";
import {IPermissionCondition} from "./IPermissionCondition.sol";

/// @title PermissionConditionUpgradeable
/// @author Aragon Association - 2023
/// @author Aragon X - 2023
/// @notice An abstract contract for upgradeable or cloneable contracts to inherit from and to support customary permissions depending on arbitrary on-chain state.
/// @custom:security-contact [email protected]
abstract contract PermissionConditionUpgradeable is
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/IPlugin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title IPlugin
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An interface defining the traits of a plugin.
/// @custom:security-contact [email protected]
interface IPlugin {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/Plugin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {IDAO} from "../dao/IDAO.sol";
import {IPlugin} from "./IPlugin.sol";

/// @title Plugin
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract, non-upgradeable contract to inherit from when creating a plugin being deployed via the `new` keyword.
/// @custom:security-contact [email protected]
abstract contract Plugin is IPlugin, ERC165, DaoAuthorizable, ProtocolVersion {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/PluginCloneable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {IDAO} from "../dao/IDAO.sol";
import {IPlugin} from "./IPlugin.sol";

/// @title PluginCloneable
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract, non-upgradeable contract to inherit from when creating a plugin being deployed via the minimal clones pattern (see [ERC-1167](https://eips.ethereum.org/EIPS/eip-1167)).
/// @custom:security-contact [email protected]
abstract contract PluginCloneable is
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/PluginUUPSUpgradeable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {IDAO} from "../dao/IDAO.sol";
import {IPlugin} from "./IPlugin.sol";

/// @title PluginUUPSUpgradeable
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract, upgradeable contract to inherit from when creating a plugin being deployed via the UUPS pattern (see [ERC-1822](https://eips.ethereum.org/EIPS/eip-1822)).
/// @custom:security-contact [email protected]
abstract contract PluginUUPSUpgradeable is
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/extensions/governance/Addresslist.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {CheckpointsUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/
import {_uncheckedAdd, _uncheckedSub} from "../../../utils/math/UncheckedMath.sol";

/// @title Addresslist
/// @author Aragon Association - 2021-2023
/// @author Aragon X - 2021-2023
/// @notice The majority voting implementation using a list of member addresses.
/// @dev This contract inherits from `MajorityVotingBase` and implements the `IMajorityVoting` interface.
/// @custom:security-contact [email protected]
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/extensions/membership/IMembership.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title IMembership
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An interface to be implemented by DAO plugins that define membership.
/// @custom:security-contact [email protected]
interface IMembership {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/extensions/proposal/IProposal.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.8;
import {IDAO} from "../../../dao/IDAO.sol";

/// @title IProposal
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An interface to be implemented by DAO plugins that create and execute proposals.
/// @custom:security-contact [email protected]
interface IProposal {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/extensions/proposal/Proposal.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {IDAO} from "../../../dao/IDAO.sol";
import {IProposal} from "./IProposal.sol";

/// @title Proposal
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract contract containing the traits and internal functionality to create and execute proposals that can be inherited by non-upgradeable DAO plugins.
/// @custom:security-contact [email protected]
abstract contract Proposal is IProposal, ERC165 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {IDAO} from "../../../dao/IDAO.sol";
import {IProposal} from "./IProposal.sol";

/// @title ProposalUpgradeable
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An abstract contract containing the traits and internal functionality to create and execute proposals that can be inherited by upgradeable DAO plugins.
/// @custom:security-contact [email protected]
abstract contract ProposalUpgradeable is IProposal, ERC165Upgradeable {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/setup/IPluginSetup.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {PermissionLib} from "../../permission/PermissionLib.sol";
import {IDAO} from "../../dao/IDAO.sol";

/// @title IPluginSetup
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice The interface required for a plugin setup contract to be consumed by the `PluginSetupProcessor` for plugin installations, updates, and uninstallations.
/// @custom:security-contact [email protected]
interface IPluginSetup {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/setup/PluginSetup.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {ProtocolVersion} from "../../utils/versioning/ProtocolVersion.sol";
import {IPluginSetup} from "./IPluginSetup.sol";

/// @title PluginSetup
/// @author Aragon Association - 2022-2024
/// @author Aragon X - 2022-2024
/// @notice An abstract contract to inherit from to implement the plugin setup for non-upgradeable plugins, i.e,
/// - `Plugin` being deployed via the `new` keyword
/// - `PluginCloneable` being deployed via the minimal proxy pattern (see [ERC-1167](https://eips.ethereum.org/EIPS/eip-1167)).
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/plugin/setup/PluginUpgradeableSetup.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {ProtocolVersion} from "../../utils/versioning/ProtocolVersion.sol";
import {IPluginSetup} from "./IPluginSetup.sol";

/// @title PluginUpgradeableSetup
/// @author Aragon Association - 2022-2024
/// @author Aragon X - 2022-2024
/// @notice An abstract contract to inherit from to implement the plugin setup for upgradeable plugins, i.e, `PluginUUPSUpgradeable` being deployed via the UUPS pattern (see [ERC-1822](https://eips.ethereum.org/EIPS/eip-1822) and [ERC-1967](https://eips.ethereum.org/EIPS/eip-1967)).
/// @custom:security-contact [email protected]
abstract contract PluginUpgradeableSetup is ERC165, IPluginSetup, ProtocolVersion {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/utils/deployment/ProxyFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.8;
import {ProxyLib} from "./ProxyLib.sol";

/// @title ProxyFactory
/// @author Aragon Association - 2024
/// @author Aragon X - 2024
/// @notice A factory to deploy proxies via the UUPS pattern (see [ERC-1822](https://eips.ethereum.org/EIPS/eip-1822)) and minimal proxy pattern (see [ERC-1167](https://eips.ethereum.org/EIPS/eip-1167)).
/// @custom:security-contact [email protected]
contract ProxyFactory {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/utils/deployment/ProxyLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
import {Address} from "@openzeppelin/contracts/utils/Address.sol";

/// @title ProxyLib
/// @author Aragon Association - 2024
/// @author Aragon X - 2024
/// @notice A library containing methods for the deployment of proxies via the UUPS pattern (see [ERC-1822](https://eips.ethereum.org/EIPS/eip-1822)) and minimal proxy pattern (see [ERC-1167](https://eips.ethereum.org/EIPS/eip-1167)).
/// @custom:security-contact [email protected]
library ProxyLib {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/utils/versioning/IProtocolVersion.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title IProtocolVersion
/// @author Aragon Association - 2022-2023
/// @author Aragon X - 2022-2023
/// @notice An interface defining the semantic Aragon OSx protocol version number.
/// @custom:security-contact [email protected]
interface IProtocolVersion {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/utils/versioning/ProtocolVersion.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.8;
import {IProtocolVersion} from "./IProtocolVersion.sol";

/// @title ProtocolVersion
/// @author Aragon Association - 2023
/// @author Aragon X - 2023
/// @notice An abstract, stateless, non-upgradeable contract providing the current Aragon OSx protocol version number.
/// @dev Do not add any new variables to this contract that would shift down storage in the inheritance chain.
/// @custom:security-contact [email protected]
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/utils/versioning/VersionComparisonLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.8;

/// @title VersionComparisonLib
/// @author Aragon Association - 2023
/// @author Aragon X - 2023
/// @notice A library containing methods for [semantic version number](https://semver.org/spec/v2.0.0.html) comparison.
/// @custom:security-contact [email protected]
library VersionComparisonLib {
Expand Down
2 changes: 1 addition & 1 deletion sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aragon/osx-commons-sdk",
"author": "Aragon Association",
"author": "Aragon X",
"version": "0.0.1-alpha.11",
"license": "MIT",
"main": "dist/index.js",
Expand Down

0 comments on commit 06f5301

Please sign in to comment.