diff --git a/Cargo.lock b/Cargo.lock index 4c30c5b3..d09e118f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -984,7 +984,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.11.0", "lazy_static", "lazycell", "proc-macro2", @@ -1083,8 +1083,8 @@ dependencies = [ [[package]] name = "blockifier" -version = "0.8.0-rc.0" -source = "git+https://github.com/kkrt-labs/blockifier.git?rev=db79faf#db79faf9d4d9840b15d1198af837d014c403f731" +version = "0.8.0-rc.1" +source = "git+https://github.com/kkrt-labs/blockifier.git?rev=57377d6#57377d6f6772c245b5bd83abb5ad6ece3f32ff79" dependencies = [ "anyhow", "ark-ec", @@ -1096,7 +1096,7 @@ dependencies = [ "cairo-lang-runner", "cairo-lang-starknet-classes", "cairo-lang-utils", - "cairo-vm 1.0.0-rc5", + "cairo-vm", "derive_more", "indexmap 2.2.6", "itertools 0.10.5", @@ -1107,6 +1107,7 @@ dependencies = [ "num-rational", "num-traits 0.2.19", "once_cell", + "paste", "phf", "rand 0.8.5", "rstest", @@ -1437,24 +1438,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" -[[package]] -name = "cairo-felt" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae932292b9ba497a4e892b56aa4e0c6f329a455180fdbdc132700dfe68d9b153" -dependencies = [ - "lazy_static", - "num-bigint", - "num-integer", - "num-traits 0.2.19", - "serde", -] - [[package]] name = "cairo-lang-casm" -version = "2.7.0-rc.2" +version = "2.7.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b03e943deaaeaa7cbec1f33121ae4f25032423c9a41cdfc7400f1b06e127f73" +checksum = "5abf875e93f696e783412d3f2a7c6f66e94e07c30b01559380b4d0707dc0050e" dependencies = [ "cairo-lang-utils", "indoc", @@ -1466,9 +1454,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e4a03eb659c903bf67604ddf284f8081a22e022b2917f6848ceb5a971ea694" +checksum = "2698e2ca73db964e6d496a648fcbb2ace5559941b5179ab3310c9a0b6872b348" dependencies = [ "anyhow", "cairo-lang-defs", @@ -1484,24 +1472,25 @@ dependencies = [ "cairo-lang-utils", "indoc", "salsa", + "semver 1.0.23", "smol_str", "thiserror", ] [[package]] name = "cairo-lang-debug" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837a97430285c91aed314a80fa5443178f9b434ce6ffb81a87abf0b77c2f10b6" +checksum = "6ac7332f2b041ca28b24b0311a0b4a35f426bb52836a2d268a8374ea262e9e6b" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43823e8c537aeb98e46fcde8be00f86aad2078e6bfa89e3acca356b56fa5646a" +checksum = "079a34b560a82b463cd12ae62022d70981e8ab56b6505f9499348ebeaf460de8" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -1516,9 +1505,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726eb6b8f1337ffec205516f7135d3b71108587a15c88fa96d7041f1095b4559" +checksum = "c29625349297ad791942377763f5b04c779ea694f436488dc6ad194720b89487" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1528,9 +1517,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b925889c20a789f5360eb2da4ade6837943140f555fa4ecd8000cb65633afe62" +checksum = "9cb26cd75126db6eaf94d5dffe0ce750d030ac879a88de5a621551969e9b59e3" dependencies = [ "cairo-lang-utils", "good_lp", @@ -1538,23 +1527,24 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8533fa78ab2ae0235c855457f2e8674a08d30bfe83411cd9bb5165c959fdf818" +checksum = "651012f2956bea884c7a3ab9df21dc76112d7edd3f403b37ca5be62fc3f41b09" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", "path-clean", "salsa", + "semver 1.0.23", "serde", "smol_str", ] [[package]] name = "cairo-lang-formatter" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91770d67f53f8a3dea922ddbf793982648efa24a80f2c9d38c3366a405d3716c" +checksum = "0d09ffb9498368cf4e95d0b28662596331aef1677e4f759ab5e609d27dfcb587" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -1573,9 +1563,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114c41cfb84087bf8d494a9e5e688f41808b76fd685d8ab5d3260e44d8c55a7f" +checksum = "da4ffe6c197c35dec665029fcf695422f02c55b5118b4da1142e182b9fe77f87" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1598,9 +1588,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c008f31de0724197e58252439ca55f6677fbd9eba14e2d9dc7d6bf277acbc9" +checksum = "f262ad5f1110ff70c93deb81cce024cf160f4a4518762e7deb2047fe73846789" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -1618,9 +1608,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf35bfc609ab6eebf44d677dbf13895124a21cd968a4b77661ae646231ca6a1d" +checksum = "18024b44b5edbc1f378ba85c1a4ff04e880ea465a33251053aec507f08250668" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -1637,9 +1627,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1f9cc07f207a23d932fec65c02cb605687b66c96db2d109f704ed08eb5b1f5" +checksum = "124402d8fad2a033bb36910dd7d0651f3100845c63dce679c58797a8cb0448c2" dependencies = [ "cairo-lang-debug", "quote", @@ -1648,9 +1638,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0342e3a7b6ffc3e294f13560ee738b93b8ae89f8a1c22b5bb11474a0586d9b52" +checksum = "1f37dba9653eabf4dcb43a5e1436cd6bc093b5ad6f28ff42eaaef12549014213" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -1662,9 +1652,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.7.0-rc.2" +version = "2.7.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeca10974e4b3712d5998a611e363218e3d858c29b6e08b7aa21c28801bf77e" +checksum = "01ab7b0e0640adaed21b9d9b9b94b3edf7f7ab95514b1dd40c679317a33dabea" dependencies = [ "ark-ff 0.4.2", "ark-secp256k1", @@ -1678,7 +1668,7 @@ dependencies = [ "cairo-lang-sierra-type-size", "cairo-lang-starknet", "cairo-lang-utils", - "cairo-vm 1.0.0-rc5", + "cairo-vm", "itertools 0.12.1", "keccak", "num-bigint", @@ -1693,9 +1683,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ff271b014038dba66d1089a34d33a07ffe9ebd04d0cd72a48cc6d89a34c3b3" +checksum = "a1612476b548e9ab8ae89ee38a73d9875339f62f2f59d9ce8a719bc1761c54c3" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1720,9 +1710,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630c5f2625f1bc28c2d49aa4ae83026f10d5aef078a6a0a561597022bbea9c20" +checksum = "8209be8cf22263bf8a55df334a642b74fe563beecbbbefa55cda39fa4b131a61" dependencies = [ "anyhow", "cairo-lang-utils", @@ -1748,9 +1738,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d52220c919a8780c7f8c0712af6debbcb85bd030073469ddd32be4adada087d" +checksum = "1c9d1350366c23e4a9f6e18ea95939f18df52df455f06c0e3d7889f80ce18a94" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1764,9 +1754,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0d7f5332f2a42f3af5ab2fa1070780916e5abd8f971d397bca2fa74bfce935" +checksum = "9fe1ff15052b173537360b7dca5f9b2ccb10392b2a1c11af99add35d42632115" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1780,9 +1770,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c997dbf2ee6ccaae8d11301b8a2b72641757edfbbbd35807e5143861028a4e5b" +checksum = "2d3802e7b6722fabc9cc0a61c86e7ad53138f6f41880aca80a60f889739fbf55" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1805,9 +1795,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.0-rc.2" +version = "2.7.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ba5d395b1e2ef05ed2c5898735df60d8ae9abab4f92c4b6f88ba79bbcafcd9" +checksum = "8607cc5cf16f3a930ad4b3799e986b0ca36ada2c0da1dd6bd2ef35cbb1eb9e74" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1826,9 +1816,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d4ba6a52be450a3f2dc3fffe3660b76127af5b57526db7deb1cbd5a5a2a9be5" +checksum = "7ddddaacc814e0ffda9f176c913fb2a9cd74fe6594dea789e8281eef10cac201" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1836,9 +1826,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.7.0-rc.2" +version = "2.7.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a76537c39673c8d22972a9ac01293f4296512d7f4d9dc357a5202e0f1e185b" +checksum = "81a54ebea4ea990a33a2158ecdf46ffb3cb1af8fff6a79c3dd310c6a9ed43e82" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1867,9 +1857,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.0-rc.2" +version = "2.7.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56fec847ccd3b0a0928c5a33d8a9bab262be52f87ccc361593f0376e186700" +checksum = "1bb66ae799e1963318e1bab782848f53797787c396dfd590be539f3f12d56ac4" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1891,9 +1881,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b209e3efbaa9889fc2aa8c0f83fc7cfd453cede0c29562fe581cb42eaff015ea" +checksum = "b2a376f88d815b63505be54a6afa93d75b67cfd65835922ec648cfcbb0a5e4b4" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1907,9 +1897,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a426d0344b98bb96d3891fd4e571eb79b561009a8db12aa7424662b50129" +checksum = "01f276bc28f6302fc63032046a12b60d18498906e65f646acb963244eed97f7c" dependencies = [ "genco", "xshell", @@ -1917,9 +1907,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1fd08b403ccdbaf9497150f9cc870627c7bf3d7450e5cb978ab7cbf1d6bccf" +checksum = "21e90b6236439e19077ec913351a17a33c7be199dcafdacd8389c4c5199400d6" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1930,9 +1920,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.7.0-rc.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794a02dfe6bcef32eb49dc0a25e8f968e644053c53481bb4245b00e6d7dbeb7c" +checksum = "55a394e545f1500bea093d01be40895d3234faaa24d9585d08a509c514cabd88" dependencies = [ "hashbrown 0.14.5", "indexmap 2.2.6", @@ -1944,38 +1934,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cairo-vm" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90d260c5b0c0812f02fcbdc21eb0d5908fcecdca888fb779b54c3967f7f88bf" -dependencies = [ - "anyhow", - "bincode 2.0.0-rc.3", - "bitvec", - "cairo-felt", - "generic-array", - "hashbrown 0.14.5", - "hex", - "keccak", - "lazy_static", - "mimalloc", - "nom", - "num-bigint", - "num-integer", - "num-prime", - "num-traits 0.2.19", - "rand 0.8.5", - "rust_decimal", - "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "starknet-crypto 0.6.2", - "starknet-curve 0.4.2", - "thiserror-no-std", -] - [[package]] name = "cairo-vm" version = "1.0.0-rc5" @@ -2878,7 +2836,7 @@ dependencies = [ "cairo-lang-starknet", "cairo-lang-starknet-classes", "cairo-lang-utils", - "cairo-vm 0.9.3", + "cairo-vm", "cargo-emit", "chrono", "ctor", @@ -4597,16 +4555,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libmimalloc-sys" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "libp2p" version = "0.53.2" @@ -4907,15 +4855,6 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "mimalloc" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" -dependencies = [ - "libmimalloc-sys", -] - [[package]] name = "mime" version = "0.3.17" diff --git a/Cargo.toml b/Cargo.toml index ae922ae2..84b15ba1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,12 +37,12 @@ revm-interpreter = { version = "8.1.0", default-features = false } revm-primitives = { version = "7.1.0", default-features = false } # Starknet deps -cairo-lang-casm = "2.7.0-rc.2" -cairo-lang-starknet = "2.7.0-rc.2" -cairo-lang-utils = "2.7.0-rc.2" -cairo-lang-starknet-classes = "2.7.0-rc.2" -cairo-vm = "0.9.2" -blockifier = { package = "blockifier", git = "https://github.com/kkrt-labs/blockifier.git", rev = "db79faf", default-features = false, features = [ +cairo-lang-casm = "2.7.0-rc.3" +cairo-lang-starknet = "2.7.0-rc.3" +cairo-lang-utils = "2.7.0-rc.3" +cairo-lang-starknet-classes = "2.7.0-rc.3" +cairo-vm = "1.0.0-rc5" +blockifier = { package = "blockifier", git = "https://github.com/kkrt-labs/blockifier.git", rev = "57377d6", default-features = false, features = [ "testing", ] } starknet = "0.11.0" diff --git a/rust-toolchain b/rust-toolchain index 628740b1..4d2dee85 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,2 +1,2 @@ [toolchain] -channel = "1.79.0" +channel = "1.80.0"