fix merge conflicts

Author: MitchTurner

Cargo.lock

@@ -82,7 +82,7 @@ educe = { version = "0.6", default-features = false, features = [
 enum-iterator = "1.2"
 enum_dispatch = "0.3.13"
 # Workspace members
-fuel-block-aggregator-api = { version = "0.47.1", path = "crates/services/block_aggregator_api" }
+fuel-core-block-aggregator-api = { version = "0.47.1", path = "crates/services/block_aggregator_api" }
 fuel-core = { version = "0.47.1", path = "./crates/fuel-core", default-features = false }
 fuel-core-bin = { version = "0.47.1", path = "./bin/fuel-core" }
 fuel-core-chain-config = { version = "0.47.1", path = "./crates/chain-config", default-features = false }

Cargo.toml

@@ -55,7 +55,7 @@ clap = { workspace = true, features = ["derive", "env", "string"] }
 const_format = { version = "0.2", optional = true }
 dirs = "4.0"
 dotenvy = { version = "0.15", optional = true }
-fuel-block-aggregator-api = { workspace = true }
+fuel-core-block-aggregator-api = { workspace = true }
 fuel-core = { workspace = true, features = ["wasm-executor"] }
 fuel-core-chain-config = { workspace = true }
 fuel-core-metrics = { workspace = true }

bin/fuel-core/Cargo.toml

@@ -13,8 +13,8 @@ pub struct RpcArgs {
 }
 
 impl RpcArgs {
-    pub fn into_config(self) -> fuel_block_aggregator_api::integration::Config {
-        fuel_block_aggregator_api::integration::Config {
+    pub fn into_config(self) -> fuel_core_block_aggregator_api::integration::Config {
+        fuel_core_block_aggregator_api::integration::Config {
             addr: net::SocketAddr::new(self.rpc_ip, self.rpc_port),
         }
     }

bin/fuel-core/src/cli/run/rpc.rs

@@ -60,7 +60,7 @@ clap = { workspace = true, features = ["derive"] }
 cosmrs = { version = "0.21", optional = true }
 derive_more = { version = "0.99" }
 enum-iterator = { workspace = true }
-fuel-block-aggregator-api = { workspace = true }
+fuel-core-block-aggregator-api = { workspace = true }
 fuel-core-chain-config = { workspace = true, features = ["std"] }
 fuel-core-compression-service = { workspace = true }
 fuel-core-consensus-module = { workspace = true }

crates/fuel-core/Cargo.toml

@@ -1,5 +1,5 @@
 use crate::database::database_description::DatabaseDescription;
-use fuel_block_aggregator_api::db::storage_db::table::Column;
+use fuel_core_block_aggregator_api::db::storage_db::table::Column;
 use fuel_core_types::fuel_types::BlockHeight;
 
 #[derive(Clone, Copy, Debug)]

crates/fuel-core/src/database/database_description/block_aggregator.rs

@@ -38,7 +38,7 @@ aws-sdk-kms = { version = "1.37.0", optional = true }
 clap = { workspace = true }
 cynic = { workspace = true }
 ethers = "2"
-fuel-block-aggregator-api = { version = "0.46.0", path = "../crates/services/block_aggregator_api" }
+fuel-core-block-aggregator-api = { workspace = true }
 fuel-core = { path = "../crates/fuel-core", default-features = false, features = [
   "p2p",
   "relayer",