fix: FunctionRegistry bugs + tests (#266)

succinctlabs · Oct 31, 2023 · 7703e85 · 7703e85
1 parent 5e5a54c
commit 7703e85
Show file tree

Hide file tree

Showing 5 changed files with 310 additions and 15 deletions.
diff --git a/contracts/.gitignore b/contracts/.gitignore
@@ -11,9 +11,7 @@ cache/
 out/
 
 # Ignores development broadcast logs
-!/broadcast
-/broadcast/*/31337/
-/broadcast/**/dry-run/
+/broadcast
 
 # Docs
 docs/

diff --git a/contracts/src/FunctionRegistry.sol b/contracts/src/FunctionRegistry.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.16;
 
 import {IFunctionRegistry} from "./interfaces/IFunctionRegistry.sol";
 
-contract FunctionRegistry is IFunctionRegistry {
+abstract contract FunctionRegistry is IFunctionRegistry {
     /// @dev Maps function identifiers to their corresponding verifiers.
     mapping(bytes32 => address) public verifiers;
 
@@ -18,7 +18,7 @@ contract FunctionRegistry is IFunctionRegistry {
         external
         returns (bytes32 functionId)
     {
-        functionId = getFunctionId(msg.sender, _name);
+        functionId = getFunctionId(_owner, _name);
         if (address(verifiers[functionId]) != address(0)) {
             revert FunctionAlreadyRegistered(functionId); // should call update instead
         }
@@ -39,7 +39,7 @@ contract FunctionRegistry is IFunctionRegistry {
         external
         returns (bytes32 functionId, address verifier)
     {
-        functionId = getFunctionId(msg.sender, _name);
+        functionId = getFunctionId(_owner, _name);
         if (address(verifiers[functionId]) != address(0)) {
             revert FunctionAlreadyRegistered(functionId); // should call update instead
         }
@@ -66,6 +66,9 @@ contract FunctionRegistry is IFunctionRegistry {
         if (_verifier == address(0)) {
             revert VerifierCannotBeZero();
         }
+        if (_verifier == verifiers[functionId]) {
+            revert VerifierAlreadyUpdated(functionId);
+        }
         verifiers[functionId] = _verifier;
 
         emit FunctionVerifierUpdated(functionId, _verifier);
@@ -90,7 +93,7 @@ contract FunctionRegistry is IFunctionRegistry {
     }
 
     /// @notice Returns the functionId for a given owner and function name.
-    /// @param _owner The owner of the function (sender of registerFunction).
+    /// @param _owner The owner of the function.
     /// @param _name The name of the function.
     function getFunctionId(address _owner, string memory _name)
         public

diff --git a/contracts/src/interfaces/IFunctionRegistry.sol b/contracts/src/interfaces/IFunctionRegistry.sol
@@ -15,6 +15,7 @@ interface IFunctionRegistryErrors {
     error EmptyBytecode();
     error FailedDeploy();
     error VerifierCannotBeZero();
+    error VerifierAlreadyUpdated(bytes32 functionId);
     error FunctionAlreadyRegistered(bytes32 functionId);
     error NotFunctionOwner(address owner, address actualOwner);
 }