Add boost log and target circuit

NilFoundation · Jul 4, 2024 · 71cde3a · 71cde3a
1 parent 3021b99
commit 71cde3a
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 26 deletions.
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
@@ -2,7 +2,7 @@
 
 include(CMakeFindDependencyMacro)
 find_dependency(crypto3 REQUIRED)
-find_dependency(blueprint_crypto3 REQUIRED)
+find_dependency(crypto3_blueprint REQUIRED)
 find_dependency(evmc REQUIRED)
 find_dependency(intx REQUIRED)
 find_dependency(ethash REQUIRED)

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,22 +11,22 @@
         flake-utils.follows = "flake-utils";
       };
     };
-    nil_crypto3 = {
+    nil-crypto3 = {
       url = "https://github.com/NilFoundation/crypto3";
       type = "git";
       submodules = true;
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
     };
-    nil_zkllvm_blueprint = {
+    nil-zkllvm-blueprint = {
       url = "https://github.com/NilFoundation/zkllvm-blueprint";
       type = "git";
       submodules = true;
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
-        nil_crypto3.follows = "nil_crypto3";
+        nil-crypto3.follows = "nil-crypto3";
       };
     };
   };
@@ -50,12 +50,12 @@
         # Add more complicated logic here if you need to have debug packages
         resolveInput = input: input.packages.${system}.default;
 
-        nil_inputs = with inputs; [
-          nil_crypto3
-          nil_zkllvm_blueprint
+        nil-inputs = with inputs; [
+          nil-crypto3
+          nil-zkllvm-blueprint
         ];
 
-        nil_packages = map resolveInput nil_inputs;
+        nil-packages = map resolveInput nil-inputs;
 
         defaultNativeBuildInputs = with pkgs; [
           cmake
@@ -77,7 +77,7 @@
               ethash
             ];
           in
-          deps ++ nil_packages;
+          deps ++ nil-packages;
 
         devInputs = [ pkgs.clang_17 ];
 

diff --git a/lib/assigner/CMakeLists.txt b/lib/assigner/CMakeLists.txt
@@ -15,7 +15,6 @@ add_library(${PROJECT_NAME} STATIC ${evmone_sources})
 
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
 
-find_package(Boost REQUIRED COMPONENTS container random filesystem log log_setup program_options thread system)
 find_package(crypto3 REQUIRED)
 find_package(crypto3_blueprint REQUIRED)
 

diff --git a/lib/assigner/include/assigner.hpp b/lib/assigner/include/assigner.hpp
@@ -10,6 +10,10 @@
 
 #include <evmc/evmc.hpp>
 
+#include <boost/log/core.hpp>
+#include <boost/log/expressions.hpp>
+#include <boost/log/trivial.hpp>
+
 #include <nil/crypto3/algebra/curves/pallas.hpp>
 #include <nil/blueprint/blueprint/plonk/assignment.hpp>
 
@@ -20,6 +24,18 @@
 namespace nil {
     namespace blueprint {
 
+        enum zkevm_circuit : uint8_t {
+            ALL = 0,
+            BYTECODE = 1,
+            RW = 2
+        };
+
+        static const std::map<std::string, zkevm_circuit> zkevm_circuits_map = {
+            {"", zkevm_circuit::ALL},
+            {"bytecode", zkevm_circuit::BYTECODE},
+            {"rw", zkevm_circuit::RW}
+        };
+
         template<typename BlueprintFieldType>
         struct assigner {
 
@@ -43,7 +59,11 @@ namespace nil {
         template<typename BlueprintFieldType>
         static evmc::Result evaluate(const evmc_host_interface* host, evmc_host_context* ctx,
                                 evmc_revision rev, const evmc_message* msg, const uint8_t* code_ptr, size_t code_size,
-                                std::shared_ptr<nil::blueprint::assigner<BlueprintFieldType>> assigner) {
+                                std::shared_ptr<nil::blueprint::assigner<BlueprintFieldType>> assigner, const std::string& target_circuit = "") {
+            if(zkevm_circuits_map.find(target_circuit) == zkevm_circuits_map.end()) {
+                std::cerr << "Unknown target circuit " << target_circuit << "\n";
+                return evmc::Result{EVMC_FAILURE, msg->gas};
+            }
             const evmone::bytes_view container{code_ptr, code_size};
             const auto code_analysis = evmone::baseline::analyze(rev, container);
             const auto data = code_analysis.eof_header.get_data(container);
@@ -59,6 +79,8 @@ namespace nil {
 
             const auto& cost_table = evmone::baseline::get_baseline_cost_table(state.rev, code_analysis.eof_header.version);
 
+            BOOST_LOG_TRIVIAL(debug) << "Run evaluate\n";
+
             gas = evmone::baseline::dispatch<false>(cost_table, state, msg->gas, code.data());
 
             // fill assignments for read/write circuit