add txpool.check_block_limit config

bxq2011hust · Dec 7, 2023 · c45e80f · c45e80f
1 parent 286323e
commit c45e80f
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 11 deletions.
diff --git a/bcos-executor/src/executive/TransactionExecutive.cpp b/bcos-executor/src/executive/TransactionExecutive.cpp
@@ -522,7 +522,7 @@ std::tuple<std::unique_ptr<HostContext>, CallParameters::UniquePtr> TransactionE
     try
     {
         m_storageWrapper->createTable(tableName, std::string(STORAGE_VALUE));
-        EXECUTIVE_LOG(INFO) << "create contract table " << LOG_KV("table", tableName)
+        EXECUTIVE_LOG(DEBUG) << "create contract table " << LOG_KV("table", tableName)
                             << LOG_KV("sender", callParameters->senderAddress);
         if (m_blockContext.isAuthCheck() ||
             (!m_blockContext.isWasm() &&

diff --git a/bcos-tool/bcos-tool/NodeConfig.cpp b/bcos-tool/bcos-tool/NodeConfig.cpp
@@ -513,9 +513,11 @@ void NodeConfig::loadTxPoolConfig(boost::property_tree::ptree const& _pt)
     m_txsExpirationTime = std::max(
         {txsExpirationTime * 1000, (int64_t)DEFAULT_MIN_CONSENSUS_TIME_MS, (int64_t)m_minSealTime});
 
+    m_checkBlockLimit = _pt.get<bool>("txpool.check_block_limit", true);
     NodeConfig_LOG(INFO) << LOG_DESC("loadTxPoolConfig") << LOG_KV("txpoolLimit", m_txpoolLimit)
                          << LOG_KV("notifierWorkers", m_notifyWorkerNum)
                          << LOG_KV("verifierWorkers", m_verifierWorkerNum)
+                         << LOG_KV("checkBlockLimit", m_checkBlockLimit)
                          << LOG_KV("txsExpirationTime(ms)", m_txsExpirationTime);
 }
 

diff --git a/bcos-tool/bcos-tool/NodeConfig.h b/bcos-tool/bcos-tool/NodeConfig.h
@@ -105,6 +105,7 @@ class NodeConfig
     size_t notifyWorkerNum() const { return m_notifyWorkerNum; }
     size_t verifierWorkerNum() const { return m_verifierWorkerNum; }
     int64_t txsExpirationTime() const { return m_txsExpirationTime; }
+    bool checkBlockLimit() const { return m_checkBlockLimit; }
 
     bool smCryptoType() const { return m_genesisConfig.m_smCrypto; }
     std::string const& chainId() const { return m_genesisConfig.m_chainID; }
@@ -320,6 +321,7 @@ class NodeConfig
     size_t m_notifyWorkerNum;
     size_t m_verifierWorkerNum;
     int64_t m_txsExpirationTime;
+    bool m_checkBlockLimit = true;
     // TODO: the block sync module need some configurations?
 
     // chain configuration

diff --git a/bcos-txpool/bcos-txpool/TxPool.cpp b/bcos-txpool/bcos-txpool/TxPool.cpp
@@ -544,9 +544,10 @@ void TxPool::init()
     TXPOOL_LOG(INFO) << LOG_DESC("fetch history nonces success");
 
     // create LedgerNonceChecker and set it into the validator
-    TXPOOL_LOG(INFO) << LOG_DESC("init txs validator");
-    auto ledgerNonceChecker = std::make_shared<LedgerNonceChecker>(
-        ledgerConfigFetcher->nonceList(), ledgerConfig->blockNumber(), blockLimit);
+    TXPOOL_LOG(INFO) << LOG_DESC("init txs validator")
+                     << LOG_KV("checkBlockLimit", m_checkBlockLimit);
+    auto ledgerNonceChecker = std::make_shared<LedgerNonceChecker>(ledgerConfigFetcher->nonceList(),
+        ledgerConfig->blockNumber(), blockLimit, m_checkBlockLimit);
 
     auto validator = std::dynamic_pointer_cast<TxValidator>(m_config->txValidator());
     validator->setLedgerNonceChecker(ledgerNonceChecker);

diff --git a/bcos-txpool/bcos-txpool/TxPool.h b/bcos-txpool/bcos-txpool/TxPool.h
@@ -136,6 +136,8 @@ class TxPool : public TxPoolInterface, public std::enable_shared_from_this<TxPoo
 
     auto treeRouter() const { return m_treeRouter; }
 
+    void setCheckBlockLimit(bool _checkBlockLimit) { m_checkBlockLimit = _checkBlockLimit; }
+
 protected:
     virtual bool checkExistsInGroup(bcos::protocol::TxSubmitCallback _txSubmitCallback);
     virtual void getTxsFromLocalLedger(bcos::crypto::HashListPtr _txsHash,
@@ -170,5 +172,6 @@ class TxPool : public TxPoolInterface, public std::enable_shared_from_this<TxPoo
     // Note: This x_markTxsMutex is used for locking asyncSealTxs() during sealBlock
     // because memory storage is not contain a big lock now
     mutable bcos::SharedMutex x_markTxsMutex;
+    bool m_checkBlockLimit = true;
 };
 }  // namespace bcos::txpool
diff --git a/bcos-txpool/bcos-txpool/TxPoolConfig.h b/bcos-txpool/bcos-txpool/TxPoolConfig.h
@@ -73,7 +73,6 @@ class TxPoolConfig
     }
     std::shared_ptr<bcos::ledger::LedgerInterface> ledger() { return m_ledger; }
     int64_t blockLimit() const { return m_blockLimit; }
-
 private:
     TxValidatorInterface::Ptr m_txValidator;
     bcos::protocol::TransactionSubmitResultFactory::Ptr m_txResultFactory;

diff --git a/bcos-txpool/bcos-txpool/txpool/validator/LedgerNonceChecker.cpp b/bcos-txpool/bcos-txpool/txpool/validator/LedgerNonceChecker.cpp
@@ -41,8 +41,11 @@ TransactionStatus LedgerNonceChecker::checkNonce(Transaction::ConstPtr _tx, bool
     {
         return status;
     }
-    // check blockLimit
-    return checkBlockLimit(_tx);
+    if (m_checkBlockLimit)
+    {  // check blockLimit
+        return checkBlockLimit(_tx);
+    }
+    return TransactionStatus::None;
 }
 
 TransactionStatus LedgerNonceChecker::checkBlockLimit(bcos::protocol::Transaction::ConstPtr _tx)

diff --git a/bcos-txpool/bcos-txpool/txpool/validator/LedgerNonceChecker.h b/bcos-txpool/bcos-txpool/txpool/validator/LedgerNonceChecker.h
@@ -29,8 +29,11 @@ class LedgerNonceChecker : public TxPoolNonceChecker
 public:
     LedgerNonceChecker(
         std::shared_ptr<std::map<int64_t, bcos::protocol::NonceListPtr> > _initialNonces,
-        bcos::protocol::BlockNumber _blockNumber, int64_t _blockLimit)
-      : TxPoolNonceChecker(), m_blockNumber(_blockNumber), m_blockLimit(_blockLimit)
+        bcos::protocol::BlockNumber _blockNumber, int64_t _blockLimit, bool _checkBlockLimit)
+      : TxPoolNonceChecker(),
+        m_blockNumber(_blockNumber),
+        m_blockLimit(_blockLimit),
+        m_checkBlockLimit(_checkBlockLimit)
     {
         if (_initialNonces)
         {
@@ -46,11 +49,13 @@ class LedgerNonceChecker : public TxPoolNonceChecker
 protected:
     virtual bcos::protocol::TransactionStatus checkBlockLimit(
         bcos::protocol::Transaction::ConstPtr _tx);
-    void initNonceCache(std::shared_ptr<std::map<int64_t, bcos::protocol::NonceListPtr> > _initialNonces);
+    void initNonceCache(
+        std::shared_ptr<std::map<int64_t, bcos::protocol::NonceListPtr> > _initialNonces);
 
 private:
     std::atomic<bcos::protocol::BlockNumber> m_blockNumber = {0};
     int64_t m_blockLimit;
+    bool m_checkBlockLimit = true;
 
     /// cache the block nonce to in case of accessing the DB to get nonces of given block frequently
     /// key: block number

diff --git a/libinitializer/TxPoolInitializer.cpp b/libinitializer/TxPoolInitializer.cpp
@@ -47,7 +47,7 @@ TxPoolInitializer::TxPoolInitializer(bcos::tool::NodeConfig::Ptr _nodeConfig,
 
     m_txpool = txpoolFactory->createTxPool(m_nodeConfig->notifyWorkerNum(),
         m_nodeConfig->verifierWorkerNum(), m_nodeConfig->txsExpirationTime());
-
+    m_txpool->setCheckBlockLimit(m_nodeConfig->checkBlockLimit());
     if (m_nodeConfig->enableSendTxByTree())
     {
         INITIALIZER_LOG(INFO) << LOG_DESC("enableSendTxByTree");