handle optional parameter ext

taikoxyz · Dec 27, 2024 · 5fa3fcb · 5fa3fcb
1 parent b9a32e7
commit 5fa3fcb
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/crates/taiko/evm/src/lib.rs b/crates/taiko/evm/src/lib.rs
@@ -68,17 +68,18 @@ impl ConfigureEvmEnv for TaikoEvmConfig {
     ) {
         transaction.fill_tx_env(tx_env, sender);
 
-        let EnvExt { is_anchor, block_number, extra_data } = ext.unwrap();
-        // Set taiko specific data
-        tx_env.taiko.is_anchor = is_anchor;
+        if let Some(ext) = ext {
+            let EnvExt { is_anchor, block_number, extra_data } = ext;
+            // Set taiko specific data
+            tx_env.taiko.is_anchor = is_anchor;
+            if self.chain_spec.is_ontake_active_at_block(block_number) {
+                // set the basefee ratio
+                tx_env.taiko.basefee_ratio = decode_ontake_extra_data(extra_data);
+            }
+        }
         // set the treasury address
         let treasury = self.chain_spec.treasury();
         tx_env.taiko.treasury = treasury;
-
-        if self.chain_spec.is_ontake_active_at_block(block_number) {
-            // set the basefee ratio
-            tx_env.taiko.basefee_ratio = decode_ontake_extra_data(extra_data);
-        }
     }
 
     fn fill_tx_env_system_contract_call(