diff --git a/Cargo.lock b/Cargo.lock index 53c9ef7d870..03fbdd0b263 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -998,7 +998,7 @@ dependencies = [ "sha2", "sha3", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "strum 0.25.0", "strum_macros 0.25.3", "test-case", @@ -1006,6 +1006,47 @@ dependencies = [ "tikv-jemallocator", ] +[[package]] +name = "blockifier" +version = "0.8.0-dev.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01029cc5149e250cf8357bc08fb9301fac2c4edfe55ef6cc102d3b3712c22eda" +dependencies = [ + "anyhow", + "ark-ec", + "ark-ff", + "ark-secp256k1", + "ark-secp256r1", + "cached", + "cairo-lang-casm", + "cairo-lang-runner", + "cairo-lang-starknet-classes", + "cairo-lang-utils", + "cairo-vm", + "derive_more", + "indexmap 2.2.6", + "itertools 0.10.5", + "keccak", + "log", + "num-bigint 0.4.5", + "num-integer", + "num-rational 0.4.2", + "num-traits 0.2.19", + "once_cell", + "phf", + "rand 0.8.5", + "rstest", + "serde", + "serde_json", + "sha2", + "sha3", + "starknet-types-core", + "starknet_api 0.13.0-rc.0", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror", +] + [[package]] name = "blocking" version = "1.6.0" @@ -5267,10 +5308,10 @@ name = "mempool_test_utils" version = "0.0.0" dependencies = [ "assert_matches", - "blockifier", + "blockifier 0.8.0-dev.1", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", ] [[package]] @@ -5532,7 +5573,7 @@ dependencies = [ name = "native_blockifier" version = "0.8.0-dev.1" dependencies = [ - "blockifier", + "blockifier 0.8.0-dev.1", "cached", "cairo-lang-starknet-classes", "cairo-vm", @@ -5546,7 +5587,7 @@ dependencies = [ "serde", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "tempfile", "thiserror", ] @@ -6065,7 +6106,7 @@ dependencies = [ "serde", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "tar", "tempfile", "test-with", @@ -6081,7 +6122,7 @@ dependencies = [ "papyrus_storage", "papyrus_test_utils", "pretty_assertions", - "starknet_api", + "starknet_api 0.13.0-dev.9", "thiserror", "tracing", ] @@ -6105,7 +6146,7 @@ dependencies = [ "sha3", "starknet-crypto 0.5.2", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "thiserror", ] @@ -6138,7 +6179,7 @@ dependencies = [ "papyrus_storage", "papyrus_test_utils", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "test-case", "thiserror", "tokio", @@ -6151,7 +6192,7 @@ version = "0.4.0-dev.4" dependencies = [ "anyhow", "assert_matches", - "blockifier", + "blockifier 0.8.0-dev.1", "cairo-lang-casm", "cairo-lang-starknet-classes", "cairo-lang-utils", @@ -6170,7 +6211,7 @@ dependencies = [ "serde", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "thiserror", "tracing", ] @@ -6241,7 +6282,7 @@ dependencies = [ "pretty_assertions", "replace_with", "serde", - "starknet_api", + "starknet_api 0.13.0-dev.9", "thiserror", "tokio", "tokio-stream", @@ -6286,7 +6327,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_client", "strum 0.25.0", "tempfile", @@ -6320,7 +6361,7 @@ dependencies = [ "rand_chacha 0.3.1", "serde", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "static_assertions", "thiserror", "tokio", @@ -6357,7 +6398,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "thiserror", ] @@ -6405,7 +6446,7 @@ dependencies = [ "serde_json", "starknet-core", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_client", "strum 0.25.0", "strum_macros 0.25.3", @@ -6457,7 +6498,7 @@ dependencies = [ "serde_json", "simple_logger", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "statistical", "tempfile", "test-case", @@ -6499,7 +6540,7 @@ dependencies = [ "serde", "simple_logger", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_client", "thiserror", "tokio", @@ -6526,7 +6567,7 @@ dependencies = [ "serde", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "tracing", ] @@ -8741,6 +8782,30 @@ dependencies = [ "thiserror", ] +[[package]] +name = "starknet_api" +version = "0.13.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a80f50db7439ceb65de759fcbadb1695c82aec82126b2313413632e40d4eec" +dependencies = [ + "bitvec", + "cairo-lang-starknet-classes", + "derive_more", + "hex", + "indexmap 2.2.6", + "itertools 0.12.1", + "once_cell", + "primitive-types", + "serde", + "serde_json", + "sha3", + "starknet-crypto 0.5.2", + "starknet-types-core", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror", +] + [[package]] name = "starknet_client" version = "0.4.0-dev.4" @@ -8766,7 +8831,7 @@ dependencies = [ "serde_repr", "simple_logger", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "strum 0.25.0", "strum_macros 0.25.3", "thiserror", @@ -8783,7 +8848,7 @@ dependencies = [ "assert_matches", "async-trait", "axum", - "blockifier", + "blockifier 0.8.0-dev.1 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-lang-starknet-classes", "cairo-vm", "hyper", @@ -8798,7 +8863,7 @@ dependencies = [ "serde", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_mempool", "starknet_mempool_infra", "starknet_mempool_types", @@ -8820,7 +8885,7 @@ dependencies = [ "pretty_assertions", "rstest", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_mempool_infra", "starknet_mempool_types", "tokio", @@ -8847,7 +8912,7 @@ name = "starknet_mempool_integration_tests" version = "0.0.0" dependencies = [ "axum", - "blockifier", + "blockifier 0.8.0-dev.1", "cairo-lang-starknet-classes", "indexmap 2.2.6", "mempool_test_utils", @@ -8859,7 +8924,7 @@ dependencies = [ "rstest", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_client", "starknet_gateway", "starknet_mempool_infra", @@ -8902,7 +8967,7 @@ name = "starknet_mempool_types" version = "0.0.0" dependencies = [ "async-trait", - "starknet_api", + "starknet_api 0.13.0-dev.9", "starknet_mempool_infra", "thiserror", ] @@ -8919,7 +8984,7 @@ dependencies = [ "serde", "serde_json", "starknet-types-core", - "starknet_api", + "starknet_api 0.13.0-dev.9", "thiserror", ] diff --git a/crates/gateway/Cargo.toml b/crates/gateway/Cargo.toml index 7dd636c274f..c9fc8a9e2db 100644 --- a/crates/gateway/Cargo.toml +++ b/crates/gateway/Cargo.toml @@ -14,22 +14,22 @@ testing = [] [dependencies] async-trait.workspace = true axum.workspace = true -blockifier = { path = "../blockifier", version = "0.8.0-dev.1" , features = ["testing"] } +blockifier = { version = "0.8.0-dev.1", features = ["testing"] } cairo-lang-starknet-classes.workspace = true cairo-vm.workspace = true hyper.workspace = true +mempool_test_utils = { path = "../mempool_test_utils", version = "0.0" } num-traits.workspace = true papyrus_config = { path = "../papyrus_config", version = "0.4.0-dev.4" } papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-dev.4" } reqwest.workspace = true serde.workspace = true serde_json.workspace = true +starknet-types-core.workspace = true starknet_api = { path = "../starknet_api", version = "0.13.0-dev.9" } starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" } starknet_mempool_types = { path = "../mempool_types", version = "0.0" } starknet_sierra_compile = { path = "../starknet_sierra_compile", version = "0.0" } -starknet-types-core.workspace = true -mempool_test_utils = { path = "../mempool_test_utils", version = "0.0"} thiserror.workspace = true tokio.workspace = true tracing.workspace = true