From 82bbd44259410b62f6fce12c45ed292dcd955932 Mon Sep 17 00:00:00 2001
From: x-mass <36629999+x-mass@users.noreply.github.com>
Date: Fri, 31 May 2024 11:24:13 +0000
Subject: [PATCH] Update crypto3, actor. New multiprecision. Update CI Boost to
 1.83

---
 .github/workflows/pull_request.yml                         | 3 ++-
 .github/workflows/reusable-generate-proofs-linux.yml       | 5 ++---
 bin/proof-generator/CMakeLists.txt                         | 7 ++++++-
 bin/proof-generator/include/nil/proof-generator/prover.hpp | 2 --
 libs/actor/container                                       | 2 +-
 libs/actor/math                                            | 2 +-
 libs/actor/zk                                              | 2 +-
 libs/crypto3                                               | 2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 2b9cde7f..b597c299 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BOOST_VERSION: "1.78.0"
+  BOOST_VERSION: "1.83.0"
   CAA_ARTIFACT_NAME: circuits-and-assignments
   TO_ARTIFACT_NAME: transpiler-output
   INTEGRATION_TESTING_TARGETS: |
@@ -234,6 +234,7 @@ jobs:
           # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
           platform_version: ${{ steps.strings.outputs.platform-version }}
           boost_install_dir: ${{ steps.strings.outputs.dependencies-dir }}
+          link: static+shared
 
       - name: Configure CMake
         env:
diff --git a/.github/workflows/reusable-generate-proofs-linux.yml b/.github/workflows/reusable-generate-proofs-linux.yml
index 5423ecbb..6da76c6a 100644
--- a/.github/workflows/reusable-generate-proofs-linux.yml
+++ b/.github/workflows/reusable-generate-proofs-linux.yml
@@ -33,7 +33,7 @@ on:
         type: string
         description: "Version of Boost to install"
         required: false
-        default: '1.78.0'
+        default: '1.83.0'
 
     outputs:
       artifact-name:
@@ -133,6 +133,7 @@ jobs:
           # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
           platform_version: ${{ steps.strings.outputs.platform-version }}
           boost_install_dir: ${{ steps.strings.outputs.dependencies-dir }}
+          link: static+shared
 
       - name: Configure CMake
         env:
@@ -186,5 +187,3 @@ jobs:
           name: ${{ steps.set-artifact-name.outputs.artifact-name }}
           path: |
             ${{ steps.strings.outputs.artifact-dir }}
-
-
diff --git a/bin/proof-generator/CMakeLists.txt b/bin/proof-generator/CMakeLists.txt
index 87540818..b8bb5290 100644
--- a/bin/proof-generator/CMakeLists.txt
+++ b/bin/proof-generator/CMakeLists.txt
@@ -48,13 +48,18 @@ function(setup_proof_generator_target)
         endforeach()
     endif()
 
-
     set_target_properties(${ARG_TARGET_NAME} PROPERTIES
         LINKER_LANGUAGE CXX
         EXPORT_NAME ${ARG_TARGET_NAME}
         CXX_STANDARD 17
         CXX_STANDARD_REQUIRED TRUE)
 
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        target_compile_options(${ARG_TARGET_NAME} PRIVATE "-fconstexpr-steps=2147483647")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        target_compile_options(${ARG_TARGET_NAME} PRIVATE "-fconstexpr-ops-limit=4294967295")
+    endif ()
+
     target_include_directories(${ARG_TARGET_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
diff --git a/bin/proof-generator/include/nil/proof-generator/prover.hpp b/bin/proof-generator/include/nil/proof-generator/prover.hpp
index c4bdd33b..ac6fbcad 100644
--- a/bin/proof-generator/include/nil/proof-generator/prover.hpp
+++ b/bin/proof-generator/include/nil/proof-generator/prover.hpp
@@ -25,7 +25,6 @@
 #include <sstream>
 
 #include <boost/log/trivial.hpp>
-#include <boost/test/unit_test.hpp> // TODO: remove this. Required only because of an incorrect assert check in zk
 
 #include <nil/crypto3/algebra/fields/arithmetic_params/pallas.hpp>
 #include <nil/crypto3/marshalling/zk/types/commitments/eval_storage.hpp>
@@ -35,7 +34,6 @@
 #include <nil/crypto3/marshalling/zk/types/plonk/assignment_table.hpp>
 #include <nil/crypto3/marshalling/zk/types/plonk/constraint_system.hpp>
 #include <nil/crypto3/math/algorithms/calculate_domain_set.hpp>
-#include <nil/crypto3/multiprecision/cpp_int.hpp>
 #include <nil/crypto3/zk/snark/arithmetization/plonk/constraint_system.hpp>
 #include <nil/crypto3/zk/snark/arithmetization/plonk/params.hpp>
 #include <nil/crypto3/zk/snark/systems/plonk/placeholder/detail/placeholder_policy.hpp>
diff --git a/libs/actor/container b/libs/actor/container
index 2cb15c95..401ae44c 160000
--- a/libs/actor/container
+++ b/libs/actor/container
@@ -1 +1 @@
-Subproject commit 2cb15c9585207b57ef86121c89fdf37539e2f8fd
+Subproject commit 401ae44cb8e336add7d6344f7641ba87e5b467f4
diff --git a/libs/actor/math b/libs/actor/math
index 884640f9..b2a2c26f 160000
--- a/libs/actor/math
+++ b/libs/actor/math
@@ -1 +1 @@
-Subproject commit 884640f90258640e545af406a9916ec3e9395ed7
+Subproject commit b2a2c26fc3bf04ca75f059d3e7a0ff1d9e9148e4
diff --git a/libs/actor/zk b/libs/actor/zk
index f1bd7808..bb90c788 160000
--- a/libs/actor/zk
+++ b/libs/actor/zk
@@ -1 +1 @@
-Subproject commit f1bd780872a24306d3d481ea7916ee2fa04c03c8
+Subproject commit bb90c788fd630619bcb40b40e632cdd5ea51135d
diff --git a/libs/crypto3 b/libs/crypto3
index 3de07753..261d07e4 160000
--- a/libs/crypto3
+++ b/libs/crypto3
@@ -1 +1 @@
-Subproject commit 3de0775395bf06c0e4969ff7f921cc7523904269
+Subproject commit 261d07e4ed974bc7ed2fb80edea58d70a04c3af3