diff --git a/Cargo.lock b/Cargo.lock index 31e9323dd..c3681206c 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=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a43421bf72645b3a562d264747166d6f093e960a69dfa38b67bb3209e370366" 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=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24242af537265add372896d9ab0678c86a68d3484281fbeb6d8a9d4d5bacf7c8" dependencies = [ "anyhow", "cairo-lang-defs", @@ -596,7 +598,6 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "indoc", - "rayon", "salsa", "smol_str", "thiserror", @@ -604,16 +605,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d28f38e1c62fed15a4de9f3c95741d6b24ef2a9e67a2b88a047eb6ea7de992e" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712206b7be3fb1a33e50e1c30aa8502b4a461155fd93ad26213d0d8b242cb08d" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -628,8 +631,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3c8dc2bff2411fbf602d80a83b719e6e3955c1c5d767ec18b295fc92e8616a" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -639,8 +643,9 @@ dependencies = [ [[package]] name = "cairo-lang-doc" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04a82d79c36047fe17f6d299053f35eb2b17c023f516730ca8c3945f046e02a" dependencies = [ "cairo-lang-defs", "cairo-lang-formatter", @@ -653,8 +658,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa8ac24c97770739f5a78d630b8515273c8b9f4aff34e1f88b988fac50340de" dependencies = [ "cairo-lang-utils", "good_lp", @@ -662,8 +668,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4596331565fe61d10a0a6a03ace2b9d0ba93f03ee12a8450fe9252a6fee770f3" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -675,8 +682,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b8eb08e511d6e6df51370cdc7d85f0de9a38c8b14a15762665c60c2df6d32d" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -695,8 +703,9 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32ce4ba948a52a088144071d2555d4383bf7f45ddfadecf99d0ef138f1718abc" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -713,8 +722,6 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-test-plugin", "cairo-lang-utils", - "indent", - "indoc", "itertools 0.12.1", "salsa", "scarb-metadata 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -730,8 +737,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d535dc591513875b39b799270df21db10540033fd7710917760c22fc063a4ae" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -795,8 +803,9 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" [[package]] name = "cairo-lang-parser" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73019d5873715964f428ff10467efb607d6dc007ae164a21547bf20d9b5dcc72" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -814,8 +823,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96e52fca18bc696011a47a4ded0dc00e2e0ac7c81a8052eddd4ad546c46b818e" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -832,8 +842,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d55dcf98a6e1a03e0b36129fad4253f9e6666a1746ab9c075d212ba68a4e9c1" dependencies = [ "cairo-lang-debug", "quote", @@ -842,8 +853,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ddb432e5199a65e37bab97ef6322afabd60e0e638ada31178d9c23d237219d" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -855,8 +867,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5bbbabd509ce88abc67436973d3377e099269dbd14578fa84fce884a74fa23" dependencies = [ "ark-ff", "ark-secp256k1", @@ -885,8 +898,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "393325820207491a7475269e98163e0db7e85e4b215f4d801ca537ce1cd6daa7" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -911,8 +925,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "918fb0611203fb8cdd1fcdb434f395a59e0ebb0db64b11a0e15bfbfb03552821" dependencies = [ "anyhow", "cairo-lang-utils", @@ -938,8 +953,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa1834ec729e89fcbd00df03f2a64a18515fcf07eb18dfef39afe020a10955d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -953,8 +969,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b00927d39f910dd5ae1047cef9b46b2ee11617d33d290f875bc00dfc7e3d992" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -968,8 +985,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7620a6a7becf5997093a83d289a5e3b3162bc8fd031ad75df82a5bc04f8cc954" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -992,8 +1010,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67bd155770abf91d4290a31b0c0a1fb393ecee85eb0af40c16893b4601eff4d6" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1012,8 +1031,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbae9458999da692c272501678b6cfec358a6bcadb54921bf35d21afdcd91251" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1021,8 +1041,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f242d889180386d35935597f9d1cac07d4f3d60bd0f10558660ae4a77da701b6" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1051,8 +1072,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa17b313f46fcf7ff4de32b86c250eaf584d1e2c8e37ed16db155b221721e735" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1074,8 +1096,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0ca518ed7c3674d9b62470f7482f4b07553eb3a02d83e0ae61bd6b5ecb4ec8" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1089,8 +1112,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f12bdff5c265edb5a76084bfde2bc8270a7fdaf16ac58aa0d54ea6a20c29023" dependencies = [ "genco", "xshell", @@ -1098,13 +1122,15 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b526ea053b930222352027b3259be44fb3cd3b25106e2b1fbc815526423650" dependencies = [ "anyhow", "cairo-lang-compiler", "cairo-lang-debug", "cairo-lang-defs", + "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-lowering", "cairo-lang-semantic", @@ -1124,8 +1150,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d44caf2f6ef96ba7653037a7f419d941158f5bf35f2802986986352a02354eb6" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1146,8 +1173,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a2365bd502a657437f9d0d665e32e017054d0effdbecb1dda776bfcc11235d" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1158,8 +1186,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=d0273bcc88a14c39fe61d76da7860eb25857ea83#d0273bcc88a14c39fe61d76da7860eb25857ea83" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5c8c127b9362a12ffb9dede38e792c81b4ded5a98b448baec157b745f47d1" dependencies = [ "env_logger", "hashbrown 0.14.5", @@ -1175,9 +1204,9 @@ dependencies = [ [[package]] name = "cairo-vm" -version = "1.0.0-rc4" +version = "1.0.0-rc6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f805c860c1f3831b93787c470e166ca762da9aba00c8b3a373076420f0e8bb2c" +checksum = "f905a936b3287d085706d3d68e405be4844ec7bc1c95eaa3d53220dd33efd4ff" dependencies = [ "anyhow", "bincode", @@ -4593,7 +4622,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.6.4" +version = "2.7.0" dependencies = [ "anyhow", "assert_fs", @@ -4684,7 +4713,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.6.4" +version = "2.7.0" dependencies = [ "cargo_metadata", "semver", @@ -4692,7 +4721,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.6.4" +version = "2.7.0" dependencies = [ "assert_fs", "cairo-lang-language-server", @@ -4704,7 +4733,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.6.4" +version = "2.7.0" dependencies = [ "anyhow", "assert_fs", @@ -4726,7 +4755,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.6.4" +version = "2.7.0" dependencies = [ "anyhow", "assert_fs", @@ -4746,7 +4775,7 @@ dependencies = [ [[package]] name = "scarb-doc" -version = "2.6.4" +version = "2.7.0" dependencies = [ "anyhow", "assert_fs", @@ -4804,7 +4833,7 @@ dependencies = [ [[package]] name = "scarb-snforge-test-collector" -version = "2.6.4" +version = "2.7.0" dependencies = [ "anyhow", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 0dd20cba5..f88e998e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.6.4" +version = "2.7.0" 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 = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "d0273bcc88a14c39fe61d76da7860eb25857ea83", features = ["env_logger"] } +cairo-lang-casm = "2.7.0" +cairo-lang-compiler = "2.7.0" +cairo-lang-debug = "2.7.0" +cairo-lang-defs = "2.7.0" +cairo-lang-diagnostics = "2.7.0" +cairo-lang-doc = "2.7.0" +cairo-lang-filesystem = "2.7.0" +cairo-lang-formatter = "2.7.0" +cairo-lang-language-server = "2.7.0" +cairo-lang-lowering = "2.7.0" +cairo-lang-parser = "2.7.0" +cairo-lang-project = "2.7.0" +cairo-lang-runner = "2.7.0" +cairo-lang-semantic = "2.7.0" +cairo-lang-sierra = "2.7.0" +cairo-lang-sierra-generator = "2.7.0" +cairo-lang-sierra-to-casm = "2.7.0" +cairo-lang-sierra-type-size = "2.7.0" +cairo-lang-starknet = "2.7.0" +cairo-lang-starknet-classes = "2.7.0" +cairo-lang-syntax = "2.7.0" +cairo-lang-test-plugin = "2.7.0" +cairo-lang-test-runner = "2.7.0" +cairo-lang-utils = { version = "2.7.0", 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..55a24f36f 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" diff --git a/examples/hello_world/Scarb.toml b/examples/hello_world/Scarb.toml index bc239bb86..0cd7989e0 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" diff --git a/examples/starknet_hello_world/Scarb.toml b/examples/starknet_hello_world/Scarb.toml index c58ca29e3..ab29833d7 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" [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0" [[target.starknet-contract]] diff --git a/examples/starknet_multiple_contracts/Scarb.toml b/examples/starknet_multiple_contracts/Scarb.toml index bd3bc6e98..abe971963 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" [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0" [[target.starknet-contract]] diff --git a/examples/workspaces/Scarb.toml b/examples/workspaces/Scarb.toml index f4a2fc3fd..b06d63a77 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" +starknet = "2.7.0" [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/compilers/test.rs b/scarb/src/compiler/compilers/test.rs index 423b4ba3c..5556077c7 100644 --- a/scarb/src/compiler/compilers/test.rs +++ b/scarb/src/compiler/compilers/test.rs @@ -46,8 +46,7 @@ impl Compiler for TestCompiler { .compiler_config .unstable_add_statements_functions_debug_info, }; - let allow_warnings = unit.compiler_config.allow_warnings; - compile_test_prepared_db(db, config, main_crate_ids, test_crate_ids, allow_warnings)? + compile_test_prepared_db(db, config, main_crate_ids, test_crate_ids)? }; { diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 9f84802e4..1f99aaf7f 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -109,7 +109,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 ); ^***^