<feat&fix>(executor,utilities): add feature_evm_timestamp feat, fix u…

…256 hex abbort. (FISCO-BCOS#4622)
kyonRay · Sep 13, 2024 · ce7c03e · ce7c03e
1 parent 8679a6e
commit ce7c03e
Show file tree

Hide file tree

Showing 35 changed files with 196 additions and 81 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-set(VERSION "3.11.0")
+set(VERSION "3.12.0")
 set(VERSION_SUFFIX "")
 include(Options)
 configure_project()

diff --git a/bcos-crypto/bcos-crypto/ChecksumAddress.h b/bcos-crypto/bcos-crypto/ChecksumAddress.h
@@ -132,7 +132,7 @@ inline std::string newLegacyEVMAddress(bytesConstRef sender, u256 nonce) noexcep
 
 inline std::string newLegacyEVMAddress(bytesConstRef sender, std::string const& nonce) noexcept
 {
-    const auto uNonce = u256(nonce);
+    const auto uNonce = hex2u(nonce);
     return newLegacyEVMAddress(sender, uNonce);
 }
 

diff --git a/bcos-crypto/test/unittests/AddressTest.cpp b/bcos-crypto/test/unittests/AddressTest.cpp
@@ -66,6 +66,14 @@ BOOST_AUTO_TEST_CASE(testCreatLegacyEVMAddress)
         auto newAddress = newLegacyEVMAddress(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);
+        BOOST_CHECK_EQUAL(newAddress, "5fbdb2315678afecb367f032d93f642f64180aa3");
+    }
 }
 
 BOOST_AUTO_TEST_CASE(testCreate2Address)

diff --git a/bcos-executor/src/executive/TransactionExecutive.cpp b/bcos-executor/src/executive/TransactionExecutive.cpp
@@ -307,8 +307,9 @@ CallParameters::UniquePtr TransactionExecutive::execute(CallParameters::UniquePt
                     co_await ledger::account::create(addr);
                 }
                 auto const nonceInStorage = co_await ledger::account::nonce(addr);
-                auto const baseNonce = u256(nonceInStorage.value_or("0"));
-                auto const newNonce = std::max(callNonce, baseNonce) + 1;
+                // FIXME)) : only web3 tx use this
+                auto const storageNonce = u256(nonceInStorage.value_or("0"));
+                auto const newNonce = std::max(callNonce, storageNonce) + 1;
                 co_await ledger::account::setNonce(addr, newNonce.convert_to<std::string>());
             }(std::move(address), callParameters->nonce));
         }

diff --git a/bcos-executor/src/executor/TransactionExecutor.cpp b/bcos-executor/src/executor/TransactionExecutor.cpp
@@ -2629,6 +2629,12 @@ void TransactionExecutor::removeCommittedState()
     m_ledgerCache->clearCacheByNumber(number);
 }
 
+/**
+ * call when scheduler ExecutionMessage::MESSAGE
+ * @param input scheduler input
+ * @param staticCall whether static call
+ * @return callParameters
+ */
 std::unique_ptr<CallParameters> TransactionExecutor::createCallParameters(
     bcos::protocol::ExecutionMessage& input, bool staticCall)
 {
@@ -2734,6 +2740,12 @@ std::unique_ptr<CallParameters> TransactionExecutor::createCallParameters(
     return callParameters;
 }
 
+/**
+ * call when scheduler ExecutionMessage::TXHASH
+ * @param input scheduler input
+ * @param tx transaction
+ * @return callParameters
+ */
 std::unique_ptr<CallParameters> TransactionExecutor::createCallParameters(
     bcos::protocol::ExecutionMessage& input, const bcos::protocol::Transaction& tx)
 {
@@ -2764,7 +2776,8 @@ std::unique_ptr<CallParameters> TransactionExecutor::createCallParameters(
     callParameters->gasLimit = input.gasLimit();
     callParameters->maxFeePerGas = u256(input.maxFeePerGas());
     callParameters->maxPriorityFeePerGas = u256(input.maxPriorityFeePerGas());
-    callParameters->nonce = u256(input.nonce());
+    // TODO: depends on whether web3 tx?
+    callParameters->nonce = hex2u(input.nonce());
 
     if (!m_isWasm && !callParameters->create)
     {

diff --git a/bcos-executor/src/precompiled/ConsensusPrecompiled.cpp b/bcos-executor/src/precompiled/ConsensusPrecompiled.cpp
@@ -180,8 +180,8 @@ static int addSealerImpl(bool isConsensus,
                 // version >= 3.1.0, only allow adding sealer in observer list
                 return CODE_ADD_SEALER_SHOULD_IN_OBSERVER;
             }
-            consensusList.emplace_back(nodeIDPtr, consensus::Type::consensus_sealer, voteWeight, 0,
-                blockContext.number() + 1);
+            consensusList.emplace_back(consensus::ConsensusNode{nodeIDPtr,
+                consensus::Type::consensus_sealer, voteWeight, 0, blockContext.number() + 1});
         }
         node->enableNumber = blockContext.number() + 1;
     }
@@ -205,8 +205,8 @@ static int addSealerImpl(bool isConsensus,
         }
         else
         {
-            consensusList.emplace_back(
-                nodeIDPtr, consensus::Type::consensus_observer, 0, 0, blockContext.number() + 1);
+            consensusList.emplace_back(consensus::ConsensusNode{
+                nodeIDPtr, consensus::Type::consensus_observer, 0, 0, blockContext.number() + 1});
         }
     }
 

diff --git a/bcos-executor/src/precompiled/common/WorkingSealerManagerImpl.cpp b/bcos-executor/src/precompiled/common/WorkingSealerManagerImpl.cpp
@@ -375,7 +375,7 @@ static WorkingSealer pickNodeByWeight(
     auto weight =
         nodeIt->offset - ((nodeWeightRanges.begin() == nodeIt) ? 0LU : (nodeIt - 1)->offset);
     totalWeight -= weight;
-    for (auto& it : RANGES::subrange(nodeIt + 1, nodeWeightRanges.end()))
+    for (auto& it : RANGES::subrange<decltype(nodeIt)>(nodeIt + 1, nodeWeightRanges.end()))
     {
         it.offset -= weight;
     }

diff --git a/bcos-executor/src/vm/HostContext.cpp b/bcos-executor/src/vm/HostContext.cpp
@@ -251,6 +251,7 @@ evmc_result HostContext::externalRequest(const evmc_message* _msg)
             *m_executive->storage().getRawStorage(), request->senderAddress);
         request->nonce = task::syncWait([](decltype(account) contract) -> task::Task<u256> {
             auto const nonceString = co_await ledger::account::nonce(contract);
+            // uint in storage
             auto const nonce = u256(nonceString.value_or("0"));
             co_return nonce;
         }(std::move(account)));
@@ -702,6 +703,11 @@ uint32_t HostContext::blockVersion() const
 
 uint64_t HostContext::timestamp() const
 {
+    if (m_executive->blockContext().features().get(ledger::Features::Flag::feature_evm_timestamp))
+    {
+        // millisecond to second
+        return m_executive->blockContext().timestamp() / 1000;
+    }
     return m_executive->blockContext().timestamp();
 }
 

diff --git a/bcos-executor/test/unittest/libprecompiled/WorkingSealerManagerTest.cpp b/bcos-executor/test/unittest/libprecompiled/WorkingSealerManagerTest.cpp
@@ -67,14 +67,18 @@ BOOST_AUTO_TEST_CASE(testRotate)
 
         // Node list
         consensus::ConsensusNodeList nodeList;
-        nodeList.emplace_back(std::make_shared<crypto::KeyImpl>(fromHex(node1)),
-            consensus::Type::consensus_candidate_sealer, 0, 70, 0);
-        nodeList.emplace_back(std::make_shared<crypto::KeyImpl>(fromHex(node2)),
-            consensus::Type::consensus_candidate_sealer, 0, 20, 0);
-        nodeList.emplace_back(std::make_shared<crypto::KeyImpl>(fromHex(node3)),
-            consensus::Type::consensus_candidate_sealer, 0, 7, 0);
-        nodeList.emplace_back(std::make_shared<crypto::KeyImpl>(fromHex(node4)),
-            consensus::Type::consensus_candidate_sealer, 0, 3, 0);
+        nodeList.emplace_back(
+            consensus::ConsensusNode{std::make_shared<crypto::KeyImpl>(fromHex(node1)),
+                consensus::Type::consensus_candidate_sealer, 0, 70, 0});
+        nodeList.emplace_back(
+            consensus::ConsensusNode{std::make_shared<crypto::KeyImpl>(fromHex(node2)),
+                consensus::Type::consensus_candidate_sealer, 0, 20, 0});
+        nodeList.emplace_back(
+            consensus::ConsensusNode{std::make_shared<crypto::KeyImpl>(fromHex(node3)),
+                consensus::Type::consensus_candidate_sealer, 0, 7, 0});
+        nodeList.emplace_back(
+            consensus::ConsensusNode{std::make_shared<crypto::KeyImpl>(fromHex(node4)),
+                consensus::Type::consensus_candidate_sealer, 0, 3, 0});
         co_await ledger::setNodeList(storage, nodeList);
 
         auto storageWrapper =

diff --git a/bcos-framework/bcos-framework/ledger/Features.h b/bcos-framework/bcos-framework/ledger/Features.h
@@ -58,8 +58,9 @@ class Features
         feature_paillier_add_raw,
         feature_evm_cancun,
         feature_calculate_gasPrice,
+        feature_evm_timestamp,
         feature_evm_address,
-        feature_ethereum_compatible,  // will enbale all bugfixes, all features about evm
+        feature_ethereum_compatible,  // will enable all bugfixes, all features about evm
         feature_rpbft_term_weight,
     };
 
@@ -77,6 +78,11 @@ class Features
         return *value;
     }
 
+    static bool contains(std::string_view flag)
+    {
+        return magic_enum::enum_cast<Flag>(flag).has_value();
+    }
+
     void validate(std::string_view flag) const
     {
         auto value = magic_enum::enum_cast<Flag>(flag);
@@ -114,36 +120,46 @@ class Features
     }
     bool get(std::string_view flag) const { return get(string2Flag(flag)); }
 
-    void set(Flag flag)
-    {
-        auto index = magic_enum::enum_index(flag);
-        if (!index)
-        {
-            BOOST_THROW_EXCEPTION(NoSuchFeatureError{});
-        }
-
-        validate(flag);
-        m_flags[*index] = true;
-        turnOnMainSwitch(flag);
-    }
-
-    void turnOnMainSwitch(Flag flag)
+    // DO NOT use now, there is some action after set feature in systemPrecompiled
+    static auto getFeatureDependencies(Flag flag)
     {
+        /// NOTE：请不要在此处添加旧版本feature依赖！否则会出现数据不一致!
+        /// Do NOT add old version feature dependencies here! Otherwise, data inconsistency will
+        /// occur!
         const auto mainSwitchDependence = std::unordered_map<Flag, std::set<Flag>>(
             {{Flag::feature_ethereum_compatible, {
                                                      Flag::feature_balance,
                                                      Flag::feature_balance_precompiled,
                                                      Flag::feature_calculate_gasPrice,
+                                                     Flag::feature_evm_timestamp,
                                                      Flag::feature_evm_address,
                                                      Flag::feature_evm_cancun,
                                                  }}});
         if (mainSwitchDependence.contains(flag))
         {
-            for (const auto& dependence : mainSwitchDependence.at(flag))
-            {
-                set(dependence);
-            }
+            return mainSwitchDependence.at(flag);
         }
+        return std::set<Flag>();
+    }
+    void enableDependencyFeatures(Flag flag)
+    {
+        for (const auto& dependence : getFeatureDependencies(flag))
+        {
+            set(dependence);
+        }
+    }
+
+    void set(Flag flag)
+    {
+        auto index = magic_enum::enum_index(flag);
+        if (!index)
+        {
+            BOOST_THROW_EXCEPTION(NoSuchFeatureError{});
+        }
+
+        validate(flag);
+        m_flags[*index] = true;
+        // enableDependencyFeatures(flag);
     }
 
     void set(std::string_view flag) { set(string2Flag(flag)); }

diff --git a/bcos-framework/bcos-framework/protocol/Protocol.h b/bcos-framework/bcos-framework/protocol/Protocol.h
@@ -114,6 +114,7 @@ enum ProtocolVersion : uint32_t
 
 enum class BlockVersion : uint32_t
 {
+    V3_12_0_VERSION = 0x030c0000,  // 3.12.0
     V3_11_0_VERSION = 0x030b0000,
     V3_10_0_VERSION = 0x030a0000,
     V3_9_0_VERSION = 0x03090000,
@@ -138,7 +139,7 @@ enum class BlockVersion : uint32_t
     V3_0_VERSION = 0x03000000,
     RC4_VERSION = 4,
     MIN_VERSION = RC4_VERSION,
-    MAX_VERSION = V3_11_0_VERSION,
+    MAX_VERSION = V3_12_0_VERSION,  // 3.12.0
 };
 
 enum class TransactionVersion : uint32_t
@@ -153,10 +154,10 @@ 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";
 
-const BlockVersion DEFAULT_VERSION = bcos::protocol::BlockVersion::V3_11_0_VERSION;
+constexpr BlockVersion DEFAULT_VERSION = bcos::protocol::BlockVersion::V3_12_0_VERSION;
 const std::string DEFAULT_VERSION_STR = V3_9_VERSION_STR;
-const uint8_t MAX_MAJOR_VERSION = std::numeric_limits<uint8_t>::max();
-const uint8_t MIN_MAJOR_VERSION = 3;
+constexpr uint8_t MAX_MAJOR_VERSION = std::numeric_limits<uint8_t>::max();
+constexpr uint8_t MIN_MAJOR_VERSION = 3;
 
 [[nodiscard]] inline int versionCompareTo(
     std::variant<uint32_t, BlockVersion> const& _v1, BlockVersion const& _v2)

diff --git a/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp b/bcos-framework/test/unittests/interfaces/FeaturesTest.cpp
@@ -157,6 +157,7 @@ BOOST_AUTO_TEST_CASE(feature)
         "feature_paillier_add_raw",
         "feature_evm_cancun",
         "feature_calculate_gasPrice",
+        "feature_evm_timestamp",
         "feature_evm_address",
         "feature_ethereum_compatible",
         "feature_rpbft_term_weight",
@@ -394,4 +395,16 @@ BOOST_AUTO_TEST_CASE(genesis)
     }
 }
 
+
+BOOST_AUTO_TEST_CASE(testDependenciesFeatures)
+{
+    Features features;
+    features.set(ledger::Features::Flag::feature_ethereum_compatible);
+    // BOOST_CHECK(features.get(ledger::Features::Flag::feature_balance));
+    // BOOST_CHECK(features.get(ledger::Features::Flag::feature_balance_precompiled));
+    // BOOST_CHECK(features.get(ledger::Features::Flag::feature_calculate_gasPrice));
+    // BOOST_CHECK(features.get(ledger::Features::Flag::feature_evm_address));
+    // BOOST_CHECK(features.get(ledger::Features::Flag::feature_evm_cancun));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/bcos-ledger/bcos-ledger/Ledger.cpp b/bcos-ledger/bcos-ledger/Ledger.cpp
@@ -443,14 +443,14 @@ task::Task<std::optional<ledger::StorageState>> Ledger::getStorageState(
     {
         co_return std::nullopt;
     }
-    state.nonce = std::stoull(std::string(nonceEntry->get()));
+    state.nonce = std::string(nonceEntry->get());
     auto const balanceEntry =
         co_await getStorageAt(_address, ACCOUNT_TABLE_FIELDS::BALANCE, _blockNumber);
     if (!balanceEntry.has_value())
     {
         co_return std::nullopt;
     }
-    state.balance = std::stoull(std::string(balanceEntry->get()));
+    state.balance = std::string(balanceEntry->get());
     co_return state;
 }
 

diff --git a/bcos-ledger/test/unittests/ledger/LedgerTest.cpp b/bcos-ledger/test/unittests/ledger/LedgerTest.cpp
@@ -167,14 +167,14 @@ class LedgerFixture : public TestPromptFixture
         auto signImpl = std::make_shared<Secp256k1Crypto>();
         consensus::ConsensusNodeList consensusNodeList;
         consensus::ConsensusNodeList observerNodeList;
-        for (int i = 0; i < 4; ++i)
+        for (size_t i = 0; i < 4; ++i)
         {
-            auto node = consensus::ConsensusNode(signImpl->generateKeyPair()->publicKey(),
-                consensus::Type::consensus_sealer, 10 + i, 0, 0);
+            auto node = consensus::ConsensusNode{signImpl->generateKeyPair()->publicKey(),
+                consensus::Type::consensus_sealer, 10 + i, 0, 0};
             consensusNodeList.emplace_back(node);
         }
-        auto observer_node = consensus::ConsensusNode(signImpl->generateKeyPair()->publicKey(),
-            consensus::Type::consensus_observer, -1, 0, 0);
+        auto observer_node = consensus::ConsensusNode{signImpl->generateKeyPair()->publicKey(),
+            consensus::Type::consensus_observer, uint64_t(-1), 0, 0};
         observerNodeList.emplace_back(observer_node);
 
         m_param->setConsensusNodeList(consensusNodeList);
@@ -733,8 +733,9 @@ BOOST_AUTO_TEST_CASE(testNodeListByType)
 
     std::promise<bool> setSealer1;
     auto nodeList = task::syncWait(ledger::getNodeList(*m_storage));
-    nodeList.emplace_back(std::make_shared<KeyImpl>(bcos::crypto::HashType("56789").asBytes()),
-        consensus::Type::consensus_sealer, 100, 0, 5);
+    nodeList.emplace_back(consensus::ConsensusNode{
+        std::make_shared<KeyImpl>(bcos::crypto::HashType("56789").asBytes()),
+        consensus::Type::consensus_sealer, 100, 0, 5});
     task::syncWait(ledger::setNodeList(*m_storage, nodeList));
 
     std::promise<bool> p2;

diff --git a/bcos-pbft/test/unittests/pbft/PBFTFixture.h b/bcos-pbft/test/unittests/pbft/PBFTFixture.h
@@ -328,7 +328,7 @@ class PBFTFixture
 
     void appendConsensusNode(PublicPtr _nodeId)
     {
-        auto node = ConsensusNode(_nodeId, consensus::Type::consensus_sealer, 1, 0, 0);
+        auto node = ConsensusNode{_nodeId, consensus::Type::consensus_sealer, 1, 0, 0};
         appendConsensusNode(node);
     }
 

diff --git a/bcos-rpbft/test/unittests/config/RPBFTConfigTest.cpp b/bcos-rpbft/test/unittests/config/RPBFTConfigTest.cpp
@@ -82,23 +82,23 @@ class RPBFTConfigFixture : public TestPromptFixture
 
         for (size_t i = 0; i < consensusNodeNum; ++i)
         {
-            ledgerConfig->mutableConsensusList().push_back(consensus::ConsensusNode(
+            ledgerConfig->mutableConsensusList().push_back(consensus::ConsensusNode{
                 m_cryptoSuite->signatureImpl()->generateKeyPair()->publicKey(),
-                consensus::Type::consensus_sealer, 1, 0, 0));
+                consensus::Type::consensus_sealer, 1, 0, 0});
         }
 
         for (size_t i = 0; i < observerNodeNum; ++i)
         {
-            ledgerConfig->mutableObserverList().push_back(consensus::ConsensusNode(
+            ledgerConfig->mutableObserverList().push_back(consensus::ConsensusNode{
                 m_cryptoSuite->signatureImpl()->generateKeyPair()->publicKey(),
-                consensus::Type::consensus_observer, 0, 0, 0));
+                consensus::Type::consensus_observer, 0, 0, 0});
         }
 
         for (size_t i = 0; i < candidateSealerNodeNum; ++i)
         {
-            ledgerConfig->mutableCandidateSealerNodeList().push_back(consensus::ConsensusNode(
+            ledgerConfig->mutableCandidateSealerNodeList().push_back(consensus::ConsensusNode{
                 m_cryptoSuite->signatureImpl()->generateKeyPair()->publicKey(),
-                consensus::Type::consensus_candidate_sealer, 1, 0, 0));
+                consensus::Type::consensus_candidate_sealer, 1, 0, 0});
         }
         return ledgerConfig;
     }

diff --git a/bcos-rpc/test/unittests/common/RPCFixture.h b/bcos-rpc/test/unittests/common/RPCFixture.h
@@ -76,7 +76,7 @@ class RPCFixture : public TestPromptFixture
         factory =
             std::make_shared<bcos::rpc::RpcFactory>(chainId, gateway, cryptoSuite->keyFactory());
         nodeConfig = std::make_shared<bcos::tool::NodeConfig>();
-        
+
         nodeConfig->loadConfigFromString(configini);
         factory->setNodeConfig(nodeConfig);