Merge branch 'main' into docs_hash_utils

Author: matias-gonz

src/transaction/declare.rs

@@ -262,30 +262,36 @@ impl Declare {
         Ok(())
     }
 
-    /// Calculates actual fee used by the transaction using the execution
-    /// info returned by apply(), then updates the transaction execution info with the data of the fee.
-    pub fn execute<S: State + StateReader>(
+    fn set_contract_class<S: State + StateReader>(
         &self,
         state: &mut S,
-        block_context: &BlockContext,
-    ) -> Result<TransactionExecutionInfo, TransactionError> {
-        let mut tx_exec_info = self.apply(state, block_context)?;
-        self.handle_nonce(state)?;
-        // Set contract class
+    ) -> Result<(), TransactionError> {
         match state.get_contract_class(&self.class_hash) {
             Err(StateError::NoneCompiledHash(_)) => {
                 // Class is undeclared; declare it.
                 state.set_contract_class(&self.class_hash, &self.contract_class)?;
+                Ok(())
             }
-            Err(error) => return Err(error.into()),
+            Err(error) => Err(error.into()),
             Ok(_) => {
                 // Class is already declared; cannot redeclare.
-                return Err(TransactionError::ClassAlreadyDeclared(self.class_hash));
+                Err(TransactionError::ClassAlreadyDeclared(self.class_hash))
             }
         }
+    }
+    /// Calculates actual fee used by the transaction using the execution
+    /// info returned by apply(), then updates the transaction execution info with the data of the fee.
+    pub fn execute<S: State + StateReader>(
+        &self,
+        state: &mut S,
+        block_context: &BlockContext,
+    ) -> Result<TransactionExecutionInfo, TransactionError> {
+        let mut tx_exec_info = self.apply(state, block_context)?;
+        self.handle_nonce(state)?;
 
         let (fee_transfer_info, actual_fee) =
             self.charge_fee(state, &tx_exec_info.actual_resources, block_context)?;
+        self.set_contract_class(state)?;
         tx_exec_info.set_fee_info(actual_fee, fee_transfer_info);
 
         Ok(tx_exec_info)

src/transaction/declare_v2.rs

@@ -222,10 +222,9 @@ impl DeclareV2 {
             None,
         )?;
 
-        self.compile_and_store_casm_class(state)?;
-
         let (fee_transfer_info, actual_fee) =
             self.charge_fee(state, &actual_resources, block_context)?;
+        self.compile_and_store_casm_class(state)?;
 
         let mut tx_exec_info = TransactionExecutionInfo::new_without_fee_info(
             validate_info,