diff --git a/Cargo.lock b/Cargo.lock index e05d97e32..e2bf77fff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -561,8 +561,8 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-utils", "indoc", @@ -577,8 +577,8 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-lang-defs", @@ -600,16 +600,16 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -624,8 +624,8 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -635,8 +635,8 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-utils", "good_lp", @@ -644,8 +644,8 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -657,8 +657,8 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -676,8 +676,8 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -705,8 +705,8 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -730,8 +730,8 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -749,8 +749,8 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -767,8 +767,8 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "quote", @@ -777,8 +777,8 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -790,8 +790,8 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "ark-ff", "ark-secp256k1", @@ -817,8 +817,8 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -829,6 +829,7 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "id-arena", + "indoc", "itertools 0.11.0", "num-bigint", "num-traits 0.2.16", @@ -839,8 +840,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-lang-utils", @@ -863,8 +864,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -876,8 +877,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -889,8 +890,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -912,8 +913,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "assert_matches", "cairo-felt", @@ -932,8 +933,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -941,8 +942,8 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-felt", @@ -976,8 +977,8 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -991,8 +992,8 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "genco", "xshell", @@ -1000,8 +1001,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-felt", @@ -1025,8 +1026,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "anyhow", "cairo-felt", @@ -1046,8 +1047,8 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.3.0" -source = "git+https://github.com/starkware-libs/cairo?rev=bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f#bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" +version = "2.3.1" +source = "git+https://github.com/starkware-libs/cairo?rev=034bbf866f78535d246b86652d16d2620bd7f6b1#034bbf866f78535d246b86652d16d2620bd7f6b1" dependencies = [ "env_logger", "indexmap 2.0.0", @@ -4368,7 +4369,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.3.0" +version = "2.3.1" dependencies = [ "anyhow", "assert_fs", @@ -4447,7 +4448,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.3.0" +version = "2.3.1" dependencies = [ "cargo_metadata", "semver", @@ -4455,7 +4456,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.3.0" +version = "2.3.1" dependencies = [ "cairo-lang-language-server", "cairo-lang-utils", @@ -4465,7 +4466,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.3.0" +version = "2.3.1" dependencies = [ "anyhow", "assert_fs", @@ -4484,7 +4485,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.3.0" +version = "2.3.1" dependencies = [ "anyhow", "cairo-lang-compiler", diff --git a/Cargo.toml b/Cargo.toml index b94b5e84f..20c950350 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.3.0" +version = "2.3.1" edition = "2021" authors = ["Software Mansion "] @@ -29,19 +29,19 @@ anyhow = "1" assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "bf91adecc5a1cb2ced041ba383d7b7c38dd2fa7f", features = ["env_logger"] } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "034bbf866f78535d246b86652d16d2620bd7f6b1", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = "0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 438eb5394..16c55e325 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -96,7 +96,10 @@ fn build_project_config(unit: &CompilationUnit) -> Result { unit.core_package_component().target.source_root().into(), )); - let content = ProjectConfigContent { crate_roots }; + let content = ProjectConfigContent { + crate_roots, + crates_config: Default::default(), + }; let project_config = ProjectConfig { base_path: unit.main_component().package.root().into(),