diff --git a/Cargo.lock b/Cargo.lock index f570397cd..927f5a76f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaa9ea039a6f9304b4a593d780b1f23e1ae183acdee938b11b38795acacc9f1" +checksum = "4bc32535569185cbcb6ad5fa64d989a47bccb9a08e27284b1f2a3ccf16e6d010" dependencies = [ "alloy-primitives", "num_enum", @@ -1238,9 +1238,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core", "base64 0.22.1", @@ -1573,9 +1573,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" dependencies = [ "serde", ] @@ -2596,7 +2596,7 @@ dependencies = [ "serde_json", "sha2", "sha3", - "starknet-crypto", + "starknet-crypto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "starknet-types-core", "thiserror 2.0.17", "zip", @@ -2613,9 +2613,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.45" +version = "1.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" dependencies = [ "find-msvc-tools", "jobserver", @@ -2659,9 +2659,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", "clap_derive", @@ -2669,9 +2669,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstream", "anstyle", @@ -3416,9 +3416,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "fixed-hash" @@ -6296,9 +6296,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.15.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" +checksum = "10574371d41b0d9b2cff89418eda27da52bcaff2cc8741db26382a77c29131f1" dependencies = [ "base64 0.22.1", "chrono", @@ -6315,9 +6315,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.15.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" +checksum = "08a72d8216842fdd57820dc78d840bef99248e35fb2554ff923319e60f2d686b" dependencies = [ "darling 0.21.3", "proc-macro2", @@ -6572,13 +6572,12 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "starknet-accounts" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7c118729bcdcfa1610844047cbdb23090fb1d4172a36bb97a663be8d022d1a" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" dependencies = [ "async-trait", "auto_impl", "starknet-core", - "starknet-crypto", + "starknet-crypto 0.8.1 (git+https://github.com/software-mansion-labs/starknet-rs)", "starknet-providers", "starknet-signers", "thiserror 1.0.69", @@ -6587,8 +6586,7 @@ dependencies = [ [[package]] name = "starknet-contract" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb64331b72caf51c0d8b684b62012f9a771015b4cf5e52cba9bf61be8384ad3" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" dependencies = [ "serde", "serde_json", @@ -6602,8 +6600,7 @@ dependencies = [ [[package]] name = "starknet-core" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb7212226769766c1c7d79b70f9242ffbd213290a41604ecc7e78faa0ed0deb" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" dependencies = [ "base64 0.21.7", "crypto-bigint", @@ -6612,21 +6609,21 @@ dependencies = [ "hex", "indexmap 2.12.0", "num-traits", + "semver 1.0.27", "serde", "serde_json", "serde_json_pythonic", "serde_with", "sha3", "starknet-core-derive", - "starknet-crypto", + "starknet-crypto 0.8.1 (git+https://github.com/software-mansion-labs/starknet-rs)", "starknet-types-core", ] [[package]] name = "starknet-core-derive" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08520b7d80eda7bf1a223e8db4f9bb5779a12846f15ebf8f8d76667eca7f5ad" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" dependencies = [ "proc-macro2", "quote", @@ -6647,7 +6644,27 @@ dependencies = [ "num-traits", "rfc6979", "sha2", - "starknet-curve", + "starknet-curve 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "starknet-types-core", + "zeroize", +] + +[[package]] +name = "starknet-crypto" +version = "0.8.1" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" +dependencies = [ + "blake2", + "crypto-bigint", + "digest 0.10.7", + "hex", + "hmac", + "num-bigint", + "num-integer", + "num-traits", + "rfc6979", + "sha2", + "starknet-curve 0.6.0 (git+https://github.com/software-mansion-labs/starknet-rs)", "starknet-types-core", "zeroize", ] @@ -6661,6 +6678,14 @@ dependencies = [ "starknet-types-core", ] +[[package]] +name = "starknet-curve" +version = "0.6.0" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" +dependencies = [ + "starknet-types-core", +] + [[package]] name = "starknet-devnet" version = "0.6.1" @@ -6779,8 +6804,7 @@ dependencies = [ [[package]] name = "starknet-providers" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fc3d94cc008cea64e291b261e8349065424ee7491e5dd0fa9bd688818bece1" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" dependencies = [ "async-trait", "auto_impl", @@ -6800,8 +6824,7 @@ dependencies = [ [[package]] name = "starknet-signers" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d839b06d899ef3a0de11b1e9a91a14c118b1ed36830ec8e59d9fbc9a1e51976b" +source = "git+https://github.com/software-mansion-labs/starknet-rs#6e3a394ebe9ded6c18fc56479fec9a196ff6f75e" dependencies = [ "async-trait", "auto_impl", @@ -6810,7 +6833,7 @@ dependencies = [ "getrandom 0.2.16", "rand 0.8.5", "starknet-core", - "starknet-crypto", + "starknet-crypto 0.8.1 (git+https://github.com/software-mansion-labs/starknet-rs)", "thiserror 1.0.69", ] @@ -6862,7 +6885,7 @@ dependencies = [ "serde_json", "sha3", "sizeof", - "starknet-crypto", + "starknet-crypto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "starknet-types-core", "strum 0.25.0", "strum_macros 0.25.3", diff --git a/Cargo.toml b/Cargo.toml index ad496c38d..4874d7030 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 diff --git a/crates/starknet-devnet-core/src/starknet/events.rs b/crates/starknet-devnet-core/src/starknet/events.rs index 8cee75a86..c370df277 100644 --- a/crates/starknet-devnet-core/src/starknet/events.rs +++ b/crates/starknet-devnet-core/src/starknet/events.rs @@ -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, diff --git a/crates/starknet-devnet-types/src/rpc/emitted_event.rs b/crates/starknet-devnet-types/src/rpc/emitted_event.rs index a281e3d9c..efdbcbf1d 100644 --- a/crates/starknet-devnet-types/src/rpc/emitted_event.rs +++ b/crates/starknet-devnet-types/src/rpc/emitted_event.rs @@ -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, - #[serde(skip_serializing_if = "Option::is_none")] - pub event_index: Option, + pub transaction_index: u64, + pub event_index: u64, #[serde(skip_serializing_if = "Option::is_none")] pub block_hash: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -27,10 +25,8 @@ impl From 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 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)]