test full pesismistic

0xPolygonHermez · Jul 26, 2024 · a7e7955 · a7e7955
1 parent b8f847b
commit a7e7955
Show file tree

Hide file tree

Showing 3 changed files with 420 additions and 18 deletions.
diff --git a/contracts/mocks/VerifierRollupHelperMock.sol b/contracts/mocks/VerifierRollupHelperMock.sol
@@ -3,12 +3,20 @@
 pragma solidity 0.8.20;
 
 import "../interfaces/IVerifierRollup.sol";
+import "../v2/interfaces/ISP1Verifier.sol";
 
-contract VerifierRollupHelperMock is IVerifierRollup {
+contract VerifierRollupHelperMock is IVerifierRollup, ISP1Verifier {
     function verifyProof(
         bytes32[24] calldata proof,
         uint256[1] memory pubSignals
     ) public pure override returns (bool) {
         return true;
     }
+
+    // SP1 interface
+    function verifyProof(
+        bytes32 programVKey,
+        bytes calldata publicValues,
+        bytes calldata proofBytes
+    ) public pure {}
 }
diff --git a/contracts/v2/PolygonRollupManager.sol b/contracts/v2/PolygonRollupManager.sol
@@ -593,13 +593,6 @@ contract PolygonRollupManager is
             revert UpdateToOldRollupTypeID();
         }
 
-        if (
-            rollup.rollupVerifierType !=
-            rollupTypeMap[newRollupTypeID].rollupVerifierType
-        ) {
-            revert UpdateNotCompatible();
-        }
-
         _updateRollup(rollupContract, newRollupTypeID, new bytes(0));
     }
 
@@ -655,13 +648,7 @@ contract PolygonRollupManager is
 
         // Check rollup types
         if (rollup.rollupVerifierType != newRollupType.rollupVerifierType) {
-            // Currently the transition from pessimistic to state transition is not allowed
-            if (rollup.rollupVerifierType == VerifierType.Pessimistic) {
-                revert RollupTypeObsolete();
-            }
-
-            // Update rollup verifier type
-            rollup.rollupVerifierType = newRollupType.rollupVerifierType;
+            revert UpdateNotCompatible();
         }
 
         // Update rollup parameters