more logger specific

Author: Naohiro Yoshida

derivation/src/derivation.rs

@@ -1,6 +1,8 @@
-use crate::errors;
 use crate::errors::Error;
 use crate::oracle::{MemoryOracleClient, NopeHintWriter};
+use crate::{errors, logger};
+use alloc::fmt::format;
+use alloc::format;
 use alloc::sync::Arc;
 use alloy_consensus::Header;
 use alloy_primitives::{keccak256, Sealed, B256};
@@ -73,6 +75,12 @@ impl Derivation {
             rollup_config: rollup_config.clone(),
         };
         let rollup_config = Arc::new(boot.rollup_config.clone());
+
+        logger::info(&format!(
+            "fetching safe head hash {:?} for L2 derivation",
+            boot.agreed_l2_output_root
+        ));
+
         let safe_head_hash = fetch_safe_head_hash(&oracle, boot.agreed_l2_output_root).await?;
         let oracle_for_preimage = oracle.clone();
         let oracle = Arc::new(oracle);
@@ -106,6 +114,7 @@ impl Derivation {
         )
         .await?;
 
+        logger::info(&format!("create evm factory"));
         let evm_factory = FpvmOpEvmFactory::new(NopeHintWriter, oracle_for_preimage);
         let executor = KonaExecutor::new(
             rollup_config.as_ref(),
@@ -118,10 +127,18 @@ impl Derivation {
 
         // Run the derivation pipeline until we are able to produce the output root of the claimed
         // L2 block.
+        logger::info(&format!(
+            "start advancing to target L2 block {}",
+            boot.claimed_l2_block_number
+        ));
         let (_, output_root) = driver
             .advance_to_target(&boot.rollup_config, Some(boot.claimed_l2_block_number))
             .await?;
 
+        logger::info(&format!(
+            "end advancing to target L2 block {}",
+            boot.claimed_l2_block_number
+        ));
         ////////////////////////////////////////////////////////////////
         //                          EPILOGUE                          //
         ////////////////////////////////////////////////////////////////

derivation/src/lib.rs

@@ -3,6 +3,7 @@ extern crate alloc;
 
 pub mod derivation;
 pub mod errors;
+pub mod logger;
 pub mod oracle;
 pub mod types;
 

light-client/src/logger.rs derivation/src/logger.rslight-client/src/logger.rs renamed to derivation/src/logger.rs

@@ -6,8 +6,8 @@ use crate::header::Header;
 use crate::message::ClientMessage;
 use crate::misbehaviour::Misbehaviour;
 use alloc::string::{String, ToString};
-use alloc::{format, vec};
 use alloc::vec::Vec;
+use alloc::{format, vec};
 use alloy_primitives::keccak256;
 use core::time::Duration;
 use ethereum_consensus::types::H256;
@@ -21,7 +21,7 @@ use light_client::{
     CreateClientResult, Error as LightClientError, HostClientReader, LightClient, MisbehaviourData,
     UpdateClientResult, UpdateStateData, VerifyMembershipResult, VerifyNonMembershipResult,
 };
-use crate::logger;
+use optimism_derivation::logger;
 
 pub struct OptimismLightClient<const L1_SYNC_COMMITTEE_SIZE: usize>;
 
@@ -175,7 +175,11 @@ impl<const L1_SYNC_COMMITTEE_SIZE: usize> OptimismLightClient<L1_SYNC_COMMITTEE_
         client_id: ClientId,
         header: Header<L1_SYNC_COMMITTEE_SIZE>,
     ) -> Result<UpdateStateData, Error> {
-        logger::info(&format!("update_state {} trusted_height={}", client_id.to_string(), header.trusted_height.revision_height()));
+        logger::info(&format!(
+            "update_state {} trusted_height={}",
+            client_id.to_string(),
+            header.trusted_height.revision_height()
+        ));
         let trusted_height = header.trusted_height;
         let any_client_state = ctx.client_state(&client_id).map_err(Error::LCPError)?;
         let any_consensus_state = ctx

light-client/src/client.rs

@@ -18,6 +18,7 @@ use ethereum_light_client_verifier::context::Fraction;
 use ethereum_light_client_verifier::execution::ExecutionVerifier;
 use kona_genesis::RollupConfig;
 use light_client::types::{Any, ClientId, Height, Time};
+use optimism_derivation::logger;
 use optimism_ibc_proto::google::protobuf::Any as IBCAny;
 use optimism_ibc_proto::ibc::lightclients::ethereum::v1::{
     Fork as ProtoFork, ForkParameters as ProtoForkParameters, ForkSpec as ProtoForkSpec,
@@ -26,7 +27,6 @@ use optimism_ibc_proto::ibc::lightclients::ethereum::v1::{
 use optimism_ibc_proto::ibc::lightclients::optimism::v1::ClientState as RawClientState;
 use optimism_ibc_proto::ibc::lightclients::optimism::v1::L1Config as RawL1Config;
 use prost::Message;
-use crate::logger;
 
 pub const OPTIMISM_CLIENT_STATE_TYPE_URL: &str = "/ibc.lightclients.optimism.v1.ClientState";
 
@@ -72,7 +72,10 @@ impl ClientState {
         trusted_consensus_state: &ConsensusState,
         header: Header<L1_SYNC_COMMITTEE_SIZE>,
     ) -> Result<(ClientState, ConsensusState, Height), Error> {
-        logger::info(&format!("check_header_and_update_state trusted_height={}", header.trusted_height.revision_height()));
+        logger::info(&format!(
+            "check_header_and_update_state trusted_height={}",
+            header.trusted_height.revision_height()
+        ));
         // Since the L1 block hash is used for L2 derivation, the validity of L1 must be verified.
         let l1_consensus = header.verify_l1(
             &self.l1_config,

light-client/src/client_state.rs

@@ -9,12 +9,12 @@ use alloy_primitives::B256;
 use kona_genesis::RollupConfig;
 use light_client::types::{Any, Height};
 use optimism_derivation::derivation::Derivation;
+use optimism_derivation::logger;
 use optimism_derivation::oracle::MemoryOracleClient;
 use optimism_derivation::types::Preimages;
 use optimism_ibc_proto::google::protobuf::Any as IBCAny;
 use optimism_ibc_proto::ibc::lightclients::optimism::v1::Header as RawHeader;
 use prost::Message;
-use crate::logger;
 
 pub const OPTIMISM_HEADER_TYPE_URL: &str = "/ibc.lightclients.optimism.v1.Header";
 
@@ -53,7 +53,10 @@ impl<const L1_SYNC_COMMITTEE_SIZE: usize> L1Headers<L1_SYNC_COMMITTEE_SIZE> {
 
         let mut updated_as_next = false;
         for (i, l1_header) in self.trusted_to_deterministic.iter().enumerate() {
-            logger::info(&format!("verify l1 trusted_to_deterministic index={i} number={}", l1_header.execution_update.block_number));
+            logger::info(&format!(
+                "verify l1 trusted_to_deterministic index={i} number={}",
+                l1_header.execution_update.block_number
+            ));
             let result = l1_header.verify(now_sec, l1_config, &l1_consensus);
             let result = result.map_err(|e| {
                 Error::L1HeaderTrustedToDeterministicVerifyError(
@@ -70,7 +73,10 @@ impl<const L1_SYNC_COMMITTEE_SIZE: usize> L1Headers<L1_SYNC_COMMITTEE_SIZE> {
         // Verify finalized l1 header by last l1 consensus for L2 derivation
         let mut l1_consensus_for_verify_only = l1_consensus.clone();
         for (i, l1_header) in self.deterministic_to_latest.iter().enumerate() {
-            logger::info(&format!("verify l1 deterministic_to_latest index={i} number={}", l1_header.execution_update.block_number));
+            logger::info(&format!(
+                "verify l1 deterministic_to_latest index={i} number={}",
+                l1_header.execution_update.block_number
+            ));
             let result = l1_header.verify(now_sec, l1_config, &l1_consensus_for_verify_only);
             let result = result.map_err(|e| {
                 Error::L1HeaderDeterministicToLatestVerifyError(
@@ -114,7 +120,10 @@ impl<const L1_SYNC_COMMITTEE_SIZE: usize> Header<L1_SYNC_COMMITTEE_SIZE> {
         trusted_output_root: B256,
         rollup_config: &RollupConfig,
     ) -> Result<(alloy_consensus::Header, u64, B256), Error> {
-        logger::info(&format!("verify l2 derivation={:?}", self.derivation.l2_block_number));
+        logger::info(&format!(
+            "verify l2 derivation={:?}",
+            self.derivation.l2_block_number
+        ));
         // Ensure trusted
         if self.derivation.agreed_l2_output_root != trusted_output_root {
             return Err(Error::UnexpectedTrustedOutputRoot(

light-client/src/header.rs

@@ -15,7 +15,6 @@ mod commitment;
 pub mod errors;
 pub mod header;
 mod l1;
-mod logger;
 mod message;
 mod misbehaviour;
 mod misc;