ignore txpool warning(sync from FISCO-BCOS#3845)

JimmyShi22 · Aug 24, 2023 · d399f7c · d399f7c
1 parent 5a24d08
commit d399f7c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/bcos-tool/bcos-tool/LedgerConfigFetcher.cpp b/bcos-tool/bcos-tool/LedgerConfigFetcher.cpp
@@ -31,7 +31,7 @@ using namespace bcos::consensus;
 using namespace bcos::tool;
 using namespace bcos::ledger;
 
-void LedgerConfigFetcher::fetchBlockNumberAndHash()
+void LedgerConfigFetcher::fetchBlockNumber()
 {
     std::promise<std::pair<Error::Ptr, BlockNumber>> blockNumberPromise;
     m_ledger->asyncGetBlockNumber([&blockNumberPromise](Error::Ptr _error, BlockNumber _number) {
@@ -51,6 +51,12 @@ void LedgerConfigFetcher::fetchBlockNumberAndHash()
     m_ledgerConfig->setBlockNumber(blockNumber);
     TOOL_LOG(INFO) << LOG_DESC("LedgerConfigFetcher: fetchBlockNumber success")
                    << LOG_KV("blockNumber", blockNumber);
+}
+
+void LedgerConfigFetcher::fetchBlockNumberAndHash()
+{
+    fetchBlockNumber();
+    auto blockNumber = m_ledgerConfig->blockNumber();
     // fetch blockHash
     auto hash = fetchBlockHash(blockNumber);
     TOOL_LOG(INFO) << LOG_DESC("LedgerConfigFetcher: fetchBlockHash success")

diff --git a/bcos-tool/bcos-tool/LedgerConfigFetcher.h b/bcos-tool/bcos-tool/LedgerConfigFetcher.h
@@ -39,6 +39,7 @@ class LedgerConfigFetcher : public std::enable_shared_from_this<LedgerConfigFetc
 
     virtual ~LedgerConfigFetcher() {}
 
+    virtual void fetchBlockNumber();
     virtual void fetchBlockNumberAndHash();
     virtual void fetchConsensusNodeList();
     virtual void fetchObserverNodeList();

diff --git a/bcos-txpool/bcos-txpool/TxPool.cpp b/bcos-txpool/bcos-txpool/TxPool.cpp
@@ -500,6 +500,21 @@ void TxPool::initSendResponseHandler()
 void TxPool::storeVerifiedBlock(bcos::protocol::Block::Ptr _block)
 {
     auto blockHeader = _block->blockHeader();
+
+    // return if block has been committed
+    auto ledgerConfigFetcher = std::make_shared<LedgerConfigFetcher>(m_config->ledger());
+    TXPOOL_LOG(INFO) << LOG_DESC("storeVerifiedBlock fetch block number from LedgerConfig");
+    ledgerConfigFetcher->fetchBlockNumber();
+    auto committedBlockNumber = ledgerConfigFetcher->ledgerConfig()->blockNumber();
+    if (blockHeader->number() <= committedBlockNumber)
+    {
+        TXPOOL_LOG(INFO) << LOG_DESC("storeVerifiedBlock, block already committed")
+                         << LOG_KV("consNum", blockHeader->number())
+                         << LOG_KV("hash", blockHeader->hash().abridged())
+                         << LOG_KV("committedNum", committedBlockNumber);
+        return;
+    }
+
     TXPOOL_LOG(INFO) << LOG_DESC("storeVerifiedBlock") << LOG_KV("consNum", blockHeader->number())
                      << LOG_KV("hash", blockHeader->hash().abridged())
                      << LOG_KV("txsSize", _block->transactionsHashSize());