diff --git a/crates/apollo_batcher/src/batcher.rs b/crates/apollo_batcher/src/batcher.rs index 13c465c53f2..37f14dbd8d1 100644 --- a/crates/apollo_batcher/src/batcher.rs +++ b/crates/apollo_batcher/src/batcher.rs @@ -1033,8 +1033,6 @@ impl Batcher { .compiled_class_hashes_for_migration, parent_proposal_commitment, #[cfg(feature = "os_input")] - accessed_keys, - #[cfg(feature = "os_input")] initial_reads, }, }) diff --git a/crates/apollo_batcher_types/src/batcher_types.rs b/crates/apollo_batcher_types/src/batcher_types.rs index 4f9c6a9200d..d6f8dfc5a10 100644 --- a/crates/apollo_batcher_types/src/batcher_types.rs +++ b/crates/apollo_batcher_types/src/batcher_types.rs @@ -3,8 +3,6 @@ use std::ops::Deref; use blockifier::blockifier::transaction_executor::CompiledClassHashesForMigration; use blockifier::bouncer::{BouncerWeights, CasmHashComputationData}; -#[cfg(feature = "os_input")] -use blockifier::state::accessed_keys::AccessedKeys; use blockifier::state::cached_state::CommitmentStateDiff; #[cfg(feature = "os_input")] use blockifier::state::cached_state::StateMaps; @@ -162,8 +160,6 @@ pub struct CentralObjects { pub casm_hash_computation_data_proving_gas: CasmHashComputationData, pub compiled_class_hashes_for_migration: CompiledClassHashesForMigration, pub parent_proposal_commitment: Option, - #[cfg(feature = "os_input")] - pub accessed_keys: AccessedKeys, /// Pre-block read values the OS needs to replay the block. #[cfg(feature = "os_input")] pub initial_reads: StateMaps, diff --git a/crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs b/crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs index a359eea676c..799b4ab0336 100644 --- a/crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs +++ b/crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs @@ -46,8 +46,6 @@ use blockifier::fee::resources::{ TransactionResources, }; #[cfg(feature = "os_input")] -use blockifier::state::accessed_keys::AccessedKeys; -#[cfg(feature = "os_input")] use blockifier::state::cached_state::StateMaps; use blockifier::state::cached_state::{ CommitmentStateDiff, @@ -786,8 +784,6 @@ fn central_blob() -> AerospikeBlob { #[cfg(feature = "os_input")] recent_state_commitment_infos: recent_state_commitment_infos(), #[cfg(feature = "os_input")] - accessed_keys: AccessedKeys::default(), - #[cfg(feature = "os_input")] initial_reads: StateMaps::default(), }; @@ -821,8 +817,6 @@ fn central_blob_with_empty_or_none_fields() -> AerospikeBlob { #[cfg(feature = "os_input")] recent_state_commitment_infos: vec![], #[cfg(feature = "os_input")] - accessed_keys: AccessedKeys::default(), - #[cfg(feature = "os_input")] initial_reads: StateMaps::default(), }; @@ -1179,15 +1173,14 @@ fn serialize_central_objects(#[case] rust_obj: impl Serialize, #[case] python_js let python_json: serde_json::Value = read_json_file(python_json_path); let rust_json = serde_json::to_value(rust_obj).unwrap(); - // `recent_state_commitment_infos`, `accessed_keys` and `initial_reads` are os_input-only and - // absent from the central (python) blob, so strip them before comparing. + // `recent_state_commitment_infos` and `initial_reads` are os_input-only and absent from the + // central (python) blob, so strip them before comparing. // TODO(Itamar): Remove this stripping once the python blob includes the fields. #[cfg(feature = "os_input")] let rust_json = { let mut rust_json = rust_json; if let Some(object) = rust_json.as_object_mut() { object.remove("recent_state_commitment_infos"); - object.remove("accessed_keys"); object.remove("initial_reads"); } rust_json diff --git a/crates/apollo_consensus_orchestrator/src/cende/mod.rs b/crates/apollo_consensus_orchestrator/src/cende/mod.rs index 49de9e2aa1b..9cf297022a8 100644 --- a/crates/apollo_consensus_orchestrator/src/cende/mod.rs +++ b/crates/apollo_consensus_orchestrator/src/cende/mod.rs @@ -12,8 +12,6 @@ use async_trait::async_trait; use blockifier::abi::constants::STORED_BLOCK_HASH_BUFFER; use blockifier::blockifier::transaction_executor::CompiledClassHashesForMigration; use blockifier::bouncer::{BouncerWeights, CasmHashComputationData}; -#[cfg(feature = "os_input")] -use blockifier::state::accessed_keys::AccessedKeys; use blockifier::state::cached_state::CommitmentStateDiff; #[cfg(feature = "os_input")] use blockifier::state::cached_state::StateMaps; @@ -109,8 +107,6 @@ pub struct AerospikeBlob { #[cfg(feature = "os_input")] recent_state_commitment_infos: Vec, #[cfg(feature = "os_input")] - accessed_keys: AccessedKeys, - #[cfg(feature = "os_input")] initial_reads: StateMaps, } @@ -408,8 +404,6 @@ pub struct BlobParameters { #[cfg(feature = "os_input")] pub recent_state_commitment_infos: Vec, #[cfg(feature = "os_input")] - pub accessed_keys: AccessedKeys, - #[cfg(feature = "os_input")] pub initial_reads: StateMaps, } @@ -469,8 +463,6 @@ impl AerospikeBlob { #[cfg(feature = "os_input")] recent_state_commitment_infos: blob_parameters.recent_state_commitment_infos, #[cfg(feature = "os_input")] - accessed_keys: blob_parameters.accessed_keys, - #[cfg(feature = "os_input")] initial_reads: blob_parameters.initial_reads, }) } diff --git a/crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs b/crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs index f69970878a1..79e39707ed0 100644 --- a/crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs +++ b/crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs @@ -621,8 +621,6 @@ impl SequencerConsensusContext { .collect_recent_state_commitment_infos(height) .await, #[cfg(feature = "os_input")] - accessed_keys: central_objects.accessed_keys, - #[cfg(feature = "os_input")] initial_reads: central_objects.initial_reads, }) .await