handler register

CeciliaZ030 · Jan 18, 2024 · c306f98 · c306f98
1 parent 72a085e
commit c306f98
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 1,245 deletions.
diff --git a/crates/interpreter/src/lib.rs b/crates/interpreter/src/lib.rs
@@ -6,6 +6,8 @@
 #![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,6 +6,8 @@
 #![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/lib.rs b/crates/primitives/src/lib.rs
@@ -6,6 +6,8 @@
 #![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/specification.rs b/crates/primitives/src/specification.rs
@@ -130,7 +130,8 @@ 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")))]            "Katla" => SpecId::KATLA,
+            #[cfg(all(feature = "taiko", not(feature = "optimism")))]            
+            "Katla" => SpecId::KATLA,
             _ => Self::LATEST,
         }
     }
@@ -186,7 +187,8 @@ spec!(BEDROCK, BedrockSpec);
 spec!(REGOLITH, RegolithSpec);
 
 // Taiko Hardforks
-#[cfg(all(feature = "taiko", not(feature = "optimism")))]spec!(KATLA, KatlaSpec);
+#[cfg(all(feature = "taiko", not(feature = "optimism")))]
+spec!(KATLA, KatlaSpec);
 
 #[cfg(all(feature = "optimism", not(feature = "taiko")))]
 spec!(CANYON, CanyonSpec);
@@ -265,6 +267,11 @@ macro_rules! spec_to_generic {
                 use $crate::CanyonSpec as SPEC;
                 $e
             }
+            #[cfg(all(feature = "taiko", not(feature = "optimism")))]
+            $crate::SpecId::KATLA => {
+                use $crate::KatlaSpec as SPEC;
+                $e
+            }
         }
     }};
 }