fix: properly set tx type on TransactionRequest filler

Author: Evalir

src/evm.rs

@@ -2357,6 +2357,7 @@ mod tests {
     use alloy::signers::SignerSync;
     use alloy::{consensus::constants::ETH_TO_WEI, rpc::types::TransactionRequest};
 
+    use revm::context::transaction::AuthorizationTr;
     use revm::database::InMemoryDB;
     use revm::inspector::NoOpInspector;
     use revm::primitives::bytes;
@@ -2417,6 +2418,7 @@ mod tests {
         };
         let signature = BOB.sign_hash_sync(&authorization.signature_hash()).unwrap();
         let signed_authorization = authorization.into_signed(signature);
+        assert!(signed_authorization.authority().unwrap() == BOB.address());
 
         let tx = TransactionRequest::default()
             .from(ALICE.address())

src/fill/alloy.rs

@@ -359,9 +359,22 @@ impl Tx for alloy::rpc::types::TransactionRequest {
 
         *caller = self.from.unwrap_or_default();
 
-        // NB: this is set to max if not provided, as users will typically
-        // intend that to mean "as much as possible"
-        *tx_type = self.transaction_type.unwrap_or(TxType::Eip1559 as u8);
+        // Determine the minimal tx type usable.
+        *tx_type = {
+            if self.transaction_type.is_some() {
+                self.transaction_type.unwrap()
+            } else if self.authorization_list.is_some() {
+                TxType::Eip7702 as u8
+            } else if self.has_eip4844_fields() {
+                TxType::Eip4844 as u8
+            } else if self.has_eip1559_fields() {
+                TxType::Eip1559 as u8
+            } else if self.access_list.is_some() {
+                TxType::Eip2930 as u8
+            } else {
+                TxType::Legacy as u8
+            }
+        };
         *gas_limit = self.gas.unwrap_or(u64::MAX);
         *gas_price =
             self.gas_price.unwrap_or_default().max(self.max_fee_per_gas.unwrap_or_default());