From 63d9cd3f4283b64ca81ad19d1687d047671042d0 Mon Sep 17 00:00:00 2001 From: Yonatan Iluz Date: Sun, 4 Aug 2024 19:44:24 +0300 Subject: [PATCH] chore: bump compiler to 2.7.0 and vm to 1.0.0-rc6 --- Cargo.lock | 112 +++++++++--------- Cargo.toml | 12 +- .../src/execution/entry_point_execution.rs | 2 +- .../blockifier/src/execution/syscalls/mod.rs | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc8e8d91603..97932559bba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1150,9 +1150,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cairo-lang-casm" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abf875e93f696e783412d3f2a7c6f66e94e07c30b01559380b4d0707dc0050e" +checksum = "4a43421bf72645b3a562d264747166d6f093e960a69dfa38b67bb3209e370366" dependencies = [ "cairo-lang-utils", "indoc 2.0.5", @@ -1165,9 +1165,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f135e1768e199e88b04f824e34b9411ff49fc31970e77cbf5c6f448170441d18" +checksum = "24242af537265add372896d9ab0678c86a68d3484281fbeb6d8a9d4d5bacf7c8" dependencies = [ "anyhow", "cairo-lang-defs", @@ -1189,18 +1189,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e2bf0a6caf1e54938bc67ca082cbeb5385969784bfb1109c187ca9dc5e1806" +checksum = "2d28f38e1c62fed15a4de9f3c95741d6b24ef2a9e67a2b88a047eb6ea7de992e" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65bb0e855afeb88d11585605f836bd0cd444375b234103e87342df2c91aba1b" +checksum = "712206b7be3fb1a33e50e1c30aa8502b4a461155fd93ad26213d0d8b242cb08d" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -1215,9 +1215,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab96083f60a077d300d0b89bd4b9c31731c95f5db355a11c4657ee25f3acc198" +checksum = "9a3c8dc2bff2411fbf602d80a83b719e6e3955c1c5d767ec18b295fc92e8616a" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1227,9 +1227,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf2aaa50fa5b15070b2bf02c60a62f917f9aa1ff6dedf5a2627ecafe8e33cfa" +checksum = "eaa8ac24c97770739f5a78d630b8515273c8b9f4aff34e1f88b988fac50340de" dependencies = [ "cairo-lang-utils", "good_lp", @@ -1237,9 +1237,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8094bcf7e44204c2fc2f10760e7e2e5769a6267cba5d8a303c0331dd480d5663" +checksum = "4596331565fe61d10a0a6a03ace2b9d0ba93f03ee12a8450fe9252a6fee770f3" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -1251,9 +1251,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1d92f1163b3b0e22e6392d22f7a275b9e64ab453f32b8b62bb1aeedbe73e04" +checksum = "69b8eb08e511d6e6df51370cdc7d85f0de9a38c8b14a15762665c60c2df6d32d" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -1272,9 +1272,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25eb629a773c07c2863717d1711fd3ecc17807c1fc094bb90cccac56061056a4" +checksum = "6d535dc591513875b39b799270df21db10540033fd7710917760c22fc063a4ae" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1297,9 +1297,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff7b1d7af8e1bff971b8b9bbce796650a57de93dfb092bc0c17c2f85d915de6e" +checksum = "73019d5873715964f428ff10467efb607d6dc007ae164a21547bf20d9b5dcc72" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -1317,9 +1317,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eccf06d643d155a72057dc93c40cf34dabe11e8c629dbf3111c528a3d750a66" +checksum = "96e52fca18bc696011a47a4ded0dc00e2e0ac7c81a8052eddd4ad546c46b818e" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -1336,9 +1336,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa10434f9ce0828e8d77f3a13ae2f878da453345b14d54a66de3e196c0e4674" +checksum = "3d55dcf98a6e1a03e0b36129fad4253f9e6666a1746ab9c075d212ba68a4e9c1" dependencies = [ "cairo-lang-debug", "quote", @@ -1347,9 +1347,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4882d2263fb7c95dbab0c3b5578d8c0e2417fd680df8cc61aa50321b6a5a40d" +checksum = "e3ddb432e5199a65e37bab97ef6322afabd60e0e638ada31178d9c23d237219d" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -1361,9 +1361,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ab7b0e0640adaed21b9d9b9b94b3edf7f7ab95514b1dd40c679317a33dabea" +checksum = "ef5bbbabd509ce88abc67436973d3377e099269dbd14578fa84fce884a74fa23" dependencies = [ "ark-ff", "ark-secp256k1", @@ -1392,9 +1392,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba49614f98322e1ccda33265f8193f66cbd88eff23b0deb94db981aa0666650" +checksum = "393325820207491a7475269e98163e0db7e85e4b215f4d801ca537ce1cd6daa7" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1419,9 +1419,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a41d56c6afebdbe2c5ffb4e216f60b07391c29c91fccf0a60790817f49ba68" +checksum = "918fb0611203fb8cdd1fcdb434f395a59e0ebb0db64b11a0e15bfbfb03552821" dependencies = [ "anyhow", "cairo-lang-utils", @@ -1447,9 +1447,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "667050b93db661ebce0b33c92ce44abffebde37c5645e4761722ad3c49a1c34f" +checksum = "7fa1834ec729e89fcbd00df03f2a64a18515fcf07eb18dfef39afe020a10955d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1463,9 +1463,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27fcbf81e8ed4efe7e9c30bbdfa8074b9af01a5e16154999dd9527baba27f1fb" +checksum = "6b00927d39f910dd5ae1047cef9b46b2ee11617d33d290f875bc00dfc7e3d992" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1479,9 +1479,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058c05d10913a130fb21964f0bf1a37b05eafcf2f50a73cd4aa3e11da7e4cfc7" +checksum = "7620a6a7becf5997093a83d289a5e3b3162bc8fd031ad75df82a5bc04f8cc954" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1504,9 +1504,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8607cc5cf16f3a930ad4b3799e986b0ca36ada2c0da1dd6bd2ef35cbb1eb9e74" +checksum = "67bd155770abf91d4290a31b0c0a1fb393ecee85eb0af40c16893b4601eff4d6" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1525,9 +1525,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224624b1e279b3eea7693680f577335e66e6dd5fbfbd2576f4a7d0b5d697f61d" +checksum = "fbae9458999da692c272501678b6cfec358a6bcadb54921bf35d21afdcd91251" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1535,9 +1535,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a54ebea4ea990a33a2158ecdf46ffb3cb1af8fff6a79c3dd310c6a9ed43e82" +checksum = "f242d889180386d35935597f9d1cac07d4f3d60bd0f10558660ae4a77da701b6" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1566,9 +1566,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb66ae799e1963318e1bab782848f53797787c396dfd590be539f3f12d56ac4" +checksum = "aa17b313f46fcf7ff4de32b86c250eaf584d1e2c8e37ed16db155b221721e735" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1590,9 +1590,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e673dc1058a8639c094a330a701e8902cbd34defe659a3d95bcf6c3f3de249d" +checksum = "0d0ca518ed7c3674d9b62470f7482f4b07553eb3a02d83e0ae61bd6b5ecb4ec8" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1606,9 +1606,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0dd466dbac4263573b81b83e22534285da30a4e7c15b888407fbb33d8accb9" +checksum = "7f12bdff5c265edb5a76084bfde2bc8270a7fdaf16ac58aa0d54ea6a20c29023" dependencies = [ "genco", "xshell", @@ -1616,9 +1616,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09431da22acc1cf081b1802b73ff484bdc75ca1cd5ad6fa9b84fba8753b2e08f" +checksum = "e6a2365bd502a657437f9d0d665e32e017054d0effdbecb1dda776bfcc11235d" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1629,9 +1629,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.7.0-rc.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97498c08958be8d569c16982cac431d785adc3effdfa6d0775c65aec578dfd91" +checksum = "8bd5c8c127b9362a12ffb9dede38e792c81b4ded5a98b448baec157b745f47d1" dependencies = [ "hashbrown 0.14.5", "indexmap 2.2.6", @@ -1645,9 +1645,9 @@ dependencies = [ [[package]] name = "cairo-vm" -version = "1.0.0-rc5" +version = "1.0.0-rc6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09134ea1e0be6c1fbd330f0945df0512fa70944fd0b3ecc2f74a6008f01e9da" +checksum = "f905a936b3287d085706d3d68e405be4844ec7bc1c95eaa3d53220dd33efd4ff" dependencies = [ "anyhow", "bincode 2.0.0-rc.3", diff --git a/Cargo.toml b/Cargo.toml index 7d7f6505c30..2b20e842c50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,12 +67,12 @@ byteorder = "1.4.3" bytes = "1" cached = "0.44.0" cairo-felt = "0.9.1" -cairo-lang-casm = "2.7.0-rc.3" -cairo-lang-runner = "2.7.0-rc.3" -cairo-lang-sierra = "=2.7.0-rc.3" -cairo-lang-starknet-classes = "2.7.0-rc.3" -cairo-lang-utils = "2.7.0-rc.3" -cairo-vm = "=1.0.0-rc5" +cairo-lang-casm = "2.7.0" +cairo-lang-runner = "2.7.0" +cairo-lang-sierra = "=2.7.0" +cairo-lang-starknet-classes = "2.7.0" +cairo-lang-utils = "2.7.0" +cairo-vm = "=1.0.0-rc6" camelpaste = "0.1.0" chrono = "0.4.26" clap = "4.3.10" diff --git a/crates/blockifier/src/execution/entry_point_execution.rs b/crates/blockifier/src/execution/entry_point_execution.rs index 9e5bae7245d..a2b546b4959 100644 --- a/crates/blockifier/src/execution/entry_point_execution.rs +++ b/crates/blockifier/src/execution/entry_point_execution.rs @@ -125,7 +125,7 @@ fn register_visited_pcs( // after it. // TODO(lior): Avoid unnecessary relocation once the VM has a non-relocated `get_trace()` // function. - runner.relocate_trace(&[1, 1 + program_segment_size].into())?; + runner.relocate_trace(&[1, 1 + program_segment_size])?; for trace_entry in runner.relocated_trace.as_ref().expect("Relocated trace not found") { let pc = trace_entry.pc; if pc < 1 { diff --git a/crates/blockifier/src/execution/syscalls/mod.rs b/crates/blockifier/src/execution/syscalls/mod.rs index 27ea5377df2..9e31c9ab9b6 100644 --- a/crates/blockifier/src/execution/syscalls/mod.rs +++ b/crates/blockifier/src/execution/syscalls/mod.rs @@ -110,7 +110,7 @@ impl SyscallResponse for SyscallResponseWrapper { let revert_reason_start = vm.add_memory_segment(); let revert_reason_end = vm.load_data( revert_reason_start, - &error_data.into_iter().map(Into::into).collect(), + &error_data.into_iter().map(Into::into).collect::>(), )?; // Write the start and end pointers of the error data.