Merge pull request #881 from lidofinance/feat/vaults-develop-sync

chore: sync vaults and develop
lidofinance · Dec 2, 2024 · e83f05f · e83f05f
2 parents d534778 + 5de258b
commit e83f05f
Show file tree

Hide file tree

Showing 109 changed files with 10,657 additions and 5,072 deletions.
diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
@@ -1,6 +1,9 @@
 name: Analysis
 
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches: [master]
 
 jobs:
   slither:
@@ -37,11 +40,7 @@ jobs:
 
       - name: Run slither
         run: >
-          poetry run slither . \
-            --no-fail-pedantic \
-            --compile-force-framework hardhat \
-            --sarif results.sarif \
-            --exclude pess-strange-setter,pess-arbitrary-call-calldata-tainted
+          poetry run slither . --no-fail-pedantic --sarif results.sarif 
 
       - name: Check results.sarif presence
         id: results

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -33,7 +33,8 @@ jobs:
         with:
           path: ./coverage/cobertura-coverage.xml
           publish: true
-          threshold: 95
+          # TODO: restore to 95% before release
+          threshold: 80
           diff: true
           diff-branch: master
           diff-storage: _core_coverage_reports

diff --git a/.github/workflows/tests-integration-scratch.yml b/.github/workflows/tests-integration-scratch.yml
@@ -42,3 +42,4 @@ jobs:
         run: yarn test:integration:fork:local
         env:
           LOG_LEVEL: "debug"
+          INTEGRATION_WITH_CSM: "off"
diff --git a/contracts/0.4.24/nos/NodeOperatorsRegistry.sol b/contracts/0.4.24/nos/NodeOperatorsRegistry.sol
diff --git a/contracts/0.8.25/Accounting.sol b/contracts/0.8.25/Accounting.sol
@@ -357,7 +357,7 @@ contract Accounting is VaultHub {
         ReportValues memory _report,
         PreReportState memory _pre,
         CalculatedValues memory _update
-    ) internal view {
+    ) internal {
         if (_report.timestamp >= block.timestamp) revert IncorrectReportTimestamp(_report.timestamp, block.timestamp);
         if (_report.clValidators < _pre.clValidators || _report.clValidators > _pre.depositedValidators) {
             revert IncorrectReportValidators(_report.clValidators, _pre.clValidators, _pre.depositedValidators);

diff --git a/contracts/0.8.25/interfaces/IOracleReportSanityChecker.sol b/contracts/0.8.25/interfaces/IOracleReportSanityChecker.sol
@@ -27,7 +27,7 @@ interface IOracleReportSanityChecker {
         uint256 _sharesRequestedToBurn,
         uint256 _preCLValidators,
         uint256 _postCLValidators
-    ) external view;
+    ) external;
 
     //
     function checkWithdrawalQueueOracleReport(