[master] Merge q4-working-branch to master

CMakeLists.txt

@@ -5,10 +5,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
 
 find_program(CCACHE_PROGRAM ccache)
-if(CCACHE_PROGRAM)
+if (CCACHE_PROGRAM)
     message(STATUS "Found ccache")
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-endif()
+endif ()
 
 project(Zilliqa)
 
@@ -19,11 +19,11 @@ message(STATUS "We are on a ${CMAKE_SYSTEM_NAME} system")
 #             x64-osx-dynamic (see https://github.com/microsoft/vcpkg/issues/8421).
 #             This is a simple workaround against this issue.
 if (APPLE)
-  file(CREATE_LINK
-    ${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/lib
-    ${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/tools/lib
-    SYMBOLIC)
-endif()
+    file(CREATE_LINK
+        ${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/lib
+        ${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/tools/lib
+        SYMBOLIC)
+endif ()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 #
@@ -35,9 +35,7 @@ find_package(bsoncxx CONFIG REQUIRED)
 find_package(leveldb CONFIG REQUIRED)
 find_package(g3log REQUIRED)
 find_package(g3sinks REQUIRED)
-#TODO: upgrade to OpenSSL 1.1.1a
 find_package(OpenSSL REQUIRED)
-
 find_package(protobuf CONFIG REQUIRED)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -60,117 +58,117 @@ if(OPENCL_MINE)
     message(STATUS "OpenCL enabled")
     find_package(OpenCL REQUIRED)
     add_definitions(-DOPENCL_MINE)
-endif()
+endif ()
 
 # VC related test scenario
 # For DS Block Consensus
-if(VC_TEST_DS_SUSPEND_1)
+if (VC_TEST_DS_SUSPEND_1)
     message(STATUS "VC 1 test enabled")
     add_definitions(-DVC_TEST_DS_SUSPEND_1)
-endif()
+endif ()
 
-if(VC_TEST_DS_SUSPEND_3)
+if (VC_TEST_DS_SUSPEND_3)
     message(STATUS "VC 2 test enabled")
     add_definitions(-DVC_TEST_DS_SUSPEND_3)
-endif()
+endif ()
 
-if(GOVVC_TEST_DS_SUSPEND_3)
+if (GOVVC_TEST_DS_SUSPEND_3)
     message(STATUS "GOVVC 2 test enabled")
     add_definitions(-DGOVVC_TEST_DS_SUSPEND_3)
-endif()
+endif ()
 
 # For Final Block Consensus
-if(VC_TEST_FB_SUSPEND_1)
+if (VC_TEST_FB_SUSPEND_1)
     message(STATUS "VC 3 test enabled")
     add_definitions(-DVC_TEST_FB_SUSPEND_1)
-endif()
+endif ()
 
-if(VC_TEST_FB_SUSPEND_3)
+if (VC_TEST_FB_SUSPEND_3)
     message(STATUS "VC 4 test enabled")
     add_definitions(-DVC_TEST_FB_SUSPEND_3)
-endif()
+endif ()
 
 # For View change Block Consensus
-if(VC_TEST_VC_SUSPEND_1)
+if (VC_TEST_VC_SUSPEND_1)
     message(STATUS "VC 5 test enabled")
     add_definitions(-DVC_TEST_VC_SUSPEND_1)
-endif()
+endif ()
 
-if(VC_TEST_VC_SUSPEND_3)
+if (VC_TEST_VC_SUSPEND_3)
     message(STATUS "VC 6 test enabled")
     add_definitions(-DVC_TEST_VC_SUSPEND_3)
-endif()
+endif ()
 
-if(VC_TEST_VC_PRECHECK_1)
+if (VC_TEST_VC_PRECHECK_1)
     message(STATUS "VC 7 test enabled")
     add_definitions(-DVC_TEST_VC_PRECHECK_1)
-endif()
+endif ()
 
-if(VC_TEST_VC_PRECHECK_2)
+if (VC_TEST_VC_PRECHECK_2)
     message(STATUS "VC 8 test enabled")
     add_definitions(-DVC_TEST_VC_PRECHECK_2)
-endif()
+endif ()
 
-if(VC_TEST_FB_SUSPEND_RESPONSE)
+if (VC_TEST_FB_SUSPEND_RESPONSE)
     message(STATUS "VC 9 test enabled")
     add_definitions(-DVC_TEST_FB_SUSPEND_RESPONSE)
-endif()
+endif ()
 
 # For Merging DSMB into FINALBLOCK
-if(DM_TEST_DM_LESSTXN_ONE)
+if (DM_TEST_DM_LESSTXN_ONE)
     message(STATUS "DM 1 test enabled")
     add_definitions(-DDM_TEST_DM_LESSTXN_ONE)
-endif()
+endif ()
 
-if(DM_TEST_DM_LESSTXN_ALL)
+if (DM_TEST_DM_LESSTXN_ALL)
     message(STATUS "DM 2 test enabled")
     add_definitions(-DDM_TEST_DM_LESSTXN_ALL)
-endif()
+endif ()
 
-if(DM_TEST_DM_LESSMB_ONE)
+if (DM_TEST_DM_LESSMB_ONE)
     message(STATUS "DM 3 test enabled")
     add_definitions(-DDM_TEST_DM_LESSMB_ONE)
-endif()
+endif ()
 
-if(DM_TEST_DM_LESSMB_ALL)
+if (DM_TEST_DM_LESSMB_ALL)
     message(STATUS "DM 4 test enabled")
     add_definitions(-DDM_TEST_DM_LESSMB_ALL)
-endif()
+endif ()
 
-if(DM_TEST_DM_BAD_ANNOUNCE)
+if (DM_TEST_DM_BAD_ANNOUNCE)
     message(STATUS "DM 5 test enabled")
     add_definitions(-DDM_TEST_DM_BAD_ANNOUNCE)
-endif()
+endif ()
 
-if(DM_TEST_DM_BAD_MB_ANNOUNCE)
+if (DM_TEST_DM_BAD_MB_ANNOUNCE)
     message(STATUS "DM 6 test enabled")
     add_definitions(-DDM_TEST_DM_BAD_MB_ANNOUNCE)
-endif()
+endif ()
 
-if(DM_TEST_DM_MORETXN_LEADER)
+if (DM_TEST_DM_MORETXN_LEADER)
     message(STATUS "DM 7 test enabled")
     add_definitions(-DDM_TEST_DM_MORETXN_LEADER)
-endif()
+endif ()
 
-if(DM_TEST_DM_MORETXN_HALF)
+if (DM_TEST_DM_MORETXN_HALF)
     message(STATUS "DM 8 test enabled")
     add_definitions(-DDM_TEST_DM_MORETXN_HALF)
-endif()
+endif ()
 
-if(DM_TEST_DM_MOREMB_HALF)
+if (DM_TEST_DM_MOREMB_HALF)
     message(STATUS "DM 9 test enabled")
     add_definitions(-DDM_TEST_DM_MOREMB_HALF)
-endif()
+endif ()
 
-if(SJ_TEST_SJ_TXNBLKS_PROCESS_SLOW)
+if (SJ_TEST_SJ_TXNBLKS_PROCESS_SLOW)
     message(STATUS "SJ 1 test enabled")
     add_definitions(-DSJ_TEST_SJ_TXNBLKS_PROCESS_SLOW)
-endif()
+endif ()
 
-if(SJ_TEST_SJ_MISSING_MBTXNS)
+if (SJ_TEST_SJ_MISSING_MBTXNS)
     message(STATUS "SJ 2 test enabled")
     add_definitions(-DSJ_TEST_SJ_MISSING_MBTXNS)
-endif()
+endif ()
 
 include_directories(${PROTOBUF_INCLUDE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/depends/cryptoutils/include/)
@@ -199,37 +197,37 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Members of maintainers@zilliqa.com")
 # compiler and linker options
 
 add_compile_options(-Wall)
-add_compile_options(-Werror)
+#add_compile_options(-Werror)
 add_compile_options(-pedantic)
 add_compile_options(-Wextra)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
     add_compile_options(-Wno-error=deprecated-declarations)
     add_compile_options(-Wno-unused-parameter)
-endif()
+endif ()
 
 if (THREAD_SANITIZER AND ADDRESS_SANITIZER)
     message(FATAL_ERROR "Cannot use ThreadSanitizer (THREAD_SANITIZER=ON) and AddressSanitizer (ADDRESS_SANITIZER=ON) at the same time")
-endif()
+endif ()
 
 if (THREAD_SANITIZER)
     add_compile_options(-fsanitize=thread)
     link_libraries(-fsanitize=thread)
     message(STATUS "THREAD SANITIZER enabled")
-endif()
+endif ()
 
 if (ADDRESS_SANITIZER)
     add_compile_options(-fsanitize=address)
     add_compile_options(-fno-omit-frame-pointer)
     link_libraries(-fsanitize=address)
     message(STATUS "ADDRESS SANITIZER enabled")
-endif()
+endif ()
 
 if (UNDEF_BEHAVIOR_SANITIZER)
     add_compile_options(-fsanitize=undefined)
     link_libraries(-fsanitize=undefined)
     message(STATUS "UNDEFINED BEHAVIOR SANITIZER enabled")
-endif()
+endif ()
 
 if (LIBFUZZER_SANITIZER)
     include(CodeCoverage)
@@ -239,7 +237,7 @@ if (LIBFUZZER_SANITIZER)
     add_compile_options(-fno-omit-frame-pointer)
     link_libraries(-fsanitize=fuzzer,address,undefined)
     message(STATUS "Libfuzzer with address and undefined behavior sanitizer enabled")
-endif()
+endif ()
 
 # FIXME: This following
 #
@@ -252,19 +250,19 @@ endif()
 #        Once fixed, the following if-case for allowing duplciate targets
 #        (which isn't supported in Xcode) can be removed.
 if (NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
-  set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)
-endif()
+    set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)
+endif ()
 if (ENABLE_COVERAGE AND CMAKE_COMPILER_IS_GNUCXX)
     if (NOT TESTS)
         message(FATAL_ERROR "TESTS is not ON")
-    endif()
+    endif ()
     include(CodeCoverage)
     add_compile_options(--coverage)
     link_libraries(--coverage)
     add_custom_target(ctest COMMAND ${CMAKE_CTEST_COMMAND})
     # TODO: remove the hardcoded number in -j option
     setup_target_for_coverage(${PROJECT_NAME}_coverage ctest coverage "--output-on-failure;--timeout;100")
-endif()
+endif ()
 
 # using internal jsonrpc variant
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/depends)
@@ -275,21 +273,21 @@ add_subdirectory(daemon)
 if (TESTS)
     enable_testing()
     add_subdirectory(tests)
-endif()
+endif ()
 
 # installation
 
-set_target_properties(buildTxBlockHashesToNums genaccounts genkeypair genTxnBodiesFromS3
-                      getpub getaddr gentxn signmultisig verifymultisig getnetworkhistory
-                      getrewardhistory isolatedServer sendcmd validateDB zilliqa zilliqad
+set_target_properties(connectivity buildTxBlockHashesToNums genaccounts genkeypair genTxnBodiesFromS3
+    getpub getaddr gentxn signmultisig verifymultisig getnetworkhistory
+    getrewardhistory isolatedServer sendcmd validateDB zilliqa zilliqad asio_multiplier
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set_target_properties(Common Trie NAT
     PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
-if(OPENCL_MINE)
+if (OPENCL_MINE)
     set_target_properties(ethash-cl PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-endif()
+endif ()
 
 install(
     DIRECTORY ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib
@@ -298,10 +296,10 @@ install(
 )
 
 # add clang-format and clang-tidy targets lastly
-if(LLVM_EXTRA_TOOLS)
+if (LLVM_EXTRA_TOOLS)
     include(LLVMExtraTools)
-else()
+else ()
     message(STATUS "LLVM extra tools NOT found (for clang format/tidy)")
-endif()
+endif ()
 
 include(CPack)

README.md

@@ -23,7 +23,7 @@ Zilliqa is a scalable smart contract platform that aims to tackle the congestion
 
 ## Zilliqa Mainnet
 
-The current live version on the Zilliqa Mainnet is Zilliqa [v9.0.1](https://github.com/Zilliqa/Zilliqa/releases/tag/v9.0.1) and Scilla [v0.13.1](https://github.com/Zilliqa/scilla/releases/tag/v0.13.1).
+The current live version on the Zilliqa Mainnet is Zilliqa [v9.2.3](https://github.com/Zilliqa/Zilliqa/releases/tag/v9.2.3) and Scilla [v0.13.3](https://github.com/Zilliqa/scilla/releases/tag/v0.13.3).
 
 |          | URL(s) |
 |:---------|:-------|
@@ -32,7 +32,7 @@ The current live version on the Zilliqa Mainnet is Zilliqa [v9.0.1](https://gith
 
 ## Developer Testnet
 
-The current live version on the Developer Testnet is Zilliqa [v9.0.1](https://github.com/Zilliqa/Zilliqa/releases/tag/v9.0.1) and Scilla [v0.13.1](https://github.com/Zilliqa/scilla/releases/tag/v0.13.1).
+The current live version on the Developer Testnet is Zilliqa [v9.2.5](https://github.com/Zilliqa/Zilliqa/releases/tag/v9.2.5) and Scilla [v0.13.3](https://github.com/Zilliqa/scilla/releases/tag/v0.13.3).
 
 |          | URL(s) |
 |:---------|:-------|