From 78b5d720493c3b3be09f296a8c3a540a3bc288fe Mon Sep 17 00:00:00 2001 From: Michael Heuer <20623991+Michael-A-Heuer@users.noreply.github.com> Date: Tue, 23 Apr 2024 15:51:37 +0200 Subject: [PATCH] chore: change authors after AA dissolution (#21) * chore: adapt authors * fix: merge conflict artifact --- configs/package.json | 2 +- contracts/src/dao/IDAO.sol | 2 +- contracts/src/permission/PermissionLib.sol | 2 +- contracts/src/permission/auth/DaoAuthorizable.sol | 2 +- contracts/src/permission/auth/DaoAuthorizableUpgradeable.sol | 2 +- contracts/src/permission/condition/IPermissionCondition.sol | 2 +- contracts/src/permission/condition/PermissionCondition.sol | 2 +- .../src/permission/condition/PermissionConditionUpgradeable.sol | 2 +- contracts/src/plugin/IPlugin.sol | 2 +- contracts/src/plugin/Plugin.sol | 2 +- contracts/src/plugin/PluginCloneable.sol | 2 +- contracts/src/plugin/PluginUUPSUpgradeable.sol | 2 +- contracts/src/plugin/extensions/governance/Addresslist.sol | 2 +- contracts/src/plugin/extensions/membership/IMembership.sol | 2 +- contracts/src/plugin/extensions/proposal/IProposal.sol | 2 +- contracts/src/plugin/extensions/proposal/Proposal.sol | 2 +- .../src/plugin/extensions/proposal/ProposalUpgradeable.sol | 2 +- contracts/src/plugin/setup/IPluginSetup.sol | 2 +- contracts/src/plugin/setup/PluginSetup.sol | 2 +- contracts/src/plugin/setup/PluginUpgradeableSetup.sol | 2 +- contracts/src/utils/deployment/ProxyFactory.sol | 2 +- contracts/src/utils/deployment/ProxyLib.sol | 2 +- contracts/src/utils/versioning/IProtocolVersion.sol | 2 +- contracts/src/utils/versioning/ProtocolVersion.sol | 2 +- contracts/src/utils/versioning/VersionComparisonLib.sol | 2 +- sdk/package.json | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/configs/package.json b/configs/package.json index 3bb9cf8d..219c6e28 100644 --- a/configs/package.json +++ b/configs/package.json @@ -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", diff --git a/contracts/src/dao/IDAO.sol b/contracts/src/dao/IDAO.sol index ac1329e2..ba1151eb 100644 --- a/contracts/src/dao/IDAO.sol +++ b/contracts/src/dao/IDAO.sol @@ -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 sirt@aragon.org interface IDAO { diff --git a/contracts/src/permission/PermissionLib.sol b/contracts/src/permission/PermissionLib.sol index f44383a9..e21c43db 100644 --- a/contracts/src/permission/PermissionLib.sol +++ b/contracts/src/permission/PermissionLib.sol @@ -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 sirt@aragon.org library PermissionLib { diff --git a/contracts/src/permission/auth/DaoAuthorizable.sol b/contracts/src/permission/auth/DaoAuthorizable.sol index 29ca524a..42e3a61b 100644 --- a/contracts/src/permission/auth/DaoAuthorizable.sol +++ b/contracts/src/permission/auth/DaoAuthorizable.sol @@ -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 sirt@aragon.org abstract contract DaoAuthorizable is Context { diff --git a/contracts/src/permission/auth/DaoAuthorizableUpgradeable.sol b/contracts/src/permission/auth/DaoAuthorizableUpgradeable.sol index 0462188a..04d1bed6 100644 --- a/contracts/src/permission/auth/DaoAuthorizableUpgradeable.sol +++ b/contracts/src/permission/auth/DaoAuthorizableUpgradeable.sol @@ -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 sirt@aragon.org diff --git a/contracts/src/permission/condition/IPermissionCondition.sol b/contracts/src/permission/condition/IPermissionCondition.sol index 70498ac3..73862108 100644 --- a/contracts/src/permission/condition/IPermissionCondition.sol +++ b/contracts/src/permission/condition/IPermissionCondition.sol @@ -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 sirt@aragon.org diff --git a/contracts/src/permission/condition/PermissionCondition.sol b/contracts/src/permission/condition/PermissionCondition.sol index 00fd9be9..daf80626 100644 --- a/contracts/src/permission/condition/PermissionCondition.sol +++ b/contracts/src/permission/condition/PermissionCondition.sol @@ -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 sirt@aragon.org abstract contract PermissionCondition is ERC165, IPermissionCondition, ProtocolVersion { diff --git a/contracts/src/permission/condition/PermissionConditionUpgradeable.sol b/contracts/src/permission/condition/PermissionConditionUpgradeable.sol index 3ca8ea0f..0bf7118a 100644 --- a/contracts/src/permission/condition/PermissionConditionUpgradeable.sol +++ b/contracts/src/permission/condition/PermissionConditionUpgradeable.sol @@ -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 sirt@aragon.org abstract contract PermissionConditionUpgradeable is diff --git a/contracts/src/plugin/IPlugin.sol b/contracts/src/plugin/IPlugin.sol index 87e51952..0d466cfb 100644 --- a/contracts/src/plugin/IPlugin.sol +++ b/contracts/src/plugin/IPlugin.sol @@ -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 sirt@aragon.org interface IPlugin { diff --git a/contracts/src/plugin/Plugin.sol b/contracts/src/plugin/Plugin.sol index 5d4a2b28..66ffaf23 100644 --- a/contracts/src/plugin/Plugin.sol +++ b/contracts/src/plugin/Plugin.sol @@ -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 sirt@aragon.org abstract contract Plugin is IPlugin, ERC165, DaoAuthorizable, ProtocolVersion { diff --git a/contracts/src/plugin/PluginCloneable.sol b/contracts/src/plugin/PluginCloneable.sol index 1f9dfa35..08025c2c 100644 --- a/contracts/src/plugin/PluginCloneable.sol +++ b/contracts/src/plugin/PluginCloneable.sol @@ -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 sirt@aragon.org abstract contract PluginCloneable is diff --git a/contracts/src/plugin/PluginUUPSUpgradeable.sol b/contracts/src/plugin/PluginUUPSUpgradeable.sol index f4e42dd2..32380f0d 100644 --- a/contracts/src/plugin/PluginUUPSUpgradeable.sol +++ b/contracts/src/plugin/PluginUUPSUpgradeable.sol @@ -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 sirt@aragon.org abstract contract PluginUUPSUpgradeable is diff --git a/contracts/src/plugin/extensions/governance/Addresslist.sol b/contracts/src/plugin/extensions/governance/Addresslist.sol index 5ca40ef7..a9edb888 100644 --- a/contracts/src/plugin/extensions/governance/Addresslist.sol +++ b/contracts/src/plugin/extensions/governance/Addresslist.sol @@ -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 sirt@aragon.org diff --git a/contracts/src/plugin/extensions/membership/IMembership.sol b/contracts/src/plugin/extensions/membership/IMembership.sol index acd002e6..b94c836a 100644 --- a/contracts/src/plugin/extensions/membership/IMembership.sol +++ b/contracts/src/plugin/extensions/membership/IMembership.sol @@ -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 sirt@aragon.org interface IMembership { diff --git a/contracts/src/plugin/extensions/proposal/IProposal.sol b/contracts/src/plugin/extensions/proposal/IProposal.sol index 9f6769b5..889583a2 100644 --- a/contracts/src/plugin/extensions/proposal/IProposal.sol +++ b/contracts/src/plugin/extensions/proposal/IProposal.sol @@ -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 sirt@aragon.org interface IProposal { diff --git a/contracts/src/plugin/extensions/proposal/Proposal.sol b/contracts/src/plugin/extensions/proposal/Proposal.sol index 30901894..6df0a6a2 100644 --- a/contracts/src/plugin/extensions/proposal/Proposal.sol +++ b/contracts/src/plugin/extensions/proposal/Proposal.sol @@ -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 sirt@aragon.org abstract contract Proposal is IProposal, ERC165 { diff --git a/contracts/src/plugin/extensions/proposal/ProposalUpgradeable.sol b/contracts/src/plugin/extensions/proposal/ProposalUpgradeable.sol index 8bcf519a..864ace63 100644 --- a/contracts/src/plugin/extensions/proposal/ProposalUpgradeable.sol +++ b/contracts/src/plugin/extensions/proposal/ProposalUpgradeable.sol @@ -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 sirt@aragon.org abstract contract ProposalUpgradeable is IProposal, ERC165Upgradeable { diff --git a/contracts/src/plugin/setup/IPluginSetup.sol b/contracts/src/plugin/setup/IPluginSetup.sol index f9536652..c6fb9f7a 100644 --- a/contracts/src/plugin/setup/IPluginSetup.sol +++ b/contracts/src/plugin/setup/IPluginSetup.sol @@ -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 sirt@aragon.org interface IPluginSetup { diff --git a/contracts/src/plugin/setup/PluginSetup.sol b/contracts/src/plugin/setup/PluginSetup.sol index fde09491..a729ca8e 100644 --- a/contracts/src/plugin/setup/PluginSetup.sol +++ b/contracts/src/plugin/setup/PluginSetup.sol @@ -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)). diff --git a/contracts/src/plugin/setup/PluginUpgradeableSetup.sol b/contracts/src/plugin/setup/PluginUpgradeableSetup.sol index 413cc500..2261f6f4 100644 --- a/contracts/src/plugin/setup/PluginUpgradeableSetup.sol +++ b/contracts/src/plugin/setup/PluginUpgradeableSetup.sol @@ -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 sirt@aragon.org abstract contract PluginUpgradeableSetup is ERC165, IPluginSetup, ProtocolVersion { diff --git a/contracts/src/utils/deployment/ProxyFactory.sol b/contracts/src/utils/deployment/ProxyFactory.sol index 289c1c63..c340ed68 100644 --- a/contracts/src/utils/deployment/ProxyFactory.sol +++ b/contracts/src/utils/deployment/ProxyFactory.sol @@ -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 sirt@aragon.org contract ProxyFactory { diff --git a/contracts/src/utils/deployment/ProxyLib.sol b/contracts/src/utils/deployment/ProxyLib.sol index 44a2c908..389b69a7 100644 --- a/contracts/src/utils/deployment/ProxyLib.sol +++ b/contracts/src/utils/deployment/ProxyLib.sol @@ -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 sirt@aragon.org library ProxyLib { diff --git a/contracts/src/utils/versioning/IProtocolVersion.sol b/contracts/src/utils/versioning/IProtocolVersion.sol index 79cdde4c..fea10f34 100644 --- a/contracts/src/utils/versioning/IProtocolVersion.sol +++ b/contracts/src/utils/versioning/IProtocolVersion.sol @@ -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 sirt@aragon.org interface IProtocolVersion { diff --git a/contracts/src/utils/versioning/ProtocolVersion.sol b/contracts/src/utils/versioning/ProtocolVersion.sol index 684aaf82..baf6f476 100644 --- a/contracts/src/utils/versioning/ProtocolVersion.sol +++ b/contracts/src/utils/versioning/ProtocolVersion.sol @@ -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 sirt@aragon.org diff --git a/contracts/src/utils/versioning/VersionComparisonLib.sol b/contracts/src/utils/versioning/VersionComparisonLib.sol index 88b8bbdb..f19d6765 100644 --- a/contracts/src/utils/versioning/VersionComparisonLib.sol +++ b/contracts/src/utils/versioning/VersionComparisonLib.sol @@ -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 sirt@aragon.org library VersionComparisonLib { diff --git a/sdk/package.json b/sdk/package.json index 8d46f27d..ad39accc 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -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",