Prepare release 2.11 (#2044)

- **Prepare release `2.11.0`**
- **Allow specifying inlining-strategy via weight**
- **Update test expects**
- **Temp: use forked ls**

Author: maciektr

Cargo.lock

@@ -25,7 +25,7 @@ members = [
 "resolver" = "2"
 
 [workspace.package]
-version = "2.10.1"
+version = "2.11.0"
 edition = "2021"
 
 authors = ["Software Mansion <[email protected]>"]
@@ -34,49 +34,34 @@ license = "MIT"
 readme = "README.md"
 repository = "https://github.com/software-mansion/scarb"
 
-# Managing dependencies on crates from starkware-libs/cairo repository:
-#
-# The Cairo compiler is made of a bunch of crates that inter-depend on each other and have
-# synchronised versioning.
-# It is very important to use a single revision of these crates in the entire Cairo toolchain,
-# which consists of Cairo compiler, Scarb, CairoLS and other tools.
-# The toolchain is eventually built by Scarb, which depends on everything other as regular crates.
-# To ensure that all crates in the toolchain use the same revision of Cairo crates, we use a patch
-# mechanism that Cargo provides.
-# Because Cargo requires patches to change the crate source, we have an unspoken contract that
-# all tools *always* depend on some crates.io versions of Cairo crates and Scarb uses
-# [patch.crates.io] table to set final git revision for everything.
-#
-# To keep our Cargo.toml following this contract, always use `cargo xtask upgrade`
-# for manipulating these dependencies.
 [workspace.dependencies]
 anyhow = "1"
 assert_fs = "1"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["http2"] }
 bincode = "2.0.0-rc.3"
-cairo-lang-compiler = "*"
-cairo-lang-defs = "*"
-cairo-lang-diagnostics = "*"
-cairo-lang-doc = "*"
-cairo-lang-executable = "*"
-cairo-lang-filesystem = "*"
-cairo-lang-formatter = "*"
-cairo-lang-lowering = "*"
-cairo-lang-parser = "*"
-cairo-lang-runner = "*"
-cairo-lang-semantic = "*"
-cairo-lang-sierra = "*"
-cairo-lang-sierra-generator = "*"
-cairo-lang-sierra-to-casm = "*"
-cairo-lang-starknet = "*"
-cairo-lang-starknet-classes = "*"
-cairo-lang-syntax = "*"
-cairo-lang-test-plugin = "*"
-cairo-lang-test-runner = "*"
-cairo-lang-utils = { version = "*", features = ["env_logger"] }
-cairo-language-server = "*"
-cairo-lint-core = "*"
+cairo-lang-compiler = "2.11"
+cairo-lang-defs = "2.11"
+cairo-lang-diagnostics = "2.11"
+cairo-lang-doc = "2.11"
+cairo-lang-executable = "2.11"
+cairo-lang-filesystem = "2.11"
+cairo-lang-formatter = "2.11"
+cairo-lang-lowering = "2.11"
+cairo-lang-parser = "2.11"
+cairo-lang-runner = "2.11"
+cairo-lang-semantic = "2.11"
+cairo-lang-sierra = "2.11"
+cairo-lang-sierra-generator = "2.11"
+cairo-lang-sierra-to-casm = "2.11"
+cairo-lang-starknet = "2.11"
+cairo-lang-starknet-classes = "2.11"
+cairo-lang-syntax = "2.11"
+cairo-lang-test-plugin = "2.11"
+cairo-lang-test-runner = "2.11"
+cairo-lang-utils = { version = "2.11", features = ["env_logger"] }
+cairo-language-server = { git = "https://github.com/software-mansion/cairols.git", branch = "2.11" }
+cairo-lint-core = "2.11"
 cairo-vm = "1.0.1"
 camino = { version = "1", features = ["serde1"] }
 cargo_metadata = ">=0.18"
@@ -135,8 +120,8 @@ smallvec = "1"
 smol_str = { version = "0.3", features = ["serde"] }
 snapbox = { version = "0.4", features = ["cmd", "path"] }
 starknet-types-core = "0.1"
-stwo_cairo_prover = { version = "*" }
-stwo-cairo-adapter = { version = "*", features = ["std"] }
+stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "71a214aa5cb5b199e1da156a3672bcc99de21fc2" }
+stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "71a214aa5cb5b199e1da156a3672bcc99de21fc2", features = ["std"] }
 syn = "2"
 tar = "0.4"
 target-triple = "0.1"
@@ -162,49 +147,6 @@ xxhash-rust = { version = "0.8", features = ["xxh3"] }
 zip = { version = "0.6", default-features = false, features = ["deflate"] }
 zstd = "0.13"
 
-# Here we specify real dependency specifications for Cairo crates *if* currently we want to use
-# a particular unreleased commit (which is frequent mid-development).
-# We list all Cairo crates that go into Scarb's compilation unit even if Scarb itself does not depend
-# on some of them directly.
-# This ensures no duplicate instances of Cairo crates are pulled in by mistake.
-[patch.crates-io]
-cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-eq-solver = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-proc-macros = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-runnable-utils = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-sierra-ap-change = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-sierra-gas = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-syntax-codegen = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "01cdc6e5866fffc68f7d123ef54520b7cafafb9f" }
-cairo-language-server = { git = "https://github.com/software-mansion/cairols", rev = "ac5cfde0372fce38e24bb4266b4ada3ddd457483" }
-cairo-lint-core = { git = "https://github.com/software-mansion/cairo-lint", rev = "a418ae7680caec87c176b9ad391f012e23a6d9ca" }
-stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "4f16a586138170f9c565a424fec75df2b8cee750" }
-stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "4f16a586138170f9c565a424fec75df2b8cee750" }
-
 [profile.release]
 lto = true
 

Cargo.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.8.0"
+cairo_test = "2.11.0"

examples/dependencies/Scarb.toml

@@ -8,4 +8,4 @@ edition = "2023_10"
 [dependencies]
 
 [dev-dependencies]
-cairo_test = "2.8.0"
+cairo_test = "2.11.0"

examples/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.8.0"
+starknet = "2.11.0"
 
 [dev-dependencies]
-cairo_test = "2.8.0"
+cairo_test = "2.11.0"
 
 [[target.starknet-contract]]

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.8.0"
+starknet = "2.11.0"
 
 [dev-dependencies]
-cairo_test = "2.8.0"
+cairo_test = "2.11.0"
 
 [[target.starknet-contract]]

examples/starknet_multiple_contracts/Scarb.toml

@@ -10,8 +10,8 @@ test = "snforge"
 exit_first = true
 
 [workspace.dependencies]
-cairo_test = "2.8.0"
-starknet = "2.8.0"
+cairo_test = "2.11.0"
+starknet = "2.11.0"
 
 [workspace.package]
 version = "0.1.0"

examples/workspaces/Scarb.toml

@@ -3,6 +3,6 @@
 Fully qualified path: `hello_world::CircleDrop`
 
 ```rust
-impl CircleDrop of core::traits::Drop<Circle>;
+impl CircleDrop<> of core::traits::Drop<Circle>;
 ```
 

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CircleDrop.md

@@ -3,7 +3,7 @@
 Fully qualified path: `hello_world::CirclePartialEq`
 
 ```rust
-impl CirclePartialEq of core::traits::PartialEq<Circle>
+impl CirclePartialEq<> of core::traits::PartialEq<Circle>
 ```
 
 ## Impl functions

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CirclePartialEq.md

@@ -3,7 +3,7 @@
 Fully qualified path: `hello_world::CircleSerde`
 
 ```rust
-impl CircleSerde of core::serde::Serde<Circle>
+impl CircleSerde<> of core::serde::Serde<Circle>
 ```
 
 ## Impl functions

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CircleSerde.md

@@ -3,6 +3,6 @@
 Fully qualified path: `hello_world::CircleDrop`
 
 ```rust
-impl CircleDrop of core::traits::Drop<Circle>;
+impl CircleDrop<> of core::traits::Drop<Circle>;
 ```
 

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CircleDrop.md

@@ -3,7 +3,7 @@
 Fully qualified path: `hello_world::CirclePartialEq`
 
 ```rust
-impl CirclePartialEq of core::traits::PartialEq<Circle>
+impl CirclePartialEq<> of core::traits::PartialEq<Circle>
 ```
 
 ## Impl functions

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CirclePartialEq.md

@@ -3,7 +3,7 @@
 Fully qualified path: `hello_world::CircleSerde`
 
 ```rust
-impl CircleSerde of core::serde::Serde<Circle>
+impl CircleSerde<> of core::serde::Serde<Circle>
 ```
 
 ## Impl functions

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CircleSerde.md

@@ -123,6 +123,7 @@ pub fn execute(
         syscalls_used_resources: Default::default(),
         no_temporary_segments: false,
         markers: Default::default(),
+        panic_traceback: Default::default(),
     };
 
     let cairo_run_config = CairoRunConfig {

extensions/scarb-execute/src/lib.rs

@@ -39,7 +39,6 @@ fn can_take_big_number_as_arg() {
             [..]Finished `dev` profile target(s) in [..]
             [..]Executing hello
             Program output:
-            0
             1129815197211541481934112806673325772687763881719835256646064516195041515616
             Saving output to: target/execute/hello/execution1
         "#});
@@ -83,7 +82,6 @@ fn can_read_arguments_from_file() {
             [..]Finished `dev` profile target(s) in [..]
             [..]Executing hello
             Program output:
-            0
             1129815197211541481934112806673325772687763881719835256646064516195041515616
             Saving output to: target/execute/hello/execution1
         "#});

extensions/scarb-execute/tests/arguments.rs

@@ -367,7 +367,6 @@ fn can_choose_build_target() {
             [..]Finished `dev` profile target(s) in [..]
             [..]Executing hello_world
             Program output:
-            0
             42
             Saving output to: target/execute/hello_world/execution1
         "#});
@@ -384,7 +383,6 @@ fn can_choose_build_target() {
         .stdout_matches(indoc! {r#"
             [..]Executing hello_world
             Program output:
-            0
             24
             Saving output to: target/execute/hello_world/execution2
         "#});

extensions/scarb-execute/tests/build.rs

@@ -117,10 +117,9 @@ fn main_inner(args: Args, ui: Ui) -> Result<()> {
     let prover_input = adapt_vm_output(pub_input_path.as_std_path(), priv_input_path.as_std_path())
         .context("failed to adapt VM output")?;
 
-    let config = ProverConfig::builder()
-        .track_relations(args.prover.track_relations)
-        .display_components(args.prover.display_components)
-        .build();
+    let config = ProverConfig {
+        display_components: args.prover.display_components,
+    };
 
     let ProverParameters { pcs_config } = default_prod_prover_parameters();
     let proof = prove_cairo::<Blake2sMerkleChannel>(prover_input, config, pcs_config)

extensions/scarb-prove/src/main.rs

@@ -101,6 +101,9 @@ impl From<InliningStrategy> for cairo_lang_lowering::utils::InliningStrategy {
         match value {
             InliningStrategy::Default => cairo_lang_lowering::utils::InliningStrategy::Default,
             InliningStrategy::Avoid => cairo_lang_lowering::utils::InliningStrategy::Avoid,
+            InliningStrategy::InlineSmallFunctions(weight) => {
+                cairo_lang_lowering::utils::InliningStrategy::InlineSmallFunctions(weight)
+            }
         }
     }
 }
@@ -111,6 +114,9 @@ impl From<cairo_lang_lowering::utils::InliningStrategy> for InliningStrategy {
         match value {
             cairo_lang_lowering::utils::InliningStrategy::Default => InliningStrategy::Default,
             cairo_lang_lowering::utils::InliningStrategy::Avoid => InliningStrategy::Avoid,
+            cairo_lang_lowering::utils::InliningStrategy::InlineSmallFunctions(weight) => {
+                InliningStrategy::InlineSmallFunctions(weight)
+            }
         }
     }
 }

scarb/src/compiler/helpers.rs

@@ -37,13 +37,64 @@ pub struct ManifestCompilerConfig {
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, Eq, PartialEq, Hash, Clone)]
-#[serde(rename_all = "kebab-case")]
+#[serde(
+    rename_all = "kebab-case",
+    try_from = "serdex::InliningStrategy",
+    into = "serdex::InliningStrategy"
+)]
 pub enum InliningStrategy {
     /// Do not override inlining strategy.
     #[default]
     Default,
     /// Inline only in the case of an `inline(always)` annotation.
     Avoid,
+    /// Should inline small functions up to the given weight.
+    ///
+    /// Note: the weight exact definition is subject to change.
+    InlineSmallFunctions(usize),
+}
+
+mod serdex {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Debug, Deserialize, Serialize)]
+    #[serde(untagged)]
+    pub enum InliningStrategy {
+        InlineSmallFunctions(usize),
+        Predefined(String),
+    }
+
+    impl TryFrom<InliningStrategy> for super::InliningStrategy {
+        type Error = serde::de::value::Error;
+
+        fn try_from(value: InliningStrategy) -> Result<Self, Self::Error> {
+            match value {
+                InliningStrategy::InlineSmallFunctions(weight) => {
+                    Ok(Self::InlineSmallFunctions(weight))
+                }
+                InliningStrategy::Predefined(name) => match name.as_str() {
+                    "default" => Ok(Self::Default),
+                    "avoid" => Ok(Self::Avoid),
+                    _ => Err(serde::de::Error::custom(format!(
+                        "unknown inlining strategy: `{}`\nuse one of: `default`, `avoid` or a number",
+                        name
+                    ))),
+                },
+            }
+        }
+    }
+
+    impl From<super::InliningStrategy> for InliningStrategy {
+        fn from(strategy: super::InliningStrategy) -> Self {
+            match strategy {
+                super::InliningStrategy::Default => Self::Predefined("default".to_string()),
+                super::InliningStrategy::Avoid => Self::Predefined("avoid".to_string()),
+                super::InliningStrategy::InlineSmallFunctions(weight) => {
+                    Self::InlineSmallFunctions(weight)
+                }
+            }
+        }
+    }
 }
 
 impl DefaultForProfile for ManifestCompilerConfig {

scarb/src/core/manifest/compiler_config.rs

@@ -1369,7 +1369,7 @@ fn can_be_expanded() {
 
             #[derive(CustomDerive, Drop)]
             struct SomeType {}
-            impl SomeTypeDrop of core::traits::Drop<SomeType>;
+            impl SomeTypeDrop<> of core::traits::Drop<SomeType>;
             impl SomeImpl of Hello<SomeType> {
                 fn world(self: @SomeType) -> u32 {
                     32