Merge branch 'master' into dento/regenesis-old-blocks-and-txs

CHANGELOG.md

@@ -7,13 +7,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 Description of the upcoming release here.
+### Fixed
+
+- [#1814](https://github.com/FuelLabs/fuel-core/pull/1814): Bugfix: the `iter_all_by_prefix` was not working for all tables. The change adds a `Rust` level filtering.
+=======
+### Added
+
+- [#1799](https://github.com/FuelLabs/fuel-core/pull/1799) Snapshot creation is now concurrent.
+
+### Changed
+
+- [#1812](https://github.com/FuelLabs/fuel-core/pull/1812): Follow-up PR to simplify the logic around parallel snapshot creation.
 
 ## [Version 0.24.2]
 
 ### Changed
 
 #### Breaking
-- [#1798](https://github.com/FuelLabs/fuel-core/pull/1798): add nonce to relayed transactions and also hash full messages in the inbox root.
+- [#1798](https://github.com/FuelLabs/fuel-core/pull/1798): Add nonce to relayed transactions and also hash full messages in the inbox root.
 
 ### Fixed
 

Cargo.toml

@@ -97,6 +97,7 @@ parking_lot = "0.12"
 tokio = { version = "1.27", default-features = false }
 tokio-rayon = "2.1.0"
 tokio-stream = "0.1"
+tokio-util = { version = "0.7", default-features = false }
 tracing = "0.1"
 thiserror = "1.0"
 futures = "0.3"

bin/fuel-core/Cargo.toml

@@ -23,14 +23,11 @@ dirs = "4.0"
 dotenvy = { version = "0.15", optional = true }
 fuel-core = { workspace = true }
 fuel-core-chain-config = { workspace = true }
-fuel-core-storage = { workspace = true, optional = true }
 fuel-core-types = { workspace = true }
 hex = "0.4"
 humantime = "2.1"
-itertools = { workspace = true, optional = true }
 pyroscope = "0.5"
 pyroscope_pprofrs = "0.2"
-serde = { workspace = true }
 serde_json = { workspace = true }
 tikv-jemallocator = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
@@ -44,9 +41,12 @@ url = { version = "2.2", optional = true }
 
 [dev-dependencies]
 fuel-core = { workspace = true, features = ["test-helpers"] }
+fuel-core-storage = { workspace = true }
 fuel-core-types = { workspace = true, features = ["test-helpers"] }
+itertools = { workspace = true }
 pretty_assertions = { workspace = true }
 rand = { workspace = true }
+serde = { workspace = true }
 tempfile = { workspace = true }
 test-case = { workspace = true }
 
@@ -56,11 +56,7 @@ env = ["dep:dotenvy"]
 p2p = ["fuel-core/p2p", "const_format"]
 relayer = ["fuel-core/relayer", "dep:url"]
 parquet = ["fuel-core-chain-config/parquet", "fuel-core-types/serde"]
-rocksdb = ["fuel-core/rocksdb", "dep:fuel-core-storage", "dep:itertools"]
-rocksdb-production = [
-  "fuel-core/rocksdb-production",
-  "dep:fuel-core-storage",
-  "dep:itertools",
-]
+rocksdb = ["fuel-core/rocksdb"]
+rocksdb-production = ["fuel-core/rocksdb-production"]
 # features to enable in production, but increase build times
 production = ["env", "relayer", "rocksdb-production", "p2p", "parquet"]

bin/fuel-core/src/cli.rs

@@ -127,7 +127,7 @@ pub async fn run_cli() -> anyhow::Result<()> {
         Ok(opt) => match opt.command {
             Fuel::Run(command) => run::exec(command).await,
             #[cfg(any(feature = "rocksdb", feature = "rocksdb-production"))]
-            Fuel::Snapshot(command) => snapshot::exec(command),
+            Fuel::Snapshot(command) => snapshot::exec(command).await,
             Fuel::GenerateFeeContract(command) => fee_contract::exec(command).await,
         },
         Err(e) => {