feat: feat: Add total recent reject num to Terminal RPC txpool.

Author: zhangsoledad

rpc/src/module/terminal.rs

@@ -163,11 +163,17 @@ impl TerminalRpcImpl {
                 RPCError::from_any_error(err)
             })?;
 
+        let total_recent_reject_num = tx_pool.get_total_recent_reject_num().map_err(|err| {
+            error!("Get_total_recent_reject_num result error {}", err);
+            RPCError::from_any_error(err)
+        })?;
+
         let tx_pool_info = TerminalPoolInfo {
             pending: (info.pending_size as u64).into(),
             proposed: (info.proposed_size as u64).into(),
             orphan: (info.orphan_size as u64).into(),
             committing: (block_template.transactions.len() as u64).into(),
+            total_recent_reject_num: total_recent_reject_num.unwrap_or(0).into(),
             total_tx_size: (info.total_tx_size as u64).into(),
             total_tx_cycles: info.total_tx_cycles.into(),
             last_txs_updated_at: info.last_txs_updated_at.into(),

tx-pool/src/component/recent_reject.rs

@@ -77,17 +77,25 @@ impl RecentReject {
         Ok(ret.map(|bytes| unsafe { String::from_utf8_unchecked(bytes.to_vec()) }))
     }
 
+    pub fn get_estimate_total_keys_num(&self) -> u64 {
+        self.total_keys_num
+    }
+
+    fn estimate_total_keys_num(&self) -> Result<u64, AnyError> {
+        let estimate_keys_num = (0..self.shard_num)
+            .map(|num| self.db.estimate_num_keys_cf(&num.to_string()))
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok(estimate_keys_num.iter().map(|num| num.unwrap_or(0)).sum())
+    }
+
     fn shrink(&mut self) -> Result<u64, AnyError> {
         let mut rng = thread_rng();
         let shard = rng.sample(Uniform::new(0, self.shard_num)).to_string();
         self.db.drop_cf(&shard)?;
         self.db.create_cf_with_ttl(&shard, self.ttl)?;
 
-        let estimate_keys_num = (0..self.shard_num)
-            .map(|num| self.db.estimate_num_keys_cf(&num.to_string()))
-            .collect::<Result<Vec<_>, _>>()?;
-
-        let total_keys_num = estimate_keys_num.iter().map(|num| num.unwrap_or(0)).sum();
+        let total_keys_num = self.estimate_total_keys_num()?;
         self.total_keys_num = total_keys_num;
         Ok(total_keys_num)
     }

tx-pool/src/service.rs

@@ -118,6 +118,7 @@ pub(crate) enum Message {
     GetAllIds(Request<(), TxPoolIds>),
     SavePool(Request<(), ()>),
     GetPoolTxDetails(Request<Byte32, PoolTxDetailInfo>),
+    GetTotalRecentRejectNum(Request<(), Option<u64>>),
 
     UpdateIBDState(Request<bool, ()>),
     EstimateFeeRate(Request<(EstimateMode, bool), FeeEstimatesResult>),
@@ -425,6 +426,11 @@ impl TxPoolController {
     pub fn submit_local_test_tx(&self, tx: TransactionView) -> Result<SubmitTxResult, AnyError> {
         send_message!(self, SubmitLocalTestTx, tx)
     }
+
+    /// get total recent reject num
+    pub fn get_total_recent_reject_num(&self) -> Result<Option<u64>, AnyError> {
+        send_message!(self, GetTotalRecentRejectNum, ())
+    }
 }
 
 /// A builder used to create TxPoolService.
@@ -1024,6 +1030,12 @@ async fn process(mut service: TxPoolService, message: Message) {
                 error!("Responder sending plug_entry failed {:?}", e);
             };
         }
+        Message::GetTotalRecentRejectNum(Request { responder, .. }) => {
+            let total_recent_reject_num = service.get_total_recent_reject_num().await;
+            if let Err(e) = responder.send(total_recent_reject_num) {
+                error!("Responder sending total_recent_reject_num failed {:?}", e)
+            };
+        }
     }
 }
 
@@ -1051,6 +1063,14 @@ impl TxPoolService {
         }
     }
 
+    async fn get_total_recent_reject_num(&self) -> Option<u64> {
+        let tx_pool = self.tx_pool.read().await;
+        tx_pool
+            .recent_reject
+            .as_ref()
+            .map(|r| r.get_estimate_total_keys_num())
+    }
+
     /// Get Live Cell Status
     async fn get_live_cell(&self, out_point: OutPoint, eager_load: bool) -> CellStatus {
         let tx_pool = self.tx_pool.read().await;

util/jsonrpc-types/src/terminal.rs

@@ -125,6 +125,8 @@ pub struct TerminalPoolInfo {
     /// The Committing transactions refer to transactions that have been packaged into the
     /// block_template and are awaiting mining into a block.
     pub committing: Uint64,
+    /// Total count of recent reject transactions by pool
+    pub total_recent_reject_num: Uint64,
     /// Total count of transactions in the pool of all the different kinds of states (excluding orphan transactions).
     pub total_tx_size: Uint64,
     /// Total consumed VM cycles of all the transactions in the pool (excluding orphan transactions).