Allowlist and Social LR

.github/workflows/test.yml

@@ -1,34 +1,47 @@
-name: test
-
-on: workflow_dispatch
+name: wip-dev-ci
 
 env:
-  FOUNDRY_PROFILE: default
+  FOUNDRY_PROFILE: "ci"
 
-jobs:
-  check:
-    strategy:
-      fail-fast: true
+on:
+  push:
+    branches:
+      - test-dev-2
+      - dev-main
 
-    name: Foundry project
+jobs:
+  build:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+      - name: Install Node.js
+        uses: actions/setup-node@v2
         with:
-          version: nightly
+          node-version: 18.12.1
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: "Install Foundry"
+        uses: "foundry-rs/foundry-toolchain@v1"
 
-      - name: Run Forge build
-        run: |
-          forge --version
-          forge build --sizes
-        id: build
 
       - name: Run Forge tests
-        run: |
-          forge test -vvv
-        id: test
+        run: forge t
+
+      # - name: Build with Hardhat
+      #   run: npm run test
+
+      - name: generate types
+        run: npx typechain --target ethers-v5  './out/*.sol/*'
+
+      # - name: Commit changes
+      #   run: |
+      #     git config --local user.email "[email protected]"
+      #     git config --local user.name "GitHub Actions"
+      #     git add .
+      #     git commit -m "ci: forge test"
+      #     git push

.gitignore

@@ -5,9 +5,10 @@ coverage
 coverage.json
 typechain
 tempNet
-out
 cache_forge
 broadcast
+test/testData/LRfuzzDataOut.csv
+*.csv
 
 #Hardhat files
 cache
@@ -19,3 +20,4 @@ artifacts
 .openzeppelin/.session
 .openzeppelin
 integrationTests/autID.integration.js
+

contracts/AutID.sol

@@ -99,6 +99,7 @@ contract AutID is ERC2771Recipient, ERC721URIStorageUpgradeable, IAutID {
     /// @param daoAddress the address of the daoAddress contract
     function joinDAO(uint256 role, uint256 commitment, address daoAddress) external override {
         require(role > 0 && role < 4, "Role must be between 1 and 3");
+        ///@dev @todo consider if role commitment dependent as initial.
         require(commitment > 0 && commitment < 11, "AutID: Commitment should be between 1 and 10");
         require(daoAddress != address(0), "AutID: Missing DAO");
         require(balanceOf(_msgSender()) == 1, "AutID: There is no AutID registered for this address.");
@@ -127,6 +128,8 @@ contract AutID is ERC2771Recipient, ERC721URIStorageUpgradeable, IAutID {
         holderToDAOMembershipData[_msgSender()][daoAddress].isActive = false;
         holderToDAOMembershipData[_msgSender()][daoAddress].commitment = 0;
 
+        /// @dev @todo this does not change Nova storage isMember[_msgSender] will still return true (has dos implications on admin check allowlist spec)
+
         emit DAOWithdrown(daoAddress, _msgSender());
     }
 

contracts/plugins/interactions/ILocalReputation.sol → contracts/ILocalReputation.sol

@@ -6,6 +6,14 @@ pragma solidity 0.8.19;
  * @dev Interface for local reputation algorythm
  */
 
+struct periodData {
+    int32 aDiffMembersLP; // difference in member nr. between periods
+    int32 bMembersLastLP; // how many members last period
+    uint64 cAverageRepLP; // avg. reputation
+    uint64 dAverageCommitmentLP; // avg. commitment
+    uint64 ePerformanceLP; // points performance score
+}
+
 struct groupState {
     uint64 lastPeriod; //lastPeriod: Last period in which the LR was updated.
     uint64 TCL; //TCL (Total Commitment Level in the Community): Sum of all members' Commitment Levels (between 1 and 10).
@@ -16,7 +24,7 @@ struct groupState {
     uint32 p; // period length
     bytes32 commitHash;
     uint256 lrUpdatesPerPeriod; // how many iS updates were executed // used to zero TCP // ensures LRs updated
-    int64[4] archetypeData; // difference in member nr. between periods | how many members last period | avg. reputation | avg. commitment
+    periodData periodNovaParameters;
 }
 
 struct individualState {
@@ -50,25 +58,26 @@ interface ILocalReputation {
     error PeriodUnelapsed();
     error ZeroUnallawed();
     error MaxK();
+    error k1MaxPointPerInteraction();
 
     function initialize(address dao_) external;
 
     function interaction(bytes calldata msgData, address agent) external;
 
-    function setInteractionWeights(address plugin_, bytes[] memory datas, uint256[] memory points) external;
+    function setInteractionWeights(address plugin_, bytes[] memory datas, uint16[] memory points) external;
 
     function getGroupState(address nova_) external view returns (groupState memory);
 
     function getIndividualState(address agent_, address nova_) external view returns (individualState memory);
 
-    function setKP(uint16 k, uint32 p, uint16 penalty, address target_) external;
+    function setKP(uint16 k, uint32 p, uint8 penalty, address target_) external;
 
-    function updateCommitmentLevels(address nova_) external;
+    function updateCommitmentLevels(address nova_) external returns (uint256[] memory);
 
     function updateIndividualLR(address who_, address group_) external returns (uint256);
     function periodicGroupStateUpdate(address group_) external returns (uint256 nextUpdateAt);
 
-    function getArchetypeData(address nova_) external view returns (int64[4] memory);
+    function getPeriodNovaParameters(address nova_) external view returns (periodData memory);
 
     function getAvReputationAndCommitment(address nova_) external view returns (uint256 sumCommit, uint256 sumRep);