Update cairo after 2.10.0 merge (#1995)

maciektr · web-flow · commit 0f006ce405dc · 2025-02-20T11:08:32.000+01:00
- **Remove add-redeposit-gas flag**
- **Update Cairo after 2.10.0 merge**
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ members = [
 "resolver" = "2"
 
 [workspace.package]
-version = "2.9.3"
+version = "2.10.0"
 edition = "2021"
 
 authors = ["Software Mansion <contact@swmansion.com>"]
@@ -167,41 +167,41 @@ zstd = "0.13"
 # 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 = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-eq-solver = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-proc-macros = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-runnable-utils = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-sierra-ap-change = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-sierra-gas = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-syntax-codegen = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "9079dcaac9e7de1198acdfc34dbbdd31a1b4797a" }
-cairo-language-server = { git = "https://github.com/software-mansion/cairols", rev = "7f073fbe80d9501fce27af60b8a3fd2878f3a8a2" }
-cairo-lint-core = { git = "https://github.com/software-mansion/cairo-lint", rev = "f11992fba01ffc29ec656ae57b1c5edd98a74923" }
-stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "5684db96bb70deaa5021f97579aa4ce6c52d7b34" }
+cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-eq-solver = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-proc-macros = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-runnable-utils = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-sierra-ap-change = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-sierra-gas = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-syntax-codegen = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "331ffedd49b24b81feb64a871778251d5a473446" }
+cairo-language-server = { git = "https://github.com/software-mansion/cairols", rev = "d42065d551658a77489f2e336b45e40102d4c15e" }
+cairo-lint-core = { git = "https://github.com/software-mansion/cairo-lint", rev = "3ac5b157a8ba333ad3c196044020d6bfd4a74ecf" }
+stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "5ac2490aa48cc1fc6a97fcd3bbaa98600e79c4c3" }
 
 [profile.release]
 lto = true
diff --git a/extensions/scarb-cairo-run/tests/examples.rs b/extensions/scarb-cairo-run/tests/examples.rs
@@ -99,7 +99,7 @@ fn can_limit_gas() {
                 Finished `dev` profile target(s) in [..]
                  Running hello_world
             Run completed successfully, returning [987]
-            Remaining gas: 59760
+            Remaining gas: 57270
         "#});
 }
 
diff --git a/extensions/scarb-cairo-test/tests/build.rs b/extensions/scarb-cairo-test/tests/build.rs
@@ -237,12 +237,12 @@ fn integration_tests() {
             [..]Finished `dev` profile target(s) in [..]
             testing hello ...
             running 2 tests
-            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 40740)
-            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 40740)
+            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 43130)
+            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 43130)
             test result: ok. 2 passed; 0 failed; 0 ignored; 0 filtered out;
 
             running 1 test
-            test hello::tests::it_works ... ok (gas usage est.: 40740)
+            test hello::tests::it_works ... ok (gas usage est.: 43130)
             test result: ok. 1 passed; 0 failed; 0 ignored; 0 filtered out;
 
         "#});
@@ -336,7 +336,7 @@ fn can_choose_test_kind_to_run() {
             [..]Finished `dev` profile target(s) in [..]
             testing hello ...
             running 1 test
-            test hello::tests::it_works ... ok (gas usage est.: 40740)
+            test hello::tests::it_works ... ok (gas usage est.: 43130)
             test result: ok. 1 passed; 0 failed; 0 ignored; 0 filtered out;
 
         "#});
@@ -352,8 +352,8 @@ fn can_choose_test_kind_to_run() {
             [..]Finished `dev` profile target(s) in [..]
             testing hello ...
             running 2 tests
-            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 40740)
-            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 40740)
+            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 43130)
+            test hello_integrationtest::[..]::tests::it_works ... ok (gas usage est.: 43130)
             test result: ok. 2 passed; 0 failed; 0 ignored; 0 filtered out;
             
         "#});
diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs
@@ -39,9 +39,6 @@ pub(crate) fn build_scarb_root_database(
     if !unit.compiler_config.enable_gas {
         b.skip_auto_withdraw_gas();
     }
-    if unit.compiler_config.add_redeposit_gas {
-        b.with_add_redeposit_gas();
-    }
     let mut db = b.build()?;
     inject_virtual_wrapper_lib(&mut db, unit)?;
     Ok(ScarbDatabase {
diff --git a/scarb/src/core/manifest/compiler_config.rs b/scarb/src/core/manifest/compiler_config.rs
@@ -20,8 +20,6 @@ pub struct ManifestCompilerConfig {
     pub allow_warnings: bool,
     /// Enable auto gas withdrawal and gas usage check.
     pub enable_gas: bool,
-    /// Add a call to the redeposits_gas libfunc in a bunch of places.
-    pub add_redeposit_gas: bool,
     /// Add a mapping between sierra statement indexes and fully qualified paths of cairo functions
     /// to debug info. A statement index maps to a vector consisting of a function which caused the
     /// statement to be generated and all functions that were inlined or generated along the way.
@@ -54,7 +52,6 @@ impl DefaultForProfile for ManifestCompilerConfig {
             sierra_replace_ids: profile.is_dev(),
             allow_warnings: true,
             enable_gas: true,
-            add_redeposit_gas: false,
             unstable_add_statements_functions_debug_info: false,
             unstable_add_statements_code_locations_debug_info: false,
             inlining_strategy: InliningStrategy::default(),
@@ -68,7 +65,6 @@ impl From<ManifestCompilerConfig> for TomlCairo {
             sierra_replace_ids: Some(config.sierra_replace_ids),
             allow_warnings: Some(config.allow_warnings),
             enable_gas: Some(config.enable_gas),
-            add_redeposit_gas: Some(config.add_redeposit_gas),
             unstable_add_statements_functions_debug_info: Some(
                 config.unstable_add_statements_functions_debug_info,
             ),
diff --git a/scarb/src/core/manifest/toml_manifest.rs b/scarb/src/core/manifest/toml_manifest.rs
@@ -333,8 +333,6 @@ pub struct TomlCairo {
     pub allow_warnings: Option<bool>,
     /// Enable auto gas withdrawal and gas usage check.
     pub enable_gas: Option<bool>,
-    /// Add a call to the redeposits_gas libfunc in a bunch of places.
-    pub add_redeposit_gas: Option<bool>,
     /// Add a mapping between sierra statement indexes and fully qualified paths of cairo functions
     /// to debug info. A statement index maps to a vector consisting of a function which caused the
     /// statement to be generated and all functions that were inlined or generated along the way.
@@ -921,9 +919,6 @@ impl TomlManifest {
             if let Some(enable_gas) = cairo.enable_gas {
                 compiler_config.enable_gas = enable_gas;
             }
-            if let Some(add_redeposit_gas) = cairo.add_redeposit_gas {
-                compiler_config.add_redeposit_gas = add_redeposit_gas;
-            }
             if let Some(unstable_add_statements_functions_debug_info) =
                 cairo.unstable_add_statements_functions_debug_info
             {
diff --git a/scarb/tests/build.rs b/scarb/tests/build.rs
@@ -1608,37 +1608,3 @@ fn can_import_from_self_by_name() {
         .assert()
         .success();
 }
-
-#[test]
-fn can_build_with_add_redeposit_gas() {
-    let t = TempDir::new().unwrap();
-    ProjectBuilder::start()
-        .name("hello")
-        .lib_cairo(indoc! {r#"
-            fn main() -> u32 {
-                fib(16)
-            }
-
-            fn fib(mut n: u32) -> u32 {
-                let mut a: u32 = 0;
-                let mut b: u32 = 1;
-                while n != 0 {
-                    n = n - 1;
-                    let temp = b;
-                    b = a + b;
-                    a = temp;
-                };
-                a
-            }
-        "#})
-        .manifest_extra(indoc! {r#"
-            [cairo]
-            add-redeposit-gas = true
-        "#})
-        .build(&t);
-    Scarb::quick_snapbox()
-        .arg("build")
-        .current_dir(&t)
-        .assert()
-        .success();
-}
diff --git a/scarb/tests/build_starknet_contract_allowed_libfuncs.rs b/scarb/tests/build_starknet_contract_allowed_libfuncs.rs
@@ -26,47 +26,20 @@ const TESTING_LIST: &str = indoc! {r#"
 "#};
 
 #[test]
-fn default_behaviour() {
+fn check_true() {
     let t = assert_fs::TempDir::new().unwrap();
-    ProjectBuilder::start()
-        .name("hello")
-        .version("0.1.0")
-        .manifest_extra(indoc! {r#"
-            [[target.starknet-contract]]
-        "#})
-        .dep_starknet()
-        .lib_cairo(EXPERIMENTAL_LIBFUNC)
-        .build(&t);
-
-    Scarb::quick_snapbox()
-        // NOTE: we cannot use `check` here, because without full compilation
-        // we cannot predict what libfuncs would be generated
-        .arg("build")
-        .current_dir(&t)
-        .assert()
-        .success()
-        .stdout_matches(indoc! {r#"
-        [..] Compiling hello v0.1.0 ([..])
-        warn: libfunc `redeposit_gas` is not allowed in the libfuncs list `Default libfunc list`
-         --> contract: ExperimentalLibfunc
-        help: try compiling with the `experimental` list
-         --> Scarb.toml
-            [[target.starknet-contract]]
-            allowed-libfuncs-list.name = "experimental"
 
-        [..]  Finished `dev` profile target(s) in [..]
-        "#});
-}
+    t.child("testing_list.json")
+        .write_str(TESTING_LIST)
+        .unwrap();
 
-#[test]
-fn check_true() {
-    let t = assert_fs::TempDir::new().unwrap();
     ProjectBuilder::start()
         .name("hello")
         .version("0.1.0")
         .manifest_extra(indoc! {r#"
             [[target.starknet-contract]]
             allowed-libfuncs = true
+            allowed-libfuncs-list.path = "testing_list.json"
         "#})
         .dep_starknet()
         .lib_cairo(EXPERIMENTAL_LIBFUNC)
@@ -79,12 +52,8 @@ fn check_true() {
         .success()
         .stdout_matches(indoc! {r#"
         [..] Compiling hello v0.1.0 ([..])
-        warn: libfunc `redeposit_gas` is not allowed in the libfuncs list `Default libfunc list`
+        warn: libfunc `revoke_ap_tracking` is not allowed in the libfuncs list `[..]testing_list.json`
          --> contract: ExperimentalLibfunc
-        help: try compiling with the `experimental` list
-         --> Scarb.toml
-            [[target.starknet-contract]]
-            allowed-libfuncs-list.name = "experimental"
 
         [..]  Finished `dev` profile target(s) in [..]
         "#});
@@ -93,12 +62,18 @@ fn check_true() {
 #[test]
 fn check_false() {
     let t = assert_fs::TempDir::new().unwrap();
+
+    t.child("testing_list.json")
+        .write_str(TESTING_LIST)
+        .unwrap();
+
     ProjectBuilder::start()
         .name("hello")
         .version("0.1.0")
         .manifest_extra(indoc! {r#"
             [[target.starknet-contract]]
             allowed-libfuncs = false
+            allowed-libfuncs-list.path = "testing_list.json"
         "#})
         .dep_starknet()
         .lib_cairo(EXPERIMENTAL_LIBFUNC)
diff --git a/scarb/tests/metadata.rs b/scarb/tests/metadata.rs
@@ -1388,64 +1388,6 @@ fn includes_experimental_features() {
         .contains(&String::from("associated_item_constraints")));
 }
 
-#[test]
-fn add_redeposit_gas_disabled_by_default() {
-    let t = assert_fs::TempDir::new().unwrap();
-    ProjectBuilder::start()
-        .name("hello")
-        .version("0.1.0")
-        .build(&t);
-
-    let metadata = Scarb::quick_snapbox()
-        .arg("--json")
-        .arg("metadata")
-        .arg("--format-version")
-        .arg("1")
-        .current_dir(&t)
-        .stdout_json::<Metadata>();
-
-    let add_redeposit_gas = metadata
-        .compilation_units
-        .iter()
-        .find(|cu| cu.target.name.clone() == "hello")
-        .map(|cu| cu.compiler_config.get("add_redeposit_gas").unwrap())
-        .unwrap()
-        .as_bool()
-        .unwrap();
-    assert!(!add_redeposit_gas);
-}
-
-#[test]
-fn can_enable_add_redeposit_gas() {
-    let t = assert_fs::TempDir::new().unwrap();
-    ProjectBuilder::start()
-        .name("hello")
-        .version("0.1.0")
-        .manifest_package_extra(indoc! {r#"
-            [cairo]
-            add-redeposit-gas = true
-        "#})
-        .build(&t);
-
-    let metadata = Scarb::quick_snapbox()
-        .arg("--json")
-        .arg("metadata")
-        .arg("--format-version")
-        .arg("1")
-        .current_dir(&t)
-        .stdout_json::<Metadata>();
-
-    let add_redeposit_gas = metadata
-        .compilation_units
-        .iter()
-        .find(|cu| cu.target.name.clone() == "hello")
-        .map(|cu| cu.compiler_config.get("add_redeposit_gas").unwrap())
-        .unwrap()
-        .as_bool()
-        .unwrap();
-    assert!(add_redeposit_gas);
-}
-
 #[test]
 fn prebuilt_plugins_disallowed_by_default() {
     let t = assert_fs::TempDir::new().unwrap();
diff --git a/website/docs/reference/manifest.md b/website/docs/reference/manifest.md

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ fn can_limit_gas() {`
`99`	`99`	Finished `dev` profile target(s) in [..]
`100`	`100`	`Running hello_world`
`101`	`101`	`Run completed successfully, returning [987]`
`102`		`- Remaining gas: 59760`
	`102`	`+ Remaining gas: 57270`
`103`	`103`	`"#});`
`104`	`104`	`}`
`105`	`105`