non exclusive op & taiko flags

CeciliaZ030 · CeciliaZ030 · commit 983db4be8675 · 2024-01-19T03:21:10.000+08:00
diff --git a/crates/interpreter/src/lib.rs b/crates/interpreter/src/lib.rs
@@ -6,8 +6,6 @@
 #![deny(unused_must_use, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-#[cfg(all(feature = "optimism", feature = "taiko"))]
-compile_error!("Features 'optimism' and 'taiko' cannot be enabled at the same time.");
 
 extern crate alloc;
 
diff --git a/crates/precompile/src/lib.rs b/crates/precompile/src/lib.rs
@@ -6,8 +6,6 @@
 #![deny(unused_must_use, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-#[cfg(all(feature = "optimism", feature = "taiko"))]
-compile_error!("Features 'optimism' and 'taiko' cannot be enabled at the same time.");
 
 #[macro_use]
 extern crate alloc;
diff --git a/crates/primitives/src/env.rs b/crates/primitives/src/env.rs
@@ -256,7 +256,6 @@ impl Env {
     }
 }
 
-
 /// EVM configuration.
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -320,7 +319,8 @@ pub struct CfgEnv {
     #[cfg(all(feature = "optimism", not(feature = "taiko")))]
     pub optimism: bool,
 
-    #[cfg(all(feature = "taiko", not(feature = "optimism")))]    pub taiko: bool,
+    #[cfg(all(feature = "taiko", not(feature = "optimism")))]
+    pub taiko: bool,
 }
 
 impl CfgEnv {
@@ -389,7 +389,8 @@ impl CfgEnv {
         self.optimism
     }
 
-    #[cfg(all(feature = "taiko", not(feature = "optimism")))]    pub fn is_taiko(&self) -> bool {
+    #[cfg(all(feature = "taiko", not(feature = "optimism")))]
+    pub fn is_taiko(&self) -> bool {
         self.taiko
     }
 }
@@ -465,17 +466,6 @@ pub struct BlockEnv {
     pub blob_excess_gas_and_price: Option<BlobExcessGasAndPrice>,
 }
 
-impl BlobExcessGasAndPrice {
-    /// Takes excess blob gas and calculated blob fee with [`calc_blob_fee`]
-    pub fn new(excess_blob_gas: u64) -> Self {
-        let blob_gasprice = calc_blob_gasprice(excess_blob_gas);
-        Self {
-            excess_blob_gas,
-            blob_gasprice,
-        }
-    }
-}
-
 #[cfg(all(feature = "taiko", not(feature = "optimism")))]
 #[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -484,7 +474,6 @@ pub struct TaikoFields {
     pub is_anchor: bool,
 }
 
-
 impl BlockEnv {
     /// Takes `blob_excess_gas` saves it inside env
     /// and calculates `blob_fee` with [`BlobExcessGasAndPrice`].
@@ -597,7 +586,8 @@ pub struct TxEnv {
     pub optimism: OptimismFields,
 
     #[cfg_attr(feature = "serde", serde(flatten))]
-    #[cfg(all(feature = "taiko", not(feature = "optimism")))]    pub taiko: TaikoFields,
+    #[cfg(all(feature = "taiko", not(feature = "optimism")))]
+    pub taiko: TaikoFields,
 }
 
 impl TxEnv {
@@ -813,7 +803,8 @@ mod tests {
             .is_ok());
     }
 
-    #[cfg(all(feature = "taiko", not(feature = "optimism")))]    #[test]
+    #[cfg(all(feature = "taiko", not(feature = "optimism")))]
+    #[test]
     fn test_taiko() {
         // TODO(Cecilia): taiko tests
     }
diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs
@@ -6,8 +6,6 @@
 #![deny(unused_must_use, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-#[cfg(all(feature = "optimism", feature = "taiko"))]
-compile_error!("Features 'optimism' and 'taiko' cannot be enabled at the same time.");
 
 extern crate alloc;
 
diff --git a/crates/primitives/src/result.rs b/crates/primitives/src/result.rs
@@ -255,7 +255,8 @@ pub enum InvalidTransaction {
     HaltedDepositPostRegolith,
 
     /// Anchor check failed
-    #[cfg(all(feature = "taiko", not(feature = "optimism")))]    InvalidAnchorTransaction,
+    #[cfg(all(feature = "taiko", not(feature = "optimism")))]
+    InvalidAnchorTransaction,
 }
 
 #[cfg(feature = "std")]
@@ -330,10 +331,7 @@ impl fmt::Display for InvalidTransaction {
             }
             #[cfg(all(feature = "taiko", not(feature = "optimism")))]
             InvalidTransaction::InvalidAnchorTransaction => {
-                write!(
-                    f,
-                    "Invalid Anchor transaction."
-                )
+                write!(f, "Invalid Anchor transaction.")
             }
         }
     }
diff --git a/crates/primitives/src/specification.rs b/crates/primitives/src/specification.rs
@@ -4,7 +4,10 @@ pub use SpecId::*;
 /// Specification IDs and their activation block.
 ///
 /// Information was obtained from the [Ethereum Execution Specifications](https://github.com/ethereum/execution-specs)
-#[cfg(all(not(feature = "optimism"), not(feature = "taiko")))]
+#[cfg(any(
+    all(feature = "optimism", feature = "taiko"),
+    all(not(feature = "optimism"), not(feature = "taiko"))
+))]
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd, enumn::N)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -65,7 +68,8 @@ pub enum SpecId {
 /// Specification IDs and their activation block.
 ///
 /// Information was obtained from the [Ethereum Execution Specifications](https://github.com/ethereum/execution-specs)
-#[cfg(all(feature = "taiko", not(feature = "optimism")))]#[repr(u8)]
+#[cfg(all(feature = "taiko", not(feature = "optimism")))]
+#[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Ord, PartialOrd, enumn::N)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum SpecId {
@@ -130,7 +134,7 @@ impl From<&str> for SpecId {
             "Regolith" => SpecId::REGOLITH,
             #[cfg(all(feature = "optimism", not(feature = "taiko")))]
             "Canyon" => SpecId::CANYON,
-            #[cfg(all(feature = "taiko", not(feature = "optimism")))]            
+            #[cfg(all(feature = "taiko", not(feature = "optimism")))]
             "Katla" => SpecId::KATLA,
             _ => Self::LATEST,
         }
@@ -380,10 +384,11 @@ mod optimism_tests {
     }
 }
 
-#[cfg(all(feature = "taiko", not(feature = "optimism")))]#[cfg(test)]
+#[cfg(all(feature = "taiko", not(feature = "optimism")))]
+#[cfg(test)]
 mod tests {
     use super::*;
-    
+
     // TODO(Cecilia):  update this range of bits
     #[test]
     fn test_katla_post_merge_hardforks() {
@@ -393,4 +398,4 @@ mod tests {
         assert!(!SpecId::enabled(SpecId::LATEST));
         assert!(SpecId::enabled(SpecId::KATLA));
     }
-}
+}
diff --git a/crates/revm/src/lib.rs b/crates/revm/src/lib.rs
@@ -5,8 +5,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![deny(unused_must_use, rust_2018_idioms)]
 #![cfg_attr(not(feature = "std"), no_std)]
-#[cfg(all(feature = "optimism", feature = "taiko"))]
-compile_error!("Features 'optimism' and 'taiko' cannot be enabled at the same time.");
 
 #[macro_use]
 extern crate alloc;
diff --git a/crates/revm/src/taiko.rs b/crates/revm/src/taiko.rs
@@ -1,7 +1,3 @@
 //! Optimism-specific constants, types, and helpers.
 
 mod handler_register;
-
-pub use handler_register::{
-    // deduct_caller, end, handle_call_return, optimism_handle_register, output, reward_beneficiary,
-};
diff --git a/crates/revm/src/taiko/handler_register.rs b/crates/revm/src/taiko/handler_register.rs
@@ -11,4 +11,4 @@ use crate::{
         HashMap, InvalidTransaction, Output, ResultAndState, Spec, SpecId, U256,
     },
     Context,
-};
+};

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,6 @@ impl Env {`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`
`259`		`-`
`260`	`259`	`/// EVM configuration.`
`261`	`260`	`#[derive(Clone, Debug, Eq, PartialEq, Hash)]`
`262`	`261`	`#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]`
`@@ -320,7 +319,8 @@ pub struct CfgEnv {`
`320`	`319`	`#[cfg(all(feature = "optimism", not(feature = "taiko")))]`
`321`	`320`	`pub optimism: bool,`
`322`	`321`
`323`		`- #[cfg(all(feature = "taiko", not(feature = "optimism")))] pub taiko: bool,`
	`322`	`+ #[cfg(all(feature = "taiko", not(feature = "optimism")))]`
	`323`	`+ pub taiko: bool,`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`impl CfgEnv {`
`@@ -389,7 +389,8 @@ impl CfgEnv {`
`389`	`389`	`self.optimism`
`390`	`390`	`}`
`391`	`391`
`392`		`- #[cfg(all(feature = "taiko", not(feature = "optimism")))] pub fn is_taiko(&self) -> bool {`
	`392`	`+ #[cfg(all(feature = "taiko", not(feature = "optimism")))]`
	`393`	`+ pub fn is_taiko(&self) -> bool {`
`393`	`394`	`self.taiko`
`394`	`395`	`}`
`395`	`396`	`}`
`@@ -465,17 +466,6 @@ pub struct BlockEnv {`
`465`	`466`	`pub blob_excess_gas_and_price: Option<BlobExcessGasAndPrice>,`
`466`	`467`	`}`
`467`	`468`
`468`		`-impl BlobExcessGasAndPrice {`
`469`		- /// Takes excess blob gas and calculated blob fee with [`calc_blob_fee`]
`470`		`- pub fn new(excess_blob_gas: u64) -> Self {`
`471`		`- let blob_gasprice = calc_blob_gasprice(excess_blob_gas);`
`472`		`- Self {`
`473`		`- excess_blob_gas,`
`474`		`- blob_gasprice,`
`475`		`- }`
`476`		`- }`
`477`		`-}`
`478`		`-`
`479`	`469`	`#[cfg(all(feature = "taiko", not(feature = "optimism")))]`
`480`	`470`	`#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]`
`481`	`471`	`#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]`
`@@ -484,7 +474,6 @@ pub struct TaikoFields {`
`484`	`474`	`pub is_anchor: bool,`
`485`	`475`	`}`
`486`	`476`
`487`		`-`
`488`	`477`	`impl BlockEnv {`
`489`	`478`	/// Takes `blob_excess_gas` saves it inside env
`490`	`479`	/// and calculates `blob_fee` with [`BlobExcessGasAndPrice`].
`@@ -597,7 +586,8 @@ pub struct TxEnv {`
`597`	`586`	`pub optimism: OptimismFields,`
`598`	`587`
`599`	`588`	`#[cfg_attr(feature = "serde", serde(flatten))]`
`600`		`- #[cfg(all(feature = "taiko", not(feature = "optimism")))] pub taiko: TaikoFields,`
	`589`	`+ #[cfg(all(feature = "taiko", not(feature = "optimism")))]`
	`590`	`+ pub taiko: TaikoFields,`
`601`	`591`	`}`
`602`	`592`
`603`	`593`	`impl TxEnv {`
`@@ -813,7 +803,8 @@ mod tests {`
`813`	`803`	`.is_ok());`
`814`	`804`	`}`
`815`	`805`
`816`		`- #[cfg(all(feature = "taiko", not(feature = "optimism")))] #[test]`
	`806`	`+ #[cfg(all(feature = "taiko", not(feature = "optimism")))]`
	`807`	`+ #[test]`
`817`	`808`	`fn test_taiko() {`
`818`	`809`	`// TODO(Cecilia): taiko tests`
`819`	`810`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,8 @@ pub enum InvalidTransaction {`
`255`	`255`	`HaltedDepositPostRegolith,`
`256`	`256`
`257`	`257`	`/// Anchor check failed`
`258`		`- #[cfg(all(feature = "taiko", not(feature = "optimism")))] InvalidAnchorTransaction,`
	`258`	`+ #[cfg(all(feature = "taiko", not(feature = "optimism")))]`
	`259`	`+ InvalidAnchorTransaction,`
`259`	`260`	`}`
`260`	`261`
`261`	`262`	`#[cfg(feature = "std")]`
`@@ -330,10 +331,7 @@ impl fmt::Display for InvalidTransaction {`
`330`	`331`	`}`
`331`	`332`	`#[cfg(all(feature = "taiko", not(feature = "optimism")))]`
`332`	`333`	`InvalidTransaction::InvalidAnchorTransaction => {`
`333`		`- write!(`
`334`		`- f,`
`335`		`- "Invalid Anchor transaction."`
`336`		`- )`
	`334`	`+ write!(f, "Invalid Anchor transaction.")`
`337`	`335`	`}`
`338`	`336`	`}`
`339`	`337`	`}`