fix: backport fmt and anvil fixes to v1.4.1 (#12092)

* fix(fmt): ensure commasep breaks with final trailing cmnt (#12031)

* fix(fmt): refine logic over comments between uninformed commasep (#12055)

* fix(anvil): set envelope for non deposit tx in debug tracers (#12080)

* chore: bump v1.4.1 (#12083)

chore: bumpt v1.4.1

* fix(fmt): don't normalize single-line non-doc block cmnts (#12078)

* fix: don't normalize single-line non-doc block cmnts

* fix: preserve consecutive whitespaces

* fix: use byte length instead of char count

---------

Co-authored-by: 0xrusowsky <[email protected]>

Author: grandizzy

Cargo.lock

@@ -29,7 +29,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "1.4.0"
+version = "1.4.1"
 edition = "2024"
 # Remember to update clippy.toml as well
 rust-version = "1.89"

Cargo.toml

@@ -42,6 +42,7 @@ use alloy_consensus::{
 };
 use alloy_eip5792::{Capabilities, DelegationCapability};
 use alloy_eips::{
+    Encodable2718,
     eip1559::BaseFeeParams,
     eip4844::{BlobTransactionSidecar, kzg_to_versioned_hash},
     eip7840::BlobParams,
@@ -2753,7 +2754,10 @@ impl Backend {
 
             let target_tx = block.transactions[index].clone();
             let target_tx = PendingTransaction::from_maybe_impersonated(target_tx)?;
-            let tx_env = target_tx.to_revm_tx_env();
+            let mut tx_env = target_tx.to_revm_tx_env();
+            if env.networks.optimism {
+                tx_env.enveloped_tx = Some(target_tx.transaction.transaction.encoded_2718().into());
+            }
 
             let mut evm = self.new_evm_with_inspector_ref(&cache_db, &env, &mut inspector);
 

crates/anvil/src/eth/backend/mem/mod.rs

@@ -235,9 +235,9 @@ impl<'ast> CommentGatherer<'ast> {
                 let line_begin_pos = (line_begin_in_file - self.start_bpos).to_usize();
                 let mut col = CharPos(self.text[line_begin_pos..self.pos].chars().count());
 
-                // To preserve alignment in non-doc comments, normalize the block based on its
-                // least-indented line.
-                if !is_doc {
+                // To preserve alignment in multi-line non-doc comments, normalize the block based
+                // on its least-indented line.
+                if !is_doc && token_text.contains('\n') {
                     col = token_text.lines().skip(1).fold(col, |min, line| {
                         if line.is_empty() {
                             return min;