Merge branch 'master' into ethereum-types

Author: iosh

Cargo.lock

@@ -109,6 +109,7 @@ members = [
     "crates/tasks",
     "crates/eest_types",
     "crates/config",
+    "crates/cfxcore/types",
 ]
 
 resolver = "2"
@@ -181,6 +182,7 @@ secret-store = { path = "./crates/secret_store" }
 cfxstore = { path = "./crates/cfx_store" }
 network = { path = "./crates/network" }
 cfxcore = { path = "./crates/cfxcore/core" }
+cfxcore-types = { path = "./crates/cfxcore/types" }
 cfx-parameters = { path = "./crates/parameters" }
 cfx-execute-helper = { path = "./crates/execution/execute-helper" }
 cfx-executor = { path = "./crates/execution/executor" }
@@ -244,7 +246,7 @@ pow-types = { path = "./crates/pos/types/pow-types" }
 diem-types = { path = "./crates/pos/types/types" }
 diem-network-address-encryption = { path = "./crates/pos/config/management/network-address-encryption" }
 cfx-tasks = { path = "./crates/tasks" }
-eest_types = { path = "./crates/eest_types" }
+# eest_types = { path = "./crates/eest_types" }
 cfx-config = { path = "./crates/config" }
 
 # basics
@@ -335,7 +337,6 @@ blst = "0.3"
 hashbrown = "0.7.1"
 
 clap = "4"
-clap-verbosity-flag = "3"
 
 # rand & rng
 rand = "0.9"
@@ -453,4 +454,4 @@ influx_db_client = "0.5.1"
 rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "7dbd66f507db1d0cfdf5334ad56ca0b24a768740" }
 
 [patch.crates-io]
-sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }
+sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }

Cargo.toml

@@ -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

@@ -1,7 +1,10 @@
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
 use serde::ser::SerializeMap;
 use serde_derive::{Deserialize, Serialize};
-use std::ops::{Add, Index, IndexMut};
+use std::{
+    ops::{Add, Index, IndexMut},
+    str::FromStr,
+};
 
 #[derive(
     Eq,
@@ -38,6 +41,18 @@ impl From<Space> for &'static str {
     }
 }
 
+impl FromStr for Space {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "native" => Ok(Space::Native),
+            "evm" => Ok(Space::Ethereum),
+            _ => Err(format!("Unrecognized space: {}", s)),
+        }
+    }
+}
+
 impl Encodable for Space {
     fn rlp_append(&self, s: &mut RlpStream) {
         let type_int: u8 = match self {

crates/cfx_types/src/space.rs

@@ -116,6 +116,7 @@ cfx-rpc-eth-types = { workspace = true }
 jsonrpsee = { workspace = true, features = ["jsonrpsee-types"] }
 cfx-rpc-utils = { workspace = true }
 cfx-util-macros = { workspace = true }
+cfxcore-types = { workspace = true }
 
 [dev-dependencies]
 cfx-storage = { workspace = true, features = ["testonly_code"] }

crates/cfxcore/core/Cargo.toml

@@ -14,6 +14,7 @@ use cfx_storage::{
     StorageManagerTrait,
 };
 use cfx_types::{Bloom, Space, H256};
+pub use cfxcore_types::block_data_manager::block_data_types;
 use db::SystemDB;
 use malloc_size_of::{new_malloc_size_ops, MallocSizeOf, MallocSizeOfOps};
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
@@ -30,7 +31,6 @@ use std::{
     sync::Arc,
 };
 use threadpool::ThreadPool;
-pub mod block_data_types;
 pub mod db_gc_manager;
 pub mod db_manager;
 pub mod tx_data_manager;

crates/cfxcore/core/src/block_data_manager/mod.rs

@@ -505,7 +505,13 @@ impl ConsensusExecutor {
         // the lock, there might be a checkpoint coming in to break
         // index
         for state_block_hash in waiting_blocks {
-            self.wait_for_result(state_block_hash)?;
+            let commitment = self.wait_for_result(state_block_hash)?;
+            self.handler.data_man.insert_epoch_execution_commitment(
+                state_block_hash,
+                commitment.state_root_with_aux_info,
+                commitment.receipts_root,
+                commitment.logs_bloom_hash,
+            );
         }
         // Now we need to wait for the execution information of all missing
         // blocks to come back

crates/cfxcore/core/src/consensus/consensus_inner/consensus_executor/mod.rs

@@ -16,26 +16,24 @@ use keccak_hash as hash;
 pub mod message;
 
 pub mod block_data_manager;
-pub mod cache_config;
-pub mod cache_manager;
-pub mod channel;
 pub mod client;
 pub mod consensus;
-mod core_error;
 pub mod db;
 pub mod errors;
 pub mod genesis_block;
 pub mod light_protocol;
-pub mod node_type;
 pub mod pos;
 pub mod pow;
-pub mod state_exposer;
 pub mod statistics;
 pub mod sync;
 pub mod transaction_pool;
-pub mod unique_id;
 pub mod verification;
 
+pub use cfxcore_types::{
+    cache_config, cache_manager, channel, core_error, node_type, state_exposer,
+    unique_id,
+};
+
 pub use crate::{
     block_data_manager::BlockDataManager,
     channel::Notifications,