Remove unwrap from codebase.

src/state/cached_state.rs

@@ -14,6 +14,7 @@ use crate::{
 use cairo_vm::felt::Felt252;
 use getset::{Getters, MutGetters};
 use num_traits::Zero;
+use starknet::core::types::FromByteArrayError;
 use std::{
     collections::{HashMap, HashSet},
     sync::Arc,
@@ -274,7 +275,7 @@ impl<T: StateReader> State for CachedState<T> {
     fn count_actual_storage_changes(
         &mut self,
         fee_token_and_sender_address: Option<(&Address, &Address)>,
-    ) -> (usize, usize) {
+    ) -> Result<(usize, usize), FromByteArrayError> {
         let mut storage_updates = subtract_mappings(
             self.cache.storage_writes.clone(),
             self.cache.storage_initial_values.clone(),
@@ -310,14 +311,14 @@ impl<T: StateReader> State for CachedState<T> {
         // Add fee transfer storage update before actually charging it, as it needs to be included in the
         // calculation of the final fee.
         if let Some((fee_token_address, sender_address)) = fee_token_and_sender_address {
-            let (sender_low_key, _) = get_erc20_balance_var_addresses(sender_address).unwrap();
+            let (sender_low_key, _) = get_erc20_balance_var_addresses(sender_address)?;
             storage_updates.insert(
                 (fee_token_address.clone(), sender_low_key),
                 Felt252::default(),
             );
         }
 
-        (n_modified_contracts, storage_updates.len())
+        Ok((n_modified_contracts, storage_updates.len()))
     }
 
     fn get_class_hash_at(&mut self, contract_address: &Address) -> Result<ClassHash, StateError> {
@@ -730,8 +731,9 @@ mod tests {
 
             (n_modified_contracts, n_storage_updates)
         };
-        let changes =
-            cached_state.count_actual_storage_changes(Some((&fee_token_address, &sender_address)));
+        let changes = cached_state
+            .count_actual_storage_changes(Some((&fee_token_address, &sender_address)))
+            .unwrap();
 
         assert_eq!(changes, expected_changes);
     }

src/state/state_api.rs

@@ -6,6 +6,7 @@ use crate::{
     utils::{Address, ClassHash, CompiledClassHash},
 };
 use cairo_vm::felt::Felt252;
+use starknet::core::types::FromByteArrayError;
 
 pub trait StateReader {
     /// Returns the contract class of the given class hash or compiled class hash.
@@ -57,7 +58,7 @@ pub trait State {
     fn count_actual_storage_changes(
         &mut self,
         fee_token_and_sender_address: Option<(&Address, &Address)>,
-    ) -> (usize, usize);
+    ) -> Result<(usize, usize), FromByteArrayError>;
 
     fn get_class_hash_at(&mut self, contract_address: &Address) -> Result<ClassHash, StateError>;
 

src/transaction/declare.rs

@@ -171,7 +171,7 @@ impl Declare {
         let changes = state.count_actual_storage_changes(Some((
             &block_context.starknet_os_config.fee_token_address,
             &self.sender_address,
-        )));
+        )))?;
         let actual_resources = calculate_tx_resources(
             resources_manager,
             &vec![validate_info.clone()],

src/transaction/declare_v2.rs

@@ -323,7 +323,7 @@ impl DeclareV2 {
         let storage_changes = state.count_actual_storage_changes(Some((
             &block_context.starknet_os_config.fee_token_address,
             &self.sender_address,
-        )));
+        )))?;
         let actual_resources = calculate_tx_resources(
             resources_manager,
             &[execution_result.call_info.clone()],

src/transaction/deploy.rs

@@ -182,7 +182,7 @@ impl Deploy {
 
         let resources_manager = ExecutionResourcesManager::default();
 
-        let changes = state.count_actual_storage_changes(None);
+        let changes = state.count_actual_storage_changes(None)?;
         let actual_resources = calculate_tx_resources(
             resources_manager,
             &[Some(call_info.clone())],
@@ -245,7 +245,7 @@ impl Deploy {
             block_context.validate_max_n_steps,
         )?;
 
-        let changes = state.count_actual_storage_changes(None);
+        let changes = state.count_actual_storage_changes(None)?;
         let actual_resources = calculate_tx_resources(
             resources_manager,
             &[call_info.clone()],

src/transaction/deploy_account.rs

@@ -216,7 +216,7 @@ impl DeployAccount {
             state.count_actual_storage_changes(Some((
                 &block_context.starknet_os_config.fee_token_address,
                 &self.contract_address,
-            ))),
+            )))?,
             None,
             0,
         )

src/transaction/error.rs

@@ -18,6 +18,7 @@ use cairo_vm::{
         trace_errors::TraceError, vm_errors::VirtualMachineError,
     },
 };
+use starknet::core::types::FromByteArrayError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
@@ -144,4 +145,6 @@ pub enum TransactionError {
     UnsupportedVersion(String),
     #[error("Invalid compiled class, expected class hash: {0}, but received: {1}")]
     InvalidCompiledClassHash(String, String),
+    #[error(transparent)]
+    FromByteArrayError(#[from] FromByteArrayError),
 }

src/transaction/invoke_function.rs

@@ -248,7 +248,7 @@ impl InvokeFunction {
         let changes = state.count_actual_storage_changes(Some((
             &block_context.starknet_os_config.fee_token_address,
             &self.contract_address,
-        )));
+        )))?;
         let actual_resources = calculate_tx_resources(
             resources_manager,
             &vec![call_info.clone(), validate_info.clone()],

src/transaction/l1_handler.rs

@@ -128,7 +128,7 @@ impl L1Handler {
             )?
         };
 
-        let changes = state.count_actual_storage_changes(None);
+        let changes = state.count_actual_storage_changes(None)?;
         let actual_resources = calculate_tx_resources(
             resources_manager,
             &[call_info.clone()],