Merge pull request #99 from Aut-Labs/refactor/base-test

Refactor/base test

contracts/autid/AutID.sol

@@ -28,7 +28,7 @@ contract AutID is AutIDUtils, ERC721URIStorageUpgradeable, OwnableUpgradeable, E
     address public localReputation;
     mapping(bytes32 => uint256) public tokenIdForUsername;
     mapping(address => uint256) public tokenIdForAccount;
-    mapping(address => uint64) public mintedAt;
+    mapping(address => uint32) public mintedAt;
 
     constructor(address trustedForwarder_) ERC2771ContextUpgradeable(trustedForwarder_) {}
 
@@ -72,7 +72,7 @@ contract AutID is AutIDUtils, ERC721URIStorageUpgradeable, OwnableUpgradeable, E
     /// @inheritdoc IAutID
     function mint(
         uint256 role,
-        uint256 commitment,
+        uint8 commitment,
         address nova,
         string memory username_,
         string memory optionalURI
@@ -83,14 +83,14 @@ contract AutID is AutIDUtils, ERC721URIStorageUpgradeable, OwnableUpgradeable, E
     /// @inheritdoc IAutID
     function createRecordAndJoinNova(
         uint256 role,
-        uint256 commitment,
+        uint8 commitment,
         address nova,
         string memory username_,
         string memory optionalURI
     ) public {
         address account = _msgSender();
         AutIDUtils._revertForZeroAddress(account);
-        mintedAt[account] = uint64(block.timestamp);
+        mintedAt[account] = uint32(block.timestamp);
 
         _createRecord(account, username_, optionalURI);
         _joinNova(account, role, commitment, nova);
@@ -105,7 +105,7 @@ contract AutID is AutIDUtils, ERC721URIStorageUpgradeable, OwnableUpgradeable, E
     }
 
     function userNovaCommitmentLevel(address nova, address user) external view returns (uint256) {
-        return INova(nova).commitmentLevels(user);
+        return INova(nova).currentCommitmentLevels(user);
     }
 
     function userNovaJoinedAt(address nova, address user) external view returns (uint256) {
@@ -127,7 +127,7 @@ contract AutID is AutIDUtils, ERC721URIStorageUpgradeable, OwnableUpgradeable, E
     }
 
     /// @inheritdoc IAutID
-    function joinNova(uint256 role, uint256 commitment, address nova) public {
+    function joinNova(uint256 role, uint8 commitment, address nova) public {
         address account = _msgSender();
         _revertForZeroAddress(account);
         uint256 tokenId = tokenIdForAccount[account];
@@ -136,7 +136,7 @@ contract AutID is AutIDUtils, ERC721URIStorageUpgradeable, OwnableUpgradeable, E
         _joinNova(account, role, commitment, nova);
     }
 
-    function _joinNova(address account, uint256 role, uint256 commitment, address nova) internal {
+    function _joinNova(address account, uint256 role, uint8 commitment, address nova) internal {
         address novaRegistryAddress = novaRegistry;
         _revertForZeroAddress(novaRegistryAddress);
         _revertForZeroAddress(nova);

contracts/autid/IAutID.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 interface IAutID {
     event RecordCreated(uint256 tokenId, address account, string username, string uri);
-    event NovaJoined(address account, uint256 role, uint256 commitment, address nova);
+    event NovaJoined(address account, uint256 role, uint8 commitment, address nova);
     event NovaRegistrySet(address);
     event LocalReputationSet(address);
     event TokenMetadataUpdated(uint256 tokenId, address account, string uri);
@@ -41,7 +41,7 @@ interface IAutID {
     /// @param optionalURI Metadata URI string associated with the new AutID NFT
     function mint(
         uint256 role,
-        uint256 commitment,
+        uint8 commitment,
         address nova,
         string memory username_,
         string memory optionalURI
@@ -55,7 +55,7 @@ interface IAutID {
     /// @param optionalURI Metadata URI string associated with the new AutID NFT
     function createRecordAndJoinNova(
         uint256 role,
-        uint256 commitment,
+        uint8 commitment,
         address nova,
         string memory username_,
         string memory optionalURI
@@ -65,5 +65,5 @@ interface IAutID {
     /// @param role Role to join the Nova
     /// @param commitment Commitment to join the Nova
     /// @param nova Address of the Nova to join
-    function joinNova(uint256 role, uint256 commitment, address nova) external;
+    function joinNova(uint256 role, uint8 commitment, address nova) external;
 }

contracts/globalParameters/GlobalParametersAlpha.sol

@@ -48,7 +48,7 @@ contract GlobalParametersAlpha is IGlobalParametersAlpha, OwnableUpgradeable {
 
     /// @dev fill with default values
     function initialize() external initializer {
-        period0Start = TimeLibrary.periodStart({timestamp: block.timestamp});
+        period0Start = TimeLibrary.periodStart({timestamp: uint32(block.timestamp)});
         periodDuration = TimeLibrary.FOUR_WEEKS;
         steepnessDegree3Exp = 300;
         penaltyFactor3Exp = 500;
@@ -57,7 +57,7 @@ contract GlobalParametersAlpha is IGlobalParametersAlpha, OwnableUpgradeable {
     }
 
     function currentPeriodId() external view returns (uint32) {
-        return TimeLibrary.periodId({ period0Start: period0Start, timestamp: block.timestamp });
+        return TimeLibrary.periodId({ period0Start: period0Start, timestamp: uint32(block.timestamp) });
     }
 
     function stagePeriodDuration(uint32 nextPeriodDuration) external {

contracts/interactions/InteractionFactory.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.20;
+pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {

contracts/interactions/InteractionRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.20;
+pragma solidity ^0.8.20;
 
 import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
 

contracts/libraries/TimeLibrary.sol

@@ -20,7 +20,7 @@ library TimeLibrary {
     /// @dev returns the id of the curent period, starting at 1
     function periodId(uint32 period0Start, uint32 timestamp) internal pure returns (uint32) {
         unchecked {
-            ((periodStart({timestamp: timestamp}) - period0Start) / FOUR_WEEKS) + 1;
+            return (((periodStart({timestamp: timestamp}) - period0Start) / FOUR_WEEKS) + 1);
         }
     }
 }

contracts/nova/INova.sol

@@ -11,6 +11,7 @@ interface INova {
     error MemberHasNotJoinedHub();
     error SameCommitmentLevel();
     error InvalidCommitmentLevel();
+    error UserHasNotYetCommited();
 
     event AdminGranted(address to);
     event AdminRenounced(address from);
@@ -37,8 +38,8 @@ interface INova {
     function metadataUri() external view returns (string memory);
 
     function roles(address) external view returns (uint256);
-    function commitmentLevels(address) external view returns (uint256);
-    function joinedAt(address) external view returns (uint256);
+    function currentCommitmentLevels(address) external view returns (uint8);
+    function joinedAt(address) external view returns (uint32);
     function parameterWeight(uint256) external view returns (uint256);
     function accountMasks(address) external view returns (uint256);
 
@@ -52,7 +53,7 @@ interface INova {
 
     function removeUrl(string memory) external;
 
-    function join(address who, uint256 role, uint256 commitmentLevel) external;
+    function join(address who, uint256 role, uint8 commitmentLevel) external;
 
     function canJoin(address who, uint256 role) external view returns (bool);
 

contracts/nova/INovaRegistry.sol

@@ -6,8 +6,6 @@ import "../hubContracts/IHubDomainsRegistry.sol";
 interface INovaRegistry {
     function checkNova(address) external view returns (bool);
 
-    function initialize(address autIdAddr_, address novaLogic, address pluginRegistry, address hubDomainsRegistry) external;
-
     function deployNova(uint256 market, string memory metadata, uint256 commitment) external returns (address nova);
 
     function joinNovaHook(address user) external;

contracts/nova/Nova.sol

@@ -8,6 +8,7 @@ import {INova} from "./INova.sol";
 import {INovaRegistry} from "./INovaRegistry.sol";
 import "../hubContracts/IHubDomainsRegistry.sol";
 import {IGlobalParametersAlpha} from "../globalParameters/IGlobalParametersAlpha.sol";
+import {TimeLibrary} from "../libraries/TimeLibrary.sol";
 
 // todo: admin retro onboarding
 contract Nova is INova, NovaUtils, NovaUpgradeable {
@@ -39,8 +40,8 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
     uint32 public initPeriodId;
 
     mapping(address => uint256) public roles;
-    mapping(address => uint256) public joinedAt;
-    mapping(address => uint256) public currentCommitmentLevels;
+    mapping(address => uint32) public joinedAt;
+    mapping(address => uint8) public currentCommitmentLevels;
     mapping(uint256 => uint256) public parameterWeight;
     mapping(address => uint256) public accountMasks;
 
@@ -91,7 +92,7 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
         hubDomainsRegistry = hubDomainsRegistry_;
         deployer = deployer_;
 
-        initTimestamp = block.timestamp;
+        initTimestamp = uint32(block.timestamp);
         initPeriodId = IGlobalParametersAlpha(novaRegistry_).currentPeriodId();
     }
 
@@ -131,21 +132,20 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
         _removeUrl(url);
     }
 
-    function join(address who, uint256 role, uint256 commitmentLevel) external {
+    function join(address who, uint256 role, uint8 commitmentLevel) external {
         require(msg.sender == autID, "caller not AutID contract");
         require(canJoin(who, role), "can not join");
 
         roles[who] = role;
-        commitmentLevels[who] = commitmentLevel;
         members.push(who);
-        joinedAt[who] = block.timestamp;
+        joinedAt[who] = uint32(block.timestamp);
 
         uint32 currentPeriodId = IGlobalParametersAlpha(novaRegistry).currentPeriodId();
-        partipications[msg.sender][currentPeriodId].commitmentLevel = commitmentLevel;
-        currentCommitmentLevels[msg.sender] = commitmentLevel;
+        participations[who][currentPeriodId].commitmentLevel = commitmentLevel;
+        currentCommitmentLevels[who] = commitmentLevel;
 
         _writeHistoricalSumCommitmentLevel(currentPeriodId);
-        currentSumCommitmentLevel += commitmentLevel;
+        currentSumCommitmentLevel += uint128(commitmentLevel);
 
         INovaRegistry(novaRegistry).joinNovaHook(who);
 
@@ -156,7 +156,7 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
     function getCommitmentLevel(address who, uint32 periodId) external view returns (uint32) {
         if (periodId < getPeriodIdJoined(who)) revert UserHasNotYetCommited();
 
-        Participation memory participation = participations[who];
+        Participation memory participation = participations[who][periodId];
         if (participation.commitmentLevel != 0) {
             // user has changed their commitmentLevel in a period following `periodId`.  We know this becuase
             // participation.commitmentLevel state is non-zero as it is written following a commitmentLevel change.
@@ -177,8 +177,8 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
         return periodIdJoined;
     }
 
-    function changeCommitmentLevel(uint32 newCommitmentLevel) external {
-        uint32 oldCommitmentLevel = currentCommitmentLevels[msg.sender];
+    function changeCommitmentLevel(uint8 newCommitmentLevel) external {
+        uint8 oldCommitmentLevel = currentCommitmentLevels[msg.sender];
         if (newCommitmentLevel == oldCommitmentLevel) revert SameCommitmentLevel();
 
         // TODO: globalParam
@@ -188,7 +188,7 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
         uint32 currentPeriodId = IGlobalParametersAlpha(novaRegistry).currentPeriodId();
 
         // write to storage for all 0 values- as the currentCommitmentLevels is now different
-        for (uint256 i=currentPeriodId; i>periodIdJoined - 1; i--) {
+        for (uint32 i=currentPeriodId; i>periodIdJoined - 1; i--) {
             Participation storage participation = participations[msg.sender][i];
             if (participation.commitmentLevel == 0) {
                 participation.commitmentLevel = oldCommitmentLevel;
@@ -213,16 +213,16 @@ contract Nova is INova, NovaUtils, NovaUpgradeable {
 
     /// @notice write sumCommitmentLevel to history when needed
     function writeHistoricalSumCommitmentLevel() public {
-        uint32 currentPeriodId = IGlobalParametersAlpha(novaRegistry_).currentPeriodId();
+        uint32 currentPeriodId = IGlobalParametersAlpha(novaRegistry).currentPeriodId();
         _writeHistoricalSumCommitmentLevel(currentPeriodId);
     }
 
     function _writeHistoricalSumCommitmentLevel(uint32 _currentPeriodId) internal {
         uint32 initPeriodId_ = initPeriodId; // gas
-        for (uint256 i=currentPeriodId - 1; i>initPeriodId_ - 1; i--) {
+        for (uint32 i=_currentPeriodId - 1; i>initPeriodId_ - 1; i--) {
             if (historicalSumCommitmentLevel[i] == 0) {
                 // write current sum of commitment to storage as there is currently no stored value
-                historicalSumCommitmentLevel[i] = sumCommitmentLevel;
+                historicalSumCommitmentLevel[i] = currentSumCommitmentLevel;
             } else {
                 // historical commitment levels are up to date- do nothing
                 break;

contracts/nova/NovaRegistry.sol

@@ -32,7 +32,7 @@ contract NovaRegistry is INovaRegistry, ERC2771ContextUpgradeable, OwnableUpgrad
     address public autIDAddr;
     address public pluginRegistry;
     address public hubDomainsRegistry;
-    address public glogalParameters;
+    address public globalParameters;
     UpgradeableBeacon public upgradeableBeacon;
     IAllowlist public allowlist;