src: fix rpc limit issue with introduction of size limit

0xFFFC0000 · 0xFFFC0000 · commit c0e536c85d1f · 2024-09-05T20:35:08.000Z
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
@@ -1724,9 +1724,9 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------
-  bool core::get_pool_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& txs, bool include_sensitive_txes) const
+  bool core::get_pool_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& txs, bool include_sensitive_txes, size_t limit_size) const
   {
-    return m_mempool.get_transactions_info(txids, txs, include_sensitive_txes);
+    return m_mempool.get_transactions_info(txids, txs, include_sensitive_txes, limit_size);
   }
   //-----------------------------------------------------------------------------------------------
   bool core::get_pool_transactions(std::vector<transaction>& txs, bool include_sensitive_data) const
@@ -1741,9 +1741,9 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------
-  bool core::get_pool_info(time_t start_time, bool include_sensitive_txes, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental) const
+  bool core::get_pool_info(time_t start_time, bool include_sensitive_txes, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental, size_t limit_size) const
   {
-    return m_mempool.get_pool_info(start_time, include_sensitive_txes, max_tx_count, added_txs, remaining_added_txids, removed_txs, incremental);
+    return m_mempool.get_pool_info(start_time, include_sensitive_txes, max_tx_count, added_txs, remaining_added_txids, removed_txs, incremental, limit_size);
   }
   //-----------------------------------------------------------------------------------------------
   bool core::get_pool_transaction_stats(struct txpool_stats& stats, bool include_sensitive_data) const
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
@@ -514,7 +514,7 @@ namespace cryptonote
       *
       * @note see tx_memory_pool::get_pool_transactions_info
       */
-     bool get_pool_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& txs, bool include_sensitive_txes = false) const;
+     bool get_pool_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& txs, bool include_sensitive_txes = false, size_t limit_size = 0) const;
 
      /**
       * @copydoc tx_memory_pool::get_pool_info
@@ -523,7 +523,7 @@ namespace cryptonote
       *
       * @note see tx_memory_pool::get_pool_info
       */
-     bool get_pool_info(time_t start_time, bool include_sensitive_txes, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental) const;
+     bool get_pool_info(time_t start_time, bool include_sensitive_txes, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental, size_t limit_size = 0) const;
 
     /**
       * @copydoc tx_memory_pool::get_transactions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
@@ -694,19 +694,21 @@ namespace cryptonote
     return true;
   }
   //------------------------------------------------------------------
-  bool tx_memory_pool::get_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_details>>& txs, bool include_sensitive) const
+  bool tx_memory_pool::get_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_details>>& txs, bool include_sensitive, size_t limit_size) const
   {
     CRITICAL_REGION_LOCAL(m_transactions_lock);
     CRITICAL_REGION_LOCAL1(m_blockchain);
 
     txs.clear();
+    size_t size = 0;
 
     for (const auto &it: txids)
     {
       tx_details details;
       bool success = get_transaction_info(it, details, include_sensitive, true/*include_blob*/);
-      if (success)
+      if (success && (!limit_size || (size + details.blob_size < limit_size)))
       {
+        size += details.blob_size;
         txs.push_back(std::make_pair(it, std::move(details)));
       }
     }
@@ -985,7 +987,7 @@ namespace cryptonote
     }, false, category);
   }
   //------------------------------------------------------------------
-  bool tx_memory_pool::get_pool_info(time_t start_time, bool include_sensitive, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental) const
+  bool tx_memory_pool::get_pool_info(time_t start_time, bool include_sensitive, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental, size_t limit_size) const
   {
     CRITICAL_REGION_LOCAL(m_transactions_lock);
     CRITICAL_REGION_LOCAL1(m_blockchain);
@@ -1029,7 +1031,7 @@ namespace cryptonote
         remaining_added_txids = std::vector<crypto::hash>(txids.begin() + max_tx_count, txids.end());
         txids.erase(txids.begin() + max_tx_count, txids.end());
       }
-      get_transactions_info(txids, added_txs, include_sensitive);
+      get_transactions_info(txids, added_txs, include_sensitive, limit_size);
       return true;
     }
 
@@ -1039,7 +1041,7 @@ namespace cryptonote
       if (pit.second >= start_time)
         txids.push_back(pit.first);
     }
-    get_transactions_info(txids, added_txs, include_sensitive);
+    get_transactions_info(txids, added_txs, include_sensitive, limit_size);
     if (added_txs.size() > max_tx_count)
     {
       remaining_added_txids.reserve(added_txs.size() - max_tx_count);
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h
@@ -465,7 +465,7 @@ namespace cryptonote
     /**
      * @brief get information about multiple transactions
      */
-    bool get_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_details>>& txs, bool include_sensitive_data = false) const;
+    bool get_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_details>>& txs, bool include_sensitive_data = false, size_t limit_size = 0) const;
 
     /**
      * @brief get transactions not in the passed set
@@ -477,7 +477,7 @@ namespace cryptonote
      *
      * @return true on success, false on error
      */
-    bool get_pool_info(time_t start_time, bool include_sensitive, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental) const;
+    bool get_pool_info(time_t start_time, bool include_sensitive, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental, size_t limit_size = 0) const;
 
   private:
 
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
@@ -661,7 +661,7 @@ namespace cryptonote
 
       bool incremental;
       std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>> added_pool_txs;
-      bool success = m_core.get_pool_info((time_t)req.pool_info_since, allow_sensitive, max_tx_count, added_pool_txs, res.remaining_added_pool_txids, res.removed_pool_txids, incremental);
+      bool success = m_core.get_pool_info((time_t)req.pool_info_since, allow_sensitive, max_tx_count, added_pool_txs, res.remaining_added_pool_txids, res.removed_pool_txids, incremental, LEVIN_DEFAULT_MAX_PACKET_SIZE * 0.9);
       if (success)
       {
         res.added_pool_txs.clear();

Original file line number	Diff line number	Diff line change
`@@ -1724,9 +1724,9 @@ namespace cryptonote`
`1724`	`1724`	`return true;`
`1725`	`1725`	`}`
`1726`	`1726`	`//-----------------------------------------------------------------------------------------------`
`1727`		`- bool core::get_pool_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& txs, bool include_sensitive_txes) const`
	`1727`	`+ bool core::get_pool_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& txs, bool include_sensitive_txes, size_t limit_size) const`
`1728`	`1728`	`{`
`1729`		`- return m_mempool.get_transactions_info(txids, txs, include_sensitive_txes);`
	`1729`	`+ return m_mempool.get_transactions_info(txids, txs, include_sensitive_txes, limit_size);`
`1730`	`1730`	`}`
`1731`	`1731`	`//-----------------------------------------------------------------------------------------------`
`1732`	`1732`	`bool core::get_pool_transactions(std::vector<transaction>& txs, bool include_sensitive_data) const`
`@@ -1741,9 +1741,9 @@ namespace cryptonote`
`1741`	`1741`	`return true;`
`1742`	`1742`	`}`
`1743`	`1743`	`//-----------------------------------------------------------------------------------------------`
`1744`		`- bool core::get_pool_info(time_t start_time, bool include_sensitive_txes, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental) const`
	`1744`	`+ bool core::get_pool_info(time_t start_time, bool include_sensitive_txes, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental, size_t limit_size) const`
`1745`	`1745`	`{`
`1746`		`- return m_mempool.get_pool_info(start_time, include_sensitive_txes, max_tx_count, added_txs, remaining_added_txids, removed_txs, incremental);`
	`1746`	`+ return m_mempool.get_pool_info(start_time, include_sensitive_txes, max_tx_count, added_txs, remaining_added_txids, removed_txs, incremental, limit_size);`
`1747`	`1747`	`}`
`1748`	`1748`	`//-----------------------------------------------------------------------------------------------`
`1749`	`1749`	`bool core::get_pool_transaction_stats(struct txpool_stats& stats, bool include_sensitive_data) const`
Original file line number	Diff line number	Diff line change
`@@ -694,19 +694,21 @@ namespace cryptonote`
`694`	`694`	`return true;`
`695`	`695`	`}`
`696`	`696`	`//------------------------------------------------------------------`
`697`		`- bool tx_memory_pool::get_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_details>>& txs, bool include_sensitive) const`
	`697`	`+ bool tx_memory_pool::get_transactions_info(const std::vector<crypto::hash>& txids, std::vector<std::pair<crypto::hash, tx_details>>& txs, bool include_sensitive, size_t limit_size) const`
`698`	`698`	`{`
`699`	`699`	`CRITICAL_REGION_LOCAL(m_transactions_lock);`
`700`	`700`	`CRITICAL_REGION_LOCAL1(m_blockchain);`
`701`	`701`
`702`	`702`	`txs.clear();`
	`703`	`+ size_t size = 0;`
`703`	`704`
`704`	`705`	`for (const auto &it: txids)`
`705`	`706`	`{`
`706`	`707`	`tx_details details;`
`707`	`708`	`bool success = get_transaction_info(it, details, include_sensitive, true/include_blob/);`
`708`		`- if (success)`
	`709`	`+ if (success && (!limit_size \|\| (size + details.blob_size < limit_size)))`
`709`	`710`	`{`
	`711`	`+ size += details.blob_size;`
`710`	`712`	`txs.push_back(std::make_pair(it, std::move(details)));`
`711`	`713`	`}`
`712`	`714`	`}`
`@@ -985,7 +987,7 @@ namespace cryptonote`
`985`	`987`	`}, false, category);`
`986`	`988`	`}`
`987`	`989`	`//------------------------------------------------------------------`
`988`		`- bool tx_memory_pool::get_pool_info(time_t start_time, bool include_sensitive, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental) const`
	`990`	`+ bool tx_memory_pool::get_pool_info(time_t start_time, bool include_sensitive, size_t max_tx_count, std::vector<std::pair<crypto::hash, tx_details>>& added_txs, std::vector<crypto::hash>& remaining_added_txids, std::vector<crypto::hash>& removed_txs, bool& incremental, size_t limit_size) const`
`989`	`991`	`{`
`990`	`992`	`CRITICAL_REGION_LOCAL(m_transactions_lock);`
`991`	`993`	`CRITICAL_REGION_LOCAL1(m_blockchain);`
`@@ -1029,7 +1031,7 @@ namespace cryptonote`
`1029`	`1031`	`remaining_added_txids = std::vector<crypto::hash>(txids.begin() + max_tx_count, txids.end());`
`1030`	`1032`	`txids.erase(txids.begin() + max_tx_count, txids.end());`
`1031`	`1033`	`}`
`1032`		`- get_transactions_info(txids, added_txs, include_sensitive);`
	`1034`	`+ get_transactions_info(txids, added_txs, include_sensitive, limit_size);`
`1033`	`1035`	`return true;`
`1034`	`1036`	`}`
`1035`	`1037`
`@@ -1039,7 +1041,7 @@ namespace cryptonote`
`1039`	`1041`	`if (pit.second >= start_time)`
`1040`	`1042`	`txids.push_back(pit.first);`
`1041`	`1043`	`}`
`1042`		`- get_transactions_info(txids, added_txs, include_sensitive);`
	`1044`	`+ get_transactions_info(txids, added_txs, include_sensitive, limit_size);`
`1043`	`1045`	`if (added_txs.size() > max_tx_count)`
`1044`	`1046`	`{`
`1045`	`1047`	`remaining_added_txids.reserve(added_txs.size() - max_tx_count);`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ namespace cryptonote`
`661`	`661`
`662`	`662`	`bool incremental;`
`663`	`663`	`std::vector<std::pair<crypto::hash, tx_memory_pool::tx_details>> added_pool_txs;`
`664`		`- bool success = m_core.get_pool_info((time_t)req.pool_info_since, allow_sensitive, max_tx_count, added_pool_txs, res.remaining_added_pool_txids, res.removed_pool_txids, incremental);`
	`664`	`+ bool success = m_core.get_pool_info((time_t)req.pool_info_since, allow_sensitive, max_tx_count, added_pool_txs, res.remaining_added_pool_txids, res.removed_pool_txids, incremental, LEVIN_DEFAULT_MAX_PACKET_SIZE * 0.9);`
`665`	`665`	`if (success)`
`666`	`666`	`{`
`667`	`667`	`res.added_pool_txs.clear();`