blockifier: verify that the proof facts block number matches the block hash

Author: meship-starkware

crates/apollo_consensus_orchestrator/resources/central_invoke_tx_client_side_proving.json

@@ -35,8 +35,8 @@
         "proof_facts": [
             "0x5649525455414c5f534e4f53",
             "0x4",
+            "0x7a0",
             "0x3",
-            "0x2",
             "0x1"
         ],
         "type": "INVOKE_FUNCTION"

crates/apollo_consensus_orchestrator/resources/central_preconfirmed_block.json

@@ -60,8 +60,8 @@
             "proof_facts": [
                 "0x5649525455414c5f534e4f53",
                 "0x4",
+                "0x7a0",
                 "0x3",
-                "0x2",
                 "0x1"
             ],
             "type":"INVOKE_FUNCTION"

crates/apollo_gateway/src/gateway_test.rs

@@ -38,7 +38,7 @@ use apollo_network_types::network_types::BroadcastedMessageMetadata;
 use apollo_test_utils::{get_rng, GetTestInstance};
 use blockifier::blockifier::config::ContractClassManagerConfig;
 use blockifier::context::ChainInfo;
-use blockifier::test_utils::initial_test_state::fund_account;
+use blockifier::test_utils::initial_test_state::{fund_account, setup_block_hash_from_proof_facts};
 use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use blockifier_test_utils::calldata::create_trivial_calldata;
 use blockifier_test_utils::contracts::FeatureContract;
@@ -52,6 +52,7 @@ use starknet_api::executable_transaction::AccountTransaction;
 use starknet_api::rpc_transaction::{
     InternalRpcTransaction,
     RpcDeclareTransaction,
+    RpcInvokeTransaction,
     RpcTransaction,
     RpcTransactionLabelValue,
 };
@@ -276,14 +277,21 @@ async fn setup_mock_state(
 
     setup_transaction_converter_mock(&mut mock_dependencies.mock_transaction_converter, tx_args);
 
+    // Setup state: fund account and store proof block hash if needed.
+    let state_reader =
+        &mut mock_dependencies.state_reader_factory.state_reader.blockifier_state_reader;
     let address = expected_internal_tx.contract_address();
     fund_account(
         &mock_dependencies.config.chain_info,
         address,
         VALID_ACCOUNT_BALANCE,
-        &mut mock_dependencies.state_reader_factory.state_reader.blockifier_state_reader,
+        state_reader,
     );
 
+    if let RpcTransaction::Invoke(RpcInvokeTransaction::V3(invoke_tx)) = &input_tx {
+        setup_block_hash_from_proof_facts(&invoke_tx.proof_facts, state_reader);
+    }
+
     let mempool_add_tx_args = AddTransactionArgs {
         tx: expected_internal_tx.clone(),
         account_state: AccountState { address, nonce: *input_tx.nonce() },

crates/apollo_http_server/resources/deprecated_gateway/invoke_tx_client_side_proving.json

@@ -29,8 +29,8 @@
   "proof_facts": [
     "0x5649525455414c5f534e4f53",
     "0x4",
+    "0x7a0",
     "0x3",
-    "0x2",
     "0x1"
   ],
   "proof": [

crates/apollo_starknet_client/resources/reader/invoke_v3_client_side_proving.json

@@ -35,8 +35,8 @@
     "proof_facts": [
         "0x5649525455414c5f534e4f53",
         "0x4",
+        "0x7a0",
         "0x3",
-        "0x2",
         "0x1"
     ]
 }

crates/blockifier/src/test_utils.rs

@@ -416,3 +416,11 @@ pub fn maybe_dummy_block_hash_and_number(block_number: BlockNumber) -> Option<Bl
         hash: BlockHash(StarkHash::ONE),
     })
 }
+
+/// Returns the contract address for the block hash contract used in tests.
+pub fn block_hash_contract_address() -> ContractAddress {
+    VersionedConstants::create_for_testing()
+        .os_constants
+        .os_contract_addresses
+        .block_hash_contract_address()
+}

crates/blockifier/src/test_utils/initial_test_state.rs

@@ -5,7 +5,8 @@ use starknet_api::block::FeeType;
 use starknet_api::contract_class::compiled_class_hash::HashVersion;
 use starknet_api::core::ContractAddress;
 use starknet_api::felt;
-use starknet_api::transaction::fields::Fee;
+use starknet_api::state::StorageKey;
+use starknet_api::transaction::fields::{Fee, ProofFacts, ProofFactsVariant};
 use strum::IntoEnumIterator;
 
 use crate::blockifier::config::ContractClassManagerConfig;
@@ -16,6 +17,7 @@ use crate::state::state_reader_and_contract_manager::{
     FetchCompiledClasses,
     StateReaderAndContractManager,
 };
+use crate::test_utils::block_hash_contract_address;
 use crate::test_utils::contracts::FeatureContractData;
 use crate::test_utils::dict_state_reader::DictStateReader;
 
@@ -36,6 +38,20 @@ pub fn fund_account(
     }
 }
 
+/// Sets up block hash in the block hash contract from SNOS proof facts.
+///
+/// This is a test helper used to prepare state for proof-facts validation.
+pub fn setup_block_hash_from_proof_facts(
+    proof_facts: &ProofFacts,
+    state_reader: &mut DictStateReader,
+) {
+    if let Ok(ProofFactsVariant::Snos(snos_proof_facts)) = proof_facts.try_into() {
+        let contract = block_hash_contract_address();
+        let storage_key = StorageKey::from(snos_proof_facts.block_number.0);
+        state_reader.storage_view.insert((contract, storage_key), snos_proof_facts.block_hash.0);
+    }
+}
+
 /// Sets up a state reader for testing:
 /// * "Declares" a Cairo0 ERC20 contract (class hash => class mapping set).
 /// * "Deploys" two ERC20 contracts (address => class hash mapping set) at the fee token addresses
@@ -83,6 +99,7 @@ pub fn setup_test_state(
     }
 }
 
+// TODO(Meshi): create a client-side test state.
 pub fn test_state(
     chain_info: &ChainInfo,
     initial_balances: Fee,

crates/blockifier/src/transaction/account_transaction.rs

@@ -1,13 +1,14 @@
 use std::sync::Arc;
 
 use starknet_api::abi::abi_utils::selector_from_name;
-use starknet_api::block::GasPriceVector;
+use starknet_api::block::{BlockNumber, GasPriceVector};
 use starknet_api::calldata;
 use starknet_api::contract_class::EntryPointType;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector, Nonce};
 use starknet_api::data_availability::DataAvailabilityMode;
 use starknet_api::executable_transaction::{AccountTransaction as Transaction, TransactionType};
 use starknet_api::execution_resources::GasAmount;
+use starknet_api::state::StorageKey;
 use starknet_api::transaction::fields::Resource::{L1DataGas, L1Gas, L2Gas};
 use starknet_api::transaction::fields::{
     AccountDeploymentData,
@@ -24,6 +25,8 @@ use starknet_api::transaction::{constants, TransactionHash, TransactionVersion};
 use starknet_types_core::felt::Felt;
 
 use super::errors::ResourceBoundsError;
+use crate::abi::constants::STORED_BLOCK_HASH_BUFFER;
+use crate::blockifier_versioned_constants::OsConstants;
 use crate::context::{BlockContext, GasCounter, TransactionContext};
 use crate::execution::call_info::CallInfo;
 use crate::execution::common_hints::ExecutionMode;
@@ -246,19 +249,62 @@ impl AccountTransaction {
         }
     }
 
-    fn validate_proof_facts(&self) -> TransactionPreValidationResult<()> {
-        if let Transaction::Invoke(tx) = &self.tx {
-            if tx.tx.version() == TransactionVersion::THREE {
-                let proof_facts_variant = ProofFactsVariant::try_from(&tx.tx.proof_facts())
-                    .map_err(|e| TransactionPreValidationError::InvalidProofFacts(e.to_string()))?;
-                match proof_facts_variant {
-                    ProofFactsVariant::Empty => {}
-                    ProofFactsVariant::Snos(_snos_proof_facts) => {
-                        // TODO(Meshi/ AvivG): add proof facts validations.
-                    }
-                }
-            }
+    fn validate_proof_facts(
+        &self,
+        os_constants: &OsConstants,
+        current_block_number: BlockNumber,
+        state: &mut dyn State,
+    ) -> TransactionPreValidationResult<()> {
+        // Only Invoke V3 transactions can carry proof facts.
+        let Transaction::Invoke(invoke_tx) = &self.tx else {
+            return Ok(());
+        };
+        if invoke_tx.version() < TransactionVersion::THREE {
+            return Ok(());
+        }
+
+        // Parse proof facts.
+        let proof_facts = invoke_tx.proof_facts();
+        let snos_proof_facts = match ProofFactsVariant::try_from(&proof_facts)
+            .map_err(|e| TransactionPreValidationError::InvalidProofFacts(e.to_string()))?
+        {
+            ProofFactsVariant::Empty => return Ok(()),
+            ProofFactsVariant::Snos(snos_proof_facts) => snos_proof_facts,
+        };
+
+        // Proof block must be old enough to have a stored block hash.
+        // Stored block hashes are guaranteed only up to: current - STORED_BLOCK_HASH_BUFFER.
+        let max_allowed = current_block_number.0 - STORED_BLOCK_HASH_BUFFER;
+
+        let proof_block_number = snos_proof_facts.block_number.0;
+        if proof_block_number > max_allowed {
+            return Err(TransactionPreValidationError::InvalidProofFacts(format!(
+                "Invalid proof block number {proof_block_number}. Block hashes are only available \
+                 for blocks ≤ current_block_number - STORED_BLOCK_HASH_BUFFER \
+                 ({current_block_number} - {STORED_BLOCK_HASH_BUFFER} = {max_allowed})."
+            )));
+        }
+
+        // Compare the proof's block hash with the stored block hash.
+        let contract = os_constants.os_contract_addresses.block_hash_contract_address();
+
+        let stored_block_hash =
+            state.get_storage_at(contract, StorageKey::from(proof_block_number))?;
+
+        if stored_block_hash == Felt::ZERO {
+            return Err(TransactionPreValidationError::InvalidProofFacts(format!(
+                "Stored block hash is zero for block {proof_block_number}."
+            )));
         }
+
+        let proof_block_hash = snos_proof_facts.block_hash.0;
+        if stored_block_hash != proof_block_hash {
+            return Err(TransactionPreValidationError::InvalidProofFacts(format!(
+                "Block hash mismatch for block {proof_block_number}. Proof block hash: \
+                 {proof_block_hash}, stored block hash: {stored_block_hash}."
+            )));
+        }
+
         Ok(())
     }
 
@@ -278,7 +324,11 @@ impl AccountTransaction {
             verify_can_pay_committed_bounds(state, tx_context).map_err(Box::new)?;
         }
 
-        self.validate_proof_facts()?;
+        self.validate_proof_facts(
+            &tx_context.block_context.versioned_constants.os_constants,
+            tx_context.block_context.block_info.block_number,
+            state,
+        )?;
 
         Ok(())
     }

crates/starknet_api/src/test_utils.rs

@@ -54,6 +54,12 @@ pub const TEST_ERC20_CONTRACT_ADDRESS2: &str = "0x1002";
 pub const CURRENT_BLOCK_NUMBER: u64 = 2001;
 pub const CURRENT_BLOCK_NUMBER_FOR_VALIDATE: u64 = 2000;
 
+// Range of historical blocks to populate in the block hash contract.
+// For block number N, we populate blocks BLOCK_HASH_HISTORY_START to BLOCK_HASH_HISTORY_END.
+// E.g., for block 2001: blocks 1950 to 1990.
+pub const BLOCK_HASH_HISTORY_START: u64 = 1950;
+pub const BLOCK_HASH_HISTORY_END: u64 = 1990;
+
 // The block timestamp of the BlockContext being used for testing.
 pub const CURRENT_BLOCK_TIMESTAMP: u64 = 1072023;
 pub const CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE: u64 = 1069200;
@@ -372,7 +378,16 @@ impl ProofFacts {
     /// See [`crate::transaction::fields::ProofFacts`].
     pub fn snos_proof_facts_for_testing() -> Self {
         // TODO(AvivG): Change to valid values when available.
-        proof_facts![felt!(VIRTUAL_SNOS), felt!("0x4"), felt!("0x3"), felt!("0x2"), felt!("0x1")]
+        let distance_from_start = 2;
+        let block_number = felt!(BLOCK_HASH_HISTORY_START + distance_from_start);
+        let block_hash = felt!(distance_from_start + 1);
+        assert!(
+            block_number <= felt!(BLOCK_HASH_HISTORY_END)
+                && block_number >= felt!(BLOCK_HASH_HISTORY_START),
+            "Block number is out of range"
+        );
+
+        proof_facts![felt!(VIRTUAL_SNOS), felt!("0x4"), block_number, block_hash, felt!("0x1")]
     }
 }
 

crates/starknet_os_flow_tests/src/initial_state.rs

@@ -1,7 +1,9 @@
 use std::collections::{BTreeMap, HashMap, HashSet};
 
 use blockifier::context::BlockContext;
+use blockifier::state::cached_state::StateMaps;
 use blockifier::state::state_api::UpdatableState;
+use blockifier::test_utils::block_hash_contract_address;
 use blockifier::transaction::transaction_execution::Transaction;
 use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use blockifier_test_utils::calldata::create_calldata;
@@ -24,14 +26,24 @@ use starknet_api::executable_transaction::{
     Transaction as StarknetAPITransaction,
 };
 use starknet_api::hash::{HashOutput, StateRoots};
-use starknet_api::state::{ContractClassComponentHashes, SierraContractClass};
+use starknet_api::state::{ContractClassComponentHashes, SierraContractClass, StorageKey};
 use starknet_api::test_utils::deploy_account::deploy_account_tx;
 use starknet_api::test_utils::invoke::invoke_tx;
-use starknet_api::test_utils::{NonceManager, CHAIN_ID_FOR_TESTS, CURRENT_BLOCK_NUMBER};
+use starknet_api::test_utils::{
+    NonceManager,
+    BLOCK_HASH_HISTORY_END,
+    BLOCK_HASH_HISTORY_START,
+    CHAIN_ID_FOR_TESTS,
+    CURRENT_BLOCK_NUMBER,
+};
 use starknet_api::transaction::constants::DEPLOY_CONTRACT_FUNCTION_ENTRY_POINT_NAME;
 use starknet_api::transaction::fields::{Calldata, ContractAddressSalt, ValidResourceBounds};
 use starknet_api::{calldata, deploy_account_tx_args, invoke_tx_args};
-use starknet_committer::block_committer::input::StateDiff;
+use starknet_committer::block_committer::input::{
+    StarknetStorageKey,
+    StarknetStorageValue,
+    StateDiff,
+};
 use starknet_committer::db::facts_db::db::FactsDb;
 use starknet_patricia_storage::map_storage::MapStorage;
 use starknet_types_core::felt::Felt;
@@ -128,6 +140,22 @@ pub(crate) struct InitialState<S: FlowTestState> {
     pub(crate) block_context: BlockContext,
 }
 
+/// Generates deterministic block hash storage updates for historical blocks.
+/// Populates blocks BLOCK_HASH_HISTORY_START to BLOCK_HASH_HISTORY_END with deterministic hash
+/// values (block_number - start_block + 1, i.e., 1 to 41).
+fn generate_block_hash_storage_updates() -> HashMap<StarknetStorageKey, StarknetStorageValue> {
+    (BLOCK_HASH_HISTORY_START..=BLOCK_HASH_HISTORY_END)
+        .map(|block_num| {
+            // Deterministic hash: (block_num - start_block + 1), so values are 1, 2, 3, ..., 41
+            let hash_value = block_num - BLOCK_HASH_HISTORY_START + 1;
+            (
+                StarknetStorageKey(StorageKey::from(block_num)),
+                StarknetStorageValue(Felt::from(hash_value)),
+            )
+        })
+        .collect()
+}
+
 /// Creates the initial state for the flow test which includes:
 /// Declares token and account contracts.
 /// Deploys both contracts and funds the account.
@@ -174,8 +202,26 @@ pub(crate) async fn create_default_initial_state_data<S: FlowTestState, const N:
     );
     final_state.state.apply_writes(&state_diff, &final_state.class_hash_to_class.borrow());
 
-    // Commit the state diff.
-    let committer_state_diff = create_committer_state_diff(state_diff);
+    // Generate block hash storage updates for historical blocks.
+    let block_hash_storage_updates = generate_block_hash_storage_updates();
+
+    // Commit the state diff with block hash mappings.
+    let mut committer_state_diff = create_committer_state_diff(state_diff);
+    committer_state_diff
+        .storage_updates
+        .entry(block_hash_contract_address())
+        .or_default()
+        .extend(block_hash_storage_updates.iter().map(|(k, v)| (*k, *v)));
+
+    // Also apply block hash storage to the blockifier's cached state.
+    let mut block_hash_state_maps = StateMaps::default();
+    for (key, value) in block_hash_storage_updates {
+        block_hash_state_maps.storage.insert((block_hash_contract_address(), key.0), value.0);
+    }
+    final_state
+        .state
+        .apply_writes(&block_hash_state_maps, &final_state.class_hash_to_class.borrow());
+
     let (commitment_output, commitment_storage) =
         commit_initial_state_diff(committer_state_diff).await;