Skip to content
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.

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

feat(starknet_consensus_orchestrator): add sierras to cende blob #3955

Merged
merged 1 commit into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion crates/starknet_consensus_manager/src/consensus_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ impl ConsensusManager {
Arc::clone(&self.batcher_client),
outbound_internal_sender,
votes_broadcast_channels.broadcast_topic_client.clone(),
Arc::new(CendeAmbassador::new(self.config.cende_config.clone())),
Arc::new(CendeAmbassador::new(
self.config.cende_config.clone(),
Arc::clone(&self.class_manager_client),
)),
);

let mut network_handle = tokio::task::spawn(network_manager.run());
Expand Down
2 changes: 1 addition & 1 deletion crates/starknet_consensus_orchestrator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ description = "Implements the consensus context and orchestrates the node's comp
deserialize = ["blockifier/transaction_serde"]

[dependencies]
assert_matches.workspace = true
async-trait.workspace = true
cairo-lang-starknet-classes.workspace = true
blockifier.workspace = true
Expand Down Expand Up @@ -51,6 +50,7 @@ papyrus_test_utils.path = "../papyrus_test_utils"
rstest.workspace = true
serde_json.workspace = true
starknet_batcher_types = { path = "../starknet_batcher_types", features = ["testing"] }
starknet_class_manager_types = { path = "../starknet_class_manager_types", features = ["testing"] }
starknet_infra_utils.path = "../starknet_infra_utils"
starknet_state_sync_types = { path = "../starknet_state_sync_types", features = ["testing"] }
test-case.workspace = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"paymaster_data": [],
"class_hash": "0x3a59046762823dc87385eb5ac8a21f3f5bfe4274151c6eb633737656c209056",
"compiled_class_hash": "0x1",
"sierra_program_size": 8844,
"sierra_program_size": 3,
"sierra_version": [
"0x0",
"0x1",
"0x6",
"0x0"
],
"abi_size": 11237,
"abi_size": 9,
"account_deployment_data": [],
"type": "DECLARE"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"0x1",
"0x2"
],
"contract_class_version": "dummy version",
"contract_class_version": "0.1.0",
"entry_points_by_type": {
"CONSTRUCTOR": [
{
Expand Down
38 changes: 23 additions & 15 deletions crates/starknet_consensus_orchestrator/src/cende/cende_test.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
use std::sync::Arc;

use rstest::rstest;
use starknet_api::block::{BlockInfo, BlockNumber};
use starknet_class_manager_types::MockClassManagerClient;

use super::{CendeAmbassador, RECORDER_WRITE_BLOB_PATH};
use crate::cende::{BlobParameters, CendeConfig, CendeContext};
Expand Down Expand Up @@ -31,15 +34,16 @@ async fn write_prev_height_blob(
let url = server.url();
let mock = server.mock("POST", RECORDER_WRITE_BLOB_PATH).with_status(mock_status_code).create();

let cende_ambassador = CendeAmbassador::new(CendeConfig {
recorder_url: url.parse().unwrap(),
..Default::default()
});
let cende_ambassador = CendeAmbassador::new(
CendeConfig { recorder_url: url.parse().unwrap(), ..Default::default() },
Arc::new(MockClassManagerClient::new()),
);

if let Some(prev_block) = prev_block {
cende_ambassador
.prepare_blob_for_next_height(BlobParameters::with_block_number(prev_block))
.await;
.await
.unwrap();
}

let receiver = cende_ambassador.write_prev_height_blob(BlockNumber(HEIGHT_TO_WRITE));
Expand All @@ -50,14 +54,15 @@ async fn write_prev_height_blob(

#[tokio::test]
async fn prepare_blob_for_next_height() {
let cende_ambassador = CendeAmbassador::new(CendeConfig {
recorder_url: "http://parsable_url".parse().unwrap(),
..Default::default()
});
let cende_ambassador = CendeAmbassador::new(
CendeConfig { recorder_url: "http://parsable_url".parse().unwrap(), ..Default::default() },
Arc::new(MockClassManagerClient::new()),
);

cende_ambassador
.prepare_blob_for_next_height(BlobParameters::with_block_number(HEIGHT_TO_WRITE))
.await;
.await
.unwrap();
assert_eq!(
cende_ambassador.prev_height_blob.lock().await.as_ref().unwrap().block_number.0,
HEIGHT_TO_WRITE
Expand All @@ -67,11 +72,14 @@ async fn prepare_blob_for_next_height() {
#[tokio::test]
async fn no_write_at_skipped_height() {
const SKIP_WRITE_HEIGHT: u64 = HEIGHT_TO_WRITE;
let cende_ambassador = CendeAmbassador::new(CendeConfig {
recorder_url: "http://parsable_url".parse().unwrap(),
skip_write_height: Some(BlockNumber(SKIP_WRITE_HEIGHT)),
..Default::default()
});
let cende_ambassador = CendeAmbassador::new(
CendeConfig {
recorder_url: "http://parsable_url".parse().unwrap(),
skip_write_height: Some(BlockNumber(SKIP_WRITE_HEIGHT)),
..Default::default()
},
Arc::new(MockClassManagerClient::new()),
);

// Returns false since the blob is missing and the height is different than skip_write_height.
assert!(
Expand Down
Loading
Loading