From a15dccd3cf0cb2dbd5d7f3238be805f8cc35c72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E9=94=A6=E4=BD=91?= <chinyuchan@163.com>
Date: Tue, 27 Feb 2024 11:14:22 +0800
Subject: [PATCH] fix scanning. (#230)

---
 prismer/src/commands.rs | 8 +++++---
 prismer/src/rpc.rs      | 7 ++++++-
 scanner/src/commands.rs | 6 ++++--
 scanner/src/rpc.rs      | 7 ++++++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/prismer/src/commands.rs b/prismer/src/commands.rs
index 478ed63..ca5175b 100644
--- a/prismer/src/commands.rs
+++ b/prismer/src/commands.rs
@@ -147,7 +147,7 @@ impl Subscribe {
 
         let itv = env::var("INTERVAL")
             .ok()
-            .unwrap_or(String::from("12"))
+            .unwrap_or(String::from("15"))
             .parse::<u64>()?;
         let interval = Duration::from_secs(itv);
         info!("interval={:?}", interval);
@@ -162,7 +162,7 @@ impl Subscribe {
         } else if let Ok(h) = db::load_last_height(&pool).await {
             h + 1
         } else {
-            let prism_start = std::env::var("PRISM_START").unwrap_or(String::from("1"));
+            let prism_start = env::var("PRISM_START").unwrap_or("4004430".to_string());
             prism_start.parse::<i64>().unwrap()
         };
 
@@ -192,7 +192,9 @@ impl Subscribe {
                 Ok(_) => {
                     info!("Block at {} loaded.", cursor);
                 }
-                Err(Error::NotFound) => (),
+                Err(Error::NotFound) => {
+                    error!("Block {} not found.", cursor);
+                }
                 Err(e) => return Err(e),
             };
             tokio::time::sleep(interval).await;
diff --git a/prismer/src/rpc.rs b/prismer/src/rpc.rs
index 58c6c73..3da1783 100644
--- a/prismer/src/rpc.rs
+++ b/prismer/src/rpc.rs
@@ -86,8 +86,13 @@ impl TendermintRPC {
         let resp = self.client.get(url).send().await?;
         let status = resp.status();
         if !status.is_success() {
-            return Err(resp.text().await?.into());
+            let resp_text = resp.text().await?;
+            if resp_text.contains("less than or equal to") {
+                return Err(Error::NotFound);
+            }
+            return Err(resp_text.into());
         }
+
         let bytes = resp.bytes().await?;
         if let Ok(r) = serde_json::from_slice::<'_, JsonRpcResponse<T>>(&bytes) {
             Ok(r.result)
diff --git a/scanner/src/commands.rs b/scanner/src/commands.rs
index e647884..ae74603 100644
--- a/scanner/src/commands.rs
+++ b/scanner/src/commands.rs
@@ -166,7 +166,7 @@ impl Subscribe {
 
         let itv = env::var("INTERVAL")
             .ok()
-            .unwrap_or(String::from("12"))
+            .unwrap_or(String::from("15"))
             .parse::<u64>()?;
         let interval = Duration::from_secs(itv);
         info!("interval={:?}", interval);
@@ -210,7 +210,9 @@ impl Subscribe {
                 Ok(_) => {
                     info!("Block at {} loaded.", cursor);
                 }
-                Err(Error::NotFound) => (),
+                Err(Error::NotFound) => {
+                    error!("Block {} not found.", cursor);
+                }
                 Err(e) => return Err(e),
             };
             tokio::time::sleep(interval).await;
diff --git a/scanner/src/rpc.rs b/scanner/src/rpc.rs
index f8d6e81..c671c86 100644
--- a/scanner/src/rpc.rs
+++ b/scanner/src/rpc.rs
@@ -132,8 +132,13 @@ impl TendermintRPC {
         let resp = self.client.get(url).send().await?;
         let status = resp.status();
         if !status.is_success() {
-            return Err(resp.text().await?.into());
+            let resp_text = resp.text().await?;
+            if resp_text.contains("less than or equal to") {
+                return Err(Error::NotFound);
+            }
+            return Err(resp_text.into());
         }
+
         let bytes = resp.bytes().await?;
         if let Ok(r) = serde_json::from_slice::<'_, JsonRpcResponse<T>>(&bytes) {
             Ok(r.result)