From 55754b5d35fcb47d9338bd2b83b959e4170842fb Mon Sep 17 00:00:00 2001 From: maciektr Date: Fri, 12 Jul 2024 12:08:10 +0200 Subject: [PATCH] Prepare release `2.7.0-rc.2` (#1442) --- Cargo.lock | 169 +++++++++++------- Cargo.toml | 50 +++--- examples/dependencies/Scarb.toml | 2 +- examples/hello_world/Scarb.toml | 2 +- examples/starknet_hello_world/Scarb.toml | 4 +- .../starknet_multiple_contracts/Scarb.toml | 4 +- examples/workspaces/Scarb.toml | 4 +- .../src/compilation/test_collector.rs | 2 +- scarb/src/compiler/db.rs | 2 +- scarb/tests/build_starknet_contract.rs | 6 +- 10 files changed, 138 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6962b3641..fca009c82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,8 +567,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b03e943deaaeaa7cbec1f33121ae4f25032423c9a41cdfc7400f1b06e127f73" dependencies = [ "cairo-lang-utils", "indoc", @@ -580,8 +581,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e4a03eb659c903bf67604ddf284f8081a22e022b2917f6848ceb5a971ea694" dependencies = [ "anyhow", "cairo-lang-defs", @@ -603,16 +605,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "837a97430285c91aed314a80fa5443178f9b434ce6ffb81a87abf0b77c2f10b6" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43823e8c537aeb98e46fcde8be00f86aad2078e6bfa89e3acca356b56fa5646a" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -627,8 +631,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726eb6b8f1337ffec205516f7135d3b71108587a15c88fa96d7041f1095b4559" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -638,8 +643,9 @@ dependencies = [ [[package]] name = "cairo-lang-doc" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1eebf98adfd389d4980659a2013e6fce8df7de4b2b57d9fc4a1e86956f48646" dependencies = [ "cairo-lang-defs", "cairo-lang-formatter", @@ -652,8 +658,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b925889c20a789f5360eb2da4ade6837943140f555fa4ecd8000cb65633afe62" dependencies = [ "cairo-lang-utils", "good_lp", @@ -661,8 +668,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8533fa78ab2ae0235c855457f2e8674a08d30bfe83411cd9bb5165c959fdf818" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -674,8 +682,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91770d67f53f8a3dea922ddbf793982648efa24a80f2c9d38c3366a405d3716c" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -694,8 +703,9 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff424e71338a56b006b57c110bb31d6e44ce813d55c33626ce5accd207b9ada" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -727,8 +737,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c41cfb84087bf8d494a9e5e688f41808b76fd685d8ab5d3260e44d8c55a7f" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -775,8 +786,9 @@ version = "1.0.0" [[package]] name = "cairo-lang-parser" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c008f31de0724197e58252439ca55f6677fbd9eba14e2d9dc7d6bf277acbc9" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -794,8 +806,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf35bfc609ab6eebf44d677dbf13895124a21cd968a4b77661ae646231ca6a1d" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -812,8 +825,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1f9cc07f207a23d932fec65c02cb605687b66c96db2d109f704ed08eb5b1f5" dependencies = [ "cairo-lang-debug", "quote", @@ -822,8 +836,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0342e3a7b6ffc3e294f13560ee738b93b8ae89f8a1c22b5bb11474a0586d9b52" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -835,8 +850,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdeca10974e4b3712d5998a611e363218e3d858c29b6e08b7aa21c28801bf77e" dependencies = [ "ark-ff", "ark-secp256k1", @@ -865,8 +881,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ff271b014038dba66d1089a34d33a07ffe9ebd04d0cd72a48cc6d89a34c3b3" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -891,8 +908,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630c5f2625f1bc28c2d49aa4ae83026f10d5aef078a6a0a561597022bbea9c20" dependencies = [ "anyhow", "cairo-lang-utils", @@ -918,8 +936,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d52220c919a8780c7f8c0712af6debbcb85bd030073469ddd32be4adada087d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -933,8 +952,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0d7f5332f2a42f3af5ab2fa1070780916e5abd8f971d397bca2fa74bfce935" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -948,8 +968,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c997dbf2ee6ccaae8d11301b8a2b72641757edfbbbd35807e5143861028a4e5b" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -972,8 +993,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9ba5d395b1e2ef05ed2c5898735df60d8ae9abab4f92c4b6f88ba79bbcafcd9" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -992,8 +1014,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d4ba6a52be450a3f2dc3fffe3660b76127af5b57526db7deb1cbd5a5a2a9be5" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1001,8 +1024,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a76537c39673c8d22972a9ac01293f4296512d7f4d9dc357a5202e0f1e185b" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1031,8 +1055,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd56fec847ccd3b0a0928c5a33d8a9bab262be52f87ccc361593f0376e186700" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1054,8 +1079,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b209e3efbaa9889fc2aa8c0f83fc7cfd453cede0c29562fe581cb42eaff015ea" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1069,8 +1095,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7664a426d0344b98bb96d3891fd4e571eb79b561009a8db12aa7424662b50129" dependencies = [ "genco", "xshell", @@ -1078,8 +1105,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d184fe10c17536a1cea59752aa1acba3679d6ae132877b222510bd0f3ea985df" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1105,8 +1133,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea0373d776de637aa816e4eaad2860f71181513cf832abbcd08f0dc319055d3" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1127,8 +1156,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1fd08b403ccdbaf9497150f9cc870627c7bf3d7450e5cb978ab7cbf1d6bccf" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1139,8 +1169,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=600e495aaaeab66103b1d6e703fc346595b01373#600e495aaaeab66103b1d6e703fc346595b01373" +version = "2.7.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794a02dfe6bcef32eb49dc0a25e8f968e644053c53481bb4245b00e6d7dbeb7c" dependencies = [ "env_logger", "hashbrown 0.14.5", @@ -4572,7 +4603,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "anyhow", "assert_fs", @@ -4662,7 +4693,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "cargo_metadata", "semver", @@ -4670,7 +4701,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "assert_fs", "cairo-lang-language-server", @@ -4682,7 +4713,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "anyhow", "assert_fs", @@ -4704,7 +4735,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "anyhow", "assert_fs", @@ -4724,7 +4755,7 @@ dependencies = [ [[package]] name = "scarb-doc" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "anyhow", "assert_fs", @@ -4780,7 +4811,7 @@ dependencies = [ [[package]] name = "scarb-snforge-test-collector" -version = "2.6.4" +version = "2.7.0-rc.2" dependencies = [ "anyhow", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 9696dc11d..af871d0fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.6.4" +version = "2.7.0-rc.2" edition = "2021" authors = ["Software Mansion "] @@ -35,30 +35,30 @@ anyhow = "1" assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } -cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "600e495aaaeab66103b1d6e703fc346595b01373", features = ["env_logger"] } +cairo-lang-casm = "2.7.0-rc.2" +cairo-lang-compiler = "2.7.0-rc.2" +cairo-lang-debug = "2.7.0-rc.2" +cairo-lang-defs = "2.7.0-rc.2" +cairo-lang-diagnostics = "2.7.0-rc.2" +cairo-lang-doc = "2.7.0-rc.2" +cairo-lang-filesystem = "2.7.0-rc.2" +cairo-lang-formatter = "2.7.0-rc.2" +cairo-lang-language-server = "2.7.0-rc.2" +cairo-lang-lowering = "2.7.0-rc.2" +cairo-lang-parser = "2.7.0-rc.2" +cairo-lang-project = "2.7.0-rc.2" +cairo-lang-runner = "2.7.0-rc.2" +cairo-lang-semantic = "2.7.0-rc.2" +cairo-lang-sierra = "2.7.0-rc.2" +cairo-lang-sierra-generator = "2.7.0-rc.2" +cairo-lang-sierra-to-casm = "2.7.0-rc.2" +cairo-lang-sierra-type-size = "2.7.0-rc.2" +cairo-lang-starknet = "2.7.0-rc.2" +cairo-lang-starknet-classes = "2.7.0-rc.2" +cairo-lang-syntax = "2.7.0-rc.2" +cairo-lang-test-plugin = "2.7.0-rc.2" +cairo-lang-test-runner = "2.7.0-rc.2" +cairo-lang-utils = { version = "2.7.0-rc.2", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/examples/dependencies/Scarb.toml b/examples/dependencies/Scarb.toml index ee6eadfda..e6a03f756 100644 --- a/examples/dependencies/Scarb.toml +++ b/examples/dependencies/Scarb.toml @@ -8,4 +8,4 @@ version = "0.1.0" alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git" } [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.2" diff --git a/examples/hello_world/Scarb.toml b/examples/hello_world/Scarb.toml index bc239bb86..621b55fb9 100644 --- a/examples/hello_world/Scarb.toml +++ b/examples/hello_world/Scarb.toml @@ -8,4 +8,4 @@ edition = "2023_10" [dependencies] [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.2" diff --git a/examples/starknet_hello_world/Scarb.toml b/examples/starknet_hello_world/Scarb.toml index c58ca29e3..621232dd5 100644 --- a/examples/starknet_hello_world/Scarb.toml +++ b/examples/starknet_hello_world/Scarb.toml @@ -5,9 +5,9 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.6.4" +starknet = "2.7.0-rc.2" [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.2" [[target.starknet-contract]] diff --git a/examples/starknet_multiple_contracts/Scarb.toml b/examples/starknet_multiple_contracts/Scarb.toml index bd3bc6e98..ad6d041c0 100644 --- a/examples/starknet_multiple_contracts/Scarb.toml +++ b/examples/starknet_multiple_contracts/Scarb.toml @@ -5,9 +5,9 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.6.4" +starknet = "2.7.0-rc.2" [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.2" [[target.starknet-contract]] diff --git a/examples/workspaces/Scarb.toml b/examples/workspaces/Scarb.toml index f4a2fc3fd..5afad3a98 100644 --- a/examples/workspaces/Scarb.toml +++ b/examples/workspaces/Scarb.toml @@ -10,8 +10,8 @@ test = "snforge" exit_first = true [workspace.dependencies] -cairo_test = "2.6.4" -starknet = "2.6.4" +cairo_test = "2.7.0-rc.2" +starknet = "2.7.0-rc.2" [workspace.package] version = "0.1.0" diff --git a/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs b/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs index 032743b33..a33bf699c 100644 --- a/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs +++ b/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs @@ -250,7 +250,7 @@ fn insert_lib_entrypoint_content_into_db( let module_id = ModuleId::CrateRoot(main_crate_id); let file_id = db.module_main_file(module_id).unwrap(); db.as_files_group_mut() - .override_file_content(file_id, Some(Arc::new(lib_content.to_string()))); + .override_file_content(file_id, Some(Arc::from(lib_content))); main_crate_id } diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 7b0721c7a..f16cbf25a 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -108,7 +108,7 @@ fn inject_virtual_wrapper_lib(db: &mut RootDatabase, unit: &CairoCompilationUnit let file_id = db.module_main_file(module_id).unwrap(); // Inject virtual lib file wrapper. db.as_files_group_mut() - .override_file_content(file_id, Some(Arc::new(content))); + .override_file_content(file_id, Some(Arc::from(content.as_str()))); } Ok(()) diff --git a/scarb/tests/build_starknet_contract.rs b/scarb/tests/build_starknet_contract.rs index 62d1cc77d..e68693ee2 100644 --- a/scarb/tests/build_starknet_contract.rs +++ b/scarb/tests/build_starknet_contract.rs @@ -387,7 +387,7 @@ fn compile_starknet_contract_without_starknet_dep() { fn constructor(ref self: ContractState, value_: u128) { ^***********^ - error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccessTrait::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. + error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccess::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. --> [..]src/lib.cairo:20:20 self.value.write(value_); ^***^ @@ -402,7 +402,7 @@ fn compile_starknet_contract_without_starknet_dep() { fn get(self: @ContractState) -> u128 { ^***********^ - error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapReadAccessTrait::read and StoragePointerReadAccess::read. Consider adding type annotations or explicitly refer to the impl function. + error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapReadAccess::read and StoragePointerReadAccess::read. Consider adding type annotations or explicitly refer to the impl function. --> [..]src/lib.cairo:26:24 self.value.read() ^**^ @@ -412,7 +412,7 @@ fn compile_starknet_contract_without_starknet_dep() { fn increase(ref self: ContractState, a: u128) { ^***********^ - error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccessTrait::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. + error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccess::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. --> [..]src/lib.cairo:29:24 self.value.write( self.value.read() + a ); ^***^