L3 bugs (#851)

Co-authored-by: Heemank Verma <[email protected]>
Co-authored-by: Mohit Dhattarwal <[email protected]>

Author: 3 people

.github/workflows/task-lint-cargo.yml

@@ -45,3 +45,13 @@ jobs:
           echo "Running cargo clippy..."
           cargo clippy --workspace --no-deps -- -D warnings
           cargo clippy --workspace --tests --no-deps -- -D warnings
+
+          # TODO(mehul 14/11/2025, hotfix): This is a temporary fix to ensure that the madara is linted.
+          # Madara does not belong to the toplevel workspace, so we need to lint it separately.
+          # Remove this once we add madara back to toplevel workspace.
+
+          echo "Running cargo clippy for madara..."
+          cd madara
+          cargo clippy --workspace --no-deps -- -D warnings
+          cargo clippy --workspace --tests --no-deps -- -D warnings
+          cd ..

bootstrapper/src/configs/devnet.json

@@ -3,7 +3,6 @@
   "rollup_declare_v0_seq_url": "http://127.0.0.1:9943",
   "eth_priv_key": "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
   "config_hash_version": "StarknetOsConfig2",
-  "l2_deployer_address": "0x055be462e718c4166d656d11f89e341115b8bc82389c3762a10eade04fcb225d",
   "rollup_priv_key": "0x077e56c6dc32d40a67f6f7e6625c8dc5e570abe49c0a24e9202e4ae906abcc07",
   "eth_chain_id": 31337,
   "l1_deployer_address": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",

bootstrapper/src/setup_scripts/udc.rs

@@ -39,6 +39,9 @@ impl<'a> UdcSetup<'a> {
                 Vec::from([udc_class_hash, Felt::ZERO, Felt::ONE, Felt::ZERO]),
                 None,
             )
+            .l1_gas(0)
+            .l1_data_gas(0)
+            .l2_gas(0)
             .send()
             .await
             .unwrap();

madara/clippy.toml

@@ -0,0 +1,13 @@
+allow-print-in-tests = true
+allow-unwrap-in-tests = true
+
+# Suppress large error type warnings - these are common with AWS SDK errors
+# and would require significant refactoring to fix properly
+too-large-for-stack = 1000
+
+# Allow needless updates - sometimes used for clarity in struct initialization
+# Even when all fields are specified, ..Default::default() can make intent clearer
+
+# Set a higher threshold for result-large-err to accommodate AWS SDK errors
+# which are inherently large due to comprehensive error handling
+type-complexity-threshold = 250

madara/crates/client/block_production/src/executor/mod.rs

@@ -49,7 +49,7 @@ pub enum ExecutorMessage {
         exec_ctx: BlockExecutionContext,
     },
     BatchExecuted(BatchExecutionResult),
-    EndBlock(BlockExecutionSummary),
+    EndBlock(Box<BlockExecutionSummary>),
 }
 
 #[derive(Default, Debug)]

madara/crates/client/block_production/src/executor/thread.rs

@@ -433,7 +433,7 @@ impl ExecutorThread {
                 );
                 let block_exec_summary = execution_state.executor.finalize()?;
 
-                if self.replies_sender.blocking_send(super::ExecutorMessage::EndBlock(block_exec_summary)).is_err() {
+                if self.replies_sender.blocking_send(super::ExecutorMessage::EndBlock(Box::new(block_exec_summary))).is_err() {
                     // Receiver closed
                     break Ok(());
                 }

madara/crates/client/block_production/src/util.rs

@@ -170,8 +170,9 @@ pub(crate) fn create_execution_context(
     previous_l2_gas_price: u128,
     previous_l2_gas_used: u128,
 ) -> anyhow::Result<BlockExecutionContext> {
-
-    let (block_timestamp, gas_prices) = if let Some(custom_header) = backend.get_custom_header().filter(|h| h.block_n == block_n) {
+    let (block_timestamp, gas_prices) = if let Some(custom_header) =
+        backend.get_custom_header().filter(|h| h.block_n == block_n)
+    {
         // Convert Unix timestamp (seconds since Jan 1, 1970) to SystemTime
         let block_timestamp = UNIX_EPOCH + Duration::from_secs(custom_header.timestamp);
         let gas_prices = custom_header.gas_prices;

madara/crates/client/db/src/lib.rs

@@ -121,6 +121,7 @@ use crate::storage::StoredChainInfo;
 use crate::sync_status::SyncStatusCell;
 use mp_block::commitments::BlockCommitments;
 use mp_block::commitments::CommitmentComputationContext;
+use mp_block::header::CustomHeader;
 use mp_block::BlockHeaderWithSignatures;
 use mp_block::FullBlockWithoutCommitments;
 use mp_block::TransactionWithReceipt;
@@ -133,7 +134,6 @@ use mp_transactions::L1HandlerTransactionWithFee;
 use prelude::*;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
-use mp_block::header::CustomHeader;
 mod db_version;
 mod prelude;
 pub mod storage;
@@ -404,7 +404,6 @@ impl<D: MadaraStorage> MadaraBackend<D> {
     pub fn flush(&self) -> Result<()> {
         self.db.flush()
     }
-
 }
 
 impl MadaraBackend<RocksDBStorage> {
@@ -582,7 +581,9 @@ impl<D: MadaraStorage> MadaraBackendWriter<D> {
             .context("There is no current preconfirmed block")?
             .get_full_block_with_classes()?;
 
-        if let Some(state_diff) = state_diff {
+        if let Some(mut state_diff) = state_diff {
+            state_diff.old_declared_contracts =
+                std::mem::replace(&mut block.state_diff.old_declared_contracts, state_diff.old_declared_contracts);
             block.state_diff = state_diff;
         }
 
@@ -652,20 +653,13 @@ impl<D: MadaraStorage> MadaraBackendWriter<D> {
             block.header.clone().into_confirmed_header(parent_block_hash, commitments.clone(), global_state_root);
         let block_hash = header.compute_hash(self.inner.chain_config.chain_id.to_felt(), pre_v0_13_2_hash_override);
 
-        tracing::info!(
-            "🙇 Block hash {:?} computed for #{}",
-            block_hash,
-            block.header.block_number
-        );
+        tracing::info!("🙇 Block hash {:?} computed for #{}", block_hash, block.header.block_number);
 
-        match self.inner.get_custom_header_with_clear(true) {
-            Some(header) => {
-                let is_valid = header.is_block_hash_as_expected(&block_hash);
-                if !is_valid {
-                    tracing::warn!("Block hash not as expected for {}", block.header.block_number);
-                }
+        if let Some(header) = self.inner.get_custom_header_with_clear(true) {
+            let is_valid = header.is_block_hash_as_expected(&block_hash);
+            if !is_valid {
+                tracing::warn!("Block hash not as expected for {}", block.header.block_number);
             }
-            None => {}
         }
 
         // Save the block.

madara/crates/client/db/src/rocksdb/l1_to_l2_messages.rs

@@ -78,12 +78,7 @@ impl RocksDBStorageInner {
 
     pub(super) fn write_l1_handler_txn_hash_by_nonce(&self, core_contract_nonce: u64, txn_hash: &Felt) -> Result<()> {
         let on_l2_cf = self.get_column(L1_TO_L2_TXN_HASH_BY_NONCE);
-        self.db.put_cf_opt(
-            &on_l2_cf,
-            core_contract_nonce.to_be_bytes(),
-            txn_hash.to_bytes_be(),
-            &self.writeopts,
-        )?;
+        self.db.put_cf_opt(&on_l2_cf, core_contract_nonce.to_be_bytes(), txn_hash.to_bytes_be(), &self.writeopts)?;
         Ok(())
     }
 

madara/crates/client/db/src/rocksdb/meta.rs

@@ -64,11 +64,7 @@ impl RocksDBStorageInner {
                 &self.writeopts,
             )?;
         } else {
-            self.db.delete_cf_opt(
-                &self.get_column(META_COLUMN),
-                META_CONFIRMED_ON_L1_TIP_KEY,
-                &self.writeopts,
-            )?;
+            self.db.delete_cf_opt(&self.get_column(META_COLUMN), META_CONFIRMED_ON_L1_TIP_KEY, &self.writeopts)?;
         }
         Ok(())
     }
@@ -231,11 +227,7 @@ impl RocksDBStorageInner {
                 &self.writeopts,
             )?;
         } else {
-            self.db.delete_cf_opt(
-                &self.get_column(META_COLUMN),
-                META_LATEST_APPLIED_TRIE_UPDATE,
-                &self.writeopts,
-            )?;
+            self.db.delete_cf_opt(&self.get_column(META_COLUMN), META_LATEST_APPLIED_TRIE_UPDATE, &self.writeopts)?;
         }
         Ok(())
     }