Merge pull request #5 from lidofinance/storage

storage&tools

.gitignore

@@ -22,3 +22,6 @@ lcov.info
 !.yarn/versions
 
 lib/*
+
+scc-report.*
+scm-report.*

.solhint.json

@@ -6,13 +6,13 @@
     "compiler-version": ["error", "0.8.28"],
     "no-inline-assembly": "off",
     "no-unused-import": "error",
-    "func-named-parameters": "error",
+    "func-named-parameters": ["warn", 5],
     "func-visibility": ["error", { "ignoreConstructors": true }],
     "reason-string": ["warn", { "maxLength": 64 }],
     "immutable-vars-naming": ["error", { "immutablesAsConstants": true }],
     "var-name-mixedcase": "warn",
     "func-name-mixedcase": "warn",
-    "foundry-test-functions": ["warn", ["setUp"]],
+    "foundry-test-functions": ["off", ["setUp"]],
     "no-global-import": "error",
     "ordering": "warn",
     "gas-calldata-parameters": "error",

artifacts/holesky/deploy-holesky.json

@@ -1,7 +1,7 @@
 {
   "CCCP": "0x5e30e8958a4361ac7a7C4FcE978FF18f70E915a2",
-  "CCCPImpl": "0x73CCA4DD9E58Fa3aBCA22d55ee81AE613d958980",
+  "CCCPImpl": "0x7c178B9B797C6ea6776A784C22A0f95a79385c9b",
   "ChainId": 17000,
   "DeployParams": "0x00000000000000000000000028fab2059c713a7f9d8c86db49f9bb0e96af1ef8636f6d6d756e6974792d6f6e636861696e2d7631000000000000000000000000000000000000000000000000401fd888b5e41113b7c0c47725a742bbc3a083ef000000000000000000000000401fd888b5e41113b7c0c47725a742bbc3a083ef00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000f4240",
   "LidoLocator": "0x28FAB2059C713A7F9D8c86Db49f9bb0e96Af1ef8"
-}
+}

foundry.toml

@@ -18,7 +18,7 @@ block_gas_limit = 30_000_000
 fuzz = { runs = 256 }
 
 gas_reports = [
-    "CredibleCommitmentCurationProvider",
+    "CCCP",
     "CCCPDataStorage",
     "OssifiableProxy"
 ]

package.json

@@ -8,17 +8,20 @@
   "private": true,
   "scripts": {
     "lint:solhint": "solhint './src/**/*.sol'",
-    "lint:check": "prettier --check **.sol && yarn lint:solhint",
-    "lint:fix": "prettier --write **.sol",
-    "generate:diffyscan": "node script/generateDiffyscanContracts.js"
+    "lint:check": "forge fmt --check && yarn lint:solhint",
+    "lint:fix": "forge fmt",
+    "generate:diffyscan": "node script/generateDiffyscanContracts.js",
+    "scc:report": "scc src --sort names --no-cocomo --exclude-dir interfaces --by-file --format wide > scc-report.txt",
+    "scm:report": "solidity-code-metrics $(tree -f -i -I '*interfaces*' | grep '^./src.*sol' | xargs ls -d 2>/dev/null) > scm-report.md"
   },
   "devDependencies": {
     "husky": "^9.1.7",
-    "lint-staged": "^15.3.0",
+    "lint-staged": "^15.4.2",
     "prettier": "^3.4.2",
     "prettier-plugin-solidity": "^1.4.2",
-    "solhint": "5.0.4",
-    "solhint-plugin-lido-csm": "https://github.com/lidofinance/solhint-plugin-lido-csm.git#0.3.3"
+    "solhint": "5.0.5",
+    "solhint-plugin-lido-csm": "https://github.com/lidofinance/solhint-plugin-lido-csm.git#0.3.3",
+    "solidity-code-metrics": "^0.0.28"
   },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write",

script/DeployBase.s.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {OssifiableProxy} from "../src/lib/proxy/OssifiableProxy.sol";
-import {CredibleCommitmentCurationProvider} from "../src/CredibleCommitmentCurationProvider.sol";
+import {CCCP} from "../src/CCCP.sol";
 
 import {JsonObj, Json} from "./utils/Json.sol";
 
@@ -28,7 +28,7 @@ abstract contract DeployBase is Script {
 
     address internal deployer;
     uint256 internal pk;
-    CredibleCommitmentCurationProvider public cccp;
+    CCCP public cccp;
 
     error ChainIdMismatch(uint256 actual, uint256 expected);
 
@@ -51,15 +51,14 @@ abstract contract DeployBase is Script {
 
         vm.startBroadcast(pk);
         {
-            address cccpImpl =
-                address(new CredibleCommitmentCurationProvider(config.lidoLocatorAddress, config.csModuleType));
+            address cccpImpl = address(new CCCP(config.lidoLocatorAddress, config.csModuleType));
 
-            cccp = CredibleCommitmentCurationProvider(
+            cccp = CCCP(
                 _deployProxy(
                     config.proxyAdmin,
                     address(cccpImpl),
                     abi.encodeCall(
-                        CredibleCommitmentCurationProvider.initialize,
+                        CCCP.initialize,
                         (
                             config.committeeAddress,
                             config.optInMinDurationBlocks,