rpc(ChainRpc): Add time_added_to_pool field for ChainRpcImpl::get_transaction

rpc/README.md

@@ -878,6 +878,7 @@ Response
       "witnesses": []
     },
     "cycles": "0x219",
+    "time_added_to_pool" : "0x187b3d137a1",
     "tx_status": {
       "block_hash": null,
       "status": "pending",
@@ -6936,6 +6937,8 @@ The JSON view of a transaction as well as its status.
 
 *   `cycles`: [`Cycle`](#type-cycle) `|` `null` - The transaction consumed cycles.
 
+*   `time_added_to_pool`: [`Uint64`](#type-uint64) `|` `null` - If the transaction is in tx-pool, `time_added_to_pool` represent when it enter the tx-pool. unit: Millisecond
+
 *   `tx_status`: [`TxStatus`](#type-txstatus) - The Transaction status.
 
 

rpc/src/module/chain.rs

@@ -614,6 +614,7 @@ pub trait ChainRpc {
     ///       "witnesses": []
     ///     },
     ///     "cycles": "0x219",
+    ///     "time_added_to_pool" : "0x187b3d137a1",
     ///     "tx_status": {
     ///       "block_hash": null,
     ///       "status": "pending",

rpc/src/tests/examples.rs

@@ -625,6 +625,10 @@ fn mock_rpc_response(example: &RpcTestExample, response: &mut RpcTestResponse) {
             response.result["current_time"] = example.response.result["current_time"].clone();
             response.result["work_id"] = example.response.result["work_id"].clone();
         }
+        "get_transaction" => {
+            response.result["time_added_to_pool"] =
+                example.response.result["time_added_to_pool"].clone();
+        }
         "tx_pool_info" => {
             response.result["last_txs_updated_at"] =
                 example.response.result["last_txs_updated_at"].clone()

tx-pool/src/service.rs

@@ -900,11 +900,13 @@ async fn process(mut service: TxPoolService, message: Message) {
                 Ok(TransactionWithStatus::with_proposed(
                     Some(entry.transaction().clone()),
                     entry.cycles,
+                    entry.timestamp,
                 ))
             } else if let Some(entry) = tx_pool.get_entry_from_pending_or_gap(&id) {
                 Ok(TransactionWithStatus::with_pending(
                     Some(entry.transaction().clone()),
                     entry.cycles,
+                    entry.timestamp,
                 ))
             } else if let Some(ref recent_reject_db) = tx_pool.recent_reject {
                 let recent_reject_result = recent_reject_db.get(&hash);

util/jsonrpc-types/src/blockchain.rs

@@ -525,6 +525,8 @@ pub struct TransactionWithStatusResponse {
     pub transaction: Option<ResponseFormat<TransactionView>>,
     /// The transaction consumed cycles.
     pub cycles: Option<Cycle>,
+    /// If the transaction is in tx-pool, `time_added_to_pool` represent when it enter the tx-pool. unit: Millisecond
+    pub time_added_to_pool: Option<Uint64>,
     /// The Transaction status.
     pub tx_status: TxStatus,
 }
@@ -540,13 +542,15 @@ impl TransactionWithStatusResponse {
                     .map(|tx| ResponseFormat::hex(tx.data().as_bytes())),
                 tx_status: t.tx_status.into(),
                 cycles: t.cycles.map(Into::into),
+                time_added_to_pool: t.time_added_to_pool.map(Into::into),
             },
             ResponseFormatInnerType::Json => TransactionWithStatusResponse {
                 transaction: t
                     .transaction
                     .map(|tx| ResponseFormat::json(TransactionView::from(tx))),
                 tx_status: t.tx_status.into(),
                 cycles: t.cycles.map(Into::into),
+                time_added_to_pool: t.time_added_to_pool.map(Into::into),
             },
         }
     }

util/types/src/core/tx_pool.rs

@@ -161,24 +161,36 @@ pub struct TransactionWithStatus {
     pub tx_status: TxStatus,
     /// The transaction verification consumed cycles
     pub cycles: Option<core::Cycle>,
+    /// If the transaction is in tx-pool, `time_added_to_pool` represent when it enter the tx-pool. unit: Millisecond
+    pub time_added_to_pool: Option<u64>,
 }
 
 impl TransactionWithStatus {
     /// Build with pending status
-    pub fn with_pending(tx: Option<core::TransactionView>, cycles: core::Cycle) -> Self {
+    pub fn with_pending(
+        tx: Option<core::TransactionView>,
+        cycles: core::Cycle,
+        time_added_to_pool: u64,
+    ) -> Self {
         Self {
             tx_status: TxStatus::Pending,
             transaction: tx,
             cycles: Some(cycles),
+            time_added_to_pool: Some(time_added_to_pool),
         }
     }
 
     /// Build with proposed status
-    pub fn with_proposed(tx: Option<core::TransactionView>, cycles: core::Cycle) -> Self {
+    pub fn with_proposed(
+        tx: Option<core::TransactionView>,
+        cycles: core::Cycle,
+        time_added_to_pool: u64,
+    ) -> Self {
         Self {
             tx_status: TxStatus::Proposed,
             transaction: tx,
             cycles: Some(cycles),
+            time_added_to_pool: Some(time_added_to_pool),
         }
     }
 
@@ -192,6 +204,7 @@ impl TransactionWithStatus {
             tx_status: TxStatus::Committed(hash),
             transaction: tx,
             cycles,
+            time_added_to_pool: None,
         }
     }
 
@@ -201,6 +214,7 @@ impl TransactionWithStatus {
             tx_status: TxStatus::Rejected(reason),
             transaction: None,
             cycles: None,
+            time_added_to_pool: None,
         }
     }
 
@@ -210,6 +224,7 @@ impl TransactionWithStatus {
             tx_status: TxStatus::Unknown,
             transaction: None,
             cycles: None,
+            time_added_to_pool: None,
         }
     }
 
@@ -219,6 +234,7 @@ impl TransactionWithStatus {
             tx_status,
             transaction: None,
             cycles,
+            time_added_to_pool: None,
         }
     }