Skip to content

[ON HOLD] Align with spec for emitted events #890

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[ON HOLD] Align with spec for emitted events #890

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
95 changes: 59 additions & 36 deletions Cargo.lock
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ enum-helper-macros = "0.0.1"
starknet-types-core = "=0.2.3"
starknet_api = { version = "0.16.0-rc.1", features = ["testing"] }
blockifier = { version = "0.16.0-rc.1" }
starknet-rs-signers = { version = "0.14.0", package = "starknet-signers" }
starknet-rs-core = { version = "0.16.0", package = "starknet-core" }
starknet-rs-providers = { version = "0.16.0", package = "starknet-providers" }
starknet-rs-accounts = { version = "0.16.0", package = "starknet-accounts" }
starknet-rs-contract = { version = "0.16.0", package = "starknet-contract" }
starknet-rs-signers = { git = "https://github.com/software-mansion-labs/starknet-rs", package = "starknet-signers" }
starknet-rs-core = { git = "https://github.com/software-mansion-labs/starknet-rs", package = "starknet-core" }
starknet-rs-providers = { git = "https://github.com/software-mansion-labs/starknet-rs", package = "starknet-providers" }
starknet-rs-accounts = { git = "https://github.com/software-mansion-labs/starknet-rs", package = "starknet-accounts" }
starknet-rs-contract = { git = "https://github.com/software-mansion-labs/starknet-rs", package = "starknet-contract" }
cairo-vm = "=2.5.0"

# Cairo-lang dependencies
Expand Down
4 changes: 2 additions & 2 deletions crates/starknet-devnet-core/src/starknet/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ pub(crate) fn get_events(

let emitted_event = EmittedEvent {
transaction_hash: *transaction_hash,
transaction_index: Some(transaction_index as u64),
event_index: Some(event_index as u64),
transaction_index: transaction_index as u64,
event_index: event_index as u64,
block_hash,
block_number,
keys: transaction_event.keys,
Expand Down
12 changes: 4 additions & 8 deletions crates/starknet-devnet-types/src/rpc/emitted_event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ use crate::felt::{BlockHash, TransactionHash};
#[cfg_attr(feature = "testing", derive(serde::Deserialize), serde(deny_unknown_fields))]
pub struct EmittedEvent {
pub transaction_hash: TransactionHash,
#[serde(skip_serializing_if = "Option::is_none")]
pub transaction_index: Option<u64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub event_index: Option<u64>,
pub transaction_index: u64,
pub event_index: u64,
#[serde(skip_serializing_if = "Option::is_none")]
pub block_hash: Option<BlockHash>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand All @@ -27,10 +25,8 @@ impl From<starknet_rs_core::types::EmittedEvent> for EmittedEvent {
fn from(sn_rs_event: starknet_rs_core::types::EmittedEvent) -> Self {
Self {
transaction_hash: sn_rs_event.transaction_hash,
// TODO: When starknet-rs is updated to include these fields, we can set them here.
// Types should be changed to u64 instead of Option<u64> as well.
transaction_index: None,
event_index: None,
transaction_index: sn_rs_event.transaction_index,
event_index: sn_rs_event.event_index,
block_hash: sn_rs_event.block_hash,
block_number: sn_rs_event.block_number.map(BlockNumber),
#[allow(clippy::expect_used)]
Expand Down
Loading