Merge pull request #3330 from Pana/rpc/logAddTimestamp

feat: add timeStamp to eSpace RPC log object

Author: Pana

changelogs/JSONRPC.md

@@ -1,5 +1,9 @@
 # JSON-RPC CHANGELOG
 
+## v3.0.2
+
+1. eSpace `log` object add `blockTimestamp` field.
+
 ## v3.0.0
 
 Below RPC add support for EIP-7702 tx:

crates/cfxcore/core/src/consensus/consensus_graph/rpc_api/trace_provider.rs

@@ -56,7 +56,8 @@ impl ConsensusGraph {
 
     fn filter_block_receipts<'a>(
         &self, filter: &'a LogFilter, epoch_number: u64, block_hash: H256,
-        mut receipts: Vec<Receipt>, mut tx_hashes: Vec<H256>,
+        block_timestamp: Option<u64>, mut receipts: Vec<Receipt>,
+        mut tx_hashes: Vec<H256>,
     ) -> impl Iterator<Item = LocalizedLogEntry> + 'a {
         // sanity check
         if receipts.len() != tx_hashes.len() {
@@ -97,6 +98,7 @@ impl ConsensusGraph {
                         entry: log,
                         block_hash,
                         epoch_number,
+                        block_timestamp,
                         transaction_hash,
                         // iterating in reverse order
                         transaction_index: receipts_len - index - 1,
@@ -166,6 +168,7 @@ impl ConsensusGraph {
             &filter,
             epoch,
             block_hash,
+            Some(block.block_header.timestamp()),
             receipts,
             block.transaction_hashes(/* space filter */ None),
         )))
@@ -225,6 +228,7 @@ impl ConsensusGraph {
             &filter,
             epoch,
             pivot_hash,
+            Some(pb.pivot_header.timestamp()),
             pb.receipts,
             pb.transactions.iter().map(|t| t.hash()).collect(),
         )))

crates/cfxcore/core/src/light_protocol/query_service.rs

@@ -684,9 +684,9 @@ impl QueryService {
     /// NOTE: `log.transaction_hash` is not known at this point,
     /// so this field has to be filled later on.
     fn filter_receipt_logs(
-        epoch: u64, block_hash: H256, transaction_index: usize,
-        num_logs_remaining: &mut usize, mut logs: Vec<LogEntry>,
-        filter: LogFilter,
+        epoch: u64, block_hash: H256, block_timestamp: Option<u64>,
+        transaction_index: usize, num_logs_remaining: &mut usize,
+        mut logs: Vec<LogEntry>, filter: LogFilter,
     ) -> impl Iterator<Item = LocalizedLogEntry> {
         let num_logs = logs.len();
 
@@ -702,6 +702,7 @@ impl QueryService {
             .map(move |(ii, entry)| LocalizedLogEntry {
                 block_hash,
                 epoch_number: epoch,
+                block_timestamp,
                 entry,
                 log_index: log_base_index - ii - 1,
                 transaction_hash: KECCAK_EMPTY_BLOOM, // will fill in later
@@ -731,6 +732,7 @@ impl QueryService {
                 Self::filter_receipt_logs(
                     epoch,
                     hash,
+                    None,
                     num_receipts - ii - 1,
                     &mut remaining,
                     logs,

crates/client/src/rpc/impls/cfx/cfx_filter.rs

@@ -630,6 +630,7 @@ fn retrieve_epoch_logs(
                     entry,
                     block_hash,
                     epoch_number,
+                    block_timestamp: Some(block.block_header.timestamp()),
                     transaction_hash: tx.hash,
                     transaction_index: txid,
                     log_index,

crates/client/src/rpc/impls/cfx/pubsub.rs

@@ -489,6 +489,7 @@ impl ChainNotificationHandler {
                         entry,
                         block_hash,
                         epoch_number,
+                        block_timestamp: Some(block.block_header.timestamp()),
                         transaction_hash: tx.hash,
                         transaction_index: txid,
                         log_index,

crates/primitives/src/log_entry.rs

@@ -105,6 +105,8 @@ pub struct LocalizedLogEntry {
     pub block_hash: H256,
     /// Epoch number.
     pub epoch_number: BlockNumber,
+    /// Timestamp of the block in which this log was created.
+    pub block_timestamp: Option<u64>,
     /// Hash of transaction in which this log was created.
     pub transaction_hash: H256,
     /// Index of transaction within block.

crates/rpc/rpc-eth-impl/src/eth.rs

@@ -12,9 +12,9 @@ use cfx_rpc_eth_api::EthApiServer;
 use cfx_rpc_eth_types::{
     AccessListResult, AccountOverride, AccountPendingTransactions, Block,
     BlockId, BlockOverrides, Bundle, Error, EthCallResponse, EthRpcLogFilter,
-    EthRpcLogFilter as Filter, EvmOverrides, FeeHistory, Header, Log, Receipt,
-    RpcStateOverride, SimulatePayload, SimulatedBlock, StateContext, SyncInfo,
-    SyncStatus, Transaction, TransactionRequest,
+    EthRpcLogFilter as Filter, EvmOverrides, FeeHistory, Header, Log, LogData,
+    Receipt, RpcStateOverride, SimulatePayload, SimulatedBlock, StateContext,
+    SyncInfo, SyncStatus, Transaction, TransactionRequest,
 };
 use cfx_rpc_primitives::{Bytes, Index, U64 as HexU64};
 use cfx_rpc_utils::{
@@ -355,13 +355,16 @@ impl EthApi {
             .cloned()
             .enumerate()
             .map(|(idx, log)| Log {
-                address: log.address,
-                topics: log.topics,
-                data: Bytes(log.data),
+                inner: LogData {
+                    address: log.address,
+                    topics: log.topics,
+                    data: log.data.into(),
+                },
                 block_hash,
                 block_number: block_height,
                 transaction_hash,
                 transaction_index,
+                block_timestamp: Some(b.pivot_header.timestamp().into()),
                 log_index: Some((*prior_log_index + idx).into()),
                 transaction_log_index: Some(idx.into()),
                 removed: false,

crates/rpc/rpc-eth-impl/src/helpers/eth_filter.rs

@@ -161,6 +161,7 @@ impl EthFilterHelper {
                     entry,
                     block_hash: pivot,
                     epoch_number,
+                    block_timestamp: Some(pb.pivot_header.timestamp()),
                     transaction_hash: tx.hash,
                     transaction_index: txid,
                     log_index,

crates/rpc/rpc-eth-impl/src/pubsub.rs

@@ -519,6 +519,7 @@ impl ChainDataProvider {
                     entry,
                     block_hash: pivot,
                     epoch_number,
+                    block_timestamp: Some(pb.pivot_header.timestamp()),
                     transaction_hash: tx.hash,
                     transaction_index: txid,
                     log_index,

crates/rpc/rpc-eth-types/src/lib.rs

@@ -30,7 +30,7 @@ pub use errors::Error;
 pub use eth_pubsub::*;
 pub use fee_history::FeeHistory;
 pub use filter::*;
-pub use log::Log;
+pub use log::*;
 pub use receipt::Receipt;
 pub use simulate::*;
 pub use state::{