chore: merge develop

contracts/presets/kpi-tokens/BaseKPIToken.sol

@@ -10,11 +10,10 @@ import {IKPIToken} from "../../interfaces/IKPIToken.sol";
 /// implementations for a set of Carrot KPI token functions.
 /// @author Federico Luzzi - <federico.luzzi@carrot-labs.xyz>
 abstract contract BaseKPIToken is IKPIToken, Initializable {
-    address public override owner;
-    string public override description;
-    bool public override finalized;
-    uint256 public override expiration;
-    uint256 public override creationTimestamp;
+    address internal internalOwner;
+    string internal internalDescription;
+    uint256 internal internalExpiration;
+    uint256 internal internalCreationTimestamp;
     address internal kpiTokensManager;
     uint128 internal templateVersion;
     uint256 internal templateId;
@@ -53,10 +52,10 @@ abstract contract BaseKPIToken is IKPIToken, Initializable {
         if (_templateId == 0) revert InvalidTemplateId();
         if (_templateVersion == 0) revert InvalidTemplateVersion();
 
-        owner = _owner;
-        description = _description;
-        expiration = _expiration;
-        creationTimestamp = block.timestamp;
+        internalOwner = _owner;
+        internalDescription = _description;
+        internalExpiration = _expiration;
+        internalCreationTimestamp = block.timestamp;
         kpiTokensManager = _kpiTokensManager;
         templateId = _templateId;
         templateVersion = _templateVersion;
@@ -67,15 +66,45 @@ abstract contract BaseKPIToken is IKPIToken, Initializable {
     /// @param _newOwner The new owner.
     function transferOwnership(address _newOwner) external override {
         if (_newOwner == address(0)) revert InvalidOwner();
-        address _owner = owner;
+        address _owner = internalOwner;
         if (msg.sender != _owner) revert Forbidden();
-        owner = _newOwner;
+        internalOwner = _newOwner;
         emit OwnershipTransferred(_owner, _newOwner);
     }
 
+    /// @dev Returns the KPI token's owner.
+    function owner() external view virtual override returns (address) {
+        return internalOwner;
+    }
+
+    /// @dev Returns the KPI token's description.
+    function description() external view virtual override returns (string memory) {
+        return internalDescription;
+    }
+
+    /// @dev Returns the KPI token's expiration.
+    function expiration() external view virtual override returns (uint256) {
+        return internalExpiration;
+    }
+
+    /// @dev Returns the KPI token's creation timestamp.
+    function creationTimestamp() external view virtual override returns (uint256) {
+        return internalCreationTimestamp;
+    }
+
     /// @dev Returns the KPI token's template as fetched from Carrot's KPI tokens manager,
     /// given the template's id and version.
     function template() external view override returns (Template memory) {
         return IBaseTemplatesManager(kpiTokensManager).template(templateId, templateVersion);
     }
+
+    /// @dev Queries the KPI tokens template manager's feature registry to know if a custom feature
+    /// of this KPI token is enabled for a target account or not.
+    /// @param _featureId The identifier of the queried custom feature.
+    /// @param _account The target account.
+    /// @return Whether the feature with the given identifier is enabled for the given account
+    /// or not.
+    function isFeatureEnabledFor(uint256 _featureId, address _account) internal view returns (bool) {
+        return IBaseTemplatesManager(kpiTokensManager).isTemplateFeatureEnabledFor(templateId, _featureId, _account);
+    }
 }

contracts/presets/oracles/BaseOracle.sol

@@ -10,7 +10,6 @@ import {IOracle} from "../../interfaces/IOracle.sol";
 /// implementations for a set of Carrot oracle functions.
 /// @author Federico Luzzi - <federico.luzzi@carrot-labs.xyz>
 abstract contract BaseOracle is IOracle, Initializable {
-    bool public override finalized;
     address public override kpiToken;
     address internal oraclesManager;
     uint128 internal templateVersion;

test/mocks/MockBaseOracle.sol

@@ -6,6 +6,8 @@ import {InitializeOracleParams} from "../../contracts/commons/Types.sol";
 import {BaseOracle} from "../../contracts/presets/oracles/BaseOracle.sol";
 
 contract MockBaseOracle is BaseOracle {
+    bool public override finalized;
+
     function initialize(InitializeOracleParams memory _params) external payable override initializer {
         __BaseOracle_init(_params.kpiToken, _params.templateId, _params.templateVersion);
     }

test/mocks/MockConstantAnswererTrustedOracle.sol

@@ -5,6 +5,8 @@ import {BaseOracle} from "../../contracts/presets/oracles/BaseOracle.sol";
 import {InitializeOracleParams} from "../../contracts/commons/Types.sol";
 
 contract MockConstantAnswererTrustedOracle is BaseOracle, ConstantAnswererTrustedOracle {
+    bool public override finalized;
+
     constructor(address _answerer) ConstantAnswererTrustedOracle(_answerer) {}
 
     function initialize(InitializeOracleParams memory _params) external payable override initializer {

test/mocks/MockConstrainedOracle.sol

@@ -6,6 +6,8 @@ import {IBaseTemplatesManager, Template} from "../../contracts/interfaces/IBaseT
 import {InitializeOracleParams} from "../../contracts/commons/Types.sol";
 
 contract MockConstrainedOracle is BaseOracle, ConstrainedOracle {
+    bool public override finalized;
+
     function initialize(InitializeOracleParams memory _params) external payable override initializer {
         (Constraint _constraint, uint256 _value0, uint256 _value1) =
             abi.decode(_params.data, (Constraint, uint256, uint256));

test/mocks/MockKPIToken.sol

@@ -16,6 +16,7 @@ struct OracleData {
 /// @dev A KPI token template implementation
 /// @author Federico Luzzi - <federico.luzzi@carrot-labs.xyz>
 contract MockKPIToken is BaseKPIToken {
+    bool public override finalized;
     address[] internal _oracles;
 
     function initialize(InitializeKPITokenParams memory _params) external payable override initializer {

test/mocks/MockOracle.sol

@@ -9,7 +9,7 @@ import {InitializeOracleParams} from "../../contracts/commons/Types.sol";
 contract MockOracle is IOracle, Initializable {
     address public constant RESULT_GETTER = address(4321);
 
-    bool public finalized;
+    bool public override finalized;
     address public kpiToken;
     address internal oraclesManager;
     uint128 internal templateVersion;