Skip to content

apollo_state_sync: align functionality with apollo state reader #10665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ArniStarkware wants to merge 1 commit into
base: arni/gateway/sync_state_reader/extract_get_compiled_classes_from_client
Choose a base branch
from
+26 −25
Draft

apollo_state_sync: align functionality with apollo state reader #10665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions crates/apollo_state_reader/src/apollo_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,13 @@ impl FetchCompiledClasses for ApolloReader {
}

fn is_declared(&self, class_hash: ClassHash) -> StateResult<bool> {
let state_number = StateNumber(self.latest_block);
let state_number = self.latest_block;
let class_declaration_block_number = self
.reader()?
.get_state_reader()
.and_then(|sr| sr.get_class_definition_block_number(&class_hash))
.map_err(|err| StateError::StateReadError(err.to_string()))?;
Ok(
matches!(class_declaration_block_number, Some(block_number) if block_number <= state_number.0),
)
Ok(matches!(class_declaration_block_number, Some(block_number)
if block_number <= state_number))
}
}
44 changes: 23 additions & 21 deletions crates/apollo_state_sync/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,19 +248,32 @@ impl StateSync {

async fn is_cairo_1_class_declared_at(
&self,
block_number: BlockNumber,
state_number: BlockNumber,
class_hash: ClassHash,
) -> StateSyncResult<bool> {
let storage_reader = self.storage_reader.clone();
let class_definition_block_number_opt = storage_reader
let class_definition_block_number = storage_reader
.begin_ro_txn()?
.get_state_reader()?
.get_class_definition_block_number(&class_hash)?;
if let Some(class_definition_block_number) = class_definition_block_number_opt {
Ok(class_definition_block_number <= block_number)
} else {
Ok(false)
}
.get_state_reader()
.and_then(|sr| sr.get_class_definition_block_number(&class_hash))?;
Ok(matches!(class_definition_block_number, Some(block_number)
if block_number <= state_number))
}

async fn is_cairo_0_class_declared_at(
&self,
state_number: BlockNumber,
class_hash: ClassHash,
) -> StateSyncResult<bool> {
let storage_reader = self.storage_reader.clone();
// TODO(noamsp): Add unit testing for cairo0
let deprecated_class_definition_block_number = storage_reader
.begin_ro_txn()?
.get_state_reader()
.and_then(|sr| sr.get_deprecated_class_definition_block_number(&class_hash))?;

Ok(matches!(deprecated_class_definition_block_number, Some(block_number)
if block_number <= state_number))
}

async fn is_class_declared_at(
Expand All @@ -272,18 +285,7 @@ impl StateSync {
return Ok(true);
}

let storage_reader = self.storage_reader.clone();
// TODO(noamsp): Add unit testing for cairo0
let deprecated_class_definition_block_number_opt = storage_reader
.begin_ro_txn()?
.get_state_reader()?
.get_deprecated_class_definition_block_number(&class_hash)?;

Ok(deprecated_class_definition_block_number_opt.is_some_and(
|deprecated_class_definition_block_number| {
deprecated_class_definition_block_number <= block_number
},
))
self.is_cairo_0_class_declared_at(block_number, class_hash).await
}
}

Expand Down
Loading