Setters and getters for program hash and facts registry

Author: fmkra

src/interfaces/modules/growing/IEvmSharpMmrGrowingModule.sol

@@ -39,9 +39,19 @@ interface IEvmSharpMmrGrowingModule is ISharpMmrGrowingCommon {
     struct EvmSharpMmrGrowingModuleStorage {
         IFactsRegistry factsRegistry;
         uint256 aggregatedChainId;
+        // Cairo program hash calculated with Poseidon (i.e., the off-chain block headers accumulator program)
+        uint256 programHash;
     }
 
-    function initEvmSharpMmrGrowingModule(IFactsRegistry factsRegistry) external;
+    function initEvmSharpMmrGrowingModule() external;
+
+    function setEvmSharpMmrGrowingModuleProgramHash(uint256 programHash) external;
+
+    function setEvmSharpMmrGrowingModuleFactsRegistry(address factsRegistry) external;
+
+    function getEvmSharpMmrGrowingModuleProgramHash() external view returns (uint256);
+
+    function getEvmSharpMmrGrowingModuleFactsRegistry() external view returns (address);
 
     function createEvmSharpMmr(uint256 newMmrId, uint256 originalMmrId, uint256 mmrSize) external;
 

src/interfaces/modules/growing/IStarknetSharpMmrGrowingModule.sol

@@ -22,9 +22,19 @@ interface IStarknetSharpMmrGrowingModule is ISharpMmrGrowingCommon {
         IFactsRegistry factsRegistry;
         // Either Starknet or Starknet Sepolia chain ID
         uint256 aggregatedChainId;
+        // Cairo program hash calculated with Poseidon (i.e., the off-chain block headers accumulator program)
+        uint256 programHash;
     }
 
-    function initStarknetSharpMmrGrowingModule(IFactsRegistry factsRegistry, uint256 chainId) external;
+    function initStarknetSharpMmrGrowingModule(uint256 starknetChainId) external;
+
+    function setStarknetSharpMmrGrowingModuleFactsRegistry(address factsRegistry) external;
+
+    function setStarknetSharpMmrGrowingModuleProgramHash(uint256 programHash) external;
+
+    function getStarknetSharpMmrGrowingModuleFactsRegistry() external view returns (address);
+
+    function getStarknetSharpMmrGrowingModuleProgramHash() external view returns (uint256);
 
     function createStarknetSharpMmr(uint256 newMmrId, uint256 originalMmrId, uint256 mmrSize) external;
 

src/modules/growing/EvmSharpMmrGrowingModule.sol

@@ -13,9 +13,6 @@ contract EvmSharpMmrGrowingModule is IEvmSharpMmrGrowingModule, AccessController
     // Using inline library for efficient splitting and joining of uint256 values
     using Uint256Splitter for uint256;
 
-    // Cairo program hash calculated with Poseidon (i.e., the off-chain block headers accumulator program)
-    bytes32 public constant PROGRAM_HASH = bytes32(uint256(0x1eca36d586f5356fba096edbf7414017d51cd0ed24b8fde80f78b61a9216ed2));
-
     bytes32 public constant KECCAK_HASHING_FUNCTION = keccak256("keccak");
     bytes32 public constant POSEIDON_HASHING_FUNCTION = keccak256("poseidon");
 
@@ -39,12 +36,32 @@ contract EvmSharpMmrGrowingModule is IEvmSharpMmrGrowingModule, AccessController
 
     // ========================= Core Functions ========================= //
 
-    function initEvmSharpMmrGrowingModule(IFactsRegistry factsRegistry) external onlyOwner {
+    function initEvmSharpMmrGrowingModule() external onlyOwner {
         EvmSharpMmrGrowingModuleStorage storage ms = moduleStorage();
-        ms.factsRegistry = factsRegistry;
         ms.aggregatedChainId = block.chainid;
     }
 
+    function setEvmSharpMmrGrowingModuleFactsRegistry(address factsRegistry) external onlyOwner {
+        EvmSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        ms.factsRegistry = IFactsRegistry(factsRegistry);
+    }
+
+    // Cairo program hash calculated with Poseidon (i.e., the off-chain block headers accumulator program)
+    function setEvmSharpMmrGrowingModuleProgramHash(uint256 programHash) external onlyOwner {
+        EvmSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        ms.programHash = programHash;
+    }
+
+    function getEvmSharpMmrGrowingModuleFactsRegistry() external view returns (address) {
+        EvmSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        return address(ms.factsRegistry);
+    }
+
+    function getEvmSharpMmrGrowingModuleProgramHash() external view returns (uint256) {
+        EvmSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        return ms.programHash;
+    }
+
     function createEvmSharpMmr(uint256 newMmrId, uint256 originalMmrId, uint256 mmrSize) external {
         bytes32[] memory hashingFunctions = new bytes32[](2);
         hashingFunctions[0] = KECCAK_HASHING_FUNCTION;
@@ -189,11 +206,11 @@ contract EvmSharpMmrGrowingModule is IEvmSharpMmrGrowingModule, AccessController
         // We hash the outputs
         bytes32 outputHash = keccak256(abi.encodePacked(outputs));
 
-        // We compute the deterministic fact bytes32 value
-        bytes32 fact = keccak256(abi.encode(PROGRAM_HASH, outputHash));
-
         EvmSharpMmrGrowingModuleStorage storage ms = moduleStorage();
 
+        // We compute the deterministic fact bytes32 value
+        bytes32 fact = keccak256(abi.encode(ms.programHash, outputHash));
+
         // We ensure this fact has been registered on SHARP Facts Registry
         if (!ms.factsRegistry.isValid(fact)) {
             revert InvalidFact();

src/modules/growing/StarknetSharpMmrGrowingModule.sol

@@ -10,9 +10,6 @@ import {IMmrCoreModule, RootForHashingFunction, GrownBy} from "src/interfaces/mo
 import {AccessController} from "src/libraries/AccessController.sol";
 
 contract StarknetSharpMmrGrowingModule is IStarknetSharpMmrGrowingModule, AccessController {
-    // Cairo program hash calculated with Poseidon (i.e., the off-chain block headers accumulator program)
-    bytes32 public constant PROGRAM_HASH = bytes32(uint256(0x4ebb807bacec9cf6202e6482d8f7f74a531b067571dba2ccf118b0328df8295));
-
     bytes32 public constant POSEIDON_HASHING_FUNCTION = keccak256("poseidon");
 
     // Default roots for new aggregators:
@@ -30,10 +27,30 @@ contract StarknetSharpMmrGrowingModule is IStarknetSharpMmrGrowingModule, Access
         }
     }
 
-    function initStarknetSharpMmrGrowingModule(IFactsRegistry factsRegistry, uint256 chainId) external onlyOwner {
+    function initStarknetSharpMmrGrowingModule(uint256 starknetChainId) external onlyOwner {
+        StarknetSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        ms.aggregatedChainId = starknetChainId;
+    }
+
+    function setStarknetSharpMmrGrowingModuleFactsRegistry(address factsRegistry) external onlyOwner {
         StarknetSharpMmrGrowingModuleStorage storage ms = moduleStorage();
-        ms.factsRegistry = factsRegistry;
-        ms.aggregatedChainId = chainId;
+        ms.factsRegistry = IFactsRegistry(factsRegistry);
+    }
+
+    // Cairo program hash calculated with Poseidon (i.e., the off-chain block headers accumulator program)
+    function setStarknetSharpMmrGrowingModuleProgramHash(uint256 programHash) external onlyOwner {
+        StarknetSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        ms.programHash = programHash;
+    }
+
+    function getStarknetSharpMmrGrowingModuleFactsRegistry() external view returns (address) {
+        StarknetSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        return address(ms.factsRegistry);
+    }
+
+    function getStarknetSharpMmrGrowingModuleProgramHash() external view returns (uint256) {
+        StarknetSharpMmrGrowingModuleStorage storage ms = moduleStorage();
+        return ms.programHash;
     }
 
     function createStarknetSharpMmr(uint256 newMmrId, uint256 originalMmrId, uint256 mmrSize) external {
@@ -135,11 +152,11 @@ contract StarknetSharpMmrGrowingModule is IStarknetSharpMmrGrowingModule, Access
         // We hash the outputs
         bytes32 outputHash = keccak256(abi.encodePacked(outputs));
 
-        // We compute the deterministic fact bytes32 value
-        bytes32 fact = keccak256(abi.encode(PROGRAM_HASH, outputHash));
-
         StarknetSharpMmrGrowingModuleStorage storage ms = moduleStorage();
 
+        // We compute the deterministic fact bytes32 value
+        bytes32 fact = keccak256(abi.encode(ms.programHash, outputHash));
+
         // We ensure this fact has been registered on SHARP Facts Registry
         if (!ms.factsRegistry.isValid(fact)) revert InvalidFact();
     }