fix: lost tx_type when doing type conversion (scroll-tech#710)

JasonBarbo · Aug 2, 2023 · 5fe2b3a · 5fe2b3a
1 parent f12d26c
commit 5fe2b3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/bus-mapping/src/circuit_input_builder/transaction.rs b/bus-mapping/src/circuit_input_builder/transaction.rs
@@ -253,6 +253,7 @@ impl From<&Transaction> for geth_types::Transaction {
             gas_tip_cap: tx.gas_tip_cap,
             rlp_unsigned_bytes: tx.rlp_unsigned_bytes.clone(),
             rlp_bytes: tx.rlp_bytes.clone(),
+            tx_type: tx.tx_type,
             ..Default::default()
         }
     }

diff --git a/eth-types/src/geth_types.rs b/eth-types/src/geth_types.rs
@@ -58,10 +58,16 @@ impl TxType {
             Some(x) if x == U64::from(1) => Self::Eip2930,
             Some(x) if x == U64::from(2) => Self::Eip2930,
             Some(x) if x == U64::from(0x7e) => Self::L1Msg,
-            _ => match tx.v.as_u64() {
-                0 | 1 | 27 | 28 => Self::PreEip155,
-                _ => Self::Eip155,
-            },
+            _ => {
+                if tx.v.is_zero() && tx.r.is_zero() && tx.s.is_zero() {
+                    Self::L1Msg
+                } else {
+                    match tx.v.as_u64() {
+                        0 | 1 | 27 | 28 => Self::PreEip155,
+                        _ => Self::Eip155,
+                    }
+                }
+            }
         }
     }