Merge branch 'master' into 2585-fault_provingglobal_roots-populate-uploadedbytecodes-table

Author: xgreenx

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- [2648](https://github.com/FuelLabs/fuel-core/pull/2648): Add feature-flagged field to block header `fault_proving_header` that contains a commitment to all transaction ids.
+
 ## [Version 0.41.6]
 
 ### Added

Cargo.lock

@@ -107,6 +107,7 @@ cynic = { version = "3.1.0", features = ["http-reqwest"] }
 clap = "4.4"
 derivative = { version = "2" }
 derive_more = { version = "0.99" }
+enum_dispatch = "0.3.13"
 enum-iterator = "1.2"
 hex = { version = "0.4", features = ["serde"] }
 hyper = { version = "0.14.26" }

Cargo.toml

@@ -65,6 +65,14 @@ name = "vm"
 
 [features]
 default = ["fuel-core/rocksdb", "fuel-core/rocksdb-production"]
+fault-proving = [
+  "fuel-core-types/fault-proving",
+  "fuel-core-chain-config/fault-proving",
+  "fuel-core/fault-proving",
+  "fuel-core-storage/fault-proving",
+  "fuel-core-database/fault-proving",
+  "fuel-core-sync/fault-proving",
+]
 
 [[bench]]
 harness = false

benches/Cargo.toml

@@ -65,7 +65,12 @@ fn generate_bench_block(
     let txs = generate_bench_transactions(tx_count);
     let block = PartialFuelBlock::new(header, txs);
     block
-        .generate(&[], Default::default())
+        .generate(
+            &[],
+            Default::default(),
+            #[cfg(feature = "fault-proving")]
+            &Default::default(),
+        )
         .map_err(|err| anyhow!(err))
 }
 

benches/src/db_lookup_times_utils/seed.rs

@@ -82,5 +82,11 @@ production = [
   "parquet",
   "aws-kms",
 ]
-fault-proving = ["fuel-core-compression/fault-proving"]
 parallel-executor = ["fuel-core/parallel-executor"]
+fault-proving = [
+  "fuel-core-compression/fault-proving",
+  "fuel-core-storage/fault-proving",
+  "fuel-core-types/fault-proving",
+  "fuel-core-chain-config/fault-proving",
+  "fuel-core/fault-proving",
+]

bin/fuel-core/Cargo.toml

@@ -63,3 +63,7 @@ test-helpers = [
   "fuel-core-types/random",
   "fuel-core-types/test-helpers",
 ]
+fault-proving = [
+  "fuel-core-types/fault-proving",
+  "fuel-core-storage/fault-proving",
+]

crates/chain-config/Cargo.toml

@@ -201,12 +201,19 @@ impl Randomize for CompressedBlock {
     fn randomize(mut rng: impl rand::Rng) -> Self {
         let tx1: Transaction = Randomize::randomize(&mut rng);
         let tx2: Transaction = Randomize::randomize(&mut rng);
+        let default_chain_id = ChainId::default();
 
-        let tx_ids = vec![tx1.id(&ChainId::default()), tx2.id(&ChainId::default())];
+        let tx_ids = vec![tx1.id(&default_chain_id), tx2.id(&default_chain_id)];
 
         Self::test(
             PartialBlockHeader::default()
-                .generate(&[tx1, tx2], &[], rng.gen())
+                .generate(
+                    &[tx1, tx2],
+                    &[],
+                    rng.gen(),
+                    #[cfg(feature = "fault-proving")]
+                    &default_chain_id,
+                )
                 .expect("The header is valid"),
             tx_ids,
         )

crates/chain-config/src/config/randomize.rs

@@ -49,3 +49,4 @@ std = ["fuel-core-types/std"]
 default = ["subscriptions", "std"]
 test-helpers = []
 subscriptions = ["base64", "eventsource-client", "futures", "hyper-rustls"]
+fault-proving = ["fuel-core-types/fault-proving"]

crates/client/Cargo.toml

@@ -566,10 +566,15 @@ type Header {
 	Hash of the application header.
 	"""
 	applicationHash: Bytes32!
+	"""
+	Transaction ID Commitment
+	"""
+	txIdCommitment: Bytes32
 }
 
 enum HeaderVersion {
 	V1
+	V2
 }
 
 type HeavyOperation {