diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f11bf3f42..e31ecad360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,13 @@ #### Upcoming Changes +* chore: update dependencies, particularly clap 3.2 -> 4.3 + * this removes dependency on _atty_, that's no longer mantained + * chore: remove unused dependencies [#1307](https://github.com/lambdaclass/cairo-vm/pull/1307) * rand_core * serde_bytes - * rusty-hook (*dev-dependency*) + * rusty-hook (_dev-dependency_) #### [0.8.1] - 2023-6-29 diff --git a/Cargo.lock b/Cargo.lock index ea9cdf9846..26bce6250b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,6 +33,67 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + [[package]] name = "anyhow" version = "1.0.71" @@ -48,7 +109,7 @@ dependencies = [ "ark-ff-asm", "ark-ff-macros", "ark-serialize", - "ark-std 0.4.0", + "ark-std", "derivative", "digest", "itertools", @@ -88,21 +149,11 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ - "ark-std 0.4.0", + "ark-std", "digest", "num-bigint", ] -[[package]] -name = "ark-std" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" -dependencies = [ - "num-traits 0.2.15", - "rand", -] - [[package]] name = "ark-std" version = "0.4.0" @@ -162,8 +213,8 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bincode" -version = "2.0.0-rc.2" -source = "git+https://github.com/bincode-org/bincode.git?tag=v2.0.0-rc.2#6c219e9214bda2bdce1327db6ed7f66d2fa4bf02" +version = "2.0.0-rc.3" +source = "git+https://github.com/bincode-org/bincode.git?tag=v2.0.0-rc.3#aada4bb4cb457677a4b8e47572ae7ca8dd44927c" dependencies = [ "bincode_derive", "serde", @@ -171,8 +222,8 @@ dependencies = [ [[package]] name = "bincode_derive" -version = "2.0.0-rc.2" -source = "git+https://github.com/bincode-org/bincode.git?tag=v2.0.0-rc.2#6c219e9214bda2bdce1327db6ed7f66d2fa4bf02" +version = "2.0.0-rc.3" +source = "git+https://github.com/bincode-org/bincode.git?tag=v2.0.0-rc.3#aada4bb4cb457677a4b8e47572ae7ca8dd44927c" dependencies = [ "virtue", ] @@ -272,9 +323,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d9c1d513381e7767ec1b3729da03ba4368e443c141445914c408a69ff52a46" +checksum = "0a0ca8ed0ff52856e853fb5ea8dfb01b018491546352aa9c1f3a7fc8c1060c2b" dependencies = [ "cairo-lang-utils", "indoc", @@ -289,9 +340,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68267d727fa1d975f3d783dec5feef579c11136c265541e29cdb9b126c1d9df9" +checksum = "b06332cb3a73a26bbe31b1b22bbfc8f66637da2da242391f2a5099a9ff5d9448" dependencies = [ "anyhow", "cairo-lang-defs", @@ -314,18 +365,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e09edbfb23561cff6c11e150abf78669731160b84260e7187d1f03f0e3588dc" +checksum = "65e5c740ff707fdbacdab8c2f1a284e01fc7e150641926859d486aa9b96e98ed" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f966d9791bc36a61ae264a2415cf325ea9308ed46942d7f57aba926c5dcb42" +checksum = "ae2645498415e739f868eaefef875f4cf925465b55ba07a6089685274d25254a" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -341,9 +392,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc36a010131655216738e0a9038024bed617b6539a9ef0aeeca642ccd296696" +checksum = "f41b76cac082acffd72ec7b6a4cef1aed7eb0f16fba185accacc35bfff7cf902" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -353,9 +404,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d7dae38d80ff4b5b4eaf1583cc9ea7da9589ae98261103c14dc12250d6aa0" +checksum = "7133fcad9e2c97eecff4faf7f729e1e7d9d120379704d9198d4ee07f7bf4b671" dependencies = [ "cairo-lang-utils", "good_lp", @@ -365,9 +416,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3e9fa18ca0def4c7c21af46501404f93b25abb1729790da545e8d7da579d99" +checksum = "ed215b63f87a6a15c583f5825c7860556a021d412ec70a6154010c3a7647c75c" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -379,9 +430,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3c4fb0d99a34dc6e8712f918cd90d14d3f23d9495198664871ff809905f10c" +checksum = "a876eb7ccd108f0e2e4158a1ef0d0f1ee296725410bb2b5f712ca914d99e38db" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -404,9 +455,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c029f7642d9a7fff17c91f8a0bbb743f6ce78bd52dd60694e43f26f691ca1e" +checksum = "e5c50f91f869b1d5e0898f0b9061ab1746c522e1a396e34bcb144dc1a8ab2127" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -425,9 +476,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c70ce576000a76fc351dbcf4a57d47fa8115986eaeaf5163f891d80cad1e39" +checksum = "c08ff6279c4d988983919322baf1f1e20dbb124ca9dacd0a88047624ff588861" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -444,9 +495,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e4e9f31eed6ff73b9b7a7d52aa134b0ce408640de940d405bdfa56020bd767" +checksum = "34f005a51a6569f81efbe99112c887b1dd6b921f8e4d6a1f71a6649d1f953746" dependencies = [ "cairo-lang-debug", "quote", @@ -455,9 +506,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4b80bc30e40dceda9f821be62a802425e298bbb7ad148320984f946357d080" +checksum = "7dad578d6dae004a6ef49538fcdb6516818b169db6e7da26b70e0f040b5b5dc7" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -469,9 +520,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0409e2d4a8da0d4744d1428665bb5ce9e50788d7381620b34d121d23c5be3b86" +checksum = "29d22c7c40884a35fa0a71345019460141ae642a8c8b53377aaf8c70269ae77c" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -492,9 +543,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7446acce78880d8e395afcfdd089672b457a80004765163c6c52380f2a2c8f" +checksum = "52124b04dcdb88b187029e134e5944d7f2b6e94f340d30b843f94198c32aa08d" dependencies = [ "cairo-lang-utils", "const-fnv1a-hash", @@ -515,9 +566,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "660774303d76a4e18f8a8020ee6c19396864654d00ee7c0f8d87dd095f1ebac1" +checksum = "9435c76b39013bb24a8e9acc9d689ad21d8d9d87e756035b61b52683a9524b75" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -528,9 +579,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dffb496c72156a7f49a99e7ecee75327377323a5b3bf69f94c7c791cb1a4df0" +checksum = "ce39e1e39382030291779f974a98ff75171984431ba39ea49fc45e4d79fe4aeb" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -541,9 +592,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528c8d1b365b65a425c752de1a5c48933b73c43b38cdbd8cb694cdd8d65852c4" +checksum = "bdfc04823bfee8a17d535253fdb24003b01227d93cef4c96bcdaea3e457aaea4" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -567,9 +618,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a55fcdbdc3aad7cfbf6b906be6211190044bc062e9ee3b2d8ab9a17f57b306" +checksum = "4ee0d8a131df3966781bb37cf5a08757019b1316eefe3c3df767b4501d9dbeb6" dependencies = [ "assert_matches", "cairo-felt 0.6.1", @@ -588,9 +639,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31585a2a9c9bcb75403429ae02e9d5d5f3e8e71e331188b0caf8762b3fdf17e0" +checksum = "713da559465a7b8d81bfae55e15504d0235a2b1604e708bd7167c519fa13a672" dependencies = [ "anyhow", "cairo-felt 0.6.1", @@ -628,9 +679,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca713a8918464d80cc687cc56db090fc634532d663a2af10e1f89f49ba104a5" +checksum = "1ca10a76416506fe025b7fec8b51e945417c594468d8a671740a948e220a5d95" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -645,9 +696,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198d5aaa5a6a211bceacb582fb4e90030e924c573c7f4ba16b30d01feac229b8" +checksum = "2634b5fd3dc31db50fa5d0e79a569ad90d047407de13ba847b27fcac20d4bd50" dependencies = [ "genco", "xshell", @@ -655,9 +706,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d146575a3ec1c997dea454e58dd510852a66ee6becc3b18917089a18ec24caff" +checksum = "3c996c7f6d5da304eddf06b64a03f16655117abec2c326fde0d9786f7e94dbe0" dependencies = [ "indexmap 1.9.3", "itertools", @@ -675,7 +726,7 @@ version = "0.8.1" dependencies = [ "anyhow", "ark-ff", - "ark-std 0.3.0", + "ark-std", "assert_matches", "bincode", "bitvec", @@ -684,7 +735,7 @@ dependencies = [ "cairo-lang-starknet", "criterion", "generic-array", - "hashbrown 0.13.2", + "hashbrown 0.14.0", "hex", "iai-callgrind", "keccak", @@ -714,7 +765,7 @@ dependencies = [ "assert_matches", "bincode", "cairo-vm", - "clap 3.2.25", + "clap", "mimalloc", "nom", "rstest", @@ -740,60 +791,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clap" -version = "2.34.0" +name = "ciborium" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ - "bitflags 1.3.2", - "textwrap 0.11.0", - "unicode-width", + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", ] [[package]] name = "clap" -version = "3.2.25" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", "clap_derive", - "clap_lex", - "indexmap 1.9.3", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", "strsim", - "termcolor", - "textwrap 0.16.0", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck 0.4.1", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "17bfac9400fe632590700de801b5dfbdca8b6944073832d1284bdbeef7f00e45" dependencies = [ "atty", "lazy_static", @@ -836,24 +911,24 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ - "atty", + "anes", "cast", - "clap 2.34.0", + "ciborium", + "clap", "criterion-plot", - "csv", + "is-terminal", "itertools", - "lazy_static", "num-traits 0.2.15", + "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -862,9 +937,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", "itertools", @@ -946,27 +1021,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "csv" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - [[package]] name = "derivative" version = "2.2.0" @@ -1147,7 +1201,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -1267,20 +1321,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ "ahash 0.8.3", + "allocator-api2", "serde", ] -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - [[package]] name = "heapless" version = "0.7.16" @@ -1425,7 +1474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi 0.3.1", - "rustix 0.38.1", + "rustix 0.38.2", "windows-sys", ] @@ -1440,9 +1489,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "c0aa48fab2893d8a49caa94082ae8488f4e1050d73b367881dcd2198f4199fd8" [[package]] name = "js-sys" @@ -1750,17 +1799,11 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - [[package]] name = "parity-scale-codec" -version = "3.6.1" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" +checksum = "756d439303e94fae44f288ba881ad29670c65b0c4b0e05674ca81061bb65f2c5" dependencies = [ "arrayvec", "bitvec", @@ -1771,9 +1814,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.1" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" +checksum = "9d884d78fcf214d70b1e239fcd1c6e5e95aa3be1881918da2e488cc946c7a476" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1862,9 +1905,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1922,30 +1965,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.63" @@ -2174,9 +2193,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.21" +version = "0.37.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c" +checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" dependencies = [ "bitflags 1.3.2", "errno", @@ -2188,9 +2207,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.1" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" dependencies = [ "bitflags 2.3.3", "errno", @@ -2306,32 +2325,22 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "c939f902bb7d0ccc5bce4f03297e161543c2dcb30914faf032c2bd0b7a0d48fc" 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.164" +version = "1.0.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "6eaae920e25fffe4019b75ff65e7660e72091e59dd204cb5849bbd6a3fd343d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -2454,20 +2463,20 @@ dependencies = [ "rfc6979", "sha2", "starknet-crypto-codegen", - "starknet-curve", + "starknet-curve 0.3.0", "starknet-ff", "zeroize", ] [[package]] name = "starknet-crypto-codegen" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6dc88f1f470d9de1001ffbb90d2344c9dd1a615f5467daf0574e2975dfd9ebd" +checksum = "af6527b845423542c8a16e060ea1bc43f67229848e7cd4c4d80be994a84220ce" dependencies = [ - "starknet-curve", + "starknet-curve 0.4.0", "starknet-ff", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -2479,6 +2488,15 @@ dependencies = [ "starknet-ff", ] +[[package]] +name = "starknet-curve" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68a0d87ae56572abf83ddbfd44259a7c90dbeeee1629a1ffe223e7f9a8f3052" +dependencies = [ + "starknet-ff", +] + [[package]] name = "starknet-ff" version = "0.3.4" @@ -2529,9 +2547,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.22" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -2554,7 +2572,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.21", + "rustix 0.37.22", "windows-sys", ] @@ -2569,30 +2587,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.40" @@ -2610,7 +2604,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] [[package]] @@ -2711,18 +2705,18 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "unicode-xid" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "version_check" version = "0.9.4" @@ -2731,9 +2725,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtue" -version = "0.0.8" +version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b60dcd6a64dd45abf9bd426970c9843726da7fc08f44cd6fcebf68c21220a63" +checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" [[package]] name = "wait-timeout" @@ -2781,7 +2775,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", "wasm-bindgen-shared", ] @@ -2815,7 +2809,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3007,5 +3001,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.23", ] diff --git a/Cargo.toml b/Cargo.toml index b3ae6ea61b..4c40c4ac95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,12 +14,12 @@ felt = { package = "cairo-felt", path = "./felt", version = "0.8.1", default-fea "alloc", ] } cairo-vm = { path = "./vm", version = "0.8.1", default-features = false } -mimalloc = { version = "0.1.29", default-features = false } +mimalloc = { version = "0.1.37", default-features = false } num-bigint = { version = "0.4", default-features = false, features = [ "serde", "rand", ] } -rand = { version = "0.8.3", features = ["small_rng"], default-features = false } +rand = { version = "0.8.5", features = ["small_rng"], default-features = false } num-traits = { version = "0.2", default-features = false } num-integer = { version = "0.1.45", default-features = false } serde = { version = "1.0", features = ["derive"], default-features = false } @@ -28,34 +28,34 @@ serde_json = { version = "1.0", features = [ "alloc", ], default-features = false } hex = { version = "0.4.3", default-features = false } -bincode = { version = "2.0.0-rc.2", tag = "v2.0.0-rc.2", git = "https://github.com/bincode-org/bincode.git", default-features = false, features = [ +bincode = { version = "2.0.0-rc.3", tag = "v2.0.0-rc.3", git = "https://github.com/bincode-org/bincode.git", default-features = false, features = [ "serde", ] } starknet-crypto = { version = "0.5.0", default-features = false, features = [ "signature-display", "alloc", ] } -sha3 = { version = "0.10.1", default-features = false } +sha3 = { version = "0.10.8", default-features = false } lazy_static = { version = "1.4.0", default-features = false, features = [ "spin_no_std", ] } nom = { version = "7", default-features = false } -sha2 = { version = "0.10.2", features = ["compress"], default-features = false } -generic-array = { version = "0.14.6", default-features = false } +sha2 = { version = "0.10.7", features = ["compress"], default-features = false } +generic-array = { version = "0.14.7", default-features = false } keccak = { version = "0.1.2", default-features = false } -hashbrown = { version = "0.13.2", features = ["serde"] } +hashbrown = { version = "0.14.0", features = ["serde"] } anyhow = { version = "1.0.69", default-features = false } thiserror-no-std = { version = "2.0.2", default-features = false } bitvec = { version = "1", default-features = false, features = ["alloc"] } # Dependencies for cairo-1-hints feature -cairo-lang-starknet = { version = "2.0.0-rc6", default-features = false } -cairo-lang-casm = { version = "2.0.0-rc6", default-features = false } +cairo-lang-starknet = { version = "2.0.0", default-features = false } +cairo-lang-casm = { version = "2.0.0", default-features = false } # TODO: check these dependencies for wasm compatibility -ark-ff = { version = "0.4.0-alpha.7", default-features = false } -ark-std = { version = "0.3.0", default-features = false } +ark-ff = { version = "0.4.2", default-features = false } +ark-std = { version = "0.4.0", default-features = false } [profile.release] lto = "fat" diff --git a/cairo-vm-cli/Cargo.toml b/cairo-vm-cli/Cargo.toml index cbf49bab8f..27b03b4881 100644 --- a/cairo-vm-cli/Cargo.toml +++ b/cairo-vm-cli/Cargo.toml @@ -7,12 +7,12 @@ repository.workspace = true readme.workspace = true [dependencies] -bincode = { version = "2.0.0-rc.2", tag = "v2.0.0-rc.2", git = "https://github.com/bincode-org/bincode.git" } +bincode = { version = "2.0.0-rc.3", tag = "v2.0.0-rc.3", git = "https://github.com/bincode-org/bincode.git" } cairo-vm = { workspace = true, features = ["std"] } -clap = { version = "3.2.5", features = ["derive"] } -mimalloc = { version = "0.1.29", default-features = false, optional = true } +clap = { version = "4.3.10", features = ["derive"] } +mimalloc = { version = "0.1.37", default-features = false, optional = true } nom = "7" -thiserror = { version = "1.0.32" } +thiserror = { version = "1.0.40" } [dev-dependencies] assert_matches = "1.5.0" diff --git a/cairo-vm-cli/src/main.rs b/cairo-vm-cli/src/main.rs index a42c95eac4..552f4df39f 100644 --- a/cairo-vm-cli/src/main.rs +++ b/cairo-vm-cli/src/main.rs @@ -23,23 +23,23 @@ static ALLOC: MiMalloc = MiMalloc; struct Args { #[clap(value_parser, value_hint=ValueHint::FilePath)] filename: PathBuf, - #[clap(long = "--trace_file", value_parser)] + #[clap(long = "trace_file", value_parser)] trace_file: Option, - #[structopt(long = "--print_output")] + #[structopt(long = "print_output")] print_output: bool, - #[structopt(long = "--entrypoint", default_value = "main")] + #[structopt(long = "entrypoint", default_value = "main")] entrypoint: String, - #[structopt(long = "--memory_file")] + #[structopt(long = "memory_file")] memory_file: Option, - #[clap(long = "--layout", default_value = "plain", validator=validate_layout)] + #[clap(long = "layout", default_value = "plain", value_parser=validate_layout)] layout: String, - #[structopt(long = "--proof_mode")] + #[structopt(long = "proof_mode")] proof_mode: bool, - #[structopt(long = "--secure_run")] + #[structopt(long = "secure_run")] secure_run: Option, } -fn validate_layout(value: &str) -> Result<(), String> { +fn validate_layout(value: &str) -> Result { match value { "plain" | "small" @@ -49,7 +49,7 @@ fn validate_layout(value: &str) -> Result<(), String> { | "recursive_large_output" | "all_cairo" | "all_solidity" - | "dynamic" => Ok(()), + | "dynamic" => Ok(value.to_string()), _ => Err(format!("{value} is not a valid layout")), } } @@ -283,7 +283,7 @@ mod tests { ]; for layout in valid_layouts { - assert_eq!(validate_layout(layout), Ok(())); + assert_eq!(validate_layout(layout), Ok(layout.to_string())); } } diff --git a/felt/Cargo.toml b/felt/Cargo.toml index ab8425fdac..36ea5e42db 100644 --- a/felt/Cargo.toml +++ b/felt/Cargo.toml @@ -24,5 +24,5 @@ serde = { version = "1.0", features = ["derive"], default-features = false } lambdaworks-math = { version = "0.1.2", default-features = false, optional = true } [dev-dependencies] -proptest = "1.1.0" +proptest = "1.2.0" rstest = { version = "0.17.0", default-features = false } diff --git a/vm/Cargo.toml b/vm/Cargo.toml index bddc75d616..1a667bdb6d 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -79,7 +79,7 @@ wasm-bindgen-test = "0.3.34" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] iai-callgrind = "0.3.1" -criterion = { version = "0.3", features = ["html_reports"] } +criterion = { version = "0.5.1", features = ["html_reports"] } proptest = "1.0.0" [[bench]]