From 67a82412a034b15cb78469131119bf354c015371 Mon Sep 17 00:00:00 2001
From: Peter Zhang <peter@0g.ai>
Date: Thu, 20 Mar 2025 09:31:08 +0800
Subject: [PATCH] add an option to skip old tx seq number

---
 node/rpc/src/zgs/api.rs       |  2 +-
 node/rpc/src/zgs/impl.rs      |  8 ++++----
 node/storage-async/src/lib.rs | 10 ++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/node/rpc/src/zgs/api.rs b/node/rpc/src/zgs/api.rs
index 32dcfb4..9b6f5bf 100644
--- a/node/rpc/src/zgs/api.rs
+++ b/node/rpc/src/zgs/api.rs
@@ -63,7 +63,7 @@ pub trait Rpc {
     async fn check_file_finalized(&self, tx_seq_or_root: TxSeqOrRoot) -> RpcResult<Option<bool>>;
 
     #[method(name = "getFileInfo")]
-    async fn get_file_info(&self, data_root: DataRoot) -> RpcResult<Option<FileInfo>>;
+    async fn get_file_info(&self, data_root: DataRoot, skip_old: bool) -> RpcResult<Option<FileInfo>>;
 
     #[method(name = "getFileInfoByTxSeq")]
     async fn get_file_info_by_tx_seq(&self, tx_seq: u64) -> RpcResult<Option<FileInfo>>;
diff --git a/node/rpc/src/zgs/impl.rs b/node/rpc/src/zgs/impl.rs
index 190aa53..b280add 100644
--- a/node/rpc/src/zgs/impl.rs
+++ b/node/rpc/src/zgs/impl.rs
@@ -121,7 +121,7 @@ impl RpcServer for RpcServerImpl {
     ) -> RpcResult<Option<SegmentWithProof>> {
         info!(%data_root, %index, "zgs_downloadSegmentWithProof");
 
-        let tx = try_option!(self.ctx.log_store.get_tx_by_data_root(&data_root).await?);
+        let tx = try_option!(self.ctx.log_store.get_tx_by_data_root(&data_root, false).await?);
 
         self.get_segment_with_proof_by_tx(tx, index).await
     }
@@ -163,10 +163,10 @@ impl RpcServer for RpcServerImpl {
         }
     }
 
-    async fn get_file_info(&self, data_root: DataRoot) -> RpcResult<Option<FileInfo>> {
+    async fn get_file_info(&self, data_root: DataRoot, skip_old: bool) -> RpcResult<Option<FileInfo>> {
         debug!(%data_root, "zgs_getFileInfo");
 
-        let tx = try_option!(self.ctx.log_store.get_tx_by_data_root(&data_root).await?);
+        let tx = try_option!(self.ctx.log_store.get_tx_by_data_root(&data_root, skip_old).await?);
 
         Ok(Some(self.get_file_info_by_tx(tx).await?))
     }
@@ -288,7 +288,7 @@ impl RpcServerImpl {
         let maybe_tx = self
             .ctx
             .log_store
-            .get_tx_by_data_root(&segment.root)
+            .get_tx_by_data_root(&segment.root, false)
             .await?;
 
         self.put_segment_with_maybe_tx(segment, maybe_tx).await
diff --git a/node/storage-async/src/lib.rs b/node/storage-async/src/lib.rs
index 9160a84..cb1638d 100644
--- a/node/storage-async/src/lib.rs
+++ b/node/storage-async/src/lib.rs
@@ -65,14 +65,16 @@ impl Store {
             .await
     }
 
-    pub async fn get_tx_by_data_root(&self, data_root: &DataRoot) -> Result<Option<Transaction>> {
+    pub async fn get_tx_by_data_root(&self, data_root: &DataRoot, skip_old: bool) -> Result<Option<Transaction>> {
         let root = *data_root;
         
         let res = self.spawn(move |store| store.get_tx_by_data_root(&root))
             .await?;
-        if let Some(tx) = res.clone() {
-            if self.store.check_tx_pruned(tx.seq)? {
-                return Ok(None);
+        if skip_old {
+            if let Some(tx) = res.clone() {
+                if self.store.check_tx_pruned(tx.seq)? {
+                    return Ok(None);
+                }
             }
         }
         Ok(res)