add policy1 start check and add balance overflow check (FISCO-BCOS#4183)

kyonRay · Jan 18, 2024 · b4bc5d7 · b4bc5d7
1 parent 1a059a2
commit b4bc5d7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/bcos-executor/src/precompiled/extension/AccountPrecompiled.cpp b/bcos-executor/src/precompiled/extension/AccountPrecompiled.cpp
@@ -323,6 +323,17 @@ void AccountPrecompiled::addAccountBalance(const std::string& accountTableName,
     if (entry.has_value())
     {
         u256 balance = u256(std::string(entry->get()));
+        if (balance >= (u256(-1) - value))
+        {
+            PRECOMPILED_LOG(INFO) << BLOCK_NUMBER(blockContext.number())
+                                  << LOG_BADGE("AccountPrecompiled, addAccountBalance")
+                                  << LOG_DESC("account balance overflow")
+                                  << LOG_KV("account", accountTableName)
+                                  << LOG_KV("balance", to_string(balance))
+                                  << LOG_KV("add balance", to_string(value));
+            BOOST_THROW_EXCEPTION(PrecompiledError("Account balance overflow!"));
+            return;
+        }
         balance += value;
         Entry Balance;
         Balance.importFields({boost::lexical_cast<std::string>(balance)});

diff --git a/bcos-executor/test/unittest/libprecompiled/SystemConfigPrecompileTest.cpp b/bcos-executor/test/unittest/libprecompiled/SystemConfigPrecompileTest.cpp
@@ -128,10 +128,7 @@ BOOST_AUTO_TEST_CASE(getAndSetFeature)
     setInput = codec.encodeWithSig(
         "setValueByKey(string,string)", std::string("feature_balance_policy1"), std::string("1"));
     setParameters->m_input = bcos::ref(setInput);
-    auto featureBalancePolResult = systemConfigPrecompiled.call(newExecutive, setParameters);
-
-    codec.decode(bcos::ref(featureBalancePolResult->execResult()), code);
-    BOOST_CHECK_EQUAL(code, 0);
+    BOOST_CHECK_THROW(systemConfigPrecompiled.call(newExecutive, setParameters), PrecompiledError);
 }
 
 BOOST_AUTO_TEST_CASE(upgradeVersion)

diff --git a/bcos-framework/bcos-framework/ledger/Features.h b/bcos-framework/bcos-framework/ledger/Features.h
@@ -73,12 +73,16 @@ class Features
 
     void validate(Flag flag) const
     {
-        if ((flag == Flag::feature_balance_policy1 || flag == Flag::feature_balance_precompiled) &&
-            !get(Flag::feature_balance))
+        if (flag == Flag::feature_balance_precompiled && !get(Flag::feature_balance))
         {
             BOOST_THROW_EXCEPTION(
                 PreconditionMismatchError{} << errinfo_comment("must set feature_balance first"));
         }
+        if (flag == Flag::feature_balance_policy1 && !get(Flag::feature_balance_precompiled))
+        {
+            BOOST_THROW_EXCEPTION(PreconditionMismatchError{}
+                                  << errinfo_comment("must set feature_balance_precompiled first"));
+        }
     }
 
     bool get(Flag flag) const