Remove deploy as cheatcode

ddoktorski · ddoktorski · commit 3586a93c0139 · 2025-08-26T13:19:14.000+02:00
Towards #3659 commit-id:012afbae
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `snforge` now supports [oracles](https://docs.swmansion.com/cairo-oracle/) with `--experimental-oracles` flag.
 - `--trace-components` flag to allow selecting which components of the trace to do display. Read more [here](https://foundry-rs.github.io/starknet-foundry/snforge-advanced-features/debugging.html#trace-components)
 
+### Changed
+
+- `deploy` method on `ContractClass` instance now fails immediately upon encountering an error, preventing the error from being caught. This change aligns with the behavior of the `deploy_syscall` on the network
+
 ### Cast
 
 #### Added
diff --git a/crates/cheatnet/src/runtime_extensions/forge_runtime_extension/mod.rs b/crates/cheatnet/src/runtime_extensions/forge_runtime_extension/mod.rs
@@ -11,7 +11,7 @@ use crate::runtime_extensions::{
     forge_runtime_extension::cheatcodes::{
         CheatcodeError,
         declare::declare,
-        deploy::{deploy, deploy_at},
+        deploy::deploy_at,
         generate_random_felt::generate_random_felt,
         get_class_hash::get_class_hash,
         l1_handler_execute::l1_handler_execute,
@@ -191,23 +191,6 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {
 
                 handle_declare_deploy_result(declare(*state, &contract_name, self.contracts_data))
             }
-            "deploy" => {
-                let class_hash = input_reader.read()?;
-                let calldata: Vec<_> = input_reader.read()?;
-                let cheatnet_runtime = &mut extended_runtime.extended_runtime;
-                let syscall_handler = &mut cheatnet_runtime.extended_runtime.hint_handler;
-
-                syscall_handler.increment_syscall_count_by(&SyscallSelector::Deploy, 1);
-                syscall_handler
-                    .increment_linear_factor_by(&SyscallSelector::Deploy, calldata.len());
-
-                handle_declare_deploy_result(deploy(
-                    syscall_handler,
-                    cheatnet_runtime.extension.cheatnet_state,
-                    &class_hash,
-                    &calldata,
-                ))
-            }
             "deploy_at" => {
                 let class_hash = input_reader.read()?;
                 let calldata: Vec<_> = input_reader.read()?;
@@ -239,6 +222,16 @@ impl<'a> ExtensionLogic for ForgeExtension<'a> {
 
                 Ok(CheatcodeHandlingResult::from_serializable(contract_address))
             }
+            // Internal cheat code to guarantee unique salts for each deployment
+            // when deploying via a method of the `ContractClass` struct.
+            "get_salt" => {
+                let state = &mut *extended_runtime.extended_runtime.extension.cheatnet_state;
+
+                let salt = state.get_salt();
+                state.increment_deploy_salt_base();
+
+                Ok(CheatcodeHandlingResult::from_serializable(salt))
+            }
             "var" => {
                 let name: String = input_reader.read::<ByteArray>()?.to_string();
 
diff --git a/crates/conversions/src/felt.rs b/crates/conversions/src/felt.rs
@@ -7,6 +7,7 @@ use crate::{
 use anyhow::{Context, Result, anyhow, bail};
 use conversions::padded_felt::PaddedFelt;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector, Nonce};
+use starknet_api::transaction::fields::ContractAddressSalt;
 use starknet_types_core::felt::Felt;
 use std::vec;
 
@@ -22,6 +23,12 @@ impl FromConv<ContractAddress> for Felt {
     }
 }
 
+impl FromConv<ContractAddressSalt> for Felt {
+    fn from_(value: ContractAddressSalt) -> Felt {
+        value.0.into_()
+    }
+}
+
 impl FromConv<Nonce> for Felt {
     fn from_(value: Nonce) -> Felt {
         value.0.into_()
diff --git a/crates/conversions/src/serde/serialize/serialize_impl.rs b/crates/conversions/src/serde/serialize/serialize_impl.rs
@@ -6,7 +6,7 @@ use starknet::core::types::{
 };
 use starknet_api::core::EthAddress;
 use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector, Nonce};
-use starknet_api::transaction::fields::Calldata;
+use starknet_api::transaction::fields::{Calldata, ContractAddressSalt};
 use starknet_types_core::felt::Felt;
 use std::{
     cell::{Ref, RefCell},
@@ -226,6 +226,7 @@ macro_rules! impl_serialize_for_tuple {
 impl_serialize_for_felt_type!(Felt);
 impl_serialize_for_felt_type!(ClassHash);
 impl_serialize_for_felt_type!(ContractAddress);
+impl_serialize_for_felt_type!(ContractAddressSalt);
 impl_serialize_for_felt_type!(Nonce);
 impl_serialize_for_felt_type!(EntryPointSelector);
 impl_serialize_for_felt_type!(EthAddress);
diff --git a/crates/forge/tests/integration/deploy.rs b/crates/forge/tests/integration/deploy.rs
@@ -5,41 +5,6 @@ use test_utils::runner::{Contract, assert_passed};
 use test_utils::running_tests::run_test_case;
 use test_utils::test_case;
 
-#[test]
-fn error_handling() {
-    let test = test_case!(
-        indoc!(
-            r#"
-        use result::ResultTrait;
-        use snforge_std::{ declare, ContractClass, ContractClassTrait, DeclareResultTrait };
-        use array::ArrayTrait;
-
-        #[test]
-        fn error_handling() {
-            let contract = declare("PanickingConstructor").unwrap().contract_class();
-
-            match contract.deploy(@ArrayTrait::new()) {
-                Result::Ok(_) => panic_with_felt252('Should have panicked'),
-                Result::Err(panic_data) => {
-                    assert(*panic_data.at(0_usize) == 'PANIK', *panic_data.at(0_usize));
-                    assert(*panic_data.at(1_usize) == 'DEJTA', *panic_data.at(1_usize));
-                }
-            }
-        }
-    "#
-        ),
-        Contract::from_code_path(
-            "PanickingConstructor".to_string(),
-            Path::new("tests/data/contracts/panicking_constructor.cairo"),
-        )
-        .unwrap()
-    );
-
-    let result = run_test_case(&test, ForgeTrackedResource::CairoSteps);
-
-    assert_passed(&result);
-}
-
 #[test]
 fn deploy_syscall_check() {
     let test = test_case!(
@@ -229,3 +194,66 @@ fn constructor_retdata_struct() {
 
     assert_passed(&result);
 }
+
+#[test]
+fn deploy_twice() {
+    let test = test_case!(
+        indoc!(
+            r#"
+        use snforge_std::{ContractClassTrait, DeclareResultTrait, declare};
+
+        #[test]
+        fn deploy_twice() {
+            let contract = declare("DeployChecker").unwrap().contract_class();
+            let constructor_calldata = array![1];
+
+            let (contract_address_1, _) = contract.deploy(@constructor_calldata).unwrap();
+            let (contract_address_2, _) = contract.deploy(@constructor_calldata).unwrap();
+
+            assert(contract_address_1 != contract_address_2, 'Addresses should differ');
+        }
+    "#
+        ),
+        Contract::from_code_path(
+            "DeployChecker".to_string(),
+            Path::new("tests/data/contracts/deploy_checker.cairo"),
+        )
+        .unwrap()
+    );
+
+    let result = run_test_case(&test, ForgeTrackedResource::CairoSteps);
+
+    assert_passed(&result);
+}
+
+#[test]
+fn verify_precalculate_address() {
+    let test = test_case!(
+        indoc!(
+            r#"
+        use snforge_std::{ContractClassTrait, DeclareResultTrait, declare};
+
+        #[test]
+        fn precalculate_and_deploy() {
+            let contract = declare("DeployChecker").unwrap().contract_class();
+            let constructor_calldata = array![1234];
+
+            let precalculated_address = contract.precalculate_address(@constructor_calldata);
+
+            let (contract_address, _) = contract.deploy(@constructor_calldata).unwrap();
+
+            assert(precalculated_address == contract_address, 'Addresses should not differ');
+        }
+    "#
+        ),
+        Contract::from_code_path(
+            "DeployChecker".to_string(),
+            Path::new("tests/data/contracts/deploy_checker.cairo"),
+        )
+        .unwrap()
+    );
+
+    let result = run_test_case(&test, ForgeTrackedResource::CairoSteps);
+
+    assert_passed(&result);
+}
diff --git a/crates/forge/tests/integration/gas.rs b/crates/forge/tests/integration/gas.rs
@@ -724,7 +724,7 @@ fn multiple_storage_writes_cost_cairo_steps() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(192),
-            l2_gas: GasAmount(400_000),
+            l2_gas: GasAmount(360_000),
         },
     );
 }
@@ -1270,7 +1270,7 @@ fn snforge_std_deploy_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(96),
-            l2_gas: GasAmount(615_644),
+            l2_gas: GasAmount(605_664),
         },
     );
 }
@@ -1348,7 +1348,7 @@ fn contract_keccak_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(96),
-            l2_gas: GasAmount(1_351_235),
+            l2_gas: GasAmount(1_342_425),
         },
     );
 }
@@ -1393,7 +1393,7 @@ fn contract_range_check_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(96),
-            l2_gas: GasAmount(339_740),
+            l2_gas: GasAmount(330_930),
         },
     );
 }
@@ -1444,7 +1444,7 @@ fn storage_write_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(192),
-            l2_gas: GasAmount(287_560),
+            l2_gas: GasAmount(278_750),
         },
     );
 }
@@ -1502,7 +1502,7 @@ fn multiple_storage_writes_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(192),
-            l2_gas: GasAmount(395_020),
+            l2_gas: GasAmount(386_210),
         },
     );
 }
@@ -1552,7 +1552,7 @@ fn l1_message_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(29524),
             l1_data_gas: GasAmount(96),
-            l2_gas: GasAmount(291_390),
+            l2_gas: GasAmount(282_580),
         },
     );
 }
@@ -1616,7 +1616,7 @@ fn l1_message_cost_for_proxy_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(29524),
             l1_data_gas: GasAmount(192),
-            l2_gas: GasAmount(561_090),
+            l2_gas: GasAmount(543_170),
         },
     );
 }
@@ -1708,7 +1708,7 @@ fn events_contract_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(96),
-            l2_gas: GasAmount(1_185_300),
+            l2_gas: GasAmount(1_176_490),
         },
     );
 }
@@ -1777,7 +1777,7 @@ fn nested_call_cost_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(288),
-            l2_gas: GasAmount(1_962_262),
+            l2_gas: GasAmount(1_938_832),
         },
     );
 }
@@ -1848,7 +1848,7 @@ fn nested_call_cost_in_forked_contract_sierra_gas() {
         GasVector {
             l1_gas: GasAmount(0),
             l1_data_gas: GasAmount(192),
-            l2_gas: GasAmount(1_818_362),
+            l2_gas: GasAmount(1_802_842),
         },
     );
 }
diff --git a/snforge_std/src/cheatcodes/contract_class.cairo b/snforge_std/src/cheatcodes/contract_class.cairo
@@ -66,9 +66,11 @@ impl ContractClassImpl of ContractClassTrait {
     fn deploy(
         self: @ContractClass, constructor_calldata: @Array::<felt252>,
     ) -> SyscallResult<(ContractAddress, Span<felt252>)> {
-        let mut inputs = _prepare_calldata(self.class_hash, constructor_calldata);
+        let salt: felt252 = execute_cheatcode_and_deserialize::<'get_salt'>(array![].span());
 
-        execute_cheatcode_and_deserialize::<'deploy'>(inputs.span())
+        starknet::syscalls::deploy_syscall(
+            *self.class_hash, salt, constructor_calldata.span(), false,
+        )
     }
 
     fn deploy_at(
diff --git a/snforge_std_deprecated/src/cheatcodes/contract_class.cairo b/snforge_std_deprecated/src/cheatcodes/contract_class.cairo
@@ -66,9 +66,11 @@ impl ContractClassImpl of ContractClassTrait {
     fn deploy(
         self: @ContractClass, constructor_calldata: @Array::<felt252>,
     ) -> SyscallResult<(ContractAddress, Span<felt252>)> {
-        let mut inputs = _prepare_calldata(self.class_hash, constructor_calldata);
+        let salt: felt252 = execute_cheatcode_and_deserialize::<'get_salt'>(array![].span());
 
-        execute_cheatcode_and_deserialize::<'deploy'>(inputs.span())
+        starknet::syscalls::deploy_syscall(
+            *self.class_hash, salt, constructor_calldata.span(), false,
+        )
     }
 
     fn deploy_at(
