Embed TxEnvelope into rpc-types-eth::Transaction

crates/consensus/src/transaction/envelope.rs

@@ -370,6 +370,16 @@ impl Encodable2718 for TxEnvelope {
             }
         }
     }
+
+    fn trie_hash(&self) -> B256 {
+        match self {
+            Self::Legacy(tx) => *tx.hash(),
+            Self::Eip2930(tx) => *tx.hash(),
+            Self::Eip1559(tx) => *tx.hash(),
+            Self::Eip4844(tx) => *tx.hash(),
+            Self::Eip7702(tx) => *tx.hash(),
+        }
+    }
 }
 
 impl Transaction for TxEnvelope {
@@ -1000,6 +1010,7 @@ mod tests {
         let tx_envelope: TxEnvelope = tx.into_signed(signature).into();
 
         let serialized = serde_json::to_string(&tx_envelope).unwrap();
+
         let deserialized: TxEnvelope = serde_json::from_str(&serialized).unwrap();
 
         assert_eq!(tx_envelope, deserialized);
@@ -1124,4 +1135,19 @@ mod tests {
         };
         test_serde_roundtrip(tx);
     }
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn serde_tx_from_contract_call() {
+        let rpc_tx = r#"{"hash":"0x018b2331d461a4aeedf6a1f9cc37463377578244e6a35216057a8370714e798f","nonce":"0x1","blockHash":"0x3ca295f1dcaf8ac073c543dc0eccf18859f411206df181731e374e9917252931","blockNumber":"0x2","transactionIndex":"0x0","from":"0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266","to":"0x5fbdb2315678afecb367f032d93f642f64180aa3","value":"0x0","gasPrice":"0x3a29f0f8","gas":"0x1c9c380","maxFeePerGas":"0xba43b7400","maxPriorityFeePerGas":"0x5f5e100","input":"0xd09de08a","r":"0xd309309a59a49021281cb6bb41d164c96eab4e50f0c1bd24c03ca336e7bc2bb7","s":"0x28a7f089143d0a1355ebeb2a1b9f0e5ad9eca4303021c1400d61bc23c9ac5319","v":"0x0","yParity":"0x0","chainId":"0x7a69","accessList":[],"type":"0x2"}"#;
+
+        let te = serde_json::from_str::<TxEnvelope>(rpc_tx).unwrap();
+
+        assert_eq!(
+            *te.tx_hash(),
+            alloy_primitives::b256!(
+                "018b2331d461a4aeedf6a1f9cc37463377578244e6a35216057a8370714e798f"
+            )
+        );
+    }
 }

crates/contract/Cargo.toml

@@ -37,6 +37,7 @@ thiserror.workspace = true
 alloy-pubsub = { workspace = true, optional = true }
 
 [dev-dependencies]
+alloy-consensus.workspace = true
 alloy-rpc-client = { workspace = true, features = ["pubsub", "ws"] }
 alloy-transport-http.workspace = true
 alloy-node-bindings.workspace = true

crates/contract/src/call.rs

@@ -567,6 +567,7 @@ impl<T, P, D: CallDecoder, N: Network> std::fmt::Debug for CallBuilder<T, P, D,
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloy_consensus::Transaction;
     use alloy_primitives::{address, b256, bytes, hex, utils::parse_units, B256};
     use alloy_provider::{
         layers::AnvilProvider, Provider, ProviderBuilder, RootProvider, WalletProvider,
@@ -781,13 +782,13 @@ mod tests {
             .expect("failed to fetch tx")
             .expect("tx not included");
         assert_eq!(
-            transaction.max_fee_per_gas.expect("max_fee_per_gas of the transaction should be set"),
+            transaction.max_fee_per_gas(),
             max_fee_per_gas.to(),
             "max_fee_per_gas of the transaction should be set to the right value"
         );
         assert_eq!(
             transaction
-                .max_priority_fee_per_gas
+                .max_priority_fee_per_gas()
                 .expect("max_priority_fee_per_gas of the transaction should be set"),
             max_priority_fee_per_gas.to(),
             "max_priority_fee_per_gas of the transaction should be set to the right value"

crates/network/Cargo.toml

@@ -32,6 +32,8 @@ alloy-sol-types.workspace = true
 auto_impl.workspace = true
 async-trait.workspace = true
 futures-utils-wasm.workspace = true
+serde.workspace = true
+serde_json = "1.0.128"
 thiserror.workspace = true
 
 [dev-dependencies]

crates/network/src/any/builder.rs

@@ -138,7 +138,7 @@ impl TransactionBuilder<AnyNetwork> for WithOtherFields<TransactionRequest> {
             )
             .into_unbuilt(self));
         }
-        Ok(self.inner.build_typed_tx().expect("checked by missing_keys"))
+        Ok(self.inner.build_typed_tx().expect("checked by missing_keys").into())
     }
 
     async fn build<W: NetworkWallet<AnyNetwork>>(