move 7702 related code to single file

Author: Pana

Cargo.lock

@@ -12,8 +12,9 @@ use cfx_parameters::staking::DRIPS_PER_STORAGE_COLLATERAL_UNIT;
 
 use cfx_statedb::Result as DbResult;
 use cfx_types::{Address, AddressSpaceUtil, Space, U256, U512};
-use cfx_vm_types::extract_7702_payload;
-use primitives::{transaction::Action, SignedTransaction, Transaction};
+use primitives::{
+    extract_7702_payload, transaction::Action, SignedTransaction, Transaction,
+};
 
 macro_rules! early_return_on_err {
     ($e:expr) => {

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

@@ -28,9 +28,9 @@ use cfx_types::{
 };
 use primitives::{
     transaction::Action, AuthorizationListItem, SignedTransaction,
+    CODE_PREFIX_7702,
 };
 use std::{convert::TryInto, sync::Arc};
-use vm::CODE_PREFIX_7702;
 
 pub(super) struct PreCheckedExecutive<'a, O: ExecutiveObserver> {
     pub context: ExecutiveContext<'a>,

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

@@ -1,8 +1,9 @@
 use cfx_bytes::Bytes;
 use cfx_types::{Address, AddressWithSpace, H256, U256};
-use cfx_vm_types::CODE_PREFIX_7702;
 use keccak_hash::{keccak, KECCAK_EMPTY};
-use primitives::{storage::STORAGE_LAYOUT_REGULAR_V0, CodeInfo};
+use primitives::{
+    storage::STORAGE_LAYOUT_REGULAR_V0, CodeInfo, CODE_PREFIX_7702,
+};
 use std::sync::Arc;
 
 use super::OverlayAccount;

crates/execution/executor/src/state/overlay_account/basic.rs

@@ -6,8 +6,8 @@ use cfx_types::{
     address_util::AddressUtil, Address, AddressSpaceUtil, AddressWithSpace,
     Space, H256, U256,
 };
-use cfx_vm_types::extract_7702_payload;
 use keccak_hash::KECCAK_EMPTY;
+use primitives::extract_7702_payload;
 #[cfg(test)]
 use primitives::StorageLayout;
 use std::sync::Arc;

crates/execution/executor/src/state/state_object/basic_fields.rs

@@ -18,6 +18,7 @@ malloc_size_of = { workspace = true }
 memory-cache = { workspace = true }
 parking_lot = { workspace = true }
 rustc-hex = { workspace = true }
+primitives = { workspace = true }
 
 [dev-dependencies]
 cfx-vm-types = { workspace = true, features = ["testonly_code"] }

crates/execution/vm-interpreter/Cargo.toml

@@ -18,10 +18,11 @@
 // Conflux is free software and distributed under GNU General Public License.
 // See http://www.gnu.org/licenses/
 
-use cfx_types::{Address, Space, H256, U256};
+use cfx_types::{Space, H256, U256};
 use cfx_vm_types::{self as vm, Spec};
-use std::{cmp, sync::Arc};
-use vm::{BlockHashSource, CODE_PREFIX_7702};
+use primitives::extract_7702_payload;
+use std::cmp;
+use vm::BlockHashSource;
 
 use super::{
     instructions::{self, Instruction, InstructionInfo},
@@ -625,7 +626,9 @@ fn calc_call_gas<Gas: CostType>(
         return Ok(call_gas);
     }
 
-    let Some(delegated_address) = delegated_address(context.extcode(&address)?)
+    let maybe_code = context.extcode(&address)?;
+    let Some(delegated_address) =
+        maybe_code.map(|code| extract_7702_payload(&code)).flatten()
     else {
         return Ok(call_gas);
     };
@@ -638,21 +641,6 @@ fn calc_call_gas<Gas: CostType>(
         })
 }
 
-fn delegated_address(extcode: Option<Arc<Vec<u8>>>) -> Option<Address> {
-    let code = extcode?;
-    if !code.starts_with(CODE_PREFIX_7702) {
-        return None;
-    }
-
-    let (_prefix, payload) = code.split_at(CODE_PREFIX_7702.len());
-
-    if payload.len() == Address::len_bytes() {
-        Some(Address::from_slice(payload))
-    } else {
-        None
-    }
-}
-
 #[test]
 fn test_mem_gas_cost() {
     // given

crates/execution/vm-interpreter/src/interpreter/gasometer.rs

@@ -29,10 +29,7 @@ pub use self::{
     instruction_result::InstructionResult,
     interpreter_info::InterpreterInfo,
     return_data::{GasLeft, ReturnData},
-    spec::{
-        extract_7702_payload, CIP645Spec, ConsensusGasSpec, Spec,
-        CODE_PREFIX_7702,
-    },
+    spec::{CIP645Spec, ConsensusGasSpec, Spec},
 };
 
 /// Virtual Machine interface

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

@@ -22,8 +22,6 @@
 use cfx_types::{address_util::AddressUtil, Address};
 use primitives::{block::BlockHeight, BlockNumber};
 
-pub const CODE_PREFIX_7702: &'static [u8] = b"\xef\x01\x00";
-
 /// Definition of the cost spec and other parameterisations for the VM.
 #[derive(Debug, Clone)]
 pub struct Spec {
@@ -506,16 +504,3 @@ impl ConsensusGasSpec {
 impl Default for Spec {
     fn default() -> Self { Spec::new_spec_for_test() }
 }
-
-pub fn extract_7702_payload(code: &[u8]) -> Option<Address> {
-    if code.starts_with(CODE_PREFIX_7702) {
-        let (_prefix, payload) = code.split_at(CODE_PREFIX_7702.len());
-        if payload.len() == Address::len_bytes() {
-            Some(Address::from_slice(payload))
-        } else {
-            None
-        }
-    } else {
-        None
-    }
-}

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

@@ -42,10 +42,11 @@ pub use crate::{
     },
     storage_key::*,
     transaction::{
-        AccessList, AccessListItem, Action, AuthorizationList,
-        AuthorizationListItem, SignedTransaction, Transaction,
-        TransactionWithSignature, TransactionWithSignatureSerializePart,
-        TxPropagateId, AUTH_MAGIC,
+        extract_7702_payload, AccessList, AccessListItem, Action,
+        AuthorizationList, AuthorizationListItem, SignedTransaction,
+        Transaction, TransactionWithSignature,
+        TransactionWithSignatureSerializePart, TxPropagateId, AUTH_MAGIC,
+        CODE_PREFIX_7702,
     },
     transaction_index::TransactionIndex,
     zero::Zero,