update activate logic

Author: Pana

crates/config/src/configuration.rs

@@ -1552,7 +1552,7 @@ impl Configuration {
             self.raw_conf.align_evm_transition_height;
 
         // hardfork (V3.1)
-        params.transition_numbers.eip7939 = self
+        params.transition_heights.eip7939 = self
             .raw_conf
             .eip7939_transition_number
             .unwrap_or(default_transition_time);

crates/execution/executor/src/spec.rs

@@ -115,8 +115,6 @@ pub struct TransitionsBlockNumber {
     pub cip144: BlockNumber,
     /// CIP-145: Fix Receipts upon `NotEnoughBalance` Error
     pub cip145: BlockNumber,
-    /// EIP-7939: Count Leading Zeros Instruction
-    pub eip7939: BlockHeight,
 }
 
 #[derive(Default, Debug, Clone)]
@@ -160,6 +158,8 @@ pub struct TransitionsEpochHeight {
     pub eip7623: BlockHeight,
     pub cip_c2_fix: BlockHeight,
     pub cip145_fix: BlockHeight,
+    /// EIP-7939: Count Leading Zeros Instruction
+    pub eip7939: BlockHeight,
 }
 
 impl Default for CommonParams {
@@ -231,7 +231,7 @@ impl CommonParams {
         spec.cip_c2_fix = height >= self.transition_heights.cip_c2_fix;
         spec.cancun_opcodes = number >= self.transition_numbers.cancun_opcodes;
         spec.align_evm = height >= self.transition_heights.align_evm && cip645;
-        spec.eip7939 = number >= self.transition_numbers.eip7939;
+        spec.eip7939 = height >= self.transition_heights.eip7939;
 
         spec.overwrite_gas_plan_by_cip();