Merge pull request #3226 from Pana/feat/alignEvmComplete

close cip130 in gas estimation when align_evm feature is enabled

Author: Pana

Cargo.lock

@@ -40,6 +40,7 @@ parity-version = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
 bls-signatures = { workspace = true }
 cfx-executor = { workspace = true }
+cfx-execute-helper = { workspace = true }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies.jemallocator]
 version = "0.3.2"
@@ -54,7 +55,7 @@ u64-mpt-db-key = ["client/u64_mpt_db_key"]
 # it will be enabled across all paths depending on that package. 
 # (https://doc.rust-lang.org/cargo/reference/features.html#feature-unification)
 blst-portable = ["bls-signatures/blst-portable"]
-align_evm = ["cfx-executor/align_evm"]
+align_evm = ["cfx-executor/align_evm", "cfx-execute-helper/align_evm"]
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["full"] }

bins/conflux/Cargo.toml

@@ -21,3 +21,6 @@ typemap = { workspace = true }
 alloy-rpc-types-trace = { workspace = true }
 geth-tracer = { workspace = true }
 cfx-parity-trace-types = { workspace = true }
+
+[features]
+align_evm = ["cfx-vm-types/align_evm", "cfx-executor/align_evm"]

crates/execution/execute-helper/Cargo.toml

@@ -133,6 +133,7 @@ impl<'a> EstimationContext<'a> {
     pub fn transact_virtual(
         &mut self, mut tx: SignedTransaction, request: EstimateRequest,
     ) -> DbResult<(ExecutionOutcome, EstimateExt)> {
+        #[cfg(not(feature = "align_evm"))]
         if let Some(outcome) = self.check_cip130(&tx, &request) {
             return Ok(outcome);
         }
@@ -400,7 +401,11 @@ impl<'a> EstimationContext<'a> {
 }
 
 fn estimated_gas_limit(executed: &Executed, tx: &SignedTransaction) -> U256 {
+    #[cfg(not(feature = "align_evm"))]
     let cip130_min_gas_limit = U256::from(tx.data().len() * 100);
+    #[cfg(feature = "align_evm")]
+    let cip130_min_gas_limit = U256::zero();
+
     let eip7623_gas_limit = 21000
         + tx.data()
             .iter()