test: fixed tests and added council logics

Author: geolffreym

contracts/access/AccessManager.sol

@@ -42,9 +42,9 @@ contract AccessManager is Initializable, UUPSUpgradeable, AccessManagerUpgradeab
         // Handles protocol upgrades, pause mechanisms, and operational role assignments.
         // - MOD_ROLE: Managed by a smart account or council.
         // Approves policy submissions and moderates hook operations.
-        // - VAL_ROLE: Managed by a smart account or council.
-        // Participates in governance referenda for content curation/validation.
-        // - NOD_ROLE: Managed by a smart account or council.
+        // - CONTENT_COUNCIL_ROLE: Managed by a smart account or council.
+        // Participates in governance referenda for content curation.
+        // - NODE_VALIDATOR_ROLE: Managed by a smart account or council.
         // Participates in governance referenda for nodes validation.
         //
         // Individual/Contract Based Roles:
@@ -62,18 +62,19 @@ contract AccessManager is Initializable, UUPSUpgradeable, AccessManagerUpgradeab
             │   │
             │   └── OPS_ROLE (Internal Contract Role)  
             │
-            ├── VAL_ROLE (Smart Account / Council)
+            ├── CONTENT_COUNCIL_ROLE (Smart Account / Council)
             │
-            ├── NOD_ROLE (Smart Account / Council)
+            ├── NODE_VALIDATOR_ROLE (Smart Account / Council)
             │
             ├── VER_ROLE (Individual Trusted Creator)
         */
 
-        _setRoleAdmin(C.VER_ROLE, C.GOV_ROLE);
-        _setRoleAdmin(C.VAL_ROLE, C.GOV_ROLE);
-        _setRoleAdmin(C.NOD_ROLE, C.GOV_ROLE);
         _setRoleAdmin(C.MOD_ROLE, C.ADMIN_ROLE);
         _setRoleAdmin(C.OPS_ROLE, C.ADMIN_ROLE);
+
+        _setRoleAdmin(C.VER_ROLE, C.GOV_ROLE);
+        _setRoleAdmin(C.NODE_VALIDATOR_ROLE, C.GOV_ROLE);
+        _setRoleAdmin(C.CONTENT_COUNCIL_ROLE, C.GOV_ROLE);
     }
 
     // TODO pause protocol based on permission and roles

contracts/assets/AssetOwnership.sol

@@ -143,7 +143,7 @@ contract AssetOwnership is
     /// @notice Transfers an asset to a new owner.
     /// @param to The address of the new owner.
     /// @param assetId The unique identifier of the asset being transferred.
-    function transfer(address to, uint256 assetId) external {
+    function transfer(address to, uint256 assetId) external onlyOwner(assetId) {
         _transfer(msg.sender, to, assetId);
         emit TransferredAsset(msg.sender, to, assetId);
     }

contracts/core/interfaces/custody/ICustodianExpirable.sol

@@ -4,11 +4,6 @@ pragma solidity 0.8.26;
 /// @title ICustodianInspectable
 /// @dev Interface for retrieving custodian enrollment data.
 interface ICustodianInspectable {
-    /// @notice Retrieves the enrollment deadline for a custodian.
-    /// @param custodian The address of the custodian.
-    /// @return The enrollment deadline timestamp.
-    function getEnrollmentDeadline(address custodian) external view returns (uint256);
-
     /// @notice Retrieves the total number of enrollments.
     /// @return The number of enrollments.
     function getEnrollmentCount() external view returns (uint256);

contracts/core/interfaces/custody/ICustodianInspectable.sol

@@ -2,7 +2,6 @@
 // NatSpec format convention - https://docs.soliditylang.org/en/v0.5.10/natspec-format.html
 pragma solidity 0.8.26;
 
-import { ICustodianExpirable } from "@synaps3/core/interfaces/custody/ICustodianExpirable.sol";
 import { ICustodianRegistrable } from "@synaps3/core/interfaces/custody/ICustodianRegistrable.sol";
 import { ICustodianInspectable } from "@synaps3/core/interfaces/custody/ICustodianInspectable.sol";
 import { ICustodianVerifiable } from "@synaps3/core/interfaces/custody/ICustodianVerifiable.sol";
@@ -13,7 +12,6 @@ import { ICustodianRevokable } from "@synaps3/core/interfaces/custody/ICustodian
 interface ICustodianReferendum is
     ICustodianRegistrable,
     ICustodianVerifiable,
-    ICustodianExpirable,
     ICustodianInspectable,
     ICustodianRevokable
 {}

contracts/core/interfaces/custody/ICustodianReferendum.sol

@@ -7,12 +7,11 @@ pragma solidity 0.8.26;
 /// @dev This interface indirectly implements the FSM defined in `IQuorum` using `QuorumUpgradeable`.
 ///      Functions here are semantically equivalent to the FSM transitions: register → approve.
 interface ICustodianRegistrable {
-    /// @notice Registers data with a given identifier.
-    /// @param proof The unique identifier of the agreement to be enforced.
-    /// @param currency The currency used to pay enrollment.
-    function register(uint256 proof, address currency) external;
+    /// @notice Registers a custodian to be approved by council.
+    /// @param custodian The address of the custodian to register.
+    function register(address custodian) external;
 
-    /// @notice Approves the data associated with the given identifier.
+    /// @notice Approves the data custodian with the given address.
     /// @param custodian The address of the custodian to approve.
     function approve(address custodian) external;
 }

contracts/core/interfaces/custody/ICustodianRegistrable.sol

@@ -8,14 +8,6 @@ import { T } from "@synaps3/core/primitives/Types.sol";
 /// @notice Interface for managing access to content based on licensing terms.
 /// @dev This interface defines the basic information about the policy, such as its name and description.
 interface IPolicy {
-    /// @notice Returns the string identifier associated with the policy.
-    /// @dev This function provides a way to identify the specific policy being used.
-    function name() external pure returns (string memory);
-
-    /// @notice Returns the business/strategy model implemented by the policy.
-    /// @dev A description of the business model as bytes, allowing more complex representations (such as encoded data).
-    function description() external pure returns (string memory);
-
     /// @notice Initializes the policy with specific data for a given holder.
     /// @dev Only the Rights Policies Authorizer contract has permission to call this function.
     /// @param holder The address of the holder for whom the policy is being initialized.
@@ -46,4 +38,12 @@ interface IPolicy {
     /// @notice Retrieves the address of the attestation provider.
     /// @return The address of the provider associated with the policy.
     function getAttestationProvider() external view returns (address);
+
+    /// @notice Returns the string identifier associated with the policy.
+    /// @dev This function provides a way to identify the specific policy being used.
+    function name() external pure returns (string memory);
+
+    /// @notice Returns the business/strategy model implemented by the policy.
+    /// @dev A description of the business model as bytes, allowing more complex representations (such as encoded data).
+    function description() external pure returns (string memory);
 }

contracts/core/interfaces/policies/IPolicy.sol

@@ -16,8 +16,9 @@ library C {
     uint64 internal constant MOD_ROLE = 2; // moderator role
     uint64 internal constant VER_ROLE = 3; // account verified role
     uint64 internal constant OPS_ROLE = 4; // operations roles
-    uint64 internal constant VAL_ROLE = 5; // content validation/curation roles
-    uint64 internal constant NOD_ROLE = 6; // nodes validations roles
+
+    uint64 internal constant CONTENT_COUNCIL_ROLE = 5; // content validation/curation roles
+    uint64 internal constant NODE_VALIDATOR_ROLE = 6; // nodes validations roles
 
     bytes32 internal constant REFERENDUM_SUBMIT_TYPEHASH =
         keccak256("Submission(uint256 assetId, address initiator, uint256 nonce)");

contracts/core/primitives/Constants.sol

@@ -48,6 +48,7 @@ contract CustodianImpl is
     /// @dev Ensures that the provided endpoint is valid and initializes ERC165 and Ownable contracts.
     function initialize(string calldata endpoint, address owner) external initializer {
         if (bytes(endpoint).length == 0) revert InvalidEndpoint();
+        
         __ERC165_init();
         __Ownable_init(owner);
         _endpoint = endpoint;

contracts/custody/CustodianImpl.sol

@@ -7,11 +7,8 @@ import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/I
 // solhint-disable-next-line max-line-length
 import { AccessControlledUpgradeable } from "@synaps3/core/primitives/upgradeable/AccessControlledUpgradeable.sol";
 import { QuorumUpgradeable } from "@synaps3/core/primitives/upgradeable/QuorumUpgradeable.sol";
-import { IAgreementSettler } from "@synaps3/core/interfaces/financial/IAgreementSettler.sol";
-import { IFeeSchemeValidator } from "@synaps3/core/interfaces/economics/IFeeSchemeValidator.sol";
 import { ICustodianReferendum } from "@synaps3/core/interfaces/custody/ICustodianReferendum.sol";
 import { ICustodianFactory } from "@synaps3/core/interfaces/custody/ICustodianFactory.sol";
-import { FinancialOps } from "@synaps3/core/libraries/FinancialOps.sol";
 import { T } from "@synaps3/core/primitives/Types.sol";
 
 /// @title CustodianReferendum
@@ -24,27 +21,17 @@ contract CustodianReferendum is
     UUPSUpgradeable,
     QuorumUpgradeable,
     AccessControlledUpgradeable,
-    ICustodianReferendum,
-    IFeeSchemeValidator
+    ICustodianReferendum
 {
-    using FinancialOps for address;
-
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
-    IAgreementSettler public immutable AGREEMENT_SETTLER;
     ICustodianFactory public immutable CUSTODIAN_FACTORY;
     //slither-disable-end naming-convention
 
-    /// @dev Defines the expiration period for enrollment, determining how long a custodian remains active.
-    uint256 private _expirationPeriod;
     /// @dev Tracks the number of active enrollments within the system.
     uint256 private _enrollmentsCount;
-    /// @dev Maps a custodian's address to their respective enrollment deadline timestamp.
-    mapping(address => uint256) private _enrollmentDeadline;
-
     /// @notice Event emitted when a custodian is registered
     /// @param custodian The address of the registered custodian
-    /// @param paidFees The amount of fees that were paid upon registration
-    event Registered(address indexed custodian, uint256 paidFees);
+    event Registered(address indexed custodian);
 
     /// @notice Event emitted when a custodian is approved
     /// @param custodian The address of the approved custodian
@@ -54,34 +41,25 @@ contract CustodianReferendum is
     /// @param custodian The address of the revoked custodian
     event Revoked(address indexed custodian);
 
-    /// @notice Emitted when a new period is set
-    /// @param newPeriod The new period that is set, could be in seconds, blocks, or any other unit
-    event PeriodSet(uint256 newPeriod);
-
     /// @notice Error thrown when the custodian is not recognized by the factory.
     /// @param custodian The address of the unregistered custodian contract.
     error UnregisteredCustodian(address custodian);
 
-    /// @notice Error thrown when the custodian does not match the agreement's registered party.
-    /// @param custodian The custodian provided for the operation.s
-    error CustodianAgreementMismatch(address custodian);
-
     /// @notice Modifier to ensure the custodian was deployed through the trusted factory.
     /// @param custodian The address of the custodian contract to verify.
     modifier onlyValidCustodian(address custodian) {
         // ensure the custodian was deployed through the trusted factory and is known to the protocol
         if (!CUSTODIAN_FACTORY.isRegistered(custodian)) {
-            revert UnregisteredCustodian(msg.sender);
+            revert UnregisteredCustodian(custodian);
         }
         _;
     }
 
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor(address agreementSettler, address custodianFactory) {
+    constructor(address custodianFactory) {
         /// https://forum.openzeppelin.com/t/what-does-disableinitializers-function-mean/28730/5
         /// https://forum.openzeppelin.com/t/uupsupgradeable-vulnerability-post-mortem/15680
         _disableInitializers();
-        AGREEMENT_SETTLER = IAgreementSettler(agreementSettler);
         CUSTODIAN_FACTORY = ICustodianFactory(custodianFactory);
     }
 
@@ -90,54 +68,19 @@ contract CustodianReferendum is
         __Quorum_init();
         __UUPSUpgradeable_init();
         __AccessControlled_init(accessManager);
-        // 6 months initially..
-        _expirationPeriod = 180 days;
-    }
-
-    /// @notice Checks if the given fee scheme is supported in this context.
-    /// @param scheme The fee scheme to validate.
-    /// @return True if the scheme is supported.
-    function isFeeSchemeSupported(T.Scheme scheme) external pure returns (bool) {
-        // support only FLAT scheme
-        return scheme == T.Scheme.FLAT;
-    }
-
-    /// @notice Retrieves the current expiration period for enrollments or registrations.
-    function getExpirationPeriod() external view returns (uint256) {
-        return _expirationPeriod;
-    }
-
-    /// @notice Retrieves the enrollment deadline for a custodian.
-    /// @param custodian The address of the custodian.
-    function getEnrollmentDeadline(address custodian) external view returns (uint256) {
-        return _enrollmentDeadline[custodian];
-    }
-
-    /// @notice Retrieves the total number of enrollments.
-    function getEnrollmentCount() external view returns (uint256) {
-        return _enrollmentsCount;
     }
 
     /// @notice Checks if the entity is active.
     /// @dev This function verifies the active status of the custodian.
     /// @param custodian The custodian's address to check.
     function isActive(address custodian) external view returns (bool) {
-        // TODO a renovation mechanism is needed to update the enrollment time
-        /// It ensures that custodians remain engaged and do not become inactive for extended periods.
-        /// The enrollment deadline enforces a time-based mechanism where custodians must renew
-        /// their registration to maintain their active status. This prevents dormant custodians
-        /// from continuing to benefit from the protocol without contributing.
-
         // TODO add stateful management to custodians contract, the custodian can
         // change his state to "maintenance mode" or "inactive" if its facing issues
         // in that way the custodian is omitted during load balancing.
         // in this line we can check if the custodian contract is active custodian.isActive()
         // this is important feature if the custodians want to avoid harm reputation
 
-        // This mechanism helps to verify the availability of the custodian,
-        // forcing recurrent registrations and ensuring ongoing participation.
-        bool notExpiredDeadline = _enrollmentDeadline[custodian] > block.timestamp;
-        return _status(uint160(custodian)) == T.Status.Active && notExpiredDeadline;
+        return _status(uint160(custodian)) == T.Status.Active;
     }
 
     /// @notice Checks if the entity is waiting.
@@ -154,61 +97,34 @@ contract CustodianReferendum is
         return _status(uint160(custodian)) == T.Status.Blocked;
     }
 
-    /// @notice Registers a custodian by sending a payment to the contract.
-    /// @param proof The unique identifier of the agreement to be enforced.
+    /// @notice Registers a custodian to be approved by council.
     /// @param custodian The address of the custodian to register.
-    function register(uint256 proof, address custodian) external onlyValidCustodian(custodian) {
-        /// TODO penalize invalid endpoints, and revoked during referendum
-        // !IMPORTANT:
-        // Fees act as a mechanism to prevent abuse or spam by users
-        // when submitting custodians for approval. This discourages users from
-        // making frivolous or excessive registrations without genuine intent.
-        //
-        // Additionally, the fees establish a foundation of real interest and commitment
-        // from the custodian. This ensures that only those who see value in the protocol
-        // and are willing to contribute to its ecosystem will participate.
-        //
-        // The collected fees are used to support the protocol's operations, aligning
-        // individual actions with the broader sustainability of the network.
-
-        // IMPORTANT:
-        // The expected fees are locked in the agreement, based on the custodians fees defined by the tollgate.
-        // If the fee amount is insufficient, the transaction will revert during agreement creation.
-        // Only valid agreements can be settled; the validity is guaranteed by the proof.
-        T.Agreement memory agreement = AGREEMENT_SETTLER.settleAgreement(proof, msg.sender);
-        if (agreement.parties[0] != custodian) {
-            revert CustodianAgreementMismatch(custodian);
-        }
-
+    function register(address custodian) external onlyValidCustodian(custodian) {
         // register custodian as pending approval
         _register(uint160(custodian));
         // set the custodian active enrollment period..
-        // after this time the custodian is considered inactive and cannot collect his profits...
-        _enrollmentDeadline[custodian] = block.timestamp + _expirationPeriod;
-        emit Registered(custodian, agreement.fees);
+        emit Registered(custodian);
     }
 
     /// @notice Approves a custodian's registration.
     /// @param custodian The address of the custodian to approve.
     function approve(address custodian) external restricted {
-        _enrollmentsCount++;
         _approve(uint160(custodian));
+        _enrollmentsCount++;
         emit Approved(custodian);
     }
 
     /// @notice Revokes the registration of a custodian.
     /// @param custodian The address of the custodian to revoke.
     function revoke(address custodian) external restricted {
-        _enrollmentsCount--;
         _revoke(uint160(custodian));
+        _enrollmentsCount--;
         emit Revoked(custodian);
     }
 
-    /// @notice Sets a new expiration period for an enrollment or registration.
-    /// @param newPeriod The new expiration period, in seconds.
-    function setExpirationPeriod(uint256 newPeriod) external restricted {
-        _expirationPeriod = newPeriod;
-        emit PeriodSet(newPeriod);
+    /// @notice Retrieves the total number of enrollments.
+    function getEnrollmentCount() external view returns (uint256) {
+        return _enrollmentsCount;
     }
 
     /// @notice Function that should revert when msg.sender is not authorized to upgrade the contract.