node/log_entry_sync/src/sync_manager/log_entry_fetcher.rs

@@ -290,7 +290,6 @@ impl LogEntryFetcher {
         let contract = ZgsFlow::new(self.contract_address, self.provider.clone());
         let provider = self.provider.clone();
         let confirmation_delay = self.confirmation_delay;
-        let log_page_size = self.log_page_size;
         executor.spawn(
             async move {
                 debug!("start_watch starts, start={}", start_block_number);
@@ -306,7 +305,6 @@ impl LogEntryFetcher {
                         confirmation_delay,
                         &contract,
                         &block_hash_cache,
-                        log_page_size,
                     )
                     .await
                     {
@@ -342,7 +340,6 @@ impl LogEntryFetcher {
         confirmation_delay: u64,
         contract: &ZgsFlow<Provider<RetryClient<Http>>>,
         block_hash_cache: &Arc<RwLock<BTreeMap<u64, Option<BlockHashAndSubmissionIndex>>>>,
-        log_page_size: u64,
     ) -> Result<Option<(u64, H256, Option<Option<u64>>)>> {
         let latest_block_number = provider.get_block_number().await?.as_u64();
         debug!(
@@ -411,11 +408,8 @@ impl LogEntryFetcher {
             .to_block(to_block_number)
             .address(contract.address().into())
             .filter;
-        let mut stream = LogQuery::new(provider, &filter, Duration::from_millis(10))
-            .with_page_size(log_page_size);
         let mut block_logs: BTreeMap<u64, Vec<Log>> = BTreeMap::new();
-        while let Some(maybe_log) = stream.next().await {
+        for log in provider.get_logs(&filter).await? {
-            let log = maybe_log?;
             let block_number = log
                 .block_number
                 .ok_or_else(|| anyhow!("block number missing"))?
@@ -502,20 +496,20 @@ impl LogEntryFetcher {
                 } else {
                     None
                 };
-                for log in log_events.into_iter() {
-                    if let Err(e) = watch_tx.send(log) {
-                        warn!("send LogFetchProgress::Transaction failed: {:?}", e);
-                        return Ok(progress);
-                    }
-                }
                 if let Some(p) = &new_progress {
                     if let Err(e) = watch_tx.send(LogFetchProgress::SyncedBlock(*p)) {
-                        warn!("send LogFetchProgress::SyncedBlock failed: {:?}", e);
+                        warn!("send LogFetchProgress failed: {:?}", e);
                         return Ok(progress);
                     } else {
                         block_hash_cache.write().await.insert(p.0, None);
                     }
                 }
+                for log in log_events.into_iter() {
+                    if let Err(e) = watch_tx.send(log) {
+                        warn!("send log failed: {:?}", e);
+                        return Ok(progress);
+                    }
+                }
                 progress = new_progress;
             }
         }

node/log_entry_sync/src/sync_manager/mod.rs

@@ -339,7 +339,8 @@ impl LogSyncManager {
                 LogFetchProgress::Transaction(tx) => {
                     if !self.put_tx(tx.clone()).await {
                         // Unexpected error.
-                        bail!("log sync write error");
+                        error!("log sync write error");
+                        break;
                     }
                     if let Err(e) = self.event_send.send(LogSyncEvent::TxSynced { tx }) {
                         // TODO: Do we need to wait until all receivers are initialized?

node/rpc/src/types.rs

@@ -7,8 +7,7 @@ use merkle_tree::RawLeafSha3Algorithm;
 use network::Multiaddr;
 use serde::{Deserialize, Serialize};
 use shared_types::{
-    compute_padded_chunk_size, compute_segment_size, DataRoot, FileProof, NetworkIdentity,
+    compute_padded_chunk_size, compute_segment_size, DataRoot, FileProof, Transaction, CHUNK_SIZE,
-    Transaction, CHUNK_SIZE,
 };
 use std::collections::HashSet;
 use std::hash::Hasher;
@@ -29,7 +28,6 @@ pub struct Status {
     pub connected_peers: usize,
     pub log_sync_height: u64,
     pub log_sync_block: H256,
-    pub network_identity: NetworkIdentity,
 }
 
 #[derive(Serialize, Deserialize)]

node/rpc/src/zgs/impl.rs

@@ -30,7 +30,6 @@ impl RpcServer for RpcServerImpl {
             connected_peers: self.ctx.network_globals.connected_peers(),
             log_sync_height: sync_progress.0,
             log_sync_block: sync_progress.1,
-            network_identity: self.ctx.network_globals.network_id(),
         })
     }
 

node/shared_types/src/lib.rs

@@ -370,7 +370,6 @@ impl TryFrom<FileProof> for FlowProof {
 #[derive(
     DeriveEncode, DeriveDecode, Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize,
 )]
-#[serde(rename_all = "camelCase")]
 pub struct NetworkIdentity {
     /// The chain id of the blockchain network.
     pub chain_id: u64,
@@ -385,7 +384,6 @@ pub struct NetworkIdentity {
 #[derive(
     DeriveEncode, DeriveDecode, Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize,
 )]
-#[serde(rename_all = "camelCase")]
 pub struct ProtocolVersion {
     pub major: u8,
     pub minor: u8,