Extract executor into fuel-core-executor crate

CHANGELOG.md

@@ -16,6 +16,7 @@ Description of the upcoming release here.
 ### Changed
 
 - [#1517](https://github.com/FuelLabs/fuel-core/pull/1517): Changed default gossip heartbeat interval to 500ms. 
+- [#1520](https://github.com/FuelLabs/fuel-core/pull/1520): Extract `executor` into `fuel-core-executor` crate. 
 
 
 ## [Version 0.21.0]

Cargo.toml

@@ -86,7 +86,7 @@ cynic = { version = "2.2.1", features = ["http-reqwest"] }
 clap = "4.1"
 derive_more = { version = "0.99" }
 hyper = { version = "0.14.26" }
-primitive-types = "0.12"
+primitive-types = { version = "0.12", default-features = false }
 rand = "0.8"
 parking_lot = "0.12"
 tokio = { version = "1.27", default-features = false }

benches/Cargo.toml

@@ -15,13 +15,14 @@ ed25519-dalek = { version = "2.0", features = ["rand_core"] }
 ethnum = "1.3"
 fuel-core = { path = "../crates/fuel-core", default-features = false, features = ["rocksdb-production"] }
 fuel-core-chain-config = { workspace = true }
+fuel-core-database = { path = "./../crates/database" }
 fuel-core-services = { path = "./../crates/services" }
 fuel-core-storage = { path = "./../crates/storage" }
 fuel-core-sync = { path = "./../crates/services/sync", features = ["benchmarking"] }
 fuel-core-types = { path = "./../crates/types", features = ["test-helpers"] }
 futures = "0.3"
 p256 =  { version = "0.13", default-features = false, features = ["digest", "ecdsa"] }
-primitive-types = { workspace = true }
+primitive-types = { workspace = true, default-features = false }
 quanta = "0.12"
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }

benches/benches/block_target_gas.rs

@@ -31,6 +31,7 @@ use fuel_core_benches::{
 use fuel_core_chain_config::ContractConfig;
 use fuel_core_storage::{
     tables::ContractsRawCode,
+    vm_storage::IncreaseStorageKey,
     StorageAsMut,
 };
 use fuel_core_types::{
@@ -244,7 +245,6 @@ fn service_with_many_contracts(
     state_size: u64,
     contract_ids: Vec<ContractId>,
 ) -> (FuelService, tokio::runtime::Runtime) {
-    use fuel_core::database::vm_database::IncreaseStorageKey;
     let rt = tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()

benches/benches/state.rs

@@ -5,15 +5,13 @@ use criterion::{
     BenchmarkGroup,
     Criterion,
 };
-use fuel_core::database::{
-    vm_database::VmDatabase,
-    Database,
-};
-use fuel_core_storage::InterpreterStorage;
+use fuel_core::database::Database;
+use fuel_core_storage::vm_storage::VmStorage;
 use fuel_core_types::{
     blockchain::header::GeneratedConsensusFields,
     fuel_tx::Bytes32,
     fuel_types::ContractId,
+    fuel_vm::InterpreterStorage,
 };
 use rand::{
     rngs::StdRng,
@@ -53,15 +51,15 @@ fn insert_state_single_contract_database(c: &mut Criterion) {
 
     let mut bench_state = |group: &mut BenchmarkGroup<WallTime>, name: &str, n: usize| {
         group.bench_function(name, |b| {
-            let mut db = VmDatabase::default();
+            let mut db = VmStorage::default();
             let contract: ContractId = rng.gen();
             setup(db.database_mut(), &contract, n);
             let outer = db.database_mut().transaction();
             b.iter_custom(|iters| {
                 let mut elapsed_time = Duration::default();
                 for _ in 0..iters {
                     let mut inner = outer.transaction();
-                    let mut inner_db = VmDatabase::new::<GeneratedConsensusFields>(
+                    let mut inner_db = VmStorage::new::<GeneratedConsensusFields>(
                         inner.as_mut().clone(),
                         &Default::default(),
                         Default::default(),
@@ -114,15 +112,15 @@ fn insert_state_single_contract_transaction(c: &mut Criterion) {
 
     let mut bench_state = |group: &mut BenchmarkGroup<WallTime>, name: &str, n: usize| {
         group.bench_function(name, |b| {
-            let mut db = VmDatabase::default();
+            let mut db = VmStorage::<Database>::default();
             let contract: ContractId = rng.gen();
             let mut outer = db.database_mut().transaction();
             setup(outer.as_mut(), &contract, n);
             b.iter_custom(|iters| {
                 let mut elapsed_time = Duration::default();
                 for _ in 0..iters {
                     let mut inner = outer.transaction();
-                    let mut inner_db = VmDatabase::new::<GeneratedConsensusFields>(
+                    let mut inner_db = VmStorage::new::<GeneratedConsensusFields>(
                         inner.as_mut().clone(),
                         &Default::default(),
                         Default::default(),
@@ -175,7 +173,7 @@ fn insert_state_multiple_contracts_database(c: &mut Criterion) {
 
     let mut bench_state = |group: &mut BenchmarkGroup<WallTime>, name: &str, n: usize| {
         group.bench_function(name, |b| {
-            let mut db = VmDatabase::default();
+            let mut db = VmStorage::<Database>::default();
             for _ in 0..n {
                 let contract: ContractId = rng.gen();
                 setup(db.database_mut(), &contract, 1);
@@ -186,7 +184,7 @@ fn insert_state_multiple_contracts_database(c: &mut Criterion) {
                 let contract: ContractId = rng.gen();
                 for _ in 0..iters {
                     let mut inner = outer.transaction();
-                    let mut inner_db = VmDatabase::new::<GeneratedConsensusFields>(
+                    let mut inner_db = VmStorage::new::<GeneratedConsensusFields>(
                         inner.as_mut().clone(),
                         &Default::default(),
                         Default::default(),
@@ -239,7 +237,7 @@ fn insert_state_multiple_contracts_transaction(c: &mut Criterion) {
 
     let mut bench_state = |group: &mut BenchmarkGroup<WallTime>, name: &str, n: usize| {
         group.bench_function(name, |b| {
-            let mut db = VmDatabase::default();
+            let mut db = VmStorage::<Database>::default();
             let mut outer = db.database_mut().transaction();
             for _ in 0..n {
                 let contract: ContractId = rng.gen();
@@ -250,7 +248,7 @@ fn insert_state_multiple_contracts_transaction(c: &mut Criterion) {
                 let contract: ContractId = rng.gen();
                 for _ in 0..iters {
                     let mut inner = outer.transaction();
-                    let mut inner_db = VmDatabase::new::<GeneratedConsensusFields>(
+                    let mut inner_db = VmStorage::new::<GeneratedConsensusFields>(
                         inner.as_mut().clone(),
                         &Default::default(),
                         Default::default(),

benches/benches/vm_set/blockchain.rs

@@ -12,14 +12,17 @@ use criterion::{
     Throughput,
 };
 use fuel_core::{
-    database::vm_database::VmDatabase,
     service::Config,
     state::rocks_db::{
         RocksDb,
         ShallowTempDir,
     },
 };
 use fuel_core_benches::*;
+use fuel_core_storage::vm_storage::{
+    IncreaseStorageKey,
+    VmStorage,
+};
 use fuel_core_types::{
     blockchain::header::ConsensusHeader,
     fuel_asm::{
@@ -51,7 +54,6 @@ pub struct BenchDb {
 
 impl BenchDb {
     fn new(contract_id: &ContractId) -> anyhow::Result<Self> {
-        use fuel_core::database::vm_database::IncreaseStorageKey;
         let tmp_dir = ShallowTempDir::new();
 
         let db = Arc::new(RocksDb::default_open(tmp_dir.path(), None).unwrap());
@@ -102,14 +104,14 @@ impl BenchDb {
     }
 
     /// Creates a `VmDatabase` instance.
-    fn to_vm_database(&self) -> VmDatabase {
+    fn to_vm_database(&self) -> VmStorage<Database> {
         let header = ConsensusHeader {
             prev_root: Default::default(),
             height: 1.into(),
             time: Tai64::UNIX_EPOCH,
             generated: (),
         };
-        VmDatabase::new(self.db.clone(), &header, ContractId::zeroed())
+        VmStorage::new(self.db.clone(), &header, ContractId::zeroed())
     }
 }
 

benches/src/lib.rs

@@ -1,8 +1,8 @@
 pub mod default_gas_costs;
 pub mod import;
 
-use fuel_core::database::vm_database::VmDatabase;
 pub use fuel_core::database::Database;
+pub use fuel_core_storage::vm_storage::VmStorage;
 use fuel_core_types::{
     fuel_asm::{
         op,
@@ -36,9 +36,9 @@ use std::iter;
 
 const LARGE_GAS_LIMIT: u64 = u64::MAX - 1001;
 
-fn new_db() -> VmDatabase {
+fn new_db() -> VmStorage<Database> {
     // when rocksdb is enabled, this creates a new db instance with a temporary path
-    VmDatabase::default()
+    VmStorage::default()
 }
 
 pub struct ContractCode {
@@ -89,7 +89,7 @@ pub struct VmBench {
     pub inputs: Vec<Input>,
     pub outputs: Vec<Output>,
     pub witnesses: Vec<Witness>,
-    pub db: Option<VmDatabase>,
+    pub db: Option<VmStorage<Database>>,
     pub instruction: Instruction,
     pub prepare_call: Option<PrepareCall>,
     pub dummy_contract: Option<ContractId>,
@@ -100,7 +100,7 @@ pub struct VmBench {
 
 #[derive(Debug, Clone)]
 pub struct VmBenchPrepared {
-    pub vm: Interpreter<VmDatabase, Script>,
+    pub vm: Interpreter<VmStorage<Database>, Script>,
     pub instruction: Instruction,
     pub diff: diff::Diff<diff::InitialVmState>,
 }
@@ -148,7 +148,7 @@ impl VmBench {
 
     pub fn contract_using_db<R>(
         rng: &mut R,
-        mut db: VmDatabase,
+        mut db: VmStorage<Database>,
         instruction: Instruction,
     ) -> anyhow::Result<Self>
     where
@@ -209,7 +209,7 @@ impl VmBench {
             .with_prepare_call(prepare_call))
     }
 
-    pub fn with_db(mut self, db: VmDatabase) -> Self {
+    pub fn with_db(mut self, db: VmStorage<Database>) -> Self {
         self.db.replace(db);
         self
     }

ci_checks.sh

@@ -13,6 +13,10 @@ source .github/workflows/scripts/verify_openssl.sh &&
 cargo clippy --all-targets --all-features &&
 cargo make check --locked &&
 cargo make check --all-features --locked &&
+cargo check -p fuel-core-types --target wasm32-unknown-unknown --no-default-features &&
+cargo check -p fuel-core-storage --target wasm32-unknown-unknown --no-default-features &&
+cargo check -p fuel-core-client --target wasm32-unknown-unknown --no-default-features &&
+cargo check -p fuel-core-chain-config --target wasm32-unknown-unknown --no-default-features &&
 cargo test --all-features --workspace &&
 cargo test -p fuel-core --no-default-features &&
 cargo test -p fuel-core-client --no-default-features &&

crates/database/src/lib.rs

@@ -9,6 +9,7 @@
 #![deny(missing_docs)]
 #![deny(unused_crate_dependencies)]
 #![deny(warnings)]
+#![deny(unused_variables)]
 
 use fuel_core_storage::Error as StorageError;
 use fuel_core_types::services::executor::Error as ExecutorError;

crates/fuel-core/Cargo.toml

@@ -41,9 +41,7 @@ futures = { workspace = true }
 hex = { version = "0.4", features = ["serde"] }
 hyper = { workspace = true }
 itertools = { workspace = true }
-parking_lot = { workspace = true }
 postcard = { workspace = true, features = ["use-std"] }
-primitive-types = { workspace = true }
 rand = { workspace = true }
 rocksdb = { version = "0.21", default-features = false, features = [
     "lz4",
@@ -63,6 +61,7 @@ uuid = { version = "1.1", features = ["v4"] }
 
 [dev-dependencies]
 assert_matches = "1.5"
+fuel-core-executor = { workspace = true, features = ["test-helpers"] }
 fuel-core-services = { path = "./../services", features = ["test-helpers"] }
 fuel-core-storage = { path = "./../storage", features = ["test-helpers"] }
 fuel-core-trace = { path = "./../trace" }