FCMP++/Carrot mega commit [5/28/26]

Co-authored-by: jeffro256 <jeffro256@tutanota.com>
Co-authored-by: Luke Parker <lukeparker5132@gmail.com>
Co-authored-by: Lee *!* Clagett <code@leeclagett.com>
Co-authored-by: SyntheticBird45 <someoneelse.is_on.github.rio7x@simplelogin.com>
Co-authored-by: jeetrex17 <jeetrex@tutamail.com>
Co-authored-by: UkoeHB <ukoehb@users.noreply.github.com>

Author: 7 people

.gitmodules

@@ -11,3 +11,10 @@
 [submodule "external/gtest"]
 	path = external/gtest
 	url = https://github.com/google/googletest.git
+[submodule "external/fcmp-plus-plus"]
+	path = external/fcmp-plus-plus
+	url = https://github.com/kayabaNerve/fcmp-plus-plus.git
+[submodule "external/mx25519"]
+	path = external/mx25519
+	url = https://github.com/jeffro256/mx25519
+	branch = unclamped

CMakeLists.txt

@@ -388,6 +388,7 @@ if(NOT MANUAL_SUBMODULES)
     check_submodule(external/rapidjson)
     check_submodule(external/randomx)
     check_submodule(external/supercop)
+    check_submodule(external/mx25519)
   endif()
 endif()
 
@@ -459,7 +460,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
   set(BSDI TRUE)
 endif()
 
-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include external/mx25519/include)
 
 if(MINGW)
   set(DEFAULT_STATIC true)
@@ -486,6 +487,7 @@ set(PIC_FLAG "-fPIC")
 if(STATIC)
   set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZMQ_STATIC")
+  add_definitions("-DMX25519_STATIC")
 endif()
 
 option(SANITIZE "Use ASAN memory sanitizer" OFF)
@@ -969,6 +971,9 @@ endif()
 add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION)
 add_definitions(-DBOOST_NO_AUTO_PTR)
 add_definitions(-DBOOST_UUID_DISABLE_ALIGNMENT) # This restores UUID's std::has_unique_object_representations property
+# Boost has two conflicting save/load impls for `std::variant`, one in serialization/variant.hpp,
+# and one in serialization/std_variant.hpp. This macro disables the one in variant.hpp.
+add_definitions(-DBOOST_NO_CXX17_HDR_VARIANT)
 
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 if(MINGW)

contrib/epee/include/serialization/keyvalue_serialization.h

@@ -87,9 +87,9 @@ public: \
   template<typename T> inline void serialize_default(const T &t, T v) { }
   template<typename T> inline void serialize_default(T &t, T v) { t = v; }
 
-#define KV_SERIALIZE_OPT_N(variable, val_name, default_value) \
+#define KV_SERIALIZE_OPT_N(variable, val_name, default_value, exclude_default_on_write) \
   do { \
-    if (is_store && this_ref.variable == default_value) \
+    if (is_store && this_ref.variable == default_value && exclude_default_on_write) \
       break; \
     if (!epee::serialization::selector<is_store>::serialize(this_ref.variable, stg, hparent_section, val_name)) \
       epee::serialize_default(this_ref.variable, default_value); \
@@ -122,7 +122,8 @@ public: \
 #define KV_SERIALIZE_VAL_POD_AS_BLOB_OPT(varialble, def)  KV_SERIALIZE_VAL_POD_AS_BLOB_OPT_N(varialble, #varialble, def)
 #define KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(varialble)     KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(varialble, #varialble) //skip is_trivially_copyable and is_standard_layout compile time check
 #define KV_SERIALIZE_CONTAINER_POD_AS_BLOB(varialble)     KV_SERIALIZE_CONTAINER_POD_AS_BLOB_N(varialble, #varialble)
-#define KV_SERIALIZE_OPT(variable,default_value)          KV_SERIALIZE_OPT_N(variable, #variable, default_value)
+#define KV_SERIALIZE_OPT(variable,default_value)          KV_SERIALIZE_OPT_N(variable, #variable, default_value, true)
+#define KV_SERIALIZE_INCLUDE_OPT(variable,default_value)  KV_SERIALIZE_OPT_N(variable, #variable, default_value, false)
 
 }
 

contrib/epee/include/serialization/wire/traits.h

@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <cstdint>
+#include <cstddef>
 #include <type_traits>
 
 #define WIRE_DECLARE_BLOB_NS(type) \

external/CMakeLists.txt

@@ -32,3 +32,4 @@ add_subdirectory(db_drivers)
 add_subdirectory(easylogging++)
 add_subdirectory(qrcodegen)
 add_subdirectory(randomx EXCLUDE_FROM_ALL)
+add_subdirectory(mx25519)

external/mx25519

@@ -81,12 +81,15 @@ endfunction ()
 include(Version)
 monero_add_library(version SOURCES ${CMAKE_BINARY_DIR}/version.cpp DEPENDS genversion)
 
+add_subdirectory(carrot_core)
+add_subdirectory(carrot_impl)
 add_subdirectory(common)
 add_subdirectory(crypto)
 add_subdirectory(ringct)
 add_subdirectory(checkpoints)
 add_subdirectory(cryptonote_basic)
 add_subdirectory(cryptonote_core)
+add_subdirectory(fcmp_pp)
 add_subdirectory(lmdb)
 add_subdirectory(multisig)
 add_subdirectory(net)

src/CMakeLists.txt

@@ -46,6 +46,7 @@ target_link_libraries(blockchain_db
     common
     cncrypto
     cryptonote_basic
+    fcmp_pp
     ringct_basic
     ${LMDB_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}