From 6047951e92485ff0566ad26cab4697f43e9444c7 Mon Sep 17 00:00:00 2001 From: Mohammad Nassar Date: Wed, 7 Feb 2024 14:53:50 +0200 Subject: [PATCH] chore: upgrade cairo and sn-api versions --- Cargo.lock | 1076 ++--------------- Cargo.toml | 14 +- crates/blockifier/Cargo.toml | 2 +- .../src/execution/contract_class.rs | 4 +- crates/native_blockifier/Cargo.toml | 2 +- 5 files changed, 107 insertions(+), 991 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c930908e34..455fdb2e71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,66 +55,12 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" -[[package]] -name = "anstream" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - [[package]] name = "anyhow" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - [[package]] name = "ark-ec" version = "0.4.2" @@ -275,17 +221,6 @@ dependencies = [ "syn 2.0.46", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -316,26 +251,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.1", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.46", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -386,7 +301,7 @@ dependencies = [ [[package]] name = "blockifier" -version = "0.5.0-dev.0" +version = "0.5.0-rc.0" dependencies = [ "anyhow", "ark-ec", @@ -398,7 +313,7 @@ dependencies = [ "cairo-felt", "cairo-lang-casm", "cairo-lang-runner", - "cairo-lang-starknet", + "cairo-lang-starknet-classes", "cairo-lang-utils", "cairo-vm", "derive_more", @@ -419,7 +334,7 @@ dependencies = [ "starknet-crypto 0.5.2", "starknet_api", "strum", - "strum_macros 0.24.3", + "strum_macros", "test-case", "thiserror", ] @@ -442,12 +357,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - [[package]] name = "cached" version = "0.44.0" @@ -499,26 +408,23 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039c26a5d37099dc502c24374972d510380d556ad8b1ebc709018317e15aaa4b" +checksum = "79c609f2d50a308006b0c04a3e1f9eda79fc4b6cc7d5cdb128c45ae020af7391" dependencies = [ "cairo-lang-utils", - "indoc 2.0.4", + "indoc", "num-bigint", "num-traits 0.2.17", "parity-scale-codec", - "parity-scale-codec-derive", - "schemars", "serde", - "thiserror", ] [[package]] name = "cairo-lang-compiler" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00cba807bad1c5eb232246595e60dd168ba1665ee8c3e54c41bb8eaddf4cb28b" +checksum = "f9d0e519f55e16aca12c48330b058e84368fa0a2751bc6322f63e474e98039bd" dependencies = [ "anyhow", "cairo-lang-defs", @@ -533,23 +439,24 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "salsa", + "smol_str", "thiserror", ] [[package]] name = "cairo-lang-debug" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0ecf0a142e38df1565ff236dcc1d80d7abcff2bc41d6b3212f8b6d9f05c0a4" +checksum = "a28f52797c69c11cfe7099747eccdf837ecd71ff17ef443f45dff743426a7163" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd30e1f4ea6eab863bef95aeff0fde6fd6c075e83635ff58e91a03ae46080640" +checksum = "a65986f560d3c1ac573ac26e9d9e000ad95f82b64b7d1f4b49005608049c8c09" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -564,9 +471,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d804a0dd8daf7afb60277262d5a3dbcc77c92e70dd7e0c561633f9d465af27" +checksum = "0a9e688f43671b7cb397bcb4fbdb55158633369a1f5ae4e61ea42207eb371d63" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -576,9 +483,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d4ae66190fb6da39f88d970b4f11fe0a19fe44046a5008cb90063d08e1022c" +checksum = "8c516416fe6b202df2d94611e984b6177ac87f8553b17765f9430608132f5645" dependencies = [ "cairo-lang-utils", "good_lp", @@ -586,9 +493,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b5f333742ef84bc08942820db78c59be513f8c7ba1785d4cd7d3424fd7826" +checksum = "cd837ab31b831e9f7b8376ff83f77fff01ad5a6a7bd23bf146bcfaad62d4b039" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -600,9 +507,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad5141f2f5bb887a158bab910b658ddca7f30c08701bc107789880fc9a81648" +checksum = "dae6a996bd5f5c6f1ac6f961c507d2d841c9ecfbd6aa645a74140907d8a13280" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -625,9 +532,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8e4ba24c66b1b8b00028d1b54e6d6f19a32c6f614d5c6b927dd4bf1251b831" +checksum = "3ead70afebbb01898f7a1d29e3bfb91ee545c29446680ccbb66f5c51f1741313" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -645,9 +552,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b3e1847ca9e303a6f7abdb97d1cd29c5f595db1f373b911626d7ca5fa31ce37" +checksum = "32ecdc7986014341e0165a027105e612985c32a7bcd2f7c0fc4cd6197b37eb67" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -656,7 +563,7 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "indent", - "indoc 2.0.4", + "indoc", "itertools 0.11.0", "salsa", "smol_str", @@ -664,9 +571,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0a9fe6e2dd307b0c53c75c6eb625719a07829b475b3c4a04caefe4e1c92236" +checksum = "5629126ebb5347cdad42fa7388535118521b4f68419f957728fe53760a726e83" dependencies = [ "cairo-lang-debug", "quote", @@ -675,9 +582,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55bbcb9001359e2e168cfde7369bd1d6e84ac15efa425331b2b32f03958b1d24" +checksum = "60125ce673e4c453ffe532ba15b295a0664334c4af666e43ab94ecaa2915fa8a" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -689,9 +596,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9867f8e30b824988c249fbed6325ace995503143d02c45c60fc15e572b6c11c7" +checksum = "76d269f3b2fe2613cb70f72f4a2c7928d119232766a83ffc7bbb3fb0aba2c74b" dependencies = [ "ark-ff", "ark-secp256k1", @@ -701,6 +608,7 @@ dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", "cairo-lang-sierra-ap-change", + "cairo-lang-sierra-generator", "cairo-lang-sierra-to-casm", "cairo-lang-sierra-type-size", "cairo-lang-starknet", @@ -711,15 +619,16 @@ dependencies = [ "num-bigint", "num-integer", "num-traits 0.2.17", + "smol_str", "starknet-crypto 0.6.1", "thiserror", ] [[package]] name = "cairo-lang-semantic" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede5ef4b7ddbf7c07359956ab0c121cbe797453090e95338869af7fdb38e5b2b" +checksum = "0773a59a843e532aea274efaa7be499b6953a1aaeb0d64c8b8c11109ba1da2c4" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -731,7 +640,7 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "id-arena", - "indoc 2.0.4", + "indoc", "itertools 0.11.0", "num-bigint", "num-traits 0.2.17", @@ -742,9 +651,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f96b2c3ca1202536e0d17ef96e854d421a977f955f9ea6e034754f428b28ec90" +checksum = "f06cf259fa7022e55f4a997c691510728119a3a2025e8fd9a8d18d3871b91259" dependencies = [ "anyhow", "cairo-felt", @@ -768,9 +677,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761219bb5acfbc13ca71f405d4c46ae0787eb81633a861f3ec6f82e778e74c70" +checksum = "927b7624e3e6c45552a70b50760706b49939f4eec24ad03359dd9a3de383e58d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -783,9 +692,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef3a50fd3561f32fb90a6b11ad2e6e1343d650f7c5c520d7074e91bb6a6cffc" +checksum = "bce6e6355cb8f06714879a031d9c85e80d4261468e93a3c62b440b4804518e43" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -798,9 +707,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff8f590e59a378f93c26c29f123e71914c286dc94a4a9e0c09d991abfd933c6" +checksum = "085979b1238d59a2d0feebca864ddbd91854f6c057c96cf904ee5e7229e6590a" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -821,9 +730,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e65019e277a1c7e9aa9f0a5f0c4c58bb1e8d4aaaf82bdad06588523cd40dcc2" +checksum = "048b7e1627faddfcde39bc4bfaca81ef88fa01c984e17f322195a3598632bcd1" dependencies = [ "assert_matches", "cairo-felt", @@ -833,7 +742,7 @@ dependencies = [ "cairo-lang-sierra-gas", "cairo-lang-sierra-type-size", "cairo-lang-utils", - "indoc 2.0.4", + "indoc", "itertools 0.11.0", "num-bigint", "num-traits 0.2.17", @@ -842,9 +751,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de64514c18b09805c739547694e0b33a01ae72736b7c48d356a5c6fa8e06604d" +checksum = "5f5b15790a43e099efa6631b0a3a956feed3079ed5f6b8bb853bc9747c3eb305" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -852,28 +761,47 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bab15d4b6a0be7bfa1f6fc71183dc821dc99034c3285f9610077225dcb4208f" +checksum = "0fff12ebd720839dd1d51ac776b53e2ad7b898d5bc28c3998d17f380da85c8a9" dependencies = [ "anyhow", "cairo-felt", - "cairo-lang-casm", "cairo-lang-compiler", "cairo-lang-defs", "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-lowering", + "cairo-lang-plugins", "cairo-lang-semantic", "cairo-lang-sierra", "cairo-lang-sierra-generator", - "cairo-lang-sierra-to-casm", + "cairo-lang-starknet-classes", "cairo-lang-syntax", "cairo-lang-utils", "const_format", - "convert_case 0.6.0", "indent", - "indoc 2.0.4", + "indoc", + "itertools 0.11.0", + "once_cell", + "serde", + "serde_json", + "smol_str", + "thiserror", +] + +[[package]] +name = "cairo-lang-starknet-classes" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e306eeaf4766fc701a74e727c1a88c2c5d2b40748d07d0548ec8e0b0ca11dec6" +dependencies = [ + "cairo-felt", + "cairo-lang-casm", + "cairo-lang-sierra", + "cairo-lang-sierra-to-casm", + "cairo-lang-utils", + "convert_case 0.6.0", "itertools 0.11.0", "num-bigint", "num-integer", @@ -889,9 +817,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0316e4631c9e0423236caf4318bd914f15b4715aab8d76da042e69b758fcd1" +checksum = "6f5fb36c2d85254af7e33b130809cea8969150bbe8df03c51876b546224704a3" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -905,9 +833,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c7c3674f737bff4bd9657ff5c8dc6f42a1dd7c6bc9dac3e25a33b67d2137dc" +checksum = "5784bda479025abf46e895def0672d04634c7a5b8820279617d03778a6110321" dependencies = [ "genco", "xshell", @@ -915,15 +843,15 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.5.0-dev.1" +version = "2.6.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3a2a904d203bc95f244aec32b3054cc0f7fd0eb84a614136ca6e199b62059a" +checksum = "d812e9b5472c7f10cd3c8e9155d4532bc251e5352a7d1d646934c20fa0dc8bdb" dependencies = [ + "hashbrown 0.14.3", "indexmap 2.1.0", "itertools 0.11.0", "num-bigint", "num-traits 0.2.17", - "parity-scale-codec", "schemars", "serde", ] @@ -959,12 +887,6 @@ dependencies = [ "thiserror-no-std", ] -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - [[package]] name = "cc" version = "1.0.83" @@ -974,76 +896,12 @@ dependencies = [ "libc", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags 1.3.2", - "textwrap", - "unicode-width", -] - -[[package]] -name = "clap" -version = "4.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - [[package]] name = "colored" version = "2.1.0" @@ -1104,70 +962,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" -dependencies = [ - "atty", - "cast", - "clap 2.34.0", - "criterion-plot", - "csv", - "itertools 0.10.5", - "lazy_static", - "num-traits 0.2.17", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.18" @@ -1204,27 +998,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - [[package]] name = "darling" version = "0.14.4" @@ -1359,12 +1132,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - [[package]] name = "fixed-hash" version = "0.8.0" @@ -1383,31 +1150,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -1560,12 +1308,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - [[package]] name = "good_lp" version = "1.7.0" @@ -1576,12 +1318,6 @@ dependencies = [ "minilp", ] -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1626,15 +1362,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.3" @@ -1656,12 +1383,6 @@ dependencies = [ "digest", ] -[[package]] -name = "human_bytes" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" - [[package]] name = "id-arena" version = "2.2.1" @@ -1674,33 +1395,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "impl-codec" version = "0.6.0" @@ -1758,12 +1452,6 @@ dependencies = [ "serde", ] -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - [[package]] name = "indoc" version = "2.0.4" @@ -1779,19 +1467,13 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "integer-encoding" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" - [[package]] name = "is-terminal" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "rustix", "windows-sys 0.52.0", ] @@ -1879,12 +1561,6 @@ dependencies = [ "spin", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.151" @@ -1892,60 +1568,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] -name = "libloading" -version = "0.8.1" +name = "libmimalloc-sys" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "cc", + "libc", ] [[package]] -name = "libmdbx" -version = "0.3.5" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f0bee397dc9a7003e7bd34fffc1dc2d4c4fdc96530a0c439a5f98c9402bc7bf" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ "bitflags 2.4.1", - "byteorder", - "derive_more", - "indexmap 1.9.3", "libc", - "lifetimed-bytes", - "mdbx-sys", - "parking_lot 0.12.1", - "thiserror", -] - -[[package]] -name = "libmimalloc-sys" -version = "0.1.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "lifetimed-bytes" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c970c8ea4c7b023a41cfa4af4c785a16694604c2f2a3b0d1f20a9bcb73fa550" -dependencies = [ - "bytes", + "redox_syscall 0.4.1", ] [[package]] @@ -1979,12 +1619,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matrixmultiply" version = "0.2.4" @@ -1994,63 +1628,12 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "mdbx-sys" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a329f8d655fb646cc9511c00886eefcddb6ef131869ef2d4b02c24c66825ac" -dependencies = [ - "bindgen", - "cc", - "libc", -] - [[package]] name = "memchr" version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrics" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" -dependencies = [ - "ahash 0.8.7", - "metrics-macros", - "portable-atomic", -] - -[[package]] -name = "metrics-macros" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.46", -] - [[package]] name = "mimalloc" version = "0.1.39" @@ -2085,29 +1668,6 @@ dependencies = [ "adler", ] -[[package]] -name = "native_blockifier" -version = "0.5.0-dev.0" -dependencies = [ - "blockifier", - "cached", - "cairo-lang-starknet", - "cairo-vm", - "criterion", - "indexmap 2.1.0", - "log", - "num-bigint", - "papyrus_storage", - "pretty_assertions", - "pyo3", - "pyo3-log", - "serde", - "serde_json", - "starknet_api", - "tempfile", - "thiserror", -] - [[package]] name = "ndarray" version = "0.13.1" @@ -2236,74 +1796,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "page_size" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "papyrus_config" -version = "0.3.0-dev.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d970689602132e050483044c882d29da7dc290a4f2bc59b9b182dd9bd53aa9" -dependencies = [ - "clap 4.4.13", - "itertools 0.10.5", - "serde", - "serde_json", - "strum_macros 0.25.3", - "thiserror", - "validator", -] - -[[package]] -name = "papyrus_proc_macros" -version = "0.3.0-dev.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2d5d7cb785651af60d7d23c79e7c09464bc3f9647162e87f2ac28fb8acda99" -dependencies = [ - "quote", - "syn 2.0.46", -] - -[[package]] -name = "papyrus_storage" -version = "0.3.0-dev.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea240ca33cc6ac5678a196c0633b9188135b93728ba89858b5fea64e5f4b7db" -dependencies = [ - "byteorder", - "cairo-lang-casm", - "cairo-lang-starknet", - "cairo-lang-utils", - "clap 4.4.13", - "flate2", - "human_bytes", - "indexmap 2.1.0", - "integer-encoding", - "libmdbx", - "memmap2", - "metrics", - "num-bigint", - "page_size", - "papyrus_config", - "papyrus_proc_macros", - "parity-scale-codec", - "primitive-types", - "serde", - "serde_json", - "starknet_api", - "tempfile", - "thiserror", - "tracing", - "validator", -] - [[package]] name = "parity-scale-codec" version = "3.6.5" @@ -2390,18 +1882,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "petgraph" version = "0.6.4" @@ -2481,40 +1961,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits 0.2.17", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2592,79 +2038,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "pyo3" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" -dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "indoc 1.0.9", - "libc", - "memoffset", - "num-bigint", - "parking_lot 0.12.1", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-log" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c2b349b6538d8a73d436ca606dab6ce0aaab4dad9e6b7bdd57a4f556c3bc3" -dependencies = [ - "arc-swap", - "log", - "pyo3", -] - -[[package]] -name = "pyo3-macros" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quote" version = "1.0.35" @@ -2716,26 +2089,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -2923,15 +2276,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schemars" version = "0.8.16" @@ -2978,16 +2322,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.194" @@ -3051,12 +2385,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - [[package]] name = "siphasher" version = "0.3.11" @@ -3187,23 +2515,21 @@ dependencies = [ [[package]] name = "starknet_api" -version = "0.7.0-dev.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88969610ab6ea9391e0e05a3e7c38acc49dc1cb49941b93ca52814075002b92f" +checksum = "e8bfc63e01213a3a39af29aa061435b80a24919ac02d1dce758d9e1ac8be2a44" dependencies = [ - "cairo-lang-starknet", + "cairo-lang-starknet-classes", "derive_more", "hex", "indexmap 2.1.0", "once_cell", - "parity-scale-codec", - "parity-scale-codec-derive", "primitive-types", "serde", "serde_json", "starknet-crypto 0.5.2", "strum", - "strum_macros 0.24.3", + "strum_macros", "thiserror", ] @@ -3251,19 +2577,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.46", -] - [[package]] name = "subtle" version = "2.5.0" @@ -3298,25 +2611,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "target-lexicon" -version = "0.12.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.4.1", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "term" version = "0.7.0" @@ -3350,15 +2644,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.56" @@ -3408,31 +2693,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" version = "1.35.1" @@ -3501,38 +2761,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.46", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - [[package]] name = "typenum" version = "1.17.0" @@ -3560,123 +2788,30 @@ dependencies = [ "thiserror", ] -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-segmentation" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - [[package]] name = "unicode-xid" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "validator" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" -dependencies = [ - "idna 0.2.3", - "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_derive", - "validator_types", -] - -[[package]] -name = "validator_derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4286b4497f270f59276a89ae0ad109d5f8f18c69b613e3fb22b61201aadb0c4d" -dependencies = [ - "if_chain", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" - [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3737,16 +2872,6 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" -[[package]] -name = "web-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "winapi" version = "0.3.9" @@ -3763,15 +2888,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 215ff9f8a0..4e6af46853 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,10 +3,10 @@ # https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2 resolver = "2" -members = ["crates/blockifier", "crates/native_blockifier"] +members = ["crates/blockifier"] [workspace.package] -version = "0.5.0-dev.0" +version = "0.5.0-rc.0" edition = "2021" repository = "https://github.com/starkware-libs/blockifier/" license = "Apache-2.0" @@ -21,10 +21,10 @@ ark-secp256r1 = "0.4.0" assert_matches = "1.5.0" cached = "0.44.0" cairo-felt = "0.9.1" -cairo-lang-casm = "2.5.0-dev.1" -cairo-lang-runner = "2.5.0-dev.1" -cairo-lang-starknet = "2.5.0-dev.1" -cairo-lang-utils = "2.5.0-dev.1" +cairo-lang-casm = "2.6.0-rc.0" +cairo-lang-runner = "2.6.0-rc.0" +cairo-lang-starknet-classes = "2.6.0-rc.0" +cairo-lang-utils = "2.6.0-rc.0" cairo-vm = "0.9.2" criterion = "0.3" derive_more = "0.99.17" @@ -46,7 +46,7 @@ serde = "1.0.184" serde_json = "1.0.81" sha3 = "0.10.6" starknet-crypto = "0.5.1" -starknet_api = "0.7.0-dev.0" +starknet_api = "0.8.0" strum = "0.24.1" strum_macros = "0.24.3" tempfile = "3.7.0" diff --git a/crates/blockifier/Cargo.toml b/crates/blockifier/Cargo.toml index 54e6c14f5e..4a585e2cf7 100644 --- a/crates/blockifier/Cargo.toml +++ b/crates/blockifier/Cargo.toml @@ -24,7 +24,7 @@ cached.workspace = true cairo-felt.workspace = true cairo-lang-casm.workspace = true cairo-lang-runner.workspace = true -cairo-lang-starknet.workspace = true +cairo-lang-starknet-classes.workspace = true cairo-lang-utils.workspace = true cairo-vm.workspace = true derive_more.workspace = true diff --git a/crates/blockifier/src/execution/contract_class.rs b/crates/blockifier/src/execution/contract_class.rs index dee042416c..763de39c83 100644 --- a/crates/blockifier/src/execution/contract_class.rs +++ b/crates/blockifier/src/execution/contract_class.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use cairo_felt::Felt252; use cairo_lang_casm; use cairo_lang_casm::hints::Hint; -use cairo_lang_starknet::casm_contract_class::{CasmContractClass, CasmContractEntryPoint}; -use cairo_lang_starknet::NestedIntList; +use cairo_lang_starknet_classes::casm_contract_class::{CasmContractClass, CasmContractEntryPoint}; +use cairo_lang_starknet_classes::NestedIntList; use cairo_vm::serde::deserialize_program::{ ApTracking, FlowTrackingData, HintParams, ReferenceManager, }; diff --git a/crates/native_blockifier/Cargo.toml b/crates/native_blockifier/Cargo.toml index 6315d250d1..43f00f421b 100644 --- a/crates/native_blockifier/Cargo.toml +++ b/crates/native_blockifier/Cargo.toml @@ -27,7 +27,7 @@ crate-type = ["cdylib"] [dependencies] blockifier = { path = "../blockifier", features = ["testing"] } -cairo-lang-starknet.workspace = true +cairo-lang-starknet-classes.workspace = true cairo-vm.workspace = true indexmap.workspace = true log.workspace = true