diff --git a/Cargo.lock b/Cargo.lock index 7b936828..c5301fe2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -549,8 +549,9 @@ dependencies = [ [[package]] name = "blockifier" -version = "0.8.0-dev.1" -source = "git+https://github.com/starkware-libs/blockifier.git?rev=bad24f25#bad24f2543c848202f8fe2c833cd4149fef75d9f" +version = "0.8.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59eec80446f00e2c27d2a45166c6d09323021cf0543c1789250c95568143bb00" dependencies = [ "anyhow", "ark-ec", @@ -574,8 +575,6 @@ dependencies = [ "num-traits 0.2.19", "once_cell", "phf", - "rand", - "rstest", "serde", "serde_json", "sha2", @@ -590,8 +589,7 @@ dependencies = [ [[package]] name = "blockifier" version = "0.8.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59eec80446f00e2c27d2a45166c6d09323021cf0543c1789250c95568143bb00" +source = "git+https://github.com/starkware-libs/blockifier.git?rev=32191d41#32191d41502291b4b2683a4ac070e83c77d0cd31" dependencies = [ "anyhow", "ark-ec", @@ -615,6 +613,8 @@ dependencies = [ "num-traits 0.2.19", "once_cell", "phf", + "rand", + "rstest", "serde", "serde_json", "sha2", @@ -3408,7 +3408,7 @@ name = "mempool_test_utils" version = "0.0.0" dependencies = [ "assert_matches", - "blockifier 0.8.0-dev.1", + "blockifier 0.8.0-rc.0 (git+https://github.com/starkware-libs/blockifier.git?rev=32191d41)", "serde_json", "starknet-types-core", "starknet_api", @@ -3849,7 +3849,7 @@ version = "0.4.0-dev.4" source = "git+https://github.com/starkware-libs/papyrus.git?rev=ca83fd42#ca83fd42d1efddcd4e13e981654cdd920ec61288" dependencies = [ "anyhow", - "blockifier 0.8.0-rc.0", + "blockifier 0.8.0-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-lang-starknet-classes", "cairo-vm", "indexmap 2.2.6", @@ -5383,7 +5383,7 @@ dependencies = [ "assert_matches", "async-trait", "axum", - "blockifier 0.8.0-dev.1", + "blockifier 0.8.0-rc.0 (git+https://github.com/starkware-libs/blockifier.git?rev=32191d41)", "cairo-lang-starknet-classes", "cairo-vm", "hyper", @@ -5449,7 +5449,7 @@ name = "starknet_mempool_integration_tests" version = "0.0.0" dependencies = [ "axum", - "blockifier 0.8.0-dev.1", + "blockifier 0.8.0-rc.0 (git+https://github.com/starkware-libs/blockifier.git?rev=32191d41)", "cairo-lang-starknet-classes", "indexmap 2.2.6", "mempool_test_utils", diff --git a/Cargo.toml b/Cargo.toml index 6c0a7f63..b4319bef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,10 +4,10 @@ members = [ "crates/mempool", "crates/mempool_infra", "crates/mempool_node", + "crates/mempool_test_utils", "crates/mempool_types", "crates/starknet_sierra_compile", "crates/task_executor", - "crates/mempool_test_utils", "crates/tests-integration", ] resolver = "2" @@ -34,8 +34,8 @@ assert-json-diff = "2.0.2" assert_matches = "1.5.0" async-trait = "0.1.79" axum = "0.6.12" -blockifier = { git = "https://github.com/starkware-libs/blockifier.git", rev = "bad24f25" } bincode = "1.3.3" +blockifier = { git = "https://github.com/starkware-libs/blockifier.git", rev = "32191d41" } cairo-lang-sierra = "2.7.0-dev.0" cairo-lang-starknet-classes = "2.7.0-dev.0" cairo-lang-utils = "2.7.0-dev.0" @@ -45,13 +45,13 @@ colored = "2.1.0" const_format = "0.2.30" derive_more = "0.99" futures = "0.3.30" -hyper = { version = "0.14", features = ["client", "server", "http1", "http2", "tcp"] } +hyper = { version = "0.14", features = ["client", "http1", "http2", "server", "tcp"] } indexmap = "2.1.0" itertools = "0.13.0" lazy_static = "1.4.0" -mockito = "1.4.0" -num-traits = "0.2" +mockito = "1.4.0" num-bigint = { version = "0.4.5", default-features = false } +num-traits = "0.2" # TODO(YaelD, 28/5/2024): The special Papyrus version is needed in order to be aligned with the # starknet-api version. This should be removed once we have a mono-repo. papyrus_common = { git = "https://github.com/starkware-libs/papyrus.git", rev = "ca83fd42" } @@ -67,8 +67,8 @@ serde_json = { version = "1.0", features = ["arbitrary_precision"] } starknet_api = "0.13.0-dev.9" # TODO(YaelD, 28/5/2024): The special Papyrus version is needed in order to be aligned with the # starknet-api version. This should be removed once we have a mono-repo. +starknet-types-core = { version = "0.1.5", features = ["hash", "prime-bigint", "std"] } starknet_client = { git = "https://github.com/starkware-libs/papyrus.git", rev = "ca83fd42" } -starknet-types-core = { version = "0.1.5", features = ["std", "hash", "prime-bigint"] } strum = "0.24.1" tempfile = "3.3.0" thiserror = "1.0"