Merge branch 'release-3.10.0' into release-3.10.0

wenlinlee · Jul 19, 2024 · 6396975 · 6396975
2 parents 3f57b47 + 02d9bee
commit 6396975
Show file tree

Hide file tree

Showing 26 changed files with 103 additions and 220 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,6 @@ include(BuildInfoGenerator)
 
 include(IncludeDirectories)
 include(TargetSettings)
-include(PrecompiledHeaders)
 
 add_subdirectory(bcos-boostssl)
 add_subdirectory(bcos-framework)

diff --git a/bcos-framework/CMakeLists.txt b/bcos-framework/CMakeLists.txt
@@ -27,13 +27,7 @@ add_library(bcos-framework INTERFACE)
 target_include_directories(bcos-framework INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include/bcos-framework>)
-
-if (PRECOMPILED_HEADER)
-    target_link_libraries(bcos-framework INTERFACE bcos-task Microsoft.GSL::GSL precompiled-headers)
-    target_precompile_headers(bcos-framework REUSE_FROM precompiled-headers)
-else()
-    target_link_libraries(bcos-framework INTERFACE bcos-task Microsoft.GSL::GSL fmt::fmt)
-endif()
+target_link_libraries(bcos-framework INTERFACE bcos-task Microsoft.GSL::GSL fmt::fmt)
 
 if (TESTS)
     enable_testing()

diff --git a/bcos-framework/bcos-framework/ledger/LedgerInterface.h b/bcos-framework/bcos-framework/ledger/LedgerInterface.h
@@ -28,7 +28,6 @@
 #include "../storage/StorageInterface.h"
 #include "LedgerTypeDef.h"
 #include <bcos-crypto/interfaces/crypto/CommonType.h>
-#include <bcos-task/Coroutine.h>
 #include <bcos-task/Task.h>
 #include <bcos-utilities/Error.h>
 #include <gsl/span>

diff --git a/bcos-framework/bcos-framework/storage/LegacyStorageMethods.h b/bcos-framework/bcos-framework/storage/LegacyStorageMethods.h
@@ -20,7 +20,7 @@ inline task::Task<std::optional<Entry>> tag_invoke(storage2::tag_t<storage2::rea
         std::variant<std::monostate, std::optional<Entry>, std::exception_ptr> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_storage.asyncGetRow(m_table, m_key,
                 [this, handle](Error::UniquePtr error, std::optional<Entry> entry) mutable {
@@ -98,7 +98,7 @@ inline task::Task<void> tag_invoke(storage2::tag_t<storage2::writeOne> /*unused*
         std::variant<std::monostate, std::exception_ptr> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_storage.asyncSetRow(
                 m_table, m_key, std::move(m_entry), [this, handle](Error::UniquePtr error) mutable {

diff --git a/bcos-front/bcos-front/FrontImpl.h b/bcos-front/bcos-front/FrontImpl.h
@@ -40,7 +40,7 @@ class FrontImpl : public bcos::concepts::front::FrontBase<FrontImpl>
             {}
 
             constexpr bool await_ready() const noexcept { return false; }
-            void await_suspend(CO_STD::coroutine_handle<> handle)
+            void await_suspend(std::coroutine_handle<> handle)
             {
                 bcos::concepts::getRef(m_gateway).asyncGetPeers(
                     [this, m_handle = handle](Error::Ptr error, const gateway::GatewayInfo::Ptr&,
@@ -123,7 +123,7 @@ class FrontImpl : public bcos::concepts::front::FrontBase<FrontImpl>
         {
             constexpr bool await_ready() const { return false; }
 
-            void await_suspend(CO_STD::coroutine_handle<task::Task<void>::promise_type> handle)
+            void await_suspend(std::coroutine_handle<task::Task<void>::promise_type> handle)
             {
                 FRONT_LOG(DEBUG) << "P2P client send message: " << m_moduleID << " | "
                                  << m_nodeID->hex() << " | " << m_requestBuffer.size();

diff --git a/bcos-ledger/src/libledger/LedgerMethods.cpp b/bcos-ledger/src/libledger/LedgerMethods.cpp
@@ -22,7 +22,7 @@ bcos::task::Task<void> bcos::ledger::prewriteBlockToStorage(LedgerInterface& led
         Error::Ptr m_error;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncPrewriteBlock(
                 m_storage, std::move(m_transactions), std::move(m_block),
@@ -74,7 +74,7 @@ bcos::task::Task<bcos::protocol::Block::Ptr> bcos::ledger::tag_invoke(
         std::variant<Error::Ptr, bcos::protocol::Block::Ptr> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetBlockDataByNumber(m_blockNumber, m_blockFlag,
                 [this, handle](Error::Ptr error, bcos::protocol::Block::Ptr block) {
@@ -113,7 +113,7 @@ bcos::task::Task<bcos::ledger::TransactionCount> bcos::ledger::tag_invoke(
         std::variant<Error::Ptr, TransactionCount> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetTotalTransactionCount(
                 [this, handle](Error::Ptr error, int64_t total, int64_t failed,
@@ -155,7 +155,7 @@ bcos::task::Task<bcos::protocol::BlockNumber> bcos::ledger::tag_invoke(
         std::variant<Error::Ptr, protocol::BlockNumber> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetBlockNumber(
                 [this, handle](Error::Ptr error, bcos::protocol::BlockNumber blockNumber) {
@@ -195,7 +195,7 @@ bcos::task::Task<bcos::crypto::HashType> bcos::ledger::tag_invoke(
         std::variant<Error::Ptr, crypto::HashType> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetBlockHashByNumber(
                 m_blockNumber, [this, handle](Error::Ptr error, crypto::HashType hash) {
@@ -236,7 +236,7 @@ bcos::task::Task<bcos::protocol::BlockNumber> bcos::ledger::tag_invoke(
         std::variant<bcos::Error::Ptr, bcos::protocol::BlockNumber> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetBlockNumberByHash(
                 m_hash, [this, handle](bcos::Error::Ptr error, bcos::protocol::BlockNumber number) {
@@ -275,7 +275,7 @@ bcos::task::Task<std::optional<bcos::ledger::SystemConfigEntry>> bcos::ledger::t
         std::variant<Error::Ptr, std::optional<SystemConfigEntry>> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetSystemConfigByKey(
                 m_key, [this, handle](Error::Ptr error, std::string value,
@@ -325,7 +325,7 @@ bcos::task::Task<bcos::consensus::ConsensusNodeList> bcos::ledger::tag_invoke(
         std::variant<Error::Ptr, consensus::ConsensusNodeList> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetNodeListByType(
                 m_type, [this, handle](Error::Ptr error,
@@ -485,7 +485,7 @@ bcos::task::Task<bcos::protocol::TransactionReceipt::ConstPtr> bcos::ledger::tag
         std::variant<bcos::Error::Ptr, bcos::protocol::TransactionReceipt::ConstPtr> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetTransactionReceiptByHash(m_hash, false,
                 [this, handle](bcos::Error::Ptr error,
@@ -526,7 +526,7 @@ bcos::task::Task<bcos::protocol::TransactionsConstPtr> bcos::ledger::tag_invoke(
         std::variant<bcos::Error::Ptr, bcos::protocol::TransactionsConstPtr> m_result;
 
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle)
+        void await_suspend(std::coroutine_handle<> handle)
         {
             m_ledger.asyncGetBatchTxsByHashList(
                 std::move(m_hashes), false, [this, handle](auto&& error, auto&& txs, auto&&) {

diff --git a/bcos-rpc/bcos-rpc/web3jsonrpc/endpoints/EthEndpoint.cpp b/bcos-rpc/bcos-rpc/web3jsonrpc/endpoints/EthEndpoint.cpp
@@ -351,7 +351,7 @@ task::Task<void> EthEndpoint::getCode(const Json::Value& request, Json::Value& r
         std::string m_address;
         std::variant<Error::Ptr, bcos::bytes> m_result{};
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle) noexcept
+        void await_suspend(std::coroutine_handle<> handle) noexcept
         {
             m_scheduler->getCode(m_address, [this, handle](auto&& error, auto&& code) {
                 if (error)
@@ -497,7 +497,7 @@ task::Task<void> EthEndpoint::call(const Json::Value& request, Json::Value& resp
         bcos::protocol::Transaction::Ptr m_tx;
         std::variant<Error::Ptr, protocol::TransactionReceipt::Ptr> m_result{};
         constexpr static bool await_ready() noexcept { return false; }
-        void await_suspend(CO_STD::coroutine_handle<> handle) noexcept
+        void await_suspend(std::coroutine_handle<> handle) noexcept
         {
             m_scheduler.call(m_tx, [this, handle](Error::Ptr&& error, auto&& result) {
                 if (error)

diff --git a/bcos-sdk/bcos-cpp-sdk/tarsRPC/CoRPCClient.cpp b/bcos-sdk/bcos-cpp-sdk/tarsRPC/CoRPCClient.cpp
@@ -4,10 +4,10 @@
 class CoCallback : public bcos::sdk::Callback
 {
 private:
-    CO_STD::coroutine_handle<> m_handle;
+    std::coroutine_handle<> m_handle;
 
 public:
-    CoCallback(CO_STD::coroutine_handle<> handle) : m_handle(handle) {}
+    CoCallback(std::coroutine_handle<> handle) : m_handle(handle) {}
     void onMessage([[maybe_unused]] int seq) override
     {
         // Make sure we are in the io thread of tars!
@@ -18,7 +18,7 @@ class CoCallback : public bcos::sdk::Callback
 bcos::sdk::async::Awaitable<bcos::sdk::SendTransaction> bcos::sdk::async::sendTransaction(
     RPCClient& rpcClient, const bcos::protocol::Transaction& transaction)
 {
-    return {[&](CO_STD::coroutine_handle<> handle) {
+    return {[&](std::coroutine_handle<> handle) {
         bcos::sdk::SendTransaction sendTransaction(rpcClient);
         sendTransaction.setCallback(std::make_shared<CoCallback>(handle));
         sendTransaction.send(transaction);
@@ -29,7 +29,7 @@ bcos::sdk::async::Awaitable<bcos::sdk::SendTransaction> bcos::sdk::async::sendTr
 bcos::sdk::async::Awaitable<bcos::sdk::Call> bcos::sdk::async::call(
     RPCClient& rpcClient, const bcos::protocol::Transaction& transaction)
 {
-    return {[&](CO_STD::coroutine_handle<> handle) {
+    return {[&](std::coroutine_handle<> handle) {
         bcos::sdk::Call call(rpcClient);
         call.setCallback(std::make_shared<CoCallback>(handle));
         call.send(transaction);
@@ -40,7 +40,7 @@ bcos::sdk::async::Awaitable<bcos::sdk::Call> bcos::sdk::async::call(
 bcos::sdk::async::Awaitable<bcos::sdk::BlockNumber> bcos::sdk::async::blockNumber(
     RPCClient& rpcClient)
 {
-    return {[&](CO_STD::coroutine_handle<> handle) {
+    return {[&](std::coroutine_handle<> handle) {
         bcos::sdk::BlockNumber blockNumber(rpcClient);
         blockNumber.setCallback(std::make_shared<CoCallback>(handle));
         blockNumber.send();

diff --git a/bcos-sdk/bcos-cpp-sdk/tarsRPC/CoRPCClient.h b/bcos-sdk/bcos-cpp-sdk/tarsRPC/CoRPCClient.h
@@ -1,9 +1,6 @@
 #pragma once
 #include "RPCClient.h"
-#include <bcos-task/Coroutine.h>
-#include <exception>
-#include <type_traits>
-#include <variant>
+#include <coroutine>
 
 namespace bcos::sdk::async
 {
@@ -12,14 +9,14 @@ template <class Handle>
 class Awaitable
 {
 private:
-    std::function<Handle(CO_STD::coroutine_handle<>)> m_applyCall;
+    std::function<Handle(std::coroutine_handle<>)> m_applyCall;
     std::optional<Handle> m_handle;
 
 public:
     Awaitable(decltype(m_applyCall) applyCall) : m_applyCall(std::move(applyCall)) {}
 
     constexpr bool await_ready() const { return false; }
-    void await_suspend(CO_STD::coroutine_handle<> handle) { m_handle.emplace(m_applyCall(handle)); }
+    void await_suspend(std::coroutine_handle<> handle) { m_handle.emplace(m_applyCall(handle)); }
     Handle await_resume() { return std::move(*m_handle); }
 };
 

diff --git a/bcos-sync/bcos-sync/state/SyncPeerStatus.h b/bcos-sync/bcos-sync/state/SyncPeerStatus.h
@@ -77,8 +77,8 @@ class PeerStatus
 
 private:
     bcos::crypto::PublicPtr m_nodeId;
-    bcos::protocol::BlockNumber m_number;
-    bcos::protocol::BlockNumber m_archivedNumber;
+    bcos::protocol::BlockNumber m_number{};
+    bcos::protocol::BlockNumber m_archivedNumber{};
     bcos::crypto::HashType m_hash;
     bcos::crypto::HashType m_genesisHash;
 

diff --git a/bcos-tars-protocol/bcos-tars-protocol/client/TxPoolServiceClient.h b/bcos-tars-protocol/bcos-tars-protocol/client/TxPoolServiceClient.h
@@ -57,7 +57,7 @@ class TxPoolServiceClient : public bcos::txpool::TxPoolInterface
                 m_handle.resume();
             }
 
-            CO_STD::coroutine_handle<> m_handle;
+            std::coroutine_handle<> m_handle;
             std::variant<std::monostate, bcos::Error::Ptr,
                 bcostars::protocol::TransactionSubmitResultImpl::Ptr>
                 m_submitResult;
@@ -67,7 +67,7 @@ class TxPoolServiceClient : public bcos::txpool::TxPoolInterface
         struct Awaitable
         {
             constexpr bool await_ready() { return false; }
-            void await_suspend(CO_STD::coroutine_handle<> handle)
+            void await_suspend(std::coroutine_handle<> handle)
             {
                 m_callback->m_handle = handle;
                 m_proxy->tars_set_timeout(600000)->async_submit(m_callback,

diff --git a/bcos-txpool/bcos-txpool/txpool/storage/MemoryStorage.cpp b/bcos-txpool/bcos-txpool/txpool/storage/MemoryStorage.cpp
@@ -99,7 +99,7 @@ task::Task<protocol::TransactionSubmitResult::Ptr> MemoryStorage::submitTransact
     struct Awaitable
     {
         [[maybe_unused]] constexpr bool await_ready() { return false; }
-        [[maybe_unused]] void await_suspend(CO_STD::coroutine_handle<> handle)
+        [[maybe_unused]] void await_suspend(std::coroutine_handle<> handle)
         {
             try
             {
@@ -180,7 +180,7 @@ task::Task<protocol::TransactionSubmitResult::Ptr> MemoryStorage::submitTransact
     struct Awaitable
     {
         [[maybe_unused]] constexpr bool await_ready() { return false; }
-        [[maybe_unused]] void await_suspend(CO_STD::coroutine_handle<> handle)
+        [[maybe_unused]] void await_suspend(std::coroutine_handle<> handle)
         {
             try
             {

diff --git a/cmake/CompilerSettings.cmake b/cmake/CompilerSettings.cmake
@@ -107,7 +107,6 @@ if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR("${CMAKE_CXX_COMPILER_ID}" MATC
 
         add_compile_options(-fstack-protector-strong)
         add_compile_options(-fstack-protector)
-        add_compile_options(-fno-omit-frame-pointer)
 
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0)
             add_compile_options(-fcoroutines)
@@ -116,7 +115,7 @@ if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR("${CMAKE_CXX_COMPILER_ID}" MATC
 
         add_compile_options(-fPIC)
         add_compile_options(-Wno-error=nonnull)
-        add_compile_options(-foptimize-sibling-calls)
+        # add_compile_options(-foptimize-sibling-calls)
         add_compile_options(-Wno-stringop-overflow)
         add_compile_options(-Wno-restrict)
         add_compile_options(-Wno-error=format-truncation)
@@ -127,7 +126,11 @@ if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR("${CMAKE_CXX_COMPILER_ID}" MATC
             add_compile_options(-Wno-array-bounds)
             add_compile_options(-Wno-aggressive-loop-optimizations)
         endif()
-        # add_compile_options(-fconcepts-diagnostics-depth=10)
+
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0)
+            set(CMAKE_CXX_STANDARD 23)
+            add_compile_options(-Wno-error=uninitialized)
+        endif()
     elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
             set(CMAKE_CXX_FLAGS_DEBUG "-O -g")
@@ -172,7 +175,6 @@ if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR("${CMAKE_CXX_COMPILER_ID}" MATC
     endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
     add_compile_definitions(NOMINMAX)
-    #add_definitions(-DUSE_STD_RANGES)
     add_compile_options(/std:c++latest)
     add_compile_options(-bigobj)
 

diff --git a/cmake/Options.cmake b/cmake/Options.cmake
@@ -56,7 +56,6 @@ macro(configure_project)
     default_option(SANITIZE_ADDRESS OFF)
     default_option(SANITIZE_THREAD OFF)
     default_option(IPO OFF)
-    default_option(PRECOMPILED_HEADER OFF)
     if(IPO)
         set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
     endif()
@@ -156,7 +155,6 @@ macro(print_config NAME)
     message("-- TESTS              Build tests                  ${TESTS}")
     message("-- NATIVE             Build native binary          ${NATIVE}")
     message("-- IPO                Enable IPO optimization      ${IPO}")
-    message("-- PRECOMPILED_HEADER Enable precompiled header    ${PRECOMPILED_HEADER}")
     message("-- SANITIZE_ADDRESS   Enable sanitize              ${SANITIZE_ADDRESS}")
     message("-- SANITIZE_THREAD    Enable sanitize              ${SANITIZE_THREAD}")
     message("-- TOOLCHAIN_FILE     CMake toolchain file         ${CMAKE_TOOLCHAIN_FILE}")