From ecd0397de2c1d6bfe340ba92b3080948c5df3e1b Mon Sep 17 00:00:00 2001 From: maciektr Date: Wed, 23 Oct 2024 13:59:23 +0200 Subject: [PATCH] Update Cairo (#1672) --- Cargo.lock | 63 ++++++++++--------- Cargo.toml | 48 +++++++------- extensions/scarb-cairo-run/tests/arguments.rs | 9 +-- scarb/tests/fmt.rs | 14 +++-- 4 files changed, 71 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62b3952f8..7360dd61a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,7 +563,7 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-utils", "indoc", @@ -576,7 +576,7 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-defs", @@ -601,7 +601,7 @@ dependencies = [ [[package]] name = "cairo-lang-debug" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-utils", ] @@ -609,7 +609,7 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -625,7 +625,7 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "cairo-lang-doc" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-defs", "cairo-lang-filesystem", @@ -651,7 +651,7 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-utils", "good_lp", @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -694,7 +694,7 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -734,7 +734,7 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -799,7 +799,7 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" [[package]] name = "cairo-lang-parser" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -818,7 +818,7 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -836,7 +836,7 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "quote", @@ -846,7 +846,7 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -859,7 +859,7 @@ dependencies = [ [[package]] name = "cairo-lang-runner" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "ark-ff", "ark-secp256k1", @@ -868,6 +868,7 @@ dependencies = [ "cairo-lang-lowering", "cairo-lang-sierra", "cairo-lang-sierra-ap-change", + "cairo-lang-sierra-gas", "cairo-lang-sierra-generator", "cairo-lang-sierra-to-casm", "cairo-lang-sierra-type-size", @@ -889,7 +890,7 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -914,7 +915,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-utils", @@ -940,7 +941,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -955,7 +956,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -970,7 +971,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -993,7 +994,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1013,7 +1014,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1022,7 +1023,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1051,7 +1052,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1073,7 +1074,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1088,7 +1089,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "genco", "xshell", @@ -1097,7 +1098,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1123,7 +1124,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1145,7 +1146,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1157,7 +1158,7 @@ dependencies = [ [[package]] name = "cairo-lang-utils" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=7cfecf38801416c19a431e3a5c21b7d68615ce93#7cfecf38801416c19a431e3a5c21b7d68615ce93" +source = "git+https://github.com/starkware-libs/cairo?rev=68938b757d8b3960f7588f27931ce716c5e914bc#68938b757d8b3960f7588f27931ce716c5e914bc" dependencies = [ "env_logger", "hashbrown 0.14.5", diff --git a/Cargo.toml b/Cargo.toml index 497a3e5f8..27cb240d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "7cfecf38801416c19a431e3a5c21b7d68615ce93", features = ["env_logger"] } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "68938b757d8b3960f7588f27931ce716c5e914bc", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/extensions/scarb-cairo-run/tests/arguments.rs b/extensions/scarb-cairo-run/tests/arguments.rs index 8a622e6ae..08f70979a 100644 --- a/extensions/scarb-cairo-run/tests/arguments.rs +++ b/extensions/scarb-cairo-run/tests/arguments.rs @@ -72,6 +72,7 @@ fn can_deserialize_big_number() { } #[test] +#[ignore = "number of args validation removed in cairo-lang-runner cairo#6489"] fn invalid_number_of_args() { let t = TempDir::new().unwrap(); setup_fib_three_felt_args(&t); @@ -128,7 +129,7 @@ fn array_instead_of_felt() { error: failed to run the function Caused by: - Function param 2 only partially contains argument 2. + Operation failed: 14:0 - 1, offsets cant be negative error: process did not exit successfully: exit code: 1 "#}); #[cfg(not(windows))] @@ -139,7 +140,7 @@ fn array_instead_of_felt() { error: failed to run the function Caused by: - Function param 2 only partially contains argument 2. + Operation failed: 14:0 - 1, offsets cant be negative "#}); } @@ -272,7 +273,7 @@ fn invalid_struct_deserialization() { error: failed to run the function Caused by: - Function expects arguments of size 3 and received 2 instead. + Couldn't compute operand op1. Unknown value for memory cell 1:12 error: process did not exit successfully: exit code: 1 "#}); #[cfg(not(windows))] @@ -283,7 +284,7 @@ fn invalid_struct_deserialization() { error: failed to run the function Caused by: - Function expects arguments of size 3 and received 2 instead. + Couldn't compute operand op1. Unknown value for memory cell 1:12 "#}); } diff --git a/scarb/tests/fmt.rs b/scarb/tests/fmt.rs index 14f53485a..4fe3c8fea 100644 --- a/scarb/tests/fmt.rs +++ b/scarb/tests/fmt.rs @@ -223,13 +223,19 @@ fn format_with_import_sorting() { Diff in file [..]lib.cairo: --- original +++ modified - @@ -1,5 +1,5 @@ + @@ -1,10 +1,10 @@ +use openzeppelin::introspection::first; use openzeppelin::introspection::interface; -use openzeppelin::introspection::first; #[starknet::contract] mod SRC5 { + + use openzeppelin::introspection::{AB, interface}; + use openzeppelin::introspection::interface; + - use openzeppelin::introspection::{interface, AB}; + + #[storage] + struct Storage { @@ -14,8 +14,8 @@ use openzeppelin::introspection::first; @@ -244,9 +250,9 @@ fn format_with_import_sorting() { use starknet::ArrayTrait; mod Inner { - - use C; - use B; - + use C; + + use B; + use C; + - use B; } }