From f58eed1c5bce2d227324180e5ea6272a618f5bd8 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 6 Sep 2024 15:28:48 +0800 Subject: [PATCH] resolve conflicts --- node/log_entry_sync/src/sync_manager/mod.rs | 9 +++++++++ node/src/config/mod.rs | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/node/log_entry_sync/src/sync_manager/mod.rs b/node/log_entry_sync/src/sync_manager/mod.rs index 90bda0b..0055fb4 100644 --- a/node/log_entry_sync/src/sync_manager/mod.rs +++ b/node/log_entry_sync/src/sync_manager/mod.rs @@ -472,6 +472,15 @@ impl LogSyncManager { async fn get_start_block_number_with_hash( log_sync_manager: &LogSyncManager, ) -> Result<(u64, H256), anyhow::Error> { + if log_sync_manager + .config + .force_log_sync_from_start_block_number + { + let block_number = log_sync_manager.config.start_block_number; + let block_hash = log_sync_manager.get_block(block_number.into()).await?.1; + return Ok((block_number, block_hash)); + } + if let Some(block_number) = log_sync_manager.store.get_log_latest_block_number()? { if let Some(Some(val)) = log_sync_manager .block_hash_cache diff --git a/node/src/config/mod.rs b/node/src/config/mod.rs index e5d2bf1..0373fca 100644 --- a/node/src/config/mod.rs +++ b/node/src/config/mod.rs @@ -34,7 +34,7 @@ build_config! { (log_contract_address, (String), "".to_string()) (log_sync_start_block_number, (u64), 0) (force_log_sync_from_start_block_number, (bool), false) - (confirmation_block_count, (u64), 12) + (confirmation_block_count, (u64), 3) (log_page_size, (u64), 999) (max_cache_data_size, (usize), 100 * 1024 * 1024) // 100 MB (cache_tx_seq_ttl, (usize), 500)