From a0d478480ea0c0760ea3d991189bb9577ecfe0d8 Mon Sep 17 00:00:00 2001 From: maciektr Date: Wed, 21 Feb 2024 10:06:59 +0100 Subject: [PATCH] Update Cairo --- Cargo.lock | 131 +++++++++--------- Cargo.toml | 46 +++--- extensions/scarb-cairo-run/src/main.rs | 2 +- extensions/scarb-cairo-run/tests/examples.rs | 2 +- .../compiler/compilers/starknet_contract.rs | 1 + 5 files changed, 92 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be2d2fc8b..0f15a63b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -562,8 +562,8 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-utils", "indoc", @@ -575,8 +575,8 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-lang-defs", @@ -597,16 +597,16 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -621,8 +621,8 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -632,8 +632,8 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-utils", "good_lp", @@ -641,8 +641,8 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -654,8 +654,8 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -674,8 +674,8 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -691,19 +691,20 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-test-plugin", "cairo-lang-utils", - "log", "salsa", "scarb-metadata 1.10.0", "serde", "serde_json", "tokio", "tower-lsp", + "tracing", + "tracing-subscriber", ] [[package]] name = "cairo-lang-lowering" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -745,8 +746,8 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -764,8 +765,8 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -782,8 +783,8 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "quote", @@ -792,8 +793,8 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -805,8 +806,8 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "ark-ff", "ark-secp256k1", @@ -835,8 +836,8 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -859,8 +860,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-felt", @@ -884,8 +885,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -898,8 +899,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -912,8 +913,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -934,8 +935,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "assert_matches", "cairo-felt", @@ -954,8 +955,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -963,8 +964,8 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-felt", @@ -993,8 +994,8 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-felt", "cairo-lang-casm", @@ -1017,8 +1018,8 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1032,8 +1033,8 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "genco", "xshell", @@ -1041,8 +1042,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-felt", @@ -1068,8 +1069,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "anyhow", "cairo-felt", @@ -1090,8 +1091,8 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" +version = "2.5.4" +source = "git+https://github.com/starkware-libs/cairo?rev=bd7cca1c3332daddc738682de0fea26da1b1973d#bd7cca1c3332daddc738682de0fea26da1b1973d" dependencies = [ "env_logger", "hashbrown 0.14.3", @@ -4424,7 +4425,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "assert_fs", @@ -4509,7 +4510,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.5.3" +version = "2.5.4" dependencies = [ "cargo_metadata", "semver", @@ -4517,7 +4518,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.5.3" +version = "2.5.4" dependencies = [ "cairo-lang-language-server", "cairo-lang-utils", @@ -4527,7 +4528,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "assert_fs", @@ -4549,7 +4550,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -4595,7 +4596,7 @@ dependencies = [ [[package]] name = "scarb-snforge-test-collector" -version = "2.5.3" +version = "2.5.4" dependencies = [ "anyhow", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index f0e4f658c..fd287c1af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.5.3" +version = "2.5.4" edition = "2021" authors = ["Software Mansion "] @@ -33,28 +33,28 @@ assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } cairo-felt = "0.9.1" -cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152", version = "2.5.3", features = ["env_logger"] } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "bd7cca1c3332daddc738682de0fea26da1b1973d", version = "2.5.3", 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/src/main.rs b/extensions/scarb-cairo-run/src/main.rs index fdcd75229..8c1fdbb72 100644 --- a/extensions/scarb-cairo-run/src/main.rs +++ b/extensions/scarb-cairo-run/src/main.rs @@ -107,7 +107,7 @@ fn main_inner(ui: &Ui) -> Result<()> { Some(Default::default()) }, Default::default(), - false, + None, )?; let result = runner diff --git a/extensions/scarb-cairo-run/tests/examples.rs b/extensions/scarb-cairo-run/tests/examples.rs index 08bd378d7..c68c5667a 100644 --- a/extensions/scarb-cairo-run/tests/examples.rs +++ b/extensions/scarb-cairo-run/tests/examples.rs @@ -97,7 +97,7 @@ fn can_limit_gas() { Finished release target(s) in [..] Running hello_world Run completed successfully, returning [987] - Remaining gas: 67840 + Remaining gas: 68340 "#}); } diff --git a/scarb/src/compiler/compilers/starknet_contract.rs b/scarb/src/compiler/compilers/starknet_contract.rs index 9fa9929b8..bb1d81550 100644 --- a/scarb/src/compiler/compilers/starknet_contract.rs +++ b/scarb/src/compiler/compilers/starknet_contract.rs @@ -4,6 +4,7 @@ use std::iter::zip; use anyhow::{bail, ensure, Context, Result}; use cairo_lang_compiler::db::RootDatabase; +use cairo_lang_defs::ids::NamedLanguageElementId; use cairo_lang_filesystem::ids::{CrateId, CrateLongId}; use cairo_lang_semantic::db::SemanticGroup; use cairo_lang_starknet::compile::compile_prepared_db;