sync code from 3.15.3 (FISCO-BCOS#4900)

Author: morebtcg

CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-set(VERSION "3.15.2")
+set(VERSION "3.15.3")
 set(VERSION_SUFFIX "")
 include(Options)
 configure_project()

bcos-crypto/bcos-crypto/merkle/Merkle.h

@@ -134,7 +134,7 @@ class Merkle
 
         setNumberToHash(count, out.emplace_back());
         for (auto it = ::ranges::begin(originHashes) + index;
-             it < ::ranges::begin(originHashes) + index + count; ++it)
+            it < ::ranges::begin(originHashes) + index + count; ++it)
         {
             bcos::concepts::bytebuffer::assignTo(*it, out.emplace_back());
         }
@@ -162,9 +162,9 @@ class Merkle
         }
     }
 
-    void generateMerkle(HashRange auto const& originHashes, MerkleRange auto& out) const
+    void generateMerkle(HashRange auto&& originHashes, MerkleRange auto& out) const
     {
-        if (::ranges::empty(originHashes)) [[unlikely]]
+        if (::ranges::empty(originHashes))
         {
             BOOST_THROW_EXCEPTION(std::invalid_argument{"Empty input"});
         }

bcos-framework/bcos-framework/protocol/Protocol.h

@@ -115,6 +115,7 @@ enum ProtocolVersion : uint32_t
 
 enum class BlockVersion : uint32_t
 {
+    V3_15_3_VERSION = 0x030f0300,  // 3.15.3
     V3_15_2_VERSION = 0x030f0200,  // 3.15.2
     V3_15_1_VERSION = 0x030f0100,  // 3.15.1
     V3_15_0_VERSION = 0x030f0000,  // 3.15.0
@@ -152,7 +153,7 @@ enum class BlockVersion : uint32_t
     V3_0_VERSION = 0x03000000,
     RC4_VERSION = 4,
     MIN_VERSION = RC4_VERSION,
-    MAX_VERSION = V3_15_2_VERSION,  // 3.15.2
+    MAX_VERSION = V3_15_3_VERSION,  // 3.15.3
 };
 
 enum class TransactionVersion : uint32_t
@@ -167,7 +168,7 @@ const std::string RC4_VERSION_STR = "3.0.0-rc4";
 const std::string RC_VERSION_PREFIX = "3.0.0-rc";
 const std::string V3_9_VERSION_STR = "3.9.0";
 
-constexpr BlockVersion DEFAULT_VERSION = bcos::protocol::BlockVersion::V3_15_2_VERSION;  // 3.15.2
+constexpr BlockVersion DEFAULT_VERSION = bcos::protocol::BlockVersion::V3_15_3_VERSION;  // 3.15.3
 const std::string DEFAULT_VERSION_STR = V3_9_VERSION_STR;
 constexpr uint8_t MAX_MAJOR_VERSION = std::numeric_limits<uint8_t>::max();
 constexpr uint8_t MIN_MAJOR_VERSION = 3;

bcos-framework/bcos-framework/storage2/MemoryStorage.h

@@ -310,13 +310,14 @@ class MemoryStorage
         return {};
     }
 
-    task::AwaitableValue<void> removeSome(::ranges::input_range auto keys, bool direct)
+    task::AwaitableValue<void> removeSome(
+        ::ranges::input_range auto keys, bool ignoreLogicalDeletion)
     {
         for (auto&& key : keys)
         {
             auto& bucket = getBucket(key);
             Lock lock(bucket.mutex, true);
-            writeOne(bucket, std::forward<decltype(key)>(key), deleteItem, direct);
+            writeOne(bucket, std::forward<decltype(key)>(key), deleteItem, ignoreLogicalDeletion);
         }
 
         return {};
@@ -434,10 +435,13 @@ class MemoryStorage
         return task::AwaitableValue(std::move(iterator));
     }
 
-    template <class FromStorage>
-        requires withConcurrent && (!FromStorage::withConcurrent)
-    friend task::Task<void> tag_invoke(
-        storage2::tag_t<merge> /*unused*/, MemoryStorage& toStorage, FromStorage& fromStorage)
+    void merge(MemoryStorage& toStorage)
+        requires withConcurrent
+    {}
+    template <class FromStorage, class... FromStorages>
+    void merge(MemoryStorage& toStorage, FromStorage& fromStorage, FromStorages&... fromStorages)
+        requires(withConcurrent && !FromStorage::withConcurrent &&
+                 (... && (!FromStorages::withConcurrent)))
     {
         auto& bucket = fromStorage.m_buckets[0];
         auto& index = bucket.container.template get<0>();
@@ -473,6 +477,15 @@ class MemoryStorage
                 }
             }
         });
+        merge(toStorage, fromStorages...);
+    }
+
+    template <class... FromStorages>
+        requires(withConcurrent && (... && (!FromStorages::withConcurrent)))
+    friend task::Task<void> tag_invoke(storage2::tag_t<storage2::merge> /*unused*/,
+        MemoryStorage& toStorage, FromStorages&... fromStorage)
+    {
+        toStorage.merge(toStorage, fromStorage...);
         co_return;
     }
 };

bcos-framework/test/unittests/storage2/TestMemoryStorage.cpp

@@ -4,8 +4,11 @@
 #include <bcos-framework/storage2/MemoryStorage.h>
 #include <bcos-task/Wait.h>
 #include <fmt/format.h>
+#include <boost/test/tools/old/interface.hpp>
 #include <boost/test/unit_test.hpp>
 #include <functional>
+#include <ostream>
+#include <range/v3/view/transform.hpp>
 #include <string>
 #include <variant>
 
@@ -311,6 +314,23 @@ BOOST_AUTO_TEST_CASE(merge)
             ++i;
         }
         BOOST_CHECK_EQUAL(i, 19);
+
+        MemoryStorage<int, int, ORDERED> storage3;
+        MemoryStorage<int, int, ORDERED> storage4;
+        MemoryStorage<int, int, ORDERED | CONCURRENT> storage5;
+
+        co_await storage2::writeSome(storage3,
+            ::ranges::views::zip(::ranges::views::iota(0, 10), ::ranges::repeat_view<int>(100)));
+        co_await storage2::writeSome(storage4,
+            ::ranges::views::zip(::ranges::views::iota(10, 20), ::ranges::repeat_view<int>(100)));
+        co_await storage2::merge(storage5, storage3, storage4);
+
+        auto values2 = co_await storage2::readSome(storage5, ::ranges::views::iota(0, 20));
+        BOOST_CHECK_EQUAL(values2.size(), 20);
+        auto expectValues2 = ::ranges::views::iota(0, 20) | ::ranges::views::transform([](int i) {
+            return std::make_optional(100);
+        }) | ::ranges::to<std::vector>();
+        BOOST_CHECK(values2 == expectValues2);
     }());
 }
 

bcos-front/bcos-front/FrontService.cpp

@@ -31,6 +31,7 @@
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/single.hpp>
 #include <thread>
+#include <utility>
 
 using namespace bcos;
 using namespace front;
@@ -102,7 +103,7 @@ void FrontService::start()
     // try to getNodeIDs from gateway
     auto self = std::weak_ptr<FrontService>(shared_from_this());
     m_gatewayInterface->asyncGetGroupNodeInfo(
-        m_groupID, [self](Error::Ptr _error, bcos::gateway::GroupNodeInfo::Ptr _groupNodeInfo) {
+        m_groupID, [self](const Error::Ptr& _error, const bcos::gateway::GroupNodeInfo::Ptr& _groupNodeInfo) {
             if (_error)
             {
                 FRONT_LOG(ERROR) << LOG_BADGE("start") << LOG_DESC("asyncGetGroupNodeInfo failed")
@@ -121,7 +122,7 @@ void FrontService::start()
             }
         });
 
-    m_frontServiceThread = std::make_shared<std::thread>([=, this]() {
+    m_frontServiceThread = std::make_shared<std::thread>([this]() {
         while (m_run)
         {
             try
@@ -278,7 +279,7 @@ void FrontService::asyncSendMessageByNodeID(int _moduleID, bcos::crypto::NodeIDP
 
         auto self = weak_from_this();
         sendMessage(_moduleID, _nodeID, uuid, _data, false,
-            [self, _moduleID, _nodeID, uuid](Error::Ptr _error) {
+            [self, _moduleID, _nodeID, uuid](const Error::Ptr& _error) {
                 auto front = self.lock();
                 if (!front)
                 {
@@ -437,13 +438,13 @@ void FrontService::protocolNegotiate(bcos::gateway::GroupNodeInfo::Ptr _groupNod
 }
 
 void FrontService::notifyGroupNodeInfo(
-    const std::string& _groupID, bcos::gateway::GroupNodeInfo::Ptr _groupNodeInfo)
+    const std::string& _groupID, const bcos::gateway::GroupNodeInfo::Ptr& _groupNodeInfo)
 {
     Guard l(x_notifierLock);
     for (const auto& entry : m_module2GroupNodeInfoNotifier)
     {
         auto moduleID = entry.first;
-        entry.second(_groupNodeInfo, [_groupID, moduleID](Error::Ptr _error) {
+        entry.second(_groupNodeInfo, [_groupID, moduleID](const Error::Ptr& _error) {
             if (_error)
             {
                 FRONT_LOG(ERROR) << LOG_DESC("onReceiveGroupNodeInfo dispather failed")
@@ -468,7 +469,7 @@ void FrontService::handleCallback(bcos::Error::Ptr _error, bytesConstRef _payLoa
         if (frontService)
         {
             frontService->sendMessage(
-                _moduleID, _nodeID, _uuid, _data, true, [_uuid](Error::Ptr _error) {
+                _moduleID, _nodeID, _uuid, _data, true, [_uuid](const Error::Ptr& _error) {
                     if (_error && (_error->errorCode() != CommonError::SUCCESS))
                     {
                         FRONT_LOG(ERROR)
@@ -599,7 +600,7 @@ void FrontService::onReceiveBroadcastMessage(const std::string& _groupID,
  */
 void FrontService::sendMessage(int _moduleID, bcos::crypto::NodeIDPtr _nodeID,
     const std::string& _uuid, bytesConstRef _data, bool isResponse,
-    ReceiveMsgFunc _receiveMsgCallback)
+    const ReceiveMsgFunc& _receiveMsgCallback)
 {
     auto message = messageFactory()->buildMessage();
     message->setModuleID(_moduleID);
@@ -614,11 +615,11 @@ void FrontService::sendMessage(int _moduleID, bcos::crypto::NodeIDPtr _nodeID,
     message->encode(*buffer);
 
     // call gateway interface to send the message
-    m_gatewayInterface->asyncSendMessageByNodeID(m_groupID, _moduleID, m_nodeID, _nodeID,
+    m_gatewayInterface->asyncSendMessageByNodeID(m_groupID, _moduleID, m_nodeID, std::move(_nodeID),
         bytesConstRef(buffer->data(), buffer->size()), [_receiveMsgCallback](Error::Ptr _error) {
             if (_receiveMsgCallback)
             {
-                _receiveMsgCallback(_error);
+                _receiveMsgCallback(std::move(_error));
             }
         });
 }

bcos-front/bcos-front/FrontService.h

@@ -146,7 +146,7 @@ class FrontService : public FrontServiceInterface, public std::enable_shared_fro
      * @return void
      */
     void sendMessage(int _moduleID, bcos::crypto::NodeIDPtr _nodeID, const std::string& _uuid,
-        bytesConstRef _data, bool isResponse, ReceiveMsgFunc _receiveMsgCallback);
+        bytesConstRef _data, bool isResponse, const ReceiveMsgFunc& _receiveMsgCallback);
 
     /**
      * @brief: handle message timeout
@@ -267,7 +267,7 @@ class FrontService : public FrontServiceInterface, public std::enable_shared_fro
     virtual void handleCallback(bcos::Error::Ptr _error, bytesConstRef _payLoad,
         std::string const& _uuid, int _moduleID, bcos::crypto::NodeIDPtr _nodeID);
     void notifyGroupNodeInfo(
-        const std::string& _groupID, bcos::gateway::GroupNodeInfo::Ptr _groupNodeInfo);
+        const std::string& _groupID, const bcos::gateway::GroupNodeInfo::Ptr& _groupNodeInfo);
 
     virtual void protocolNegotiate(bcos::gateway::GroupNodeInfo::Ptr _groupNodeInfo);
 

bcos-rpc/bcos-rpc/web3jsonrpc/endpoints/EthEndpoint.cpp

@@ -255,8 +255,8 @@ task::Task<void> EthEndpoint::getTransactionCount(const Json::Value& request, Js
         {
             WEB3_LOG(TRACE) << "eth_getTransactionCount pending tx from txpool"
                             << LOG_KV("address", address) << LOG_KV("blockTag", blockTag)
-                            << LOG_KV("nonce", nonce.value() + 1);
-            Json::Value result = toQuantity(nonce.value() + 1);
+                            << LOG_KV("nonce", nonce.value());
+            Json::Value result = toQuantity(nonce.value());
             buildJsonContent(result, response);
             co_return;
         }