Upd forge-std and fix all compiler warnings (#388)

.foundryref

@@ -1 +1 @@
-03ea54c
+v0.3.0

.github/workflows/regular-mainnet.yml

@@ -23,7 +23,6 @@ jobs:
       cache-path: ${{ steps.cache.outputs.path }}
       cache-key: ${{ steps.cache.outputs.key }}
     env:
-      FORGE_REV: 03ea54c
       JUST_TAG: 1.24.0
     steps:
       - name: Build cache params
@@ -35,7 +34,6 @@ jobs:
           CACHE_PATH: |
             ~/.cargo/bin/
           KEY_INPUT: |
-            forge:${{env.FORGE_REV}}
             just:${{env.JUST_TAG}}
 
       - uses: actions/cache@v4
@@ -48,14 +46,12 @@ jobs:
         run: cargo install "just@$JUST_TAG"
         if: steps.get-cache.outputs.cache-hit != 'true'
 
-      - name: Install forge & anvil
-        run: cargo install --git https://github.com/foundry-rs/foundry --rev "$FORGE_REV" --profile release --locked forge anvil
-        if: steps.get-cache.outputs.cache-hit != 'true'
-
   test:
     name: Integration & Invariant tests
     runs-on: ubuntu-latest
     needs: bootstrap
+    env:
+      FORGE_REV: v0.3.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -66,6 +62,11 @@ jobs:
           path: ${{ needs.bootstrap.outputs.cache-path }}
           key: ${{ needs.bootstrap.outputs.cache-key }}
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: ${{ env.FORGE_REV }}
+
       - name: Install node
         uses: actions/setup-node@v4
         with:

.github/workflows/test.yml

@@ -30,7 +30,6 @@ jobs:
       cache-path: ${{ steps.cache.outputs.path }}
       cache-key: ${{ steps.cache.outputs.key }}
     env:
-      FORGE_REV: 03ea54c
       JUST_TAG: 1.24.0
     steps:
       - name: Build cache params
@@ -42,7 +41,6 @@ jobs:
           CACHE_PATH: |
             ~/.cargo/bin/
           KEY_INPUT: |
-            forge:${{env.FORGE_REV}}
             just:${{env.JUST_TAG}}
 
       - uses: actions/cache@v4
@@ -55,10 +53,6 @@ jobs:
         run: cargo install "just@$JUST_TAG"
         if: steps.get-cache.outputs.cache-hit != 'true'
 
-      - name: Install forge & anvil
-        run: cargo install --git https://github.com/foundry-rs/foundry --rev "$FORGE_REV" --profile release --locked forge anvil
-        if: steps.get-cache.outputs.cache-hit != 'true'
-
   linters:
     name: Linters
     runs-on: ubuntu-latest
@@ -90,6 +84,8 @@ jobs:
     name: Foundry project
     runs-on: ubuntu-latest
     needs: bootstrap
+    env:
+      FORGE_REV: v0.3.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -100,6 +96,11 @@ jobs:
           path: ${{ needs.bootstrap.outputs.cache-path }}
           key: ${{ needs.bootstrap.outputs.cache-key }}
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: ${{ env.FORGE_REV }}
+
       - name: Install node
         uses: actions/setup-node@v4
         with:

Justfile

@@ -156,9 +156,10 @@ _deploy-prod *args:
     forge script {{deploy_script_path}} --sig="run(string)" --force --rpc-url ${RPC_URL} {{args}} -- `git rev-parse HEAD`
 
 _deploy-impl *args:
-    forge script {{deploy_impls_script_path}} --sig="deploy(string,string)" \
-        --rpc-url {{anvil_rpc_url}} --slow {{args}} \
-        -- {{deploy_config_path}} `git rev-parse HEAD`
+    FOUNDRY_PROFILE=deploy-impl \
+        forge script {{deploy_impls_script_path}} --sig="deploy(string,string)" \
+            --rpc-url {{anvil_rpc_url}} --slow {{args}} \
+            -- {{deploy_config_path}} `git rev-parse HEAD`
 
 [confirm("You are about to broadcast deployment transactions to the network. Are you sure?")]
 deploy-impl-prod *args:

foundry.toml

@@ -35,7 +35,7 @@ fs_permissions = [
     { access = "read", path = "./test/fixtures" },
 ]
 
-ignored_warnings_from = ["src/lib/base-oracle/HashConsensus.sol", "test/helpers/mocks/LidoMock.sol", "test/OssifiableProxy.t.sol"]
+ignored_warnings_from = ["src/lib/base-oracle/HashConsensus.sol", "test/OssifiableProxy.t.sol"]
 
 [profile.ci]
 verbosity = 3
@@ -47,3 +47,8 @@ fuzz = { runs = 10_000, max_test_rejects = 2_000_000 }
 # due to coverage running with optimizer disabled, we need to increase the gas limit
 # to fit CSM contract tests in one block
 block_gas_limit = 60_000_000
+
+[profile.deploy-impl]
+# unknown problem of too high estimated gas usage in the implementation deployment script
+# after upgrading forge-std 1.7.6 -> 1.9.5
+block_gas_limit = 60_000_000

package.json

@@ -19,7 +19,7 @@
     "@openzeppelin/contracts-upgradeable": "5.0.2",
     "@openzeppelin/merkle-tree": "^1.0.6",
     "ds-test": "https://github.com/dapphub/ds-test",
-    "forge-std": "https://github.com/foundry-rs/forge-std.git#v1.7.6"
+    "forge-std": "https://github.com/foundry-rs/forge-std.git#v1.9.5"
   },
   "devDependencies": {
     "husky": "^8.0.3",

script/fork-helpers/NodeOperators.s.sol

@@ -297,15 +297,15 @@ contract NodeOperators is
 
         bytes3 moduleId = bytes3(uint24(_getCSMId()));
         bytes5 nodeOpId = bytes5(uint40(noId));
-        bytes8 validatorIndex = bytes8(uint64(validatorIndex));
+        bytes8 _validatorIndex = bytes8(uint64(validatorIndex));
 
         (, uint256 refSlot, , ) = vebo.getConsensusReport();
         uint256 reportRefSlot = refSlot + 1;
 
         data = abi.encodePacked(
             moduleId,
             nodeOpId,
-            validatorIndex,
+            _validatorIndex,
             validatorPubKey
         );
         IVEBO.ReportData memory report = IVEBO.ReportData({

src/CSModule.sol

@@ -541,7 +541,7 @@ contract CSModule is
     function updateRefundedValidatorsCount(
         uint256 /* nodeOperatorId */,
         uint256 /* refundedValidatorsCount */
-    ) external onlyRole(STAKING_ROUTER_ROLE) {
+    ) external view onlyRole(STAKING_ROUTER_ROLE) {
         revert NotSupported();
     }
 

test/BaseOracle.t.sol

@@ -126,49 +126,45 @@ contract BaseOracleTest is Test, Utilities {
     function test_submitConsensusReport_RevertsIfSenderIsNotConsensusContract()
         public
     {
-        uint256 initialRefSlot = oracle.getTime();
+        uint256 refSlot = oracle.getTime();
         vm.prank(stranger);
         vm.expectRevert(BaseOracle.SenderIsNotTheConsensusContract.selector);
-        oracle.submitConsensusReport(
-            keccak256("HASH_1"),
-            initialRefSlot,
-            initialRefSlot
-        );
+        oracle.submitConsensusReport(keccak256("HASH_1"), refSlot, refSlot);
     }
 
     function test_submitConsensusReport_SubmitsFromConsensusContract() public {
-        uint256 initialRefSlot = oracle.getTime();
+        uint256 refSlot = oracle.getTime();
         vm.prank(address(consensus));
         oracle.submitConsensusReport(
             keccak256("HASH_1"),
-            initialRefSlot,
-            initialRefSlot + SLOTS_PER_FRAME
+            refSlot,
+            refSlot + SLOTS_PER_FRAME
         );
         assertEq(oracle.getConsensusReportLastCall().callCount, 1);
     }
 
     function test_discardConsensusReport_RevertsIfSenderIsNotConsensusContract()
         public
     {
-        uint256 initialRefSlot = oracle.getTime();
+        uint256 refSlot = oracle.getTime();
         vm.prank(stranger);
         vm.expectRevert(BaseOracle.SenderIsNotTheConsensusContract.selector);
-        oracle.discardConsensusReport(initialRefSlot);
+        oracle.discardConsensusReport(refSlot);
     }
 
     function test_discardConsensusReport_DiscardsFromConsensusContract()
         public
     {
-        uint256 initialRefSlot = oracle.getTime();
+        uint256 refSlot = oracle.getTime();
         vm.prank(address(consensus));
         oracle.submitConsensusReport(
             keccak256("HASH_1"),
-            initialRefSlot,
-            initialRefSlot + SLOTS_PER_FRAME
+            refSlot,
+            refSlot + SLOTS_PER_FRAME
         );
         assertEq(oracle.getConsensusReportLastCall().callCount, 1);
         vm.prank(address(consensus));
-        oracle.discardConsensusReport(initialRefSlot);
+        oracle.discardConsensusReport(refSlot);
     }
 
     // consensus tests
@@ -392,19 +388,19 @@ contract BaseOracleTest is Test, Utilities {
         oracle.checkProcessingDeadline();
     }
 
-    function test_isConsensusMember_ReturnsFalseOnNonMember() public {
+    function test_isConsensusMember_ReturnsFalseOnNonMember() public view {
         bool r = oracle.isConsensusMember(notMember);
         assertFalse(r);
     }
 
-    function test_isConsensusMember_ReturnsTrueOnMember() public {
+    function test_isConsensusMember_ReturnsTrueOnMember() public view {
         bool r = oracle.isConsensusMember(member);
         assertTrue(r);
     }
 
     // consensus report
 
-    function test_getConsensusReport_ReturnsEmptyState() public {
+    function test_getConsensusReport_ReturnsEmptyState() public view {
         (
             bytes32 hash,
             uint256 refSlot,
@@ -820,12 +816,7 @@ contract BaseOracleTest is Test, Utilities {
         emit BaseOracle.ReportDiscarded(initialRefSlot, keccak256("HASH_1"));
         oracle.discardConsensusReport(initialRefSlot);
 
-        (
-            bytes32 hash,
-            uint256 refSlot,
-            uint256 processingDeadlineTime,
-            bool processingStarted
-        ) = oracle.getConsensusReport();
+        (bytes32 hash, , , ) = oracle.getConsensusReport();
         assertEq(hash, bytes32(0));
     }
 
@@ -842,8 +833,7 @@ contract BaseOracleTest is Test, Utilities {
         vm.prank(address(consensus));
         oracle.discardConsensusReport(initialRefSlot);
 
-        (bytes32 hash, uint256 refSlot, uint256 processingDeadlineTime) = oracle
-            .lastDiscardedReport();
+        (bytes32 hash, , ) = oracle.lastDiscardedReport();
         assertEq(hash, keccak256("HASH_1"));
     }
 
@@ -861,12 +851,7 @@ contract BaseOracleTest is Test, Utilities {
             initialRefSlot,
             deadline
         );
-        (
-            bytes32 hash,
-            uint256 refSlot,
-            uint256 processingDeadlineTime,
-            bool processingStarted
-        ) = oracle.getConsensusReport();
+        (bytes32 hash, , , ) = oracle.getConsensusReport();
         assertEq(hash, keccak256("HASH_2"));
     }
 
@@ -1099,7 +1084,7 @@ contract BaseOracleImpl is BaseOracle {
         _checkConsensusData(refSlot, consensusVersion, hash);
     }
 
-    function checkProcessingDeadline() external {
+    function checkProcessingDeadline() external view {
         _checkProcessingDeadline(
             _storageConsensusReport().value.processingDeadlineTime
         );