Improvements in scanner

Author: scx1332

crates/erc20_payment_lib/src/service.rs

@@ -80,7 +80,7 @@ pub async fn transaction_from_chain_and_into_db(
         .map_err(|_err| ConversionError::from("Cannot parse tx_hash".to_string()))
         .map_err(err_from!())?;
 
-    if let Some(chain_tx) = get_chain_tx_hash(conn, tx_hash.to_string())
+    if let Some(chain_tx) = get_chain_tx_hash(conn, format!("{:#x}", tx_hash))
         .await
         .map_err(err_from!())?
     {

src/actions/scan_chain.rs

@@ -75,57 +75,64 @@ async fn scan_auto_step(
     web3: Arc<Web3RpcPool>,
     sender: Option<Address>,
     scan_info: &mut ScanDaoDbObj,
-) -> Result<(), PaymentError> {
+) -> Result<bool, PaymentError> {
     let current_block = web3
         .clone()
         .eth_block_number()
         .await
         .map_err(err_from!())?
         .as_u64() as i64;
 
-    let (start_block, end_block, is_forward) = if scan_info.start_block == -1 {
-        let start_block = std::cmp::max(
-            current_block as i64 - scan_blockchain_options.blocks_behind.unwrap_or(100) as i64,
-            1,
-        );
-        let end_block = current_block;
-        (start_block, end_block, true)
-    } else if current_block - scan_info.last_block
-        >= scan_blockchain_options.blocks_behind.unwrap_or(100) as i64
-            + scan_blockchain_options.forward_scan_buffer as i64
-    {
-        log::info!("Scan forward needed");
-        let start_block = scan_info.last_block + 1;
+    let scan_behind_needed =
+        scan_info.start_block <= scan_blockchain_options.from_block.unwrap_or(1) as i64;
+
+    let (start_block, end_block, is_forward) = if scan_behind_needed {
+        if current_block - scan_info.last_block
+            >= scan_blockchain_options.blocks_behind.unwrap_or(100) as i64
+                + scan_blockchain_options.forward_scan_buffer as i64
+        {
+            log::info!("Scan forward needed");
+            let start_block = scan_info.last_block + 1;
+            if start_block > current_block {
+                log::warn!(
+                    "Start block {} is higher than current block {}, no newer data on blockchain",
+                    start_block,
+                    current_block
+                );
+                return Ok(true);
+            }
+            let end_block = start_block + scan_blockchain_options.blocks_at_once as i64;
+            let end_block = std::cmp::min(end_block, current_block);
+            (start_block, end_block, true)
+        } else {
+            let end_block = scan_info.start_block;
+            let start_block =
+                std::cmp::max(end_block - scan_blockchain_options.blocks_at_once as i64, 1);
+            if end_block - start_block > 0 {
+                (start_block, end_block, false)
+            } else {
+                log::warn!(
+                    "Start block {} is higher than end block {}, no newer data on blockchain",
+                    start_block,
+                    end_block
+                );
+                return Ok(true);
+            }
+        }
+    } else {
+        // normal auto scan
+        let start_block = scan_info.last_block - 100;
         if start_block > current_block {
             log::warn!(
                 "Start block {} is higher than current block {}, no newer data on blockchain",
                 start_block,
                 current_block
             );
-            return Ok(());
+            return Ok(true);
         }
         let end_block = start_block + scan_blockchain_options.blocks_at_once as i64;
-        let end_block = std::cmp::min(end_block, current_block);
+        let end_block = std::cmp::min(end_block, current_block + 1);
         (start_block, end_block, true)
-    } else {
-        if scan_info.start_block <= scan_blockchain_options.from_block.unwrap_or(1) as i64 {
-            tokio::time::sleep(std::time::Duration::from_secs(5)).await;
-            return Ok(());
-        }
-
-        let end_block = scan_info.start_block;
-        let start_block =
-            std::cmp::max(end_block - scan_blockchain_options.blocks_at_once as i64, 1);
-        if end_block - start_block > 0 {
-            (start_block, end_block, false)
-        } else {
-            log::warn!(
-                "Start block {} is higher than end block {}, no newer data on blockchain",
-                start_block,
-                end_block
-            );
-            return Ok(());
-        }
     };
 
     log::info!(
@@ -174,7 +181,7 @@ async fn scan_auto_step(
         .await
         .map_err(err_from!())?;
 
-    Ok(())
+    Ok(is_forward)
 }
 
 pub async fn scan_blockchain_local(
@@ -264,14 +271,17 @@ pub async fn scan_blockchain_local(
             )
             .await
             {
-                Ok(_) => {
+                Ok(wait) => {
                     log::info!("Scan step done");
+                    if wait {
+                        tokio::time::sleep(std::time::Duration::from_millis(2000)).await;
+                    }
                 }
                 Err(e) => {
                     log::info!("Scan step failed - trying again: {}", e);
+                    tokio::time::sleep(std::time::Duration::from_millis(2000)).await;
                 }
             }
-            //tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
         }
     } else {
         if current_block < scan_info.last_block {