Merge pull request #53 from Aut-Labs/master

rebase
Aut-Labs · Nov 3, 2023 · fc3aa5c · fc3aa5c
2 parents a876109 + 39692a1
commit fc3aa5c
Show file tree

Hide file tree

Showing 19 changed files with 23,198 additions and 21,741 deletions.
diff --git a/contracts/nova/Nova.sol b/contracts/nova/Nova.sol
@@ -6,6 +6,7 @@ import "../components/abstracts/NovaMarket.sol";
 import "../components/abstracts/NovaMembers.sol";
 import "../components/abstracts/NovaModules.sol";
 import "../components/abstracts/NovaMetadata.sol";
+import "../components/abstracts/NovaArchetype.sol";
 import "../components/abstracts/AutIDAddress.sol";
 import "../components/abstracts/NovaCommitment.sol";
 import "./NovaUpgradeable.sol";
@@ -16,7 +17,7 @@ import "./interfaces/INova.sol";
 /// @title Nova
 /// @notice
 /// @dev
-contract Nova is NovaUpgradeable, NovaMembers, NovaMetadata, NovaUrls, NovaMarket, NovaModules, NovaCommitment {
+contract Nova is NovaUpgradeable, NovaMembers, NovaMetadata, NovaUrls, NovaMarket, NovaModules, NovaCommitment, NovaArchetype {
     uint256[50] private __basesGap;
 
     address public deployer;
@@ -84,6 +85,16 @@ contract Nova is NovaUpgradeable, NovaMembers, NovaMetadata, NovaUrls, NovaMarke
         _setCommitment(commitment);
     }
 
+    /// @dev set an archetype (for example, Growth or Performance)
+    function setArchetype(uint8 parameter) external onlyAdmin {
+        _setArchetype(parameter);
+    }
+
+    /// @dev set weight for the parameter (for example, Growth or Size)
+    function setWeightFor(uint8 parameter, uint256 value) external onlyAdmin {
+        _setWeightFor(parameter, value);
+    }
+
     function canJoin(address member, uint256 role) external view returns (bool) {
         if (onboardingAddr == address(0)) return true;
         if (onboardingAddr != address(0) && !OnboardingModule(onboardingAddr).isActive()) return false;

diff --git a/out/AllowList.t.sol/AllowListT.json b/out/AllowList.t.sol/AllowListT.json
diff --git a/out/AutID.sol/AutID.json b/out/AutID.sol/AutID.json
diff --git a/out/BatchAdminAdd.t.sol/MembershipSets.json b/out/BatchAdminAdd.t.sol/MembershipSets.json
diff --git a/out/DAOExpander.sol/DAOExpander.json b/out/DAOExpander.sol/DAOExpander.json
diff --git a/out/DAOExpanderFactory.sol/DAOExpanderFactory.json b/out/DAOExpanderFactory.sol/DAOExpanderFactory.json
diff --git a/out/DeployAll.s.sol/DeployScript.json b/out/DeployAll.s.sol/DeployScript.json
diff --git a/out/DeploysInit.t.sol/DeploysInit.json b/out/DeploysInit.t.sol/DeploysInit.json
diff --git a/out/INovaMembershipSet.sol/INovaMembershipSet.json b/out/INovaMembershipSet.sol/INovaMembershipSet.json
@@ -116,19 +116,19 @@
   },
   "ast": {
     "absolutePath": "contracts/components/interfaces/set/INovaMembershipSet.sol",
-    "id": 4706,
+    "id": 4095,
     "exportedSymbols": {
       "INovaMembershipSet": [
-        4705
+        4094
       ]
     },
     "nodeType": "SourceUnit",
-    "src": "31:240:28",
+    "src": "31:240:24",
     "nodes": [
       {
-        "id": 4694,
+        "id": 4083,
         "nodeType": "PragmaDirective",
-        "src": "31:23:28",
+        "src": "31:23:24",
         "nodes": [],
         "literals": [
           "solidity",
@@ -137,61 +137,61 @@
         ]
       },
       {
-        "id": 4705,
+        "id": 4094,
         "nodeType": "ContractDefinition",
-        "src": "151:119:28",
+        "src": "151:119:24",
         "nodes": [
           {
-            "id": 4697,
+            "id": 4086,
             "nodeType": "EventDefinition",
-            "src": "186:20:28",
+            "src": "186:20:24",
             "nodes": [],
             "anonymous": false,
             "eventSelector": "94d9b0a056867efca93631b338c7fde3befc3f54db36b90b8456b069385c30be",
             "name": "MemberAdded",
-            "nameLocation": "192:11:28",
+            "nameLocation": "192:11:24",
             "parameters": {
-              "id": 4696,
+              "id": 4085,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "203:2:28"
+              "src": "203:2:24"
             }
           },
           {
-            "id": 4704,
+            "id": 4093,
             "nodeType": "FunctionDefinition",
-            "src": "212:56:28",
+            "src": "212:56:24",
             "nodes": [],
             "functionSelector": "3b4da69f",
             "implemented": false,
             "kind": "function",
             "modifiers": [],
             "name": "join",
-            "nameLocation": "221:4:28",
+            "nameLocation": "221:4:24",
             "parameters": {
-              "id": 4702,
+              "id": 4091,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 4699,
+                  "id": 4088,
                   "mutability": "mutable",
                   "name": "newMember",
-                  "nameLocation": "234:9:28",
+                  "nameLocation": "234:9:24",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4704,
-                  "src": "226:17:28",
+                  "scope": 4093,
+                  "src": "226:17:24",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
                     "typeIdentifier": "t_address",
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 4698,
+                    "id": 4087,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "226:7:28",
+                    "src": "226:7:24",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -202,24 +202,24 @@
                 },
                 {
                   "constant": false,
-                  "id": 4701,
+                  "id": 4090,
                   "mutability": "mutable",
                   "name": "role",
-                  "nameLocation": "253:4:28",
+                  "nameLocation": "253:4:24",
                   "nodeType": "VariableDeclaration",
-                  "scope": 4704,
-                  "src": "245:12:28",
+                  "scope": 4093,
+                  "src": "245:12:24",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
                     "typeIdentifier": "t_uint256",
                     "typeString": "uint256"
                   },
                   "typeName": {
-                    "id": 4700,
+                    "id": 4089,
                     "name": "uint256",
                     "nodeType": "ElementaryTypeName",
-                    "src": "245:7:28",
+                    "src": "245:7:24",
                     "typeDescriptions": {
                       "typeIdentifier": "t_uint256",
                       "typeString": "uint256"
@@ -228,15 +228,15 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "225:33:28"
+              "src": "225:33:24"
             },
             "returnParameters": {
-              "id": 4703,
+              "id": 4092,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "267:0:28"
+              "src": "267:0:24"
             },
-            "scope": 4705,
+            "scope": 4094,
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "external"
@@ -248,22 +248,22 @@
         "contractDependencies": [],
         "contractKind": "interface",
         "documentation": {
-          "id": 4695,
+          "id": 4084,
           "nodeType": "StructuredDocumentation",
-          "src": "56:95:28",
+          "src": "56:95:24",
           "text": "@title INova\n @notice The interface for the extension of each DAO that integrates AutID"
         },
         "fullyImplemented": false,
         "linearizedBaseContracts": [
-          4705
+          4094
         ],
         "name": "INovaMembershipSet",
-        "nameLocation": "161:18:28",
-        "scope": 4706,
+        "nameLocation": "161:18:24",
+        "scope": 4095,
         "usedErrors": []
       }
     ],
     "license": "MIT"
   },
-  "id": 28
+  "id": 24
 }
diff --git a/out/MultiPluginLR.t.sol/MultiPluginLR.json b/out/MultiPluginLR.t.sol/MultiPluginLR.json