Merge pull request #3299 from ChenxingLi/fix_cip145

Fix incorrect implementation of cip145

Author: ChenxingLi

crates/config/src/configuration.rs

@@ -195,6 +195,7 @@ build_config! {
         (eoa_code_transition_height, (Option<u64>), None)
         (cip151_transition_height, (Option<u64>), None)
         (cip645_transition_height, (Option<u64>), None)
+        (cip145_fix_transition_height, (Option<u64>), None)
         // For test only
         (align_evm_transition_height, (u64), u64::MAX)
 
@@ -1507,14 +1508,17 @@ impl Configuration {
         //
         set_conf!(
             self.raw_conf.eoa_code_transition_height.unwrap_or(default_transition_time);
-            params.transition_heights => { cip150, cip151, cip152, cip154, cip7702, cip645, eip2537, eip2935, eip7623 }
+            params.transition_heights => { cip150, cip151, cip152, cip154, cip7702, cip645, eip2537, eip2935, eip7623, cip145_fix }
         );
         if let Some(x) = self.raw_conf.cip151_transition_height {
             params.transition_heights.cip151 = x;
         }
         if let Some(x) = self.raw_conf.cip645_transition_height {
             params.transition_heights.cip645 = x;
         }
+        if let Some(x) = self.raw_conf.cip145_fix_transition_height {
+            params.transition_heights.cip145_fix = x;
+        }
         params.transition_heights.align_evm =
             self.raw_conf.align_evm_transition_height;
     }

crates/execution/executor/src/executive/executed.rs

@@ -88,6 +88,9 @@ impl Executed {
             gas_sponsor_paid = false;
             storage_sponsor_paid = false;
         }
+        if spec.cip145_fix {
+            gas_sponsor_paid = false;
+        }
 
         let burnt_fee = spec.cip1559.then(|| {
             let target_burnt = tx.gas().saturating_mul(cost.burnt_gas_price);
@@ -122,7 +125,7 @@ impl Executed {
             gas_sponsor_paid = false;
             storage_sponsor_paid = false;
         }
-        if spec.cip145 {
+        if spec.cip145 && !spec.cip145_fix {
             gas_sponsor_paid = false;
         }
 

crates/execution/executor/src/spec.rs

@@ -157,6 +157,7 @@ pub struct TransitionsEpochHeight {
     /// EIP-7623: Increase calldata cost
     pub eip7623: BlockHeight,
     pub cip_c2_fix: BlockHeight,
+    pub cip145_fix: BlockHeight,
 }
 
 impl Default for CommonParams {
@@ -214,6 +215,7 @@ impl CommonParams {
         spec.cip137 = number >= self.transition_numbers.cip137;
         spec.cip144 = number >= self.transition_numbers.cip144;
         spec.cip145 = number >= self.transition_numbers.cip145;
+        spec.cip145_fix = height >= self.transition_heights.cip145_fix;
         spec.cip1559 = height >= self.transition_heights.cip1559;
         spec.cip150 = height >= self.transition_heights.cip150;
         spec.cip151 = height >= self.transition_heights.cip151;

crates/execution/vm-types/src/spec.rs

@@ -185,6 +185,7 @@ pub struct Spec {
     pub cip144: bool,
     /// CIP-145: Fix Receipts upon `NotEnoughBalance` Error
     pub cip145: bool,
+    pub cip145_fix: bool,
     /// CIP-150: Reject New Contract Code Starting with the 0xEF byte
     pub cip150: bool,
     /// CIP-151: SELFDESTRUCT only in Same Transaction
@@ -400,6 +401,7 @@ impl Spec {
             cip133_core: false,
             cip137: false,
             cip145: false,
+            cip145_fix: false,
             cip1559: false,
             cancun_opcodes: false,
             cip144: false,