Merge pull request #54 from lidofinance/fix/distributor-root

weakening the check

Author: loga4

src/Distributor.sol

@@ -85,7 +85,7 @@ contract Distributor is AccessControlEnumerable {
      */
     function setMerkleRoot(bytes32 _root, string calldata _cid) external {
         _checkRole(MANAGER_ROLE, msg.sender);
-        if (_root == root || keccak256(bytes(_cid)) == keccak256(bytes(cid))) revert AlreadyProcessed();
+        if (_root == root && keccak256(bytes(_cid)) == keccak256(bytes(cid))) revert AlreadyProcessed();
 
         emit MerkleRootUpdated(root, _root, cid, _cid, lastProcessedBlock, block.number);
 

test/unit/distributor/MerkleRoot.test.sol

@@ -26,34 +26,33 @@ contract MerkleRootTest is Test, SetupDistributor {
         distributor.setMerkleRoot(newRoot, newCid);
     }
 
-    function test_SetMerkleRoot_RevertsOnSameRoot() public {
-        bytes32 newRoot = keccak256("testRoot");
-        string memory cid1 = "QmTestCID1";
-
-        vm.prank(manager);
-        distributor.setMerkleRoot(newRoot, cid1);
+    function test_SetMerkleRoot_RevertsWhenNoChanges() public {
+        bytes32 initialRoot = keccak256("root");
+        string memory initialCid = "QmCID";
 
-        // Try to set the same root with different CID
-        string memory cid2 = "QmTestCID2";
+        vm.startPrank(manager);
+        distributor.setMerkleRoot(initialRoot, initialCid);
 
-        vm.prank(manager);
         vm.expectRevert(Distributor.AlreadyProcessed.selector);
-        distributor.setMerkleRoot(newRoot, cid2);
+        distributor.setMerkleRoot(initialRoot, initialCid);
+        vm.stopPrank();
     }
 
-    function test_SetMerkleRoot_RevertsOnSameCid() public {
+    function test_SetMerkleRoot_AllowsPartialUpdates() public {
         bytes32 root1 = keccak256("root1");
-        string memory sameCid = "QmTestCID";
+        bytes32 root2 = keccak256("root2");
+        string memory cid1 = "QmCid1";
+        string memory cid2 = "QmCid2";
 
-        vm.prank(manager);
-        distributor.setMerkleRoot(root1, sameCid);
+        vm.startPrank(manager);
+        distributor.setMerkleRoot(root1, cid1);
 
-        // Try to set different root with same CID
-        bytes32 root2 = keccak256("root2");
+        // Same root, new cid
+        distributor.setMerkleRoot(root1, cid2);
 
-        vm.prank(manager);
-        vm.expectRevert(Distributor.AlreadyProcessed.selector);
-        distributor.setMerkleRoot(root2, sameCid);
+        // Same cid, new root
+        distributor.setMerkleRoot(root2, cid2);
+        vm.stopPrank();
     }
 
     // ==================== Successful Merkle Root Setting ====================