AppLayerLabs · itamarcps · Apr 29, 2024 · Mar 4, 2024 · Mar 4, 2024 · Mar 5, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
 SET(DEBUG ON CACHE BOOL "Debug mode")
 if(DEBUG)
-  set(CMAKE_CXX_FLAGS "-O0 -g -fsanitize=address -fno-inline -fno-eliminate-unused-debug-types -fstack-protector -Werror=unused-variable") # Provides faster compile time.
+  set(CMAKE_CXX_FLAGS "-O0 -g -fsanitize=address -fno-inline -fno-eliminate-unused-debug-types -fstack-protector") # Provides faster compile time.
 elseif(SONARQUBE_ANALYSIS)
   set(CMAKE_CXX_FLAGS "-O0 -g --coverage")
 else()
@@ -34,9 +34,9 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") # Always look for static libraries - "ZLIB
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # For clang-tidy
 
 # Set project version inside the code (forcefully so changes in the .in file are always reflected correctly to the compiler)
-if (EXISTS ${CMAKE_SOURCE_DIR}/src/utils/options.h)
-  file(REMOVE ${CMAKE_SOURCE_DIR}/src/utils/options.h)
-endif()
+# if (EXISTS ${CMAKE_SOURCE_DIR}/src/utils/options.h)
+#   file(REMOVE ${CMAKE_SOURCE_DIR}/src/utils/options.h)
+# endif()
 configure_file(
   ${CMAKE_SOURCE_DIR}/src/utils/options.h.in
   ${CMAKE_SOURCE_DIR}/src/utils/options.h
@@ -84,10 +84,11 @@ find_package(CryptoPP 8.2.0 REQUIRED)
 find_package(Scrypt REQUIRED)
 
 # Add external modules
-include(cmake/ProjectBoostCertify.cmake)  # Boost Certify
 include(cmake/ProjectEthash.cmake)        # Ethash
 include(cmake/ProjectSecp256k1.cmake)     # Bitcoin core fast implementation
 include(cmake/ProjectSpeedb.cmake)        # Speedb (Level/RocksDB drop-in replacement)
+include(cmake/ProjectEVMOne.cmake)        # EVMOne (EVMOne + EVMC)
+
 
 # Add catch2 as a library
 add_library(catch2
@@ -382,7 +383,7 @@ if(BUILD_AVALANCHEGO)
     ${NET_SOURCES}
   )
 
-  add_dependencies(orbitersdk_lib gen-grpc ProtoFiles)
+  add_dependencies(orbitersdk_lib gen-grpc ProtoFiles Evmc)
 
   target_include_directories(orbitersdk_lib PUBLIC ${CMAKE_SOURCE_DIR}/include ${OPENSSL_INCLUDE_DIR})
 
@@ -408,7 +409,7 @@ else()
 
   target_include_directories(orbitersdk_lib PRIVATE ${CMAKE_SOURCE_DIR}/include ${OPENSSL_INCLUDE_DIR})
 
-  target_link_libraries(orbitersdk_lib PRIVATE
+  target_link_libraries(orbitersdk_lib PRIVATE EvmcInstructions EvmcLoader EvmcTooling Evmone
     ${CRYPTOPP_LIBRARIES} ${SCRYPT_LIBRARY} Secp256k1 Ethash ${ETHASH_BYPRODUCTS}
     Speedb ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES}
   )

diff --git a/cmake/ProjectBoostCertify.cmake b/cmake/ProjectBoostCertify.cmake
diff --git a/cmake/ProjectEVMOne.cmake b/cmake/ProjectEVMOne.cmake
@@ -0,0 +1,87 @@
+include(ExternalProject)
+
+if (MSVC)
+    set(_only_release_configuration -DCMAKE_CONFIGURATION_TYPES=Release)
+    set(_overwrite_install_command INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install)
+endif()
+
+set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(EVMONE_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmone${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMONE_INCLUDE_DIR "${prefix}/include")
+set(EVMONE_VERSION "0.11.0")
+set(EVMC_INCLUDE_DIR "${prefix}/include")
+set(EVMC_INSTRUCTIONS_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-instructions${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_LOADER_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-loader${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_TOOLING_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tooling${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+if(DEBUG)
+  ## EVMONE Can't be compiled with address sanitizer/stack protector
+  ## due to GCC stack size limits and GCC not accepting -Wno-stack-usage as a ignore error flag
+  set(EVMONE_CXX_FLAGS "-O0 -g -fno-inline -fno-eliminate-unused-debug-types -Werror=unused-variable") # Provides faster compile time.
+  ExternalProject_Add(
+          evmone
+          PREFIX "${prefix}"
+          GIT_REPOSITORY https://github.com/chfast/evmone
+          GIT_TAG "v${EVMONE_VERSION}"
+          CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
+          -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+          -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+          -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+          -DCMAKE_CXX_FLAGS=${EVMONE_CXX_FLAGS}
+          -DBUILD_SHARED_LIBS=OFF
+          -DEVMC_INSTALL=ON
+          -DCMAKE_INSTALL_LIBDIR=lib
+          ${_only_release_configuration}
+          LOG_CONFIGURE 1
+          ${_overwrite_install_command}
+          LOG_INSTALL 1
+          BUILD_BYPRODUCTS ${EVMONE_LIBRARY}
+          BUILD_BYPRODUCTS ${EVMC_INSTRUCTIONS_LIBRARY}
+          BUILD_BYPRODUCTS ${EVMC_LOADER_LIBRARY}
+          BUILD_BYPRODUCTS ${EVMC_TOOLING_LIBRARY}
+  )
+else()
+    ExternalProject_Add(
+            evmone
+            PREFIX "${prefix}"
+            GIT_REPOSITORY https://github.com/chfast/evmone
+            GIT_TAG "v${EVMONE_VERSION}"
+            CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
+            -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+            -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+            -DBUILD_SHARED_LIBS=OFF
+            -DEVMC_INSTALL=ON
+            -DCMAKE_INSTALL_LIBDIR=lib
+            ${_only_release_configuration}
+            LOG_CONFIGURE 1
+            ${_overwrite_install_command}
+            LOG_INSTALL 1
+            BUILD_BYPRODUCTS ${EVMONE_LIBRARY}
+            BUILD_BYPRODUCTS ${EVMC_INSTRUCTIONS_LIBRARY}
+            BUILD_BYPRODUCTS ${EVMC_LOADER_LIBRARY}
+            BUILD_BYPRODUCTS ${EVMC_TOOLING_LIBRARY}
+    )
+endif()
+
+# Create imported library
+add_library(Evmone STATIC IMPORTED)
+file(MAKE_DIRECTORY "${EVMONE_INCLUDE_DIR}")  # Must exist.
+set_property(TARGET Evmone PROPERTY IMPORTED_CONFIGURATIONS Release)
+set_property(TARGET Evmone PROPERTY IMPORTED_LOCATION_RELEASE "${EVMONE_LIBRARY}")
+set_property(TARGET Evmone PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${EVMONE_INCLUDE_DIR}")
+add_dependencies(Evmone evmone ${EVMONE_LIBRARY} ${EVMONE_BYPRODUCTS})
+
+# Create an imported target for each library
+add_library(EvmcInstructions STATIC IMPORTED)
+set_property(TARGET EvmcInstructions PROPERTY IMPORTED_LOCATION "${EVMC_INSTRUCTIONS_LIBRARY}")
+add_dependencies(EvmcInstructions evmone)
+
+add_library(EvmcLoader STATIC IMPORTED)
+set_property(TARGET EvmcLoader PROPERTY IMPORTED_LOCATION "${EVMC_LOADER_LIBRARY}")
+add_dependencies(EvmcLoader evmone)
+
+add_library(EvmcTooling STATIC IMPORTED)
+set_property(TARGET EvmcTooling PROPERTY IMPORTED_LOCATION "${EVMC_TOOLING_LIBRARY}")
+add_dependencies(EvmcTooling evmone)
diff --git a/cmake/ProjectEthash.cmake b/cmake/ProjectEthash.cmake
@@ -18,7 +18,7 @@ ExternalProject_Add(
   GIT_REPOSITORY https://github.com/chfast/ethash
   GIT_TAG "v${ETHASH_VERSION}"
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

diff --git a/cmake/ProjectEvmc.cmake b/cmake/ProjectEvmc.cmake
@@ -0,0 +1,48 @@
+include(ExternalProject)
+
+if (MSVC)
+    set(_only_release_configuration -DCMAKE_CONFIGURATION_TYPES=Release)
+    set(_overwrite_install_command INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install)
+endif()
+
+set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(EVMC_INCLUDE_DIR "${prefix}/include")
+set(EVMC_INSTRUCTIONS_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-instructions${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_LOADER_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}evmc-loader${CMAKE_STATIC_LIBRARY_SUFFIX}")
+set(EVMC_TOOLING_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tooling${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+set(EVMC_VERSION "11.0.1")
+
+ExternalProject_Add(
+        evmc
+        PREFIX "${prefix}"
+        GIT_REPOSITORY https://github.com/ethereum/evmc
+        GIT_TAG "v${EVMC_VERSION}"
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
+        -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+        -DCMAKE_INSTALL_LIBDIR=lib
+        ${_only_release_configuration}
+        LOG_CONFIGURE 1
+        ${_overwrite_install_command}
+        LOG_INSTALL 1
+        BUILD_BYPRODUCTS ${EVMC_INSTRUCTIONS_LIBRARY}
+        BUILD_BYPRODUCTS ${EVMC_LOADER_LIBRARY}
+        BUILD_BYPRODUCTS ${EVMC_TOOLING_LIBRARY}
+)
+
+# Create an imported target for each library
+add_library(EvmcInstructions STATIC IMPORTED)
+set_property(TARGET EvmcInstructions PROPERTY IMPORTED_LOCATION "${EVMC_INSTRUCTIONS_LIBRARY}")
+add_dependencies(EvmcInstructions evmc)
+
+add_library(EvmcLoader STATIC IMPORTED)
+set_property(TARGET EvmcLoader PROPERTY IMPORTED_LOCATION "${EVMC_LOADER_LIBRARY}")
+add_dependencies(EvmcLoader evmc)
+
+add_library(EvmcTooling STATIC IMPORTED)
+set_property(TARGET EvmcTooling PROPERTY IMPORTED_LOCATION "${EVMC_TOOLING_LIBRARY}")
+add_dependencies(EvmcTooling evmc)
+
diff --git a/cmake/ProjectSecp256k1.cmake b/cmake/ProjectSecp256k1.cmake
@@ -18,7 +18,7 @@ ExternalProject_Add(
   GIT_TAG "v${SECP256K1_VERSION}"
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_LIST_DIR}/secp256k1/CMakeLists.txt <SOURCE_DIR>
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

diff --git a/cmake/ProjectSpeedb.cmake b/cmake/ProjectSpeedb.cmake
@@ -33,7 +33,7 @@ ExternalProject_Add(
   GIT_REPOSITORY https://github.com/speedb-io/speedb
   GIT_TAG "speedb/v${SPEEDB_VERSION}"
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${prefix}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
+             -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}

diff --git a/cmake/certifyPatch.patch b/cmake/certifyPatch.patch
diff --git a/scripts/AIO-setup.sh b/scripts/AIO-setup.sh
@@ -28,7 +28,7 @@ tmux kill-session -t local_testnet_discovery
 CLEAN=false # Clean the build folder
 DEPLOY=true # Deploy the executables to the local_testnet folder
 ONLY_DEPLOY=false # Only deploy, do not build
-DEBUG=ON # Build the project in debug mode
+DEBUG=OFF # Build the project in debug mode
 CORES=$(grep -c ^processor /proc/cpuinfo) # Number of cores for parallel build
 
 for arg in "$@"
@@ -104,7 +104,7 @@ if [ "$ONLY_DEPLOY" = false ]; then
   ## Build the project
   cd build_local_testnet
   cmake -DDEBUG=$DEBUG ..
-  cmake --build . --target orbitersdkd orbitersdkd-discovery -- -j${CORES}
+  make -j${CORES}
 fi
 
 if [ "$DEPLOY" = true ]; then