Aj/contracts

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "lib/nexus"]
 	path = lib/nexus
 	url = https://github.com/availproject/nexus
+[submodule "contracts/lib/risc0-ethereum"]
+	path = contracts/lib/risc0-ethereum
+	url = https://github.com/risc0/risc0-ethereum

contracts/remappings.txt

@@ -6,3 +6,5 @@ forge-std/=lib/forge-std/src/
 halmos-cheatcodes/=lib/openzeppelin-contracts-upgradeable/lib/halmos-cheatcodes/src/
 openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/
 openzeppelin-contracts/=lib/openzeppelin-contracts/
+risc0/=lib/risc0-ethereum/contracts/src/
+openzeppelin/contracts=lib/openzeppelin-contracts/contracts/

contracts/script/Nexus-zksync.sol

@@ -12,6 +12,7 @@ import {IZKSyncNexusManagerRouter} from "../src/verification/zksync/StorageProof
 import {INexusProofManager} from "../src/interfaces/INexusProofManager.sol";
 import {VerifierInfo} from "../src/interfaces/INexusMailbox.sol";
 import {INexusVerifierWrapper} from "../src/interfaces/INexusVerifierWrapper.sol";
+import {RiscZeroVerifierRouter} from "risc0/RiscZeroVerifierRouter.sol";
 
 contract NexusDeployment is Script {
     struct NetworkConfig {
@@ -34,32 +35,27 @@ contract NexusDeployment is Script {
 
         // Parse privateKey
         string memory privateKeyPath = string.concat(basePath, ".privateKey");
-        config.deployerPrivateKey = abi.decode(
-            vm.parseJson(jsonConfig, privateKeyPath),
-            (uint256)
-        );
+        config.deployerPrivateKey = abi.decode(vm.parseJson(jsonConfig, privateKeyPath), (uint256));
 
         // Parse appId
         string memory appIdPath = string.concat(basePath, ".appId");
-        bytes32 appIdUint = abi.decode(
-            vm.parseJson(jsonConfig, appIdPath),
-            (bytes32)
-        );
+        bytes32 appIdUint = abi.decode(vm.parseJson(jsonConfig, appIdPath), (bytes32));
         config.appId = appIdUint;
 
         string memory appId2Path = string.concat(basePath, ".appId2");
-        bytes32 appId2Uint = abi.decode(
-            vm.parseJson(jsonConfig, appId2Path),
-            (bytes32)
-        );
+        bytes32 appId2Uint = abi.decode(vm.parseJson(jsonConfig, appId2Path), (bytes32));
         config.appId2 = appId2Uint;
     }
 
     function run() public {
         vm.startBroadcast(config.deployerPrivateKey);
 
+        // Deploy Verifier
+        RiscZeroVerifierRouter risc0Router = new RiscZeroVerifierRouter(msg.sender);
+        // TODO : add logic for adding the verifier to the router.
+
         // Deploy NexusProofManager
-        NexusProofManager nexusManager = new NexusProofManager();
+        NexusProofManager nexusManager = new NexusProofManager(address(risc0Router));
         console.log("NexusProofManager deployed to: ", address(nexusManager));
 
         // Deploy and initialize NexusMailbox
@@ -68,19 +64,15 @@ contract NexusDeployment is Script {
         console.log("Mailbox deployed to: ", address(mailbox));
 
         // Deploy ZKSyncNexusManagerRouter
-        ZKSyncNexusManagerRouter zksyncdiamond = new ZKSyncNexusManagerRouter(
-            INexusProofManager(address(nexusManager)),
-            config.appId2
-        );
+        ZKSyncNexusManagerRouter zksyncdiamond =
+            new ZKSyncNexusManagerRouter(INexusProofManager(address(nexusManager)), config.appId2);
 
         // Deploy SparseMerkleTree
         SparseMerkleTree sparseMerkleTree = new SparseMerkleTree();
 
         // Deploy VerifierWrapper
-        VerifierWrapper verifierWrapper = new VerifierWrapper(
-            IZKSyncNexusManagerRouter(address(zksyncdiamond)),
-            sparseMerkleTree
-        );
+        VerifierWrapper verifierWrapper =
+            new VerifierWrapper(IZKSyncNexusManagerRouter(address(zksyncdiamond)), sparseMerkleTree);
 
         console.log("Verifer deployed to : ", address(verifierWrapper));
         // Add or update wrapper in mailbox

contracts/src/GethImageID.sol

@@ -0,0 +1,23 @@
+// Copyright 2024 RISC Zero, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+// This file is automatically generated
+
+pragma solidity ^0.8.20;
+
+library ImageID {
+    bytes32 public constant ADAPTER_ID = bytes32(0x35e11aa083da4b62f64a80c2b731097e5dcf9b0608a9689cd10b4633d56dcc7a);
+}