optimism: use op-alloy TxDeposit (#10667)

Co-authored-by: Matthias Seitz <[email protected]>
paradigmxyz · Sep 5, 2024 · b0fddef · b0fddef
1 parent c267c1c
commit b0fddef
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 251 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -453,9 +453,10 @@ alloy-transport-ipc = { version = "0.3.1", default-features = false }
 alloy-transport-ws = { version = "0.3.1", default-features = false }
 
 # op
-op-alloy-rpc-types = "0.2.5"
-op-alloy-rpc-types-engine = "0.2"
-op-alloy-network = "0.2"
+op-alloy-rpc-types = "0.2.8"
+op-alloy-rpc-types-engine = "0.2.8"
+op-alloy-network = "0.2.8"
+op-alloy-consensus = "0.2.8"
 
 # misc
 aquamarine = "0.5"

diff --git a/crates/optimism/node/src/txpool.rs b/crates/optimism/node/src/txpool.rs
@@ -252,7 +252,7 @@ mod tests {
             to: TxKind::Create,
             mint: None,
             value: U256::ZERO,
-            gas_limit: 0u64,
+            gas_limit: 0,
             is_system_transaction: false,
             input: Default::default(),
         });

diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -33,6 +33,7 @@ alloy-eips = { workspace = true, features = ["serde"] }
 
 # optimism
 op-alloy-rpc-types = { workspace = true, optional = true }
+op-alloy-consensus = { workspace = true, features = ["arbitrary"], optional = true }
 
 # crypto
 secp256k1 = { workspace = true, features = [
@@ -105,7 +106,9 @@ optimism = [
     "reth-chainspec/optimism",
     "reth-ethereum-forks/optimism",
     "revm-primitives/optimism",
+    "reth-codecs?/optimism",
     "dep:reth-optimism-chainspec",
+    "dep:op-alloy-consensus",
 ]
 alloy-compat = ["reth-primitives-traits/alloy-compat", "dep:alloy-rpc-types", "dep:alloy-serde", "dep:op-alloy-rpc-types"]
 test-utils = ["reth-primitives-traits/test-utils"]

diff --git a/crates/primitives/src/alloy_compat.rs b/crates/primitives/src/alloy_compat.rs
@@ -204,10 +204,7 @@ impl TryFrom<WithOtherFields<alloy_rpc_types::Transaction>> for Transaction {
                     to: TxKind::from(tx.to),
                     mint: fields.mint.filter(|n| *n != 0),
                     value: tx.value,
-                    gas_limit: tx
-                        .gas
-                        .try_into()
-                        .map_err(|_| ConversionError::Eip2718Error(RlpError::Overflow.into()))?,
+                    gas_limit: tx.gas,
                     is_system_transaction: fields.is_system_tx.unwrap_or(false),
                     input: tx.input,
                 }))

diff --git a/crates/primitives/src/transaction/compat.rs b/crates/primitives/src/transaction/compat.rs
@@ -95,7 +95,7 @@ impl FillTxEnv for TransactionSigned {
             #[cfg(feature = "optimism")]
             Transaction::Deposit(tx) => {
                 tx_env.access_list.clear();
-                tx_env.gas_limit = tx.gas_limit;
+                tx_env.gas_limit = tx.gas_limit as u64;
                 tx_env.gas_price = U256::ZERO;
                 tx_env.gas_priority_fee = None;
                 tx_env.transact_to = tx.to;

diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs
@@ -171,7 +171,11 @@ impl<'a> arbitrary::Arbitrary<'a> for Transaction {
                 Self::Eip7702(tx)
             }
             #[cfg(feature = "optimism")]
-            TxType::Deposit => Self::Deposit(TxDeposit::arbitrary(u)?),
+            TxType::Deposit => {
+                let mut tx = TxDeposit::arbitrary(u)?;
+                tx.gas_limit = (tx.gas_limit as u64).into();
+                Self::Deposit(tx)
+            }
         })
     }
 }
@@ -250,7 +254,7 @@ impl Transaction {
             Self::Eip4844(_) => TxType::Eip4844,
             Self::Eip7702(_) => TxType::Eip7702,
             #[cfg(feature = "optimism")]
-            Self::Deposit(deposit_tx) => deposit_tx.tx_type(),
+            Self::Deposit(_) => TxType::Deposit,
         }
     }
 
@@ -315,7 +319,7 @@ impl Transaction {
             Self::Eip7702(TxEip7702 { gas_limit, .. }) |
             Self::Eip2930(TxEip2930 { gas_limit, .. }) => *gas_limit as u64,
             #[cfg(feature = "optimism")]
-            Self::Deposit(TxDeposit { gas_limit, .. }) => *gas_limit,
+            Self::Deposit(TxDeposit { gas_limit, .. }) => *gas_limit as u64,
         }
     }
 
@@ -556,7 +560,7 @@ impl Transaction {
                 with_header,
             ),
             #[cfg(feature = "optimism")]
-            Self::Deposit(deposit_tx) => deposit_tx.encode(out, with_header),
+            Self::Deposit(deposit_tx) => deposit_tx.encode_inner(out, with_header),
         }
     }
 
@@ -569,7 +573,7 @@ impl Transaction {
             Self::Eip4844(tx) => tx.gas_limit = gas_limit.into(),
             Self::Eip7702(tx) => tx.gas_limit = gas_limit.into(),
             #[cfg(feature = "optimism")]
-            Self::Deposit(tx) => tx.gas_limit = gas_limit,
+            Self::Deposit(tx) => tx.gas_limit = gas_limit.into(),
         }
     }
 
@@ -839,7 +843,7 @@ impl Encodable for Transaction {
             }
             #[cfg(feature = "optimism")]
             Self::Deposit(deposit_tx) => {
-                deposit_tx.encode(out, true);
+                deposit_tx.encode_inner(out, true);
             }
         }
     }
@@ -852,7 +856,7 @@ impl Encodable for Transaction {
             Self::Eip4844(blob_tx) => blob_tx.payload_len_for_signature(),
             Self::Eip7702(set_code_tx) => set_code_tx.payload_len_for_signature(),
             #[cfg(feature = "optimism")]
-            Self::Deposit(deposit_tx) => deposit_tx.payload_len(),
+            Self::Deposit(deposit_tx) => deposit_tx.encoded_len(true),
         }
     }
 }
@@ -1243,7 +1247,7 @@ impl TransactionSigned {
                 true,
             ),
             #[cfg(feature = "optimism")]
-            Transaction::Deposit(deposit_tx) => deposit_tx.payload_len(),
+            Transaction::Deposit(deposit_tx) => deposit_tx.encoded_len(true),
         }
     }
 
@@ -1370,7 +1374,7 @@ impl TransactionSigned {
             TxType::Eip4844 => Transaction::Eip4844(TxEip4844::decode_fields(data)?),
             TxType::Eip7702 => Transaction::Eip7702(TxEip7702::decode_fields(data)?),
             #[cfg(feature = "optimism")]
-            TxType::Deposit => Transaction::Deposit(TxDeposit::decode_inner(data)?),
+            TxType::Deposit => Transaction::Deposit(TxDeposit::decode_fields(data)?),
             TxType::Legacy => return Err(RlpError::Custom("unexpected legacy tx type")),
         };
 
@@ -1455,7 +1459,7 @@ impl TransactionSigned {
                 false,
             ),
             #[cfg(feature = "optimism")]
-            Transaction::Deposit(deposit_tx) => deposit_tx.payload_len_without_header(),
+            Transaction::Deposit(deposit_tx) => deposit_tx.encoded_len(false),
         }
     }
 }