From 41273332974c92f34bb07345e9d9563ba0ae38c2 Mon Sep 17 00:00:00 2001 From: Peter Zhang Date: Mon, 2 Sep 2024 11:15:51 +0800 Subject: [PATCH] update next tx seq --- node/log_entry_sync/src/sync_manager/log_query.rs | 3 ++- node/log_entry_sync/src/sync_manager/mod.rs | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/node/log_entry_sync/src/sync_manager/log_query.rs b/node/log_entry_sync/src/sync_manager/log_query.rs index 7ee878e..b2dfc44 100644 --- a/node/log_entry_sync/src/sync_manager/log_query.rs +++ b/node/log_entry_sync/src/sync_manager/log_query.rs @@ -1,6 +1,6 @@ use ethers::prelude::{Filter, JsonRpcClient, Log, Middleware, Provider, ProviderError, U64}; use futures_core::stream::Stream; -use jsonrpsee::tracing::{error, trace}; +use jsonrpsee::tracing::{debug, error, trace}; use std::future::Future; use std::time::Duration; use std::{ @@ -152,6 +152,7 @@ where } } LogQueryState::LoadLogs((from_block, fut)) => { + debug!("LoadLogs: loading logs from block={:?}", from_block); match futures_util::ready!(fut.as_mut().poll(ctx)) { Ok(logs) => { self.current_logs = VecDeque::from(logs); diff --git a/node/log_entry_sync/src/sync_manager/mod.rs b/node/log_entry_sync/src/sync_manager/mod.rs index 0ce7722..cafd7cd 100644 --- a/node/log_entry_sync/src/sync_manager/mod.rs +++ b/node/log_entry_sync/src/sync_manager/mod.rs @@ -5,7 +5,7 @@ use anyhow::{anyhow, bail, Result}; use ethereum_types::H256; use ethers::{prelude::Middleware, types::BlockNumber}; use futures::FutureExt; -use jsonrpsee::tracing::{debug, error, trace, warn}; +use jsonrpsee::tracing::{debug, error, warn}; use shared_types::{ChunkArray, Transaction}; use std::collections::BTreeMap; use std::fmt::Debug; @@ -56,7 +56,7 @@ impl LogSyncManager { store: Arc, ) -> Result<(broadcast::Sender, oneshot::Receiver<()>)> { let next_tx_seq = store.next_tx_seq(); - + debug!("LogSyncManager spawn next_tx_seq: {}", next_tx_seq); let executor_clone = executor.clone(); let mut shutdown_sender = executor.shutdown_sender(); @@ -298,7 +298,7 @@ impl LogSyncManager { async fn handle_data(&mut self, mut rx: UnboundedReceiver) -> Result<()> { while let Some(data) = rx.recv().await { - trace!("handle_data: data={:?}", data); + debug!("handle_data: data={:?}", data); match data { LogFetchProgress::SyncedBlock(( block_number, @@ -387,7 +387,7 @@ impl LogSyncManager { } } self.data_cache.garbage_collect(self.next_tx_seq); - self.next_tx_seq += 1; + self.next_tx_seq = self.store.next_tx_seq(); true } }