Review fix

0xPolygonHermez · Feb 26, 2025 · 255af03 · 255af03
1 parent e2a5dd6
commit 255af03
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/contracts/v2/AggLayerGateway.sol b/contracts/v2/AggLayerGateway.sol
@@ -135,7 +135,7 @@ contract AggLayerGateway is Initializable, AccessControl, IAggLayerGateway {
             pessimisticVKeySelector
         ];
         if (route.verifier != address(0)) {
-            revert RouteAlreadyExists(route.verifier);
+            revert RouteAlreadyExists(pessimisticVKeySelector, route.verifier);
         }
 
         route.verifier = verifier;
@@ -157,12 +157,16 @@ contract AggLayerGateway is Initializable, AccessControl, IAggLayerGateway {
             revert RouteNotFound(pessimisticVKeySelector);
         }
         if (route.frozen) {
-            revert RouteIsFrozen(pessimisticVKeySelector);
+            revert RouteIsAlreadyFrozen(pessimisticVKeySelector);
         }
 
         route.frozen = true;
 
-        emit RouteIsAlreadyFrozen(pessimisticVKeySelector, route.verifier, route.pessimisticVKey);
+        emit RouteFrozen(
+            pessimisticVKeySelector,
+            route.verifier,
+            route.pessimisticVKey
+        );
     }
 
     ////////////////////////////////////////////////////////////

diff --git a/contracts/v2/interfaces/IAggLayerGateway.sol b/contracts/v2/interfaces/IAggLayerGateway.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.28;
+
 // based on: https://github.com/succinctlabs/sp1-contracts/blob/main/contracts/src/ISP1VerifierGateway.sol
 
 interface IAggLayerGatewayEvents {
@@ -16,7 +17,11 @@ interface IAggLayerGatewayEvents {
     /// @notice Emitted when a verifier route is frozen.
     /// @param selector The verifier selector that was frozen.
     /// @param verifier The address of the verifier contract.
-    event RouteIsAlreadyFrozen(bytes4 selector, address verifier, bytes32 pessimisticVKey);
+    event RouteFrozen(
+        bytes4 selector,
+        address verifier,
+        bytes32 pessimisticVKey
+    );
 
     /**
      * Emitted when a new default aggchain verification key is added
@@ -31,7 +36,11 @@ interface IAggLayerGatewayEvents {
      * @param previousVKey Aggchain verification key previous value
      * @param newVKey Aggchain verification key updated value
      */
-    event UpdateDefaultAggchainVKey(bytes4 selector, bytes32 previousVKey, bytes32 newVKey);
+    event UpdateDefaultAggchainVKey(
+        bytes4 selector,
+        bytes32 previousVKey,
+        bytes32 newVKey
+    );
 }
 
 /// @dev Extended error events from https://github.com/succinctlabs/sp1-contracts/blob/main/contracts/src/ISP1VerifierGateway.sol
@@ -44,9 +53,14 @@ interface IAggLayerGatewayErrors {
     /// @param selector The verifier selector that was specified.
     error RouteIsFrozen(bytes4 selector);
 
+    /// @notice Thrown when trying to freeze a route that is already frozen.
+    /// @param selector The pessimistic verification key selector that was specified.
+    error RouteIsAlreadyFrozen(bytes4 selector);
+
     /// @notice Thrown when adding a verifier route and the selector already contains a route.
+    /// @param selector The pessimistic verification key selector that was specified.
     /// @param verifier The address of the verifier contract in the existing route.
-    error RouteAlreadyExists(address verifier);
+    error RouteAlreadyExists(bytes4 selector, address verifier);
 
     /// @notice Thrown when adding a verifier route and the selector returned by the verifier is
     /// zero.

diff --git a/test/contractsv2/AggLayerGateway.test.ts b/test/contractsv2/AggLayerGateway.test.ts
@@ -112,7 +112,7 @@ describe("AggLayerGateway tests", () => {
                 .addPessimisticVKeyRoute(selector, verifierContract.target, pessimisticVKey)
         )
             .to.be.revertedWithCustomError(aggLayerGatewayContract, "RouteAlreadyExists")
-            .withArgs(verifierContract.target);
+            .withArgs(selector, verifierContract.target);
     });
 
     it("freezePessimisticVKeyRoute", async () => {
@@ -156,14 +156,14 @@ describe("AggLayerGateway tests", () => {
             .to.be.revertedWithCustomError(aggLayerGatewayContract, "RouteNotFound")
             .withArgs(testSelector);
 
-        // check RouteIsAlreadyFrozen
+        // check RouteFrozen
         await expect(aggLayerGatewayContract.connect(aggLayerAdmin).freezePessimisticVKeyRoute(selector))
-            .to.emit(aggLayerGatewayContract, "RouteIsAlreadyFrozen")
+            .to.emit(aggLayerGatewayContract, "RouteFrozen")
             .withArgs(selector, verifierContract.target, pessimisticVKey);
 
         // check RouteIsFrozen
         await expect(aggLayerGatewayContract.connect(aggLayerAdmin).freezePessimisticVKeyRoute(selector))
-            .to.be.revertedWithCustomError(aggLayerGatewayContract, "RouteIsFrozen")
+            .to.be.revertedWithCustomError(aggLayerGatewayContract, "RouteIsAlreadyFrozen")
             .withArgs(selector);
     });
 
@@ -281,10 +281,10 @@ describe("AggLayerGateway tests", () => {
 
         // frozen route
         await expect(aggLayerGatewayContract.connect(aggLayerAdmin).freezePessimisticVKeyRoute(selector))
-            .to.emit(aggLayerGatewayContract, "RouteIsAlreadyFrozen")
+            .to.emit(aggLayerGatewayContract, "RouteFrozen")
             .withArgs(selector, verifierContract.target, pessimisticVKey);
 
-        // check RouteIsAlreadyFrozen
+        // check RouteIsFrozen
         await expect(aggLayerGatewayContract.verifyPessimisticProof(input["public-values"], input["proof"]))
             .to.be.revertedWithCustomError(aggLayerGatewayContract, "RouteIsFrozen")
             .withArgs(selector);