Rename Declare to DeclareDeprecated & DeclareV2 to Declare

bench/internals.rs

@@ -19,7 +19,7 @@ use starknet_in_rust::{
         contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader,
     },
-    transaction::{declare::Declare, Deploy, DeployAccount, InvokeFunction},
+    transaction::{DeclareDeprecated, Deploy, DeployAccount, InvokeFunction},
     utils::{Address, ClassHash},
 };
 use std::{hint::black_box, sync::Arc};
@@ -142,7 +142,7 @@ pub fn declare(
         let address = CONTRACT_ADDRESS.clone();
         scope(|| {
             // new consumes more execution time than raw struct instantiation
-            let declare_tx = Declare::new(
+            let declare_tx = DeclareDeprecated::new(
                 class,
                 StarknetChainId::TestNet.to_felt(),
                 address,

bench/yas.rs

@@ -23,7 +23,7 @@ use starknet_in_rust::{
     state::{
         cached_state::CachedState, contract_class_cache::ContractClassCache, state_api::StateReader,
     },
-    transaction::{DeclareV2, InvokeFunction},
+    transaction::{Declare, InvokeFunction},
     utils::Address,
 };
 use std::time::{Duration, Instant};
@@ -369,7 +369,7 @@ where
     let sender_address = Address(*ACCOUNT_ADDRESS);
     let nonce = state.get_nonce_at(&sender_address).unwrap();
 
-    let tx_execution_info = DeclareV2::new(
+    let tx_execution_info = Declare::new(
         &sierra_contract_class,
         Some(casm_contract_class),
         casm_class_hash,
@@ -410,7 +410,7 @@ where
     let sender_address = Address(*ACCOUNT_ADDRESS);
     let nonce = state.get_nonce_at(&sender_address).unwrap();
 
-    let tx_execution_info = DeclareV2::new(
+    let tx_execution_info = Declare::new(
         &sierra_contract_class,
         Some(casm_contract_class),
         casm_class_hash,
@@ -451,7 +451,7 @@ where
     let sender_address = Address(*ACCOUNT_ADDRESS);
     let nonce = state.get_nonce_at(&sender_address).unwrap();
 
-    let tx_execution_info = DeclareV2::new(
+    let tx_execution_info = Declare::new(
         &sierra_contract_class,
         Some(casm_contract_class),
         casm_class_hash,
@@ -492,7 +492,7 @@ where
     let sender_address = Address(*ACCOUNT_ADDRESS);
     let nonce = state.get_nonce_at(&sender_address).unwrap();
 
-    let tx_execution_info = DeclareV2::new(
+    let tx_execution_info = Declare::new(
         &sierra_contract_class,
         Some(casm_contract_class),
         casm_class_hash,

examples/contract_execution/src/main.rs

@@ -20,7 +20,7 @@ use starknet_in_rust::{
         cached_state::CachedState, contract_class_cache::PermanentContractClassCache,
         in_memory_state_reader::InMemoryStateReader, state_api::State,
     },
-    transaction::{DeclareV2, DeployAccount, InvokeFunction},
+    transaction::{Declare, DeployAccount, InvokeFunction},
     utils::{calculate_sn_keccak, felt_to_hash, Address},
     CasmContractClass, SierraContractClass,
 };
@@ -159,7 +159,7 @@ fn test_contract(
     //* --------------------------------------------
     //*        Declare new contract class
     //* --------------------------------------------
-    let declare_tx = DeclareV2::new_with_tx_hash(
+    let declare_tx = Declare::new_with_tx_hash(
         &sierra_contract_class,
         Some(casm_class),
         compiled_class_hash,

examples/lru_cache/main.rs

@@ -12,7 +12,7 @@ use starknet_in_rust::{
         contract_class_cache::{ContractClassCache, PermanentContractClassCache},
         in_memory_state_reader::InMemoryStateReader,
     },
-    transaction::{Declare, Deploy, InvokeFunction},
+    transaction::{DeclareDeprecated, Deploy, InvokeFunction},
     utils::{calculate_sn_keccak, Address, ClassHash},
 };
 use std::{
@@ -53,7 +53,7 @@ fn run_contract(
 
     let contract_class = ContractClass::from_path(contract_path.as_ref()).unwrap();
 
-    let declare_tx = Declare::new(
+    let declare_tx = DeclareDeprecated::new(
         contract_class.clone(),
         chain_id,
         sender_address,

src/core/transaction_hash/current.rs

@@ -166,7 +166,7 @@ pub(super) fn calculate_deploy_account_transaction_hash(
 }
 
 #[allow(clippy::too_many_arguments)]
-pub(super) fn calculate_declare_v2_transaction_hash(
+pub(super) fn calculate_declare_transaction_hash(
     sierra_class_hash: Felt252,
     compiled_class_hash: Felt252,
     chain_id: Felt252,

src/core/transaction_hash/deprecated.rs

@@ -101,8 +101,8 @@ pub(super) fn deprecated_calculate_deploy_account_transaction_hash(
     )
 }
 
-/// Calculate the hash for a declared transaction.
-pub fn deprecated_calculate_declare_transaction_hash(
+/// Calculate the hash for a deprecated declare transaction.
+pub fn calculate_declare_deprecated_transaction_hash(
     contract_class: &ContractClass,
     chain_id: Felt252,
     sender_address: &Address,
@@ -185,11 +185,8 @@ fn preprocess_invoke_function_fields(
     }
 }
 
-// ----------------------------
-//      V2 Hash Functions
-// ----------------------------
-
-pub(super) fn deprecated_calculate_declare_v2_transaction_hash(
+/// Calculate the hash for a declare transaction.
+pub(super) fn deprecated_calculate_declare_transaction_hash(
     sierra_class_hash: Felt252,
     compiled_class_hash: Felt252,
     chain_id: Felt252,
@@ -255,7 +252,7 @@ mod tests {
     }
 
     #[test]
-    fn calculate_declare_hash_test() {
+    fn calculate_declare_deprecated_hash_test() {
         let chain_id = StarknetChainId::MainNet;
         let sender_address = Address(
             Felt252::from_dec_str(

src/core/transaction_hash/mod.rs

@@ -92,7 +92,7 @@ pub fn calculate_deploy_account_transaction_hash(
 
 /// Calculate the hash for a Declare transaction of version 2+.
 /// Uses the older pedersen version for deprecated account tx fields and the newer poseidon version for current account tx fields
-pub fn calculate_declare_v2_transaction_hash(
+pub fn calculate_declare_transaction_hash(
     sierra_class_hash: Felt252,
     compiled_class_hash: Felt252,
     version: Felt252,
@@ -103,7 +103,7 @@ pub fn calculate_declare_v2_transaction_hash(
 ) -> Result<Felt252, HashError> {
     match account_tx_fields {
         VersionSpecificAccountTxFields::Deprecated(max_fee) => {
-            deprecated::deprecated_calculate_declare_v2_transaction_hash(
+            deprecated::deprecated_calculate_declare_transaction_hash(
                 sierra_class_hash,
                 compiled_class_hash,
                 chain_id,
@@ -114,7 +114,7 @@ pub fn calculate_declare_v2_transaction_hash(
             )
         }
         VersionSpecificAccountTxFields::Current(fields) => {
-            Ok(current::calculate_declare_v2_transaction_hash(
+            Ok(current::calculate_declare_transaction_hash(
                 sierra_class_hash,
                 compiled_class_hash,
                 chain_id,

src/lib.rs

@@ -273,8 +273,8 @@ mod test {
             ExecutionResourcesManager,
         },
         transaction::{
-            Declare, DeclareV2, Deploy, DeployAccount, InvokeFunction, L1Handler, Transaction,
-            VersionSpecificAccountTxFields,
+            Declare, DeclareDeprecated, Deploy, DeployAccount, InvokeFunction, L1Handler,
+            Transaction, VersionSpecificAccountTxFields,
         },
         utils::{
             felt_to_hash,
@@ -824,8 +824,8 @@ mod test {
         let class = CONTRACT_CLASS.clone();
         let address = CONTRACT_ADDRESS.clone();
         // new consumes more execution time than raw struct instantiation
-        let declare_tx = Transaction::Declare(
-            Declare::new(
+        let declare_tx = Transaction::DeclareDeprecated(
+            DeclareDeprecated::new(
                 class,
                 StarknetChainId::TestNet.to_felt(),
                 address,
@@ -977,14 +977,14 @@ mod test {
         .unwrap();
     }
 
-    fn declarev2_tx() -> DeclareV2 {
+    fn declarev2_tx() -> Declare {
         let program_data = include_bytes!("../starknet_programs/cairo1/fibonacci.sierra");
         let sierra_contract_class: SierraContractClass =
             serde_json::from_slice(program_data).unwrap();
 
         let sierra_class_hash = compute_sierra_class_hash(&sierra_contract_class).unwrap();
 
-        DeclareV2 {
+        Declare {
             sender_address: TEST_ACCOUNT_CONTRACT_ADDRESS.clone(),
             validate_entry_point_selector: *VALIDATE_DECLARE_ENTRY_POINT_SELECTOR,
             version: 2.into(),
@@ -1006,7 +1006,7 @@ mod test {
     #[test]
     fn test_simulate_declare_v2() {
         let (block_context, state) = create_account_tx_test_state().unwrap();
-        let declare_tx = Transaction::DeclareV2(Box::new(declarev2_tx()));
+        let declare_tx = Transaction::Declare(Box::new(declarev2_tx()));
 
         simulate_transaction(
             &[&declare_tx],
@@ -1173,7 +1173,7 @@ mod test {
         let real_casm_class_hash = declare_v2.compiled_class_hash;
         let wrong_casm_class_hash = Felt252::from(1);
         declare_v2.compiled_class_hash = wrong_casm_class_hash;
-        let declare_tx = Transaction::DeclareV2(Box::new(declare_v2));
+        let declare_tx = Transaction::Declare(Box::new(declare_v2));
 
         let err = declare_tx
             .execute(
@@ -1255,7 +1255,7 @@ mod test {
         // declare tx
         // Signature & tx hash values are hand-picked for account validations to pass
         let mut declare =
-            Declare::new(
+            DeclareDeprecated::new(
                 fib_contract_class,
                 chain_id,
                 Address(Felt252::ONE),
@@ -1277,7 +1277,7 @@ mod test {
         let mut block_context = BlockContext::default();
         block_context.starknet_os_config_mut().gas_price = GasPrices::new(12, 0);
 
-        let declare_tx = Transaction::Declare(declare);
+        let declare_tx = Transaction::DeclareDeprecated(declare);
 
         let without_validate_fee = simulate_transaction(
             &[&declare_tx],