sync code from release-3.15.0 (FISCO-BCOS#4861)

Author: morebtcg

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          'readability-*,clang-diagnostic-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-*,modernize-*,performance-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard'
+Checks:          'readability-*,clang-diagnostic-*,clang-analyzer-*,bugprone-*,cppcoreguidelines-*,modernize-*,performance-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,-cppcoreguidelines-avoid-reference-coroutine-parameters'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 FormatStyle:     none

CMakeLists.txt

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

bcos-crypto/bcos-crypto/ChecksumAddress.h

@@ -25,8 +25,10 @@
 #include <bcos-crypto/hash/Keccak256.h>
 #include <bcos-crypto/interfaces/crypto/Hash.h>
 #include <bcos-utilities/DataConvertUtility.h>
+#include <evmc/evmc.h>
 #include <fmt/format.h>
 #include <boost/algorithm/string.hpp>
+#include <memory>
 #include <string>
 
 namespace bcos
@@ -120,26 +122,37 @@ inline std::string newEVMAddress(
     return newEVMAddress(*_hashImpl, blockNumber, contextID, seq);
 }
 
-
 // keccak256(rlp.encode([normalize_address(sender), nonce]))[12:]
-inline std::string newLegacyEVMAddress(bytesConstRef sender, u256 nonce) noexcept
+inline evmc_address newLegacyEVMAddress(bytesConstRef sender, const u256& nonce) noexcept
 {
-    codec::rlp::Header header{true, 1 + sender.size()};
+    codec::rlp::Header header{.isList = true, .payloadLength = 1 + sender.size()};
     header.payloadLength += codec::rlp::length(nonce);
     bcos::bytes rlp;
     codec::rlp::encodeHeader(rlp, header);
     codec::rlp::encode(rlp, sender);
     codec::rlp::encode(rlp, nonce);
     auto hash = bcos::crypto::keccak256Hash(ref(rlp));
+    evmc_address address;
+    std::uninitialized_copy(hash.begin() + 12, hash.end(), address.bytes);
+
+    return address;
+}
+
+inline std::string newLegacyEVMAddressString(bytesConstRef sender, const u256& nonce) noexcept
+{
+    auto address = newLegacyEVMAddress(sender, nonce);
+    auto view = std::span{address.bytes};
     std::string out;
-    boost::algorithm::hex_lower(hash.begin() + 12, hash.end(), std::back_inserter(out));
+    out.reserve(view.size() * 2);
+    boost::algorithm::hex_lower(view.begin(), view.end(), std::back_inserter(out));
     return out;
 }
 
-inline std::string newLegacyEVMAddress(bytesConstRef sender, std::string const& nonce) noexcept
+inline std::string newLegacyEVMAddressString(
+    bytesConstRef sender, std::string const& nonce) noexcept
 {
     const auto uNonce = hex2u(nonce);
-    return newLegacyEVMAddress(sender, uNonce);
+    return newLegacyEVMAddressString(sender, uNonce);
 }
 
 // EIP-1014

bcos-crypto/test/unittests/AddressTest.cpp

@@ -57,21 +57,21 @@ BOOST_AUTO_TEST_CASE(testCreatLegacyEVMAddress)
 {
     {
         auto sender = fromHex("fbe0afcd7658ba86be41922059dd879c192d4c73"sv);
-        auto newAddress = newLegacyEVMAddress(ref(sender), u256(0));
+        auto newAddress = newLegacyEVMAddressString(ref(sender), u256(0));
         BOOST_CHECK_EQUAL(newAddress, "c669eaad75042be84daaf9b461b0e868b9ac1871");
     }
 
     {
         auto sender = fromHex("f39Fd6e51aad88F6F4ce6aB8827279cffFb92266"sv);
-        auto newAddress = newLegacyEVMAddress(ref(sender), u256(0));
+        auto newAddress = newLegacyEVMAddressString(ref(sender), u256(0));
         BOOST_CHECK_EQUAL(newAddress, "5fbdb2315678afecb367f032d93f642f64180aa3");
     }
 
     // string nonce
     {
         auto sender = fromHex("f39Fd6e51aad88F6F4ce6aB8827279cffFb92266"sv);
         auto nonce = "0";
-        auto newAddress = newLegacyEVMAddress(ref(sender), nonce);
+        auto newAddress = newLegacyEVMAddressString(ref(sender), nonce);
         BOOST_CHECK_EQUAL(newAddress, "5fbdb2315678afecb367f032d93f642f64180aa3");
     }
 }

bcos-executor/src/Common.h

@@ -37,7 +37,6 @@
 #include <evmc/evmc.h>
 #include <evmc/instructions.h>
 #include <boost/algorithm/string/case_conv.hpp>
-#include <algorithm>
 #include <iterator>
 #include <memory>
 #include <set>
@@ -324,7 +323,7 @@ std::array<char, sizeof(evmc_address) * 2> address2HexArray(const evmc_address&
 task::Task<bool> checkTransferPermission(auto& storage, std::string_view sender)
 {
     if (co_await storage2::existsOne(
-            storage, transaction_executor::StateKeyView{ledger::SYS_BALANCE_CALLER, sender}))
+            storage, executor_v1::StateKeyView{ledger::SYS_BALANCE_CALLER, sender}))
     {
         co_return true;
     }

bcos-executor/src/executive/TransactionExecutive.cpp

@@ -116,7 +116,7 @@ CallParameters::UniquePtr TransactionExecutive::externalCall(CallParameters::Uni
             if (m_blockContext.features().get(ledger::Features::Flag::feature_evm_address))
             {
                 auto senderBytes = fromHex(input->senderAddress);
-                newAddress = bcos::newLegacyEVMAddress(ref(senderBytes), input->nonce);
+                newAddress = bcos::newLegacyEVMAddressString(ref(senderBytes), input->nonce);
             }
             else
             {

bcos-executor/src/precompiled/CastPrecompiled.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../vm/Precompiled.h"
-#include "bcos-executor/src/precompiled/common/Common.h"
 #include <bcos-crypto/interfaces/crypto/CommonType.h>
 
 namespace bcos::precompiled
@@ -16,6 +15,5 @@ class CastPrecompiled : public Precompiled
     std::shared_ptr<PrecompiledExecResult> call(
         std::shared_ptr<executor::TransactionExecutive> _executive,
         PrecompiledExecResult::Ptr _callParameters) override;
-        
 };
-}  // namespace precompiled
+}  // namespace bcos::precompiled

bcos-executor/src/precompiled/SystemConfigPrecompiled.cpp

@@ -22,6 +22,7 @@
 #include "bcos-executor/src/precompiled/common/PrecompiledResult.h"
 #include "bcos-executor/src/precompiled/common/Utilities.h"
 #include "bcos-framework/ledger/Features.h"
+#include "bcos-framework/ledger/SystemConfigs.h"
 #include "bcos-framework/storage/LegacyStorageMethods.h"
 #include "bcos-task/Wait.h"
 #include <bcos-framework/ledger/LedgerTypeDef.h>
@@ -103,6 +104,11 @@ SystemConfigPrecompiled::SystemConfigPrecompiled(crypto::Hash::Ptr hashImpl) : P
         std::make_pair(ENABLE_BALANCE_TRANSFER, [defaultCmp](int64_t _value, uint32_t version) {
             defaultCmp(ENABLE_BALANCE_TRANSFER, _value, 0, version, BlockVersion::V3_10_2_VERSION);
         }));
+    m_sysValueCmp.emplace(magic_enum::enum_name(ledger::SystemConfig::executor_version),
+        [defaultCmp](int64_t _value, uint32_t version) {
+            defaultCmp(magic_enum::enum_name(ledger::SystemConfig::executor_version), _value, 0,
+                version, BlockVersion::V3_15_0_VERSION);
+        });
     // for compatibility
     // Note: the compatibility_version is not compatibility
     m_sysValueCmp.insert(

bcos-executor/src/precompiled/TableManagerPrecompiled.cpp

@@ -311,7 +311,7 @@ void TableManagerPrecompiled::openTable(
             // if link
             auto addressEntry = _executive->storage().getRow(absolutePath, FS_LINK_ADDRESS);
             auto contractAddress = std::string(addressEntry->get());
-            auto codecAddress = codec.encode(Address(std::move(contractAddress)));
+            auto codecAddress = codec.encode(Address(contractAddress));
             _callParameters->setExecResult(std::move(codecAddress));
             return;
         }

bcos-executor/src/precompiled/TableManagerPrecompiled.h

@@ -22,8 +22,6 @@
 
 #include "../executive/TransactionExecutive.h"
 #include "../vm/Precompiled.h"
-#include "bcos-executor/src/precompiled/common/Common.h"
-#include "bcos-executor/src/precompiled/common/Utilities.h"
 #include <bcos-crypto/interfaces/crypto/CommonType.h>
 #include <bcos-framework/storage/Table.h>