README updated. Small fixes done.

NilFoundation · Dec 22, 2023 · 89f78d0 · 89f78d0
1 parent 8ab4b0a
commit 89f78d0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -18,17 +18,33 @@ ${ZKLLVM_BUILD:-build}/bin/assigner/assigner -b ${ZKLLVM_BUILD:-build}/examples/
 1. Install dependencies:
     ```
     sudo apt-get install \
+        build-essential \
         liblz4-dev \
         libgnutls28-dev \
-        libprotobuf-dev \
         libyaml-cpp-dev \
         libsctp-dev \
         ragel \
         xfslibs-dev \
         systemtap-sdt-dev \
         libc-ares-dev \
         libhwloc-dev
+        libssl-dev \
+        libicu-dev \
+        libprotobuf-dev \
+        lsb-release \
+        gnutls-dev \
+        pkg-config \
+        lksctp-tools \
+        numactl
+    ```
+
+    Install fmt-6
+    ```
+    wget http://launchpadlibrarian.net/466750967/libfmt-dev_6.1.2+ds-2_amd64.deb
+    sudo apt remove libfmt-dev
+    sudo apt install ./libfmt-dev_6.1.2+ds-2_amd64.deb
     ```
+
 2. Build with CMake:
     ```mkdir build
     cd build

diff --git a/bin/proof-generator-multithreaded/include/nil/proof-generator-multithreaded/prover.hpp b/bin/proof-generator-multithreaded/include/nil/proof-generator-multithreaded/prover.hpp
@@ -117,7 +117,7 @@ namespace nil {
             using BlueprintFieldType = typename curve_type::base_field_type;
             constexpr std::size_t WitnessColumns = 15;
             constexpr std::size_t PublicInputColumns = 1;
-            constexpr std::size_t ConstantColumns = 35;
+            constexpr std::size_t ConstantColumns = 52;
             constexpr std::size_t SelectorColumns = 36;
 
             using ArithmetizationParams =
@@ -188,7 +188,7 @@ namespace nil {
                 table_description.rows_amount = assignment_table.rows_amount();
             }
 
-            const std::size_t Lambda = 9;
+            const std::size_t Lambda = 20;
             using Hash = nil::crypto3::hashes::keccak_1600<256>;
             using circuit_params = nil::actor::zk::snark::placeholder_circuit_params<
                 BlueprintFieldType, ArithmetizationParams

diff --git a/bin/proof-generator-multithreaded/src/main.cpp b/bin/proof-generator-multithreaded/src/main.cpp
@@ -128,7 +128,7 @@ struct prover {
         }
 
         nil::actor::app_template app;
-        _exit_code = app.run(ac, av, [this, &app] {
+        app.run(ac, av, [this, &app] {
             return nil::actor::async([&] {
                 nil::proof_generator::prover(circuit_file_path, assignment_file_path, proof_file);
             });                    
@@ -142,12 +142,14 @@ struct prover {
             context_.find<nil::proof_generator::aspects::prover_vanilla>()->input_assignment_file_path();
         proof_file = context_.find<nil::proof_generator::aspects::prover_vanilla>()->output_proof_file_path();
 
-        std::vector<std::string> testArgs = { "program_name", "-shard0-mem-scale", "4800" };
+        std::vector<std::string> arguments = { "program_name", "--shard0-mem-scale", "4800" };
 
         // Constructing argc and argv
-        int argc = static_cast<int>(testArgs.size());
-        char** argv = new char*[argc];
-        start_actor(argc, argv);
+        std::vector<char*> argv;
+        for (const auto& arg : arguments)
+            argv.push_back((char*)arg.data());
+        argv.push_back(nullptr);
+        start_actor(arguments.size(), argv.data());
 
         return 0;
     }
@@ -156,9 +158,6 @@ struct prover {
     boost::filesystem::path circuit_file_path;
     boost::filesystem::path assignment_file_path;
 
-    bool _done = false;
-    int _exit_code {0};
-
     std::atomic<bool> _started {false};
     boost::application::context &context_;
 };