zkevm-framework: enable partial proof in assigner

NilFoundation · Sep 19, 2024 · a428b4e · a428b4e
1 parent 270e816
commit a428b4e
Show file tree

Hide file tree

Showing 8 changed files with 250 additions and 114 deletions.
diff --git a/flake.nix b/flake.nix
@@ -77,18 +77,24 @@
             enableDebug = false;
             crypto3 = crypto3;
             evm-assigner = evm-assigner;
+            transpiler = transpiler;
+            proof-producer = proof-producer;
           });
           zkevm-framework-tests = (pkgs.callPackage ./zkevm-framework/zkevm-framework.nix {
             runTests = true;
             enableDebug = false;
             crypto3 = crypto3;
             evm-assigner = evm-assigner;
+            transpiler = transpiler;
+            proof-producer = proof-producer;
           });
           zkevm-framework-debug-tests = (pkgs.callPackage ./zkevm-framework/zkevm-framework.nix {
             enableDebug = true;
             runTests = true;
             crypto3 = crypto3;
             evm-assigner = evm-assigner;
+            transpiler = transpiler;
+            proof-producer = proof-producer;
           });
 
           transpiler = (pkgs.callPackage ./transpiler/transpiler.nix {
@@ -186,6 +192,8 @@
             enableDebug = false;
             crypto3 = packages.crypto3;
             evm-assigner = evm-assigner-gcc;
+            transpiler = transpiler-gcc;
+            proof-producer = proof-producer-gcc;
           });
 
           transpiler-gcc = (pkgs.callPackage ./transpiler/transpiler.nix {

diff --git a/proof-producer/CMakeLists.txt b/proof-producer/CMakeLists.txt
@@ -96,3 +96,22 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/bin/proof-producer")
 
 include(CPack)
+
+# INSTALL
+
+set(CONFIG_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/proof-producer)
+set(TARGET_NAMESPACE crypto3::)
+install(EXPORT proof-producerTargets NAMESPACE ${TARGET_NAMESPACE} DESTINATION ${CONFIG_PATH})
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    cmake/Config.cmake.in
+    proof-producer-config.cmake
+    INSTALL_DESTINATION ${CONFIG_PATH}
+)
+
+install(
+    FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/proof-producer-config.cmake
+    DESTINATION ${CONFIG_PATH}
+)
diff --git a/proof-producer/bin/proof-producer/CMakeLists.txt b/proof-producer/bin/proof-producer/CMakeLists.txt
@@ -40,11 +40,14 @@ function(setup_proof_generator_target)
         src/main.cpp
     )
 
+    add_library(${ARG_TARGET_NAME}-lib INTERFACE)
+
     # Make sure to add these dependencies before the others, since for multi-threaded version dependency on
     # actor-zk must come first.
     if(ARG_ADDITIONAL_DEPENDENCIES)
         foreach(lib IN LISTS ARG_ADDITIONAL_DEPENDENCIES)
             target_link_libraries(${ARG_TARGET_NAME} ${lib})
+            target_link_libraries(${ARG_TARGET_NAME}-lib INTERFACE ${lib})
         endforeach()
     endif()
 
@@ -65,6 +68,11 @@ function(setup_proof_generator_target)
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     )
 
+    target_include_directories(${ARG_TARGET_NAME}-lib INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    )
+
     target_link_libraries(${ARG_TARGET_NAME}
         crypto3::all
 
@@ -75,14 +83,32 @@ function(setup_proof_generator_target)
         Boost::program_options
         Boost::thread
     )
+
+    target_link_libraries(${ARG_TARGET_NAME}-lib INTERFACE
+        crypto3::all
+
+        crypto3::transpiler
+
+        Boost::filesystem
+        Boost::log
+        Boost::program_options
+        Boost::thread
+    )
 endfunction()
 
 # Declare single-threaded target
 set(SINGLE_THREADED_TARGET "${CURRENT_PROJECT_NAME}-single-threaded")
 setup_proof_generator_target(TARGET_NAME ${SINGLE_THREADED_TARGET})
 
+
 # Declare multi-threaded target
 set(MULTI_THREADED_TARGET "${CURRENT_PROJECT_NAME}-multi-threaded")
 setup_proof_generator_target(TARGET_NAME ${MULTI_THREADED_TARGET} ADDITIONAL_DEPENDENCIES actor::zk)
 
 install(TARGETS ${SINGLE_THREADED_TARGET} ${MULTI_THREADED_TARGET} RUNTIME DESTINATION bin)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+# Install library
+install(TARGETS ${SINGLE_THREADED_TARGET}-lib ${MULTI_THREADED_TARGET}-lib EXPORT proof-producerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/proof-producer/cmake/Config.cmake.in b/proof-producer/cmake/Config.cmake.in
@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(crypto3 REQUIRED)
+find_dependency(crypto3_transpiler)
+
+include("${CMAKE_CURRENT_LIST_DIR}/proof-producerTargets.cmake")
diff --git a/zkevm-framework/bin/assigner/CMakeLists.txt b/zkevm-framework/bin/assigner/CMakeLists.txt
@@ -13,12 +13,15 @@ target_include_directories(${TARGET_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
+find_package(proof-producer REQUIRED)
+
 target_link_libraries(${TARGET_NAME}
     PRIVATE
     zkEVMPreset
     zkEVMAssignerRunner
     zkEVMJsonHelpers
     zkEVMOutputArtifacts
+    crypto3::proof-producer-single-threaded-lib
     Boost::program_options
     Boost::log
     Boost::random