apollo_consensus_orchestrator: add commitment fields to blob and DecisionReachedResponse (#10381)

Author: dafnamatsry

crates/apollo_batcher/src/batcher.rs

@@ -664,6 +664,7 @@ impl Batcher {
                     .casm_hash_computation_data_proving_gas,
                 compiled_class_hashes_for_migration: block_execution_artifacts
                     .compiled_class_hashes_for_migration,
+                parent_proposal_commitment: None,
             },
         })
     }

crates/apollo_batcher_types/src/batcher_types.rs

@@ -108,6 +108,7 @@ pub struct CentralObjects {
     pub casm_hash_computation_data_sierra_gas: CasmHashComputationData,
     pub casm_hash_computation_data_proving_gas: CasmHashComputationData,
     pub compiled_class_hashes_for_migration: CompiledClassHashesForMigration,
+    pub parent_proposal_commitment: Option<ProposalCommitment>,
 }
 
 #[derive(Debug, Serialize, Deserialize, PartialEq)]

crates/apollo_consensus_orchestrator/resources/central_blob.json

@@ -1175,5 +1175,7 @@
       "0x4",
       "0x3"
     ]
-  ]
+  ],
+  "proposal_commitment": "0x80020000",
+  "parent_proposal_commitment": "0x1000200"
 }

crates/apollo_consensus_orchestrator/resources/central_blob_empty_or_none_fields.json

@@ -0,0 +1,76 @@
+{
+  "block_number": 5,
+  "state_diff": {
+    "address_to_class_hash": {
+      "0x1": "0x1",
+      "0x5": "0x5"
+    },
+    "nonces": {
+      "L1": {
+        "0x2": "0x2"
+      }
+    },
+    "storage_updates": {
+      "L1": {
+        "0x3": {
+          "0x3": "0x3"
+        }
+      }
+    },
+    "class_hash_to_compiled_class_hash": {
+      "0x4": "0x4"
+    },
+    "block_info": {
+      "block_number": 5,
+      "block_timestamp": 6,
+      "sequencer_address": "0x7",
+      "l1_gas_price": {
+        "price_in_wei": "0x8",
+        "price_in_fri": "0x9"
+      },
+      "l1_data_gas_price": {
+        "price_in_wei": "0xa",
+        "price_in_fri": "0xb"
+      },
+      "l2_gas_price": {
+        "price_in_wei": "0xc",
+        "price_in_fri": "0xd"
+      },
+      "use_kzg_da": true,
+      "starknet_version": "0.14.1"
+    }
+  },
+  "compressed_state_diff": null,
+  "bouncer_weights": {
+    "l1_gas": 8,
+    "message_segment_length": 9,
+    "n_events": 2,
+    "state_diff_size": 45,
+    "sierra_gas": 10,
+    "n_txs": 2,
+    "proving_gas": 11
+  },
+  "fee_market_info": {
+    "l2_gas_consumed": 150000,
+    "next_l2_gas_price": "0x186a0"
+  },
+  "transactions": [],
+  "execution_infos": [],
+  "contract_classes": [],
+  "compiled_classes": [],
+  "casm_hash_computation_data_sierra_gas": {
+    "class_hash_to_casm_hash_computation_gas": {
+      "0x3a59046762823dc87385eb5ac8a21f3f5bfe4274151c6eb633737656c209056": 1
+    },
+    "gas_without_casm_hash_computation": 3
+  },
+  "casm_hash_computation_data_proving_gas": {
+    "class_hash_to_casm_hash_computation_gas": {
+      "0x3a59046762823dc87385eb5ac8a21f3f5bfe4274151c6eb633737656c209056": 1
+    },
+    "gas_without_casm_hash_computation": 3
+  },
+  "compiled_class_hashes_for_migration": [],
+  "proposal_commitment": "0x80020000",
+  "parent_proposal_commitment": null
+}

crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs

@@ -13,6 +13,7 @@ use apollo_batcher::cende_client_types::{
     TransactionExecutionStatus,
 };
 use apollo_class_manager_types::MockClassManagerClient;
+use apollo_consensus::types::ProposalCommitment;
 use apollo_infra_utils::test_utils::assert_json_eq;
 use apollo_sizeof::SizeOf;
 use apollo_starknet_client::reader::objects::state::StateDiff;
@@ -166,6 +167,8 @@ pub const CENTRAL_BLOB_JSON_PATH: &str = "central_blob.json";
 pub const CENTRAL_CASM_HASH_COMPUTATION_DATA_JSON_PATH: &str =
     "central_casm_hash_computation_data.json";
 pub const CENTRAL_PRECONFIRMED_BLOCK_JSON_PATH: &str = "central_preconfirmed_block.json";
+pub const CENTRAL_BLOB_EMPTY_OR_NONE_FIELDS_JSON_PATH: &str =
+    "central_blob_empty_or_none_fields.json";
 
 fn resource_bounds() -> AllResourceBounds {
     AllResourceBounds {
@@ -667,6 +670,36 @@ fn central_blob() -> AerospikeBlob {
         casm_hash_computation_data_sierra_gas: central_casm_hash_computation_data(),
         casm_hash_computation_data_proving_gas: central_casm_hash_computation_data(),
         compiled_class_hashes_for_migration: central_compiled_class_hashes_for_migration(),
+        proposal_commitment: ProposalCommitment(felt!("0x80020000")),
+        parent_proposal_commitment: Some(ProposalCommitment(felt!("0x1000200"))),
+    };
+
+    // This is to make the function sync (not async) so that it can be used as a case in the
+    // serialize_central_objects test.
+    let runtime = tokio::runtime::Runtime::new().unwrap();
+    runtime
+        .block_on(AerospikeBlob::from_blob_parameters_and_class_manager(
+            blob_parameters,
+            Arc::new(mock_class_manager),
+        ))
+        .unwrap()
+}
+
+fn central_blob_with_empty_or_none_fields() -> AerospikeBlob {
+    let mock_class_manager = MockClassManagerClient::new();
+    let blob_parameters = BlobParameters {
+        block_info: block_info(),
+        state_diff: thin_state_diff(),
+        compressed_state_diff: None,
+        transactions: vec![],
+        bouncer_weights: central_bouncer_weights(),
+        fee_market_info: central_fee_market_info(),
+        execution_infos: vec![],
+        casm_hash_computation_data_sierra_gas: central_casm_hash_computation_data(),
+        casm_hash_computation_data_proving_gas: central_casm_hash_computation_data(),
+        compiled_class_hashes_for_migration: vec![],
+        proposal_commitment: ProposalCommitment(felt!("0x80020000")),
+        parent_proposal_commitment: None,
     };
 
     // This is to make the function sync (not async) so that it can be used as a case in the
@@ -974,6 +1007,10 @@ fn starknet_preconfiremd_block() -> CendePreconfirmedBlock {
     CENTRAL_CASM_HASH_COMPUTATION_DATA_JSON_PATH
 )]
 #[case::central_blob(central_blob(), CENTRAL_BLOB_JSON_PATH)]
+#[case::empty_or_none_fields(
+    central_blob_with_empty_or_none_fields(),
+    CENTRAL_BLOB_EMPTY_OR_NONE_FIELDS_JSON_PATH
+)]
 #[case::starknet_preconfirmed_block(
     starknet_preconfiremd_block(),
     CENTRAL_PRECONFIRMED_BLOCK_JSON_PATH

crates/apollo_consensus_orchestrator/src/cende/mod.rs

@@ -6,6 +6,7 @@ use std::sync::Arc;
 
 use apollo_class_manager_types::{ClassManagerClientError, SharedClassManagerClient};
 use apollo_config::secrets::Sensitive;
+use apollo_consensus::types::ProposalCommitment;
 use apollo_consensus_orchestrator_config::config::CendeConfig;
 use apollo_proc_macros::sequencer_latency_histogram;
 use async_trait::async_trait;
@@ -82,6 +83,8 @@ pub(crate) struct AerospikeBlob {
     casm_hash_computation_data_sierra_gas: CentralCasmHashComputationData,
     casm_hash_computation_data_proving_gas: CentralCasmHashComputationData,
     compiled_class_hashes_for_migration: CentralCompiledClassHashesForMigration,
+    proposal_commitment: ProposalCommitment,
+    parent_proposal_commitment: Option<ProposalCommitment>,
 }
 
 #[cfg_attr(test, automock)]
@@ -260,6 +263,8 @@ pub struct BlobParameters {
     // serialized in the correct format from the batcher.
     pub(crate) execution_infos: Vec<TransactionExecutionInfo>,
     pub(crate) compiled_class_hashes_for_migration: CompiledClassHashesForMigration,
+    pub(crate) proposal_commitment: ProposalCommitment,
+    pub(crate) parent_proposal_commitment: Option<ProposalCommitment>,
 }
 
 impl AerospikeBlob {
@@ -304,6 +309,8 @@ impl AerospikeBlob {
                 .casm_hash_computation_data_proving_gas,
             compiled_class_hashes_for_migration: blob_parameters
                 .compiled_class_hashes_for_migration,
+            proposal_commitment: blob_parameters.proposal_commitment,
+            parent_proposal_commitment: blob_parameters.parent_proposal_commitment,
         })
     }
 }

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -614,6 +614,10 @@ impl ConsensusContext for SequencerConsensusContext {
                 },
                 compiled_class_hashes_for_migration: central_objects
                     .compiled_class_hashes_for_migration,
+                proposal_commitment: block,
+                parent_proposal_commitment: central_objects
+                    .parent_proposal_commitment
+                    .map(|commitment| ProposalCommitment(commitment.state_diff_commitment.0.0)),
             })
             .await
             .inspect_err(|e| {