diff --git a/Cargo.lock b/Cargo.lock index e1473af54..d4012b85e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -562,8 +562,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79c609f2d50a308006b0c04a3e1f9eda79fc4b6cc7d5cdb128c45ae020af7391" dependencies = [ "cairo-lang-utils", "indoc", @@ -575,8 +576,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0e519f55e16aca12c48330b058e84368fa0a2751bc6322f63e474e98039bd" dependencies = [ "anyhow", "cairo-lang-defs", @@ -597,16 +599,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28f52797c69c11cfe7099747eccdf837ecd71ff17ef443f45dff743426a7163" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a65986f560d3c1ac573ac26e9d9e000ad95f82b64b7d1f4b49005608049c8c09" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -621,8 +625,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a9e688f43671b7cb397bcb4fbdb55158633369a1f5ae4e61ea42207eb371d63" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -632,8 +637,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c516416fe6b202df2d94611e984b6177ac87f8553b17765f9430608132f5645" dependencies = [ "cairo-lang-utils", "good_lp", @@ -641,8 +647,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd837ab31b831e9f7b8376ff83f77fff01ad5a6a7bd23bf146bcfaad62d4b039" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -654,8 +661,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a0dcb97c579d680bc5d0ff991989e5d3b4ae20a7a93f14b1c5c8a5d383d28c" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -674,8 +682,9 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6564a46a066cd1a5249ec327419e9127f86024a80fbc44f42f443b3d2517482" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -702,8 +711,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dae6a996bd5f5c6f1ac6f961c507d2d841c9ecfbd6aa645a74140907d8a13280" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -726,8 +736,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ead70afebbb01898f7a1d29e3bfb91ee545c29446680ccbb66f5c51f1741313" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -745,8 +756,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32ecdc7986014341e0165a027105e612985c32a7bcd2f7c0fc4cd6197b37eb67" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -763,8 +775,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5629126ebb5347cdad42fa7388535118521b4f68419f957728fe53760a726e83" dependencies = [ "cairo-lang-debug", "quote", @@ -773,8 +786,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60125ce673e4c453ffe532ba15b295a0664334c4af666e43ab94ecaa2915fa8a" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -786,8 +800,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d269f3b2fe2613cb70f72f4a2c7928d119232766a83ffc7bbb3fb0aba2c74b" dependencies = [ "ark-ff", "ark-secp256k1", @@ -815,8 +830,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0773a59a843e532aea274efaa7be499b6953a1aaeb0d64c8b8c11109ba1da2c4" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -839,8 +855,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f06cf259fa7022e55f4a997c691510728119a3a2025e8fd9a8d18d3871b91259" dependencies = [ "anyhow", "cairo-felt", @@ -864,8 +881,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927b7624e3e6c45552a70b50760706b49939f4eec24ad03359dd9a3de383e58d" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -878,8 +896,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bce6e6355cb8f06714879a031d9c85e80d4261468e93a3c62b440b4804518e43" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -892,8 +911,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "085979b1238d59a2d0feebca864ddbd91854f6c057c96cf904ee5e7229e6590a" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -914,8 +934,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048b7e1627faddfcde39bc4bfaca81ef88fa01c984e17f322195a3598632bcd1" dependencies = [ "assert_matches", "cairo-felt", @@ -934,8 +955,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5b15790a43e099efa6631b0a3a956feed3079ed5f6b8bb853bc9747c3eb305" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -943,8 +965,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fff12ebd720839dd1d51ac776b53e2ad7b898d5bc28c3998d17f380da85c8a9" dependencies = [ "anyhow", "cairo-felt", @@ -973,8 +996,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e306eeaf4766fc701a74e727c1a88c2c5d2b40748d07d0548ec8e0b0ca11dec6" dependencies = [ "cairo-felt", "cairo-lang-casm", @@ -997,8 +1021,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5fb36c2d85254af7e33b130809cea8969150bbe8df03c51876b546224704a3" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1012,8 +1037,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5784bda479025abf46e895def0672d04634c7a5b8820279617d03778a6110321" dependencies = [ "genco", "xshell", @@ -1021,8 +1047,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2bdc19825a9e934041cb566950730387160749aa4f5143711414c24cf435d12" dependencies = [ "anyhow", "cairo-felt", @@ -1048,8 +1075,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53a98464cdf430267e55ffd01ee17564cfe2f45bd58ed4522771e3b300bcc92" dependencies = [ "anyhow", "cairo-felt", @@ -1070,8 +1098,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +version = "2.6.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d812e9b5472c7f10cd3c8e9155d4532bc251e5352a7d1d646934c20fa0dc8bdb" dependencies = [ "env_logger", "hashbrown 0.14.3", @@ -4439,7 +4468,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.5.3" +version = "2.6.0-rc.0" dependencies = [ "anyhow", "assert_fs", @@ -4522,7 +4551,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.5.3" +version = "2.6.0-rc.0" dependencies = [ "cargo_metadata", "semver", @@ -4530,7 +4559,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.5.3" +version = "2.6.0-rc.0" dependencies = [ "cairo-lang-language-server", "cairo-lang-utils", @@ -4540,7 +4569,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.5.3" +version = "2.6.0-rc.0" dependencies = [ "anyhow", "assert_fs", @@ -4562,7 +4591,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.5.3" +version = "2.6.0-rc.0" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -4608,7 +4637,7 @@ dependencies = [ [[package]] name = "scarb-snforge-test-collector" -version = "2.5.3" +version = "2.6.0-rc.0" dependencies = [ "anyhow", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 7d230bc35..232213021 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.5.3" +version = "2.6.0-rc.0" edition = "2021" authors = ["Software Mansion "] @@ -31,27 +31,27 @@ 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 = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31", version = "2.5.3", features = ["env_logger"] } +cairo-lang-casm = "2.6.0-rc.0" +cairo-lang-compiler = "2.6.0-rc.0" +cairo-lang-debug = "2.6.0-rc.0" +cairo-lang-defs = "2.6.0-rc.0" +cairo-lang-diagnostics = "2.6.0-rc.0" +cairo-lang-filesystem = "2.6.0-rc.0" +cairo-lang-formatter = "2.6.0-rc.0" +cairo-lang-language-server = "2.6.0-rc.0" +cairo-lang-lowering = "2.6.0-rc.0" +cairo-lang-project = "2.6.0-rc.0" +cairo-lang-runner = "2.6.0-rc.0" +cairo-lang-semantic = "2.6.0-rc.0" +cairo-lang-sierra = "2.6.0-rc.0" +cairo-lang-sierra-generator = "2.6.0-rc.0" +cairo-lang-sierra-to-casm = "2.6.0-rc.0" +cairo-lang-starknet = "2.6.0-rc.0" +cairo-lang-starknet-classes = "2.6.0-rc.0" +cairo-lang-syntax = "2.6.0-rc.0" +cairo-lang-test-plugin = "2.6.0-rc.0" +cairo-lang-test-runner = "2.6.0-rc.0" +cairo-lang-utils = { version = "2.6.0-rc.0", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/examples/starknet_hello_world/Scarb.toml b/examples/starknet_hello_world/Scarb.toml index 0f434cc08..32fd52ff7 100644 --- a/examples/starknet_hello_world/Scarb.toml +++ b/examples/starknet_hello_world/Scarb.toml @@ -5,6 +5,6 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.5.0" +starknet = "2.6.0-rc.0" [[target.starknet-contract]] diff --git a/examples/starknet_multiple_contracts/Scarb.toml b/examples/starknet_multiple_contracts/Scarb.toml index e062bef38..5690c4d27 100644 --- a/examples/starknet_multiple_contracts/Scarb.toml +++ b/examples/starknet_multiple_contracts/Scarb.toml @@ -5,6 +5,6 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.5.0" +starknet = "2.6.0-rc.0" [[target.starknet-contract]] diff --git a/examples/workspaces/Scarb.toml b/examples/workspaces/Scarb.toml index 532614c54..0fcf6a5df 100644 --- a/examples/workspaces/Scarb.toml +++ b/examples/workspaces/Scarb.toml @@ -10,7 +10,7 @@ test = "snforge" exit_first = true [workspace.dependencies] -starknet = "2.5.0" +starknet = "2.6.0-rc.0" [workspace.package] version = "0.1.0" diff --git a/extensions/scarb-cairo-run/tests/examples.rs b/extensions/scarb-cairo-run/tests/examples.rs index 32c3083c3..7f401e555 100644 --- a/extensions/scarb-cairo-run/tests/examples.rs +++ b/extensions/scarb-cairo-run/tests/examples.rs @@ -81,7 +81,7 @@ fn can_limit_gas() { Finished release target(s) in [..] Running hello_world Run completed successfully, returning [987] - Remaining gas: 67840 + Remaining gas: 75140 "#}); } diff --git a/extensions/scarb-snforge-test-collector/src/metadata.rs b/extensions/scarb-snforge-test-collector/src/metadata.rs index d7e1bc3e0..50e42c3d0 100644 --- a/extensions/scarb-snforge-test-collector/src/metadata.rs +++ b/extensions/scarb-snforge-test-collector/src/metadata.rs @@ -128,6 +128,9 @@ impl CompilationUnit<'_> { negative_impls: pkg .experimental_features .contains(&String::from("negative_impls")), + // TODO(maciektr): Fix corelib config and remove the override. + coupons: pkg.name == "core" + || pkg.experimental_features.contains(&String::from("coupons")), }, }, ) diff --git a/scarb/src/compiler/compilers/lib.rs b/scarb/src/compiler/compilers/lib.rs index a5f9eaa32..a03072edd 100644 --- a/scarb/src/compiler/compilers/lib.rs +++ b/scarb/src/compiler/compilers/lib.rs @@ -1,9 +1,11 @@ use anyhow::{Context, Result}; use cairo_lang_compiler::db::RootDatabase; +use cairo_lang_sierra_to_casm::compiler::SierraToCasmConfig; use cairo_lang_sierra_to_casm::metadata::calc_metadata; use serde::{Deserialize, Serialize}; use tracing::trace_span; +use crate::compiler::compilers::MAX_BYTECODE_SIZE; use crate::compiler::helpers::{ build_compiler_config, collect_main_crate_ids, write_json, write_string, }; @@ -97,7 +99,11 @@ impl Compiler for LibCompiler { let cairo_program = { let _ = trace_span!("compile_casm").enter(); - cairo_lang_sierra_to_casm::compiler::compile(&program, &metadata, gas_usage_check)? + let config = SierraToCasmConfig { + gas_usage_check, + max_bytecode_size: MAX_BYTECODE_SIZE, + }; + cairo_lang_sierra_to_casm::compiler::compile(&program, &metadata, config)? }; write_string( diff --git a/scarb/src/compiler/compilers/mod.rs b/scarb/src/compiler/compilers/mod.rs index 4d810b570..59098e516 100644 --- a/scarb/src/compiler/compilers/mod.rs +++ b/scarb/src/compiler/compilers/mod.rs @@ -5,3 +5,5 @@ pub use test::*; mod lib; mod starknet_contract; mod test; + +const MAX_BYTECODE_SIZE: usize = usize::MAX; diff --git a/scarb/src/compiler/compilers/starknet_contract.rs b/scarb/src/compiler/compilers/starknet_contract.rs index 9fa9929b8..02dd16edd 100644 --- a/scarb/src/compiler/compilers/starknet_contract.rs +++ b/scarb/src/compiler/compilers/starknet_contract.rs @@ -20,6 +20,7 @@ use serde::{Deserialize, Serialize}; use smol_str::SmolStr; use tracing::{debug, trace, trace_span}; +use crate::compiler::compilers::MAX_BYTECODE_SIZE; use crate::compiler::helpers::{build_compiler_config, collect_main_crate_ids, write_json}; use crate::compiler::{CompilationUnit, Compiler}; use crate::core::{PackageName, TargetKind, Utf8PathWorkspaceExt, Workspace}; @@ -253,6 +254,7 @@ impl Compiler for StarknetContractCompiler { let casm_class = CasmContractClass::from_contract_class( class.clone(), props.casm_add_pythonic_hints, + MAX_BYTECODE_SIZE, ) .with_context(|| { format!("{contract_name}: failed to compile Sierra contract to CASM") diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 2a61e2fe3..645b07fe3 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -93,7 +93,12 @@ fn build_project_config(unit: &CompilationUnit) -> Result { .components .iter() .map(|component| { - let experimental_features = component.package.manifest.experimental_features.clone(); + let experimental_features = component + .package + .manifest + .experimental_features + .clone() + .unwrap_or_default(); ( component.cairo_package_name(), CrateSettings { @@ -102,8 +107,10 @@ fn build_project_config(unit: &CompilationUnit) -> Result { // TODO (#1040): replace this with a macro experimental_features: cairo_lang_filesystem::db::ExperimentalFeaturesConfig { negative_impls: experimental_features - .unwrap_or_default() .contains(&SmolStr::new_inline("negative_impls")), + // TODO(maciektr): Fix corelib config and remove the override. + coupons: component.package.id.is_core() + || experimental_features.contains(&SmolStr::new_inline("coupons")), }, }, ) diff --git a/scarb/tests/build.rs b/scarb/tests/build.rs index bb8c9ad46..0962afce0 100644 --- a/scarb/tests/build.rs +++ b/scarb/tests/build.rs @@ -625,16 +625,11 @@ fn workspace_as_dep() { ); second_t.child("target/dev/third.sierra.json").assert( predicates::str::contains(r#""debug_name":"third::example""#) - .and(predicates::str::contains(r#""debug_name":"third::hello""#)) - .and(predicates::str::contains( - r#""debug_name":"withdraw_gas_all""#, - )), - ); - second_t.child("target/dev/third.sierra.json").assert( - predicates::str::contains(r#""debug_name":"second::fib""#).and(predicates::str::contains( - r#""debug_name":"get_builtin_costs""#, - )), + .and(predicates::str::contains(r#""debug_name":"third::hello""#)), ); + second_t + .child("target/dev/third.sierra.json") + .assert(predicates::str::contains(r#""debug_name":"second::fib""#)); } #[test]