More error context for L1 operations (#874)

mskrzypkows · web-flow · commit d827c3991f92 · 2026-02-23T16:29:23.000+01:00
* More error context for L1 operations

* fmt
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ resolver = "2"
 default-members = ["node"]
 
 [workspace.package]
-version = "1.33.6"
+version = "1.33.7"
 edition = "2024"
 repository = "https://github.com/NethermindEth/Catalyst"
 license = "MIT"
diff --git a/pacaya/src/l1/execution_layer.rs b/pacaya/src/l1/execution_layer.rs
@@ -18,7 +18,7 @@ use alloy::{
     primitives::{Address, U256},
     providers::DynProvider,
 };
-use anyhow::{Error, anyhow};
+use anyhow::{Context, Error, anyhow};
 use common::{
     l1::{
         bindings::IERC20,
@@ -62,9 +62,12 @@ impl ELTrait for ExecutionLayer {
                 .first()
                 .ok_or_else(|| anyhow!("L1 RPC URL is required"))?,
         )
-        .await?;
+        .await
+        .context("construct_alloy_provider")?;
         let common =
-            ExecutionLayerCommon::new(provider.clone(), common_config.signer.get_address()).await?;
+            ExecutionLayerCommon::new(provider.clone(), common_config.signer.get_address())
+                .await
+                .context("ExecutionLayerCommon::new")?;
 
         let taiko_wrapper_contract = taiko_wrapper::TaikoWrapper::new(
             specific_config.contract_addresses.taiko_wrapper,
@@ -125,18 +128,21 @@ impl PreconferProvider for ExecutionLayer {
         self.common()
             .get_account_balance(self.common().preconfer_address())
             .await
+            .context("get_preconfer_wallet_eth")
     }
 
     async fn get_preconfer_nonce_pending(&self) -> Result<u64, Error> {
         self.common()
             .get_account_nonce(self.common().preconfer_address(), BlockNumberOrTag::Pending)
             .await
+            .context("get_preconfer_nonce_pending")
     }
 
     async fn get_preconfer_nonce_latest(&self) -> Result<u64, Error> {
         self.common()
             .get_account_nonce(self.common().preconfer_address(), BlockNumberOrTag::Latest)
             .await
+            .context("get_preconfer_nonce_latest")
     }
 
     fn get_preconfer_address(&self) -> Address {
@@ -238,9 +244,13 @@ impl ExecutionLayer {
                 coinbase,
                 forced_inclusion,
             )
-            .await?;
+            .await
+            .context("build_propose_batch_tx")?;
 
-        let pending_nonce = self.get_preconfer_nonce_pending().await?;
+        let pending_nonce = self
+            .get_preconfer_nonce_pending()
+            .await
+            .context("get_preconfer_nonce_pending (send_batch_to_l1)")?;
         // Spawn a monitor for this transaction
         self.transaction_monitor
             .monitor_new_transaction(tx, pending_nonce)
@@ -255,7 +265,11 @@ impl ExecutionLayer {
             self.config.contract_addresses.taiko_inbox,
             &self.provider,
         );
-        let pacaya_config = contract.pacayaConfig().call().await?;
+        let pacaya_config = contract
+            .pacayaConfig()
+            .call()
+            .await
+            .context("ITaikoInbox::pacayaConfig")?;
 
         info!(
             "Pacaya config: chainid {}, maxUnverifiedBatches {}, batchRingBufferSize {}, maxAnchorHeightOffset {}",
@@ -273,9 +287,18 @@ impl ExecutionLayer {
             self.config.contract_addresses.taiko_inbox,
             self.provider.clone(),
         );
-        let num_batches = contract.getStats2().call().await?.numBatches;
+        let num_batches = contract
+            .getStats2()
+            .call()
+            .await
+            .context("ITaikoInbox::getStats2")?
+            .numBatches;
         // It is safe because num_batches initial value is 1
-        let batch = contract.getBatch(num_batches - 1).call().await?;
+        let batch = contract
+            .getBatch(num_batches - 1)
+            .call()
+            .await
+            .context("ITaikoInbox::getBatch")?;
 
         Ok(batch.lastBlockId)
     }
@@ -401,7 +424,10 @@ impl ExecutionLayer {
     }
 
     pub async fn is_transaction_in_progress(&self) -> Result<bool, Error> {
-        self.transaction_monitor.is_transaction_in_progress().await
+        self.transaction_monitor
+            .is_transaction_in_progress()
+            .await
+            .context("is_transaction_in_progress")
     }
 }
 
diff --git a/shasta/src/l1/execution_layer.rs b/shasta/src/l1/execution_layer.rs
@@ -10,7 +10,7 @@ use alloy::{
     rpc::client::BatchRequest,
     sol_types::SolCall,
 };
-use anyhow::{Error, anyhow};
+use anyhow::{Context, Error, anyhow};
 use common::{
     l1::{
         traits::{ELTrait, PreconferProvider},
@@ -61,9 +61,12 @@ impl ELTrait for ExecutionLayer {
                 .first()
                 .ok_or_else(|| anyhow!("L1 RPC URL is required"))?,
         )
-        .await?;
+        .await
+        .context("construct_alloy_provider")?;
         let common =
-            ExecutionLayerCommon::new(provider.clone(), common_config.signer.get_address()).await?;
+            ExecutionLayerCommon::new(provider.clone(), common_config.signer.get_address())
+                .await
+                .context("ExecutionLayerCommon::new")?;
 
         let transaction_monitor = TransactionMonitor::new(
             provider.clone(),
@@ -113,18 +116,21 @@ impl PreconferProvider for ExecutionLayer {
         self.common()
             .get_account_balance(self.common().preconfer_address())
             .await
+            .context("get_preconfer_wallet_eth")
     }
 
     async fn get_preconfer_nonce_pending(&self) -> Result<u64, Error> {
         self.common()
             .get_account_nonce(self.common().preconfer_address(), BlockNumberOrTag::Pending)
             .await
+            .context("get_preconfer_nonce_pending")
     }
 
     async fn get_preconfer_nonce_latest(&self) -> Result<u64, Error> {
         self.common()
             .get_account_nonce(self.common().preconfer_address(), BlockNumberOrTag::Latest)
             .await
+            .context("get_preconfer_nonce_latest")
     }
 
     fn get_preconfer_address(&self) -> Address {
@@ -193,9 +199,13 @@ impl ExecutionLayer {
                 self.contract_addresses.shasta_inbox,
                 num_forced_inclusion,
             )
-            .await?;
+            .await
+            .context("build_propose_tx")?;
 
-        let pending_nonce = self.get_preconfer_nonce_pending().await?;
+        let pending_nonce = self
+            .get_preconfer_nonce_pending()
+            .await
+            .context("get_preconfer_nonce_pending (send_batch_to_l1)")?;
         // Spawn a monitor for this transaction
         self.transaction_monitor
             .monitor_new_transaction(tx, pending_nonce)
@@ -206,7 +216,10 @@ impl ExecutionLayer {
     }
 
     pub async fn is_transaction_in_progress(&self) -> Result<bool, Error> {
-        self.transaction_monitor.is_transaction_in_progress().await
+        self.transaction_monitor
+            .is_transaction_in_progress()
+            .await
+            .context("is_transaction_in_progress")
     }
 
     pub async fn fetch_protocol_config(&self) -> Result<ProtocolConfig, Error> {
@@ -289,7 +302,12 @@ impl ExecutionLayer {
     }
 
     pub async fn get_inbox_next_proposal_id(&self) -> Result<u64, Error> {
-        let state = self.inbox_instance.getCoreState().call().await?;
+        let state = self
+            .inbox_instance
+            .getCoreState()
+            .call()
+            .await
+            .context("getCoreState (get_inbox_next_proposal_id)")?;
 
         Ok(state.nextProposalId.to::<u64>())
     }
diff --git a/shasta/src/l1/proposal_tx_builder.rs b/shasta/src/l1/proposal_tx_builder.rs
@@ -9,7 +9,7 @@ use alloy::{
     rpc::types::TransactionRequest,
 };
 use alloy_json_rpc::RpcError;
-use anyhow::Error;
+use anyhow::{Context, Error};
 use common::l1::{fees_per_gas::FeesPerGas, tools, transaction_error::TransactionError};
 use common::shared::l2_block_v2::L2BlockV2;
 use taiko_bindings::inbox::{IInbox::ProposeInput, Inbox, LibBlobs::BlobReference};
@@ -42,7 +42,8 @@ impl ProposalTxBuilder {
     ) -> Result<TransactionRequest, Error> {
         let tx_blob = self
             .build_propose_blob(l2_blocks, from, to, num_forced_inclusion)
-            .await?;
+            .await
+            .context("build_propose_blob")?;
         let tx_blob_gas = match self.provider.estimate_gas(tx_blob.clone()).await {
             Ok(gas) => gas,
             Err(e) => {
@@ -114,21 +115,31 @@ impl ProposalTxBuilder {
             .map_err(|e| Error::msg(format!("Can't encode and compress manifest: {e}")))?;
 
         let sidecar_builder: SidecarBuilder<BlobCoder> = SidecarBuilder::from_slice(&manifest_data);
-        let sidecar = sidecar_builder.build_7594()?;
+        let sidecar = sidecar_builder
+            .build_7594()
+            .context("sidecar builder build_7594")?;
 
         // Build the propose input.
         let input = ProposeInput {
             deadline: U48::ZERO,
             blobReference: BlobReference {
                 blobStartIndex: 0,
-                numBlobs: sidecar.blobs.len().try_into()?,
+                numBlobs: sidecar
+                    .blobs
+                    .len()
+                    .try_into()
+                    .context("blobs len try_into")?,
                 offset: U24::ZERO,
             },
             numForcedInclusions: num_forced_inclusion,
         };
 
         let inbox = Inbox::new(to, self.provider.clone());
-        let encoded_proposal_input = inbox.encodeProposeInput(input).call().await?;
+        let encoded_proposal_input = inbox
+            .encodeProposeInput(input)
+            .call()
+            .await
+            .context("inbox encodeProposeInput")?;
 
         let tx = TransactionRequest::default()
             .with_from(from)
