diff --git a/crates/blockifier/src/test_utils.rs b/crates/blockifier/src/test_utils.rs
index beb25ae789..b2afd89626 100644
--- a/crates/blockifier/src/test_utils.rs
+++ b/crates/blockifier/src/test_utils.rs
@@ -18,9 +18,9 @@ use starknet_api::state::StorageKey;
 use starknet_api::transaction::{
     Calldata,
     ContractAddressSalt,
+    DeprecatedResourceBoundsMapping,
     Resource,
     ResourceBounds,
-    DeprecatedResourceBoundsMapping,
     TransactionVersion,
 };
 use starknet_api::{contract_address, felt, patricia_key};
diff --git a/crates/blockifier/src/test_utils/declare.rs b/crates/blockifier/src/test_utils/declare.rs
index 5a70d80884..89592c631e 100644
--- a/crates/blockifier/src/test_utils/declare.rs
+++ b/crates/blockifier/src/test_utils/declare.rs
@@ -5,9 +5,9 @@ use starknet_api::transaction::{
     DeclareTransactionV0V1,
     DeclareTransactionV2,
     DeclareTransactionV3,
+    DeprecatedResourceBoundsMapping,
     Fee,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionSignature,
@@ -108,7 +108,7 @@ pub fn declare_tx(declare_tx_args: DeclareTxArgs, class_info: ClassInfo) -> Acco
                 starknet_api::transaction::DeclareTransaction::V3(DeclareTransactionV3 {
                     signature: declare_tx_args.signature,
                     sender_address: declare_tx_args.sender_address,
-                    resource_bounds: declare_tx_args.resource_bounds,
+                    resource_bounds: declare_tx_args.resource_bounds.0.try_into().expect("todo"),
                     tip: declare_tx_args.tip,
                     nonce_data_availability_mode: declare_tx_args.nonce_data_availability_mode,
                     fee_data_availability_mode: declare_tx_args.fee_data_availability_mode,
diff --git a/crates/blockifier/src/test_utils/deploy_account.rs b/crates/blockifier/src/test_utils/deploy_account.rs
index b24e0c9d3d..69302436a8 100644
--- a/crates/blockifier/src/test_utils/deploy_account.rs
+++ b/crates/blockifier/src/test_utils/deploy_account.rs
@@ -5,9 +5,9 @@ use starknet_api::transaction::{
     ContractAddressSalt,
     DeployAccountTransactionV1,
     DeployAccountTransactionV3,
+    DeprecatedResourceBoundsMapping,
     Fee,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionSignature,
@@ -96,7 +96,7 @@ pub fn deploy_account_tx(
     } else if deploy_tx_args.version == TransactionVersion::THREE {
         starknet_api::transaction::DeployAccountTransaction::V3(DeployAccountTransactionV3 {
             signature: deploy_tx_args.signature,
-            resource_bounds: deploy_tx_args.resource_bounds,
+            resource_bounds: deploy_tx_args.resource_bounds.0.try_into().expect("todo"),
             tip: deploy_tx_args.tip,
             nonce_data_availability_mode: deploy_tx_args.nonce_data_availability_mode,
             fee_data_availability_mode: deploy_tx_args.fee_data_availability_mode,
diff --git a/crates/blockifier/src/test_utils/invoke.rs b/crates/blockifier/src/test_utils/invoke.rs
index a62ef0597b..a44535b57f 100644
--- a/crates/blockifier/src/test_utils/invoke.rs
+++ b/crates/blockifier/src/test_utils/invoke.rs
@@ -4,12 +4,12 @@ use starknet_api::data_availability::DataAvailabilityMode;
 use starknet_api::transaction::{
     AccountDeploymentData,
     Calldata,
+    DeprecatedResourceBoundsMapping,
     Fee,
     InvokeTransactionV0,
     InvokeTransactionV1,
     InvokeTransactionV3,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionSignature,
@@ -96,7 +96,7 @@ pub fn invoke_tx(invoke_args: InvokeTxArgs) -> InvokeTransaction {
         })
     } else if invoke_args.version == TransactionVersion::THREE {
         starknet_api::transaction::InvokeTransaction::V3(InvokeTransactionV3 {
-            resource_bounds: invoke_args.resource_bounds,
+            resource_bounds: invoke_args.resource_bounds.0.try_into().expect("todo"),
             calldata: invoke_args.calldata,
             sender_address: invoke_args.sender_address,
             nonce: invoke_args.nonce,
diff --git a/crates/blockifier/src/transaction/transactions.rs b/crates/blockifier/src/transaction/transactions.rs
index f32bb99a8f..eeaaf4bab7 100644
--- a/crates/blockifier/src/transaction/transactions.rs
+++ b/crates/blockifier/src/transaction/transactions.rs
@@ -30,7 +30,7 @@ use crate::state::cached_state::TransactionalState;
 use crate::state::errors::StateError;
 use crate::state::state_api::{State, UpdatableState};
 use crate::transaction::constants;
-use crate::transaction::errors::{TransactionInfoCreationError, TransactionExecutionError};
+use crate::transaction::errors::{TransactionExecutionError, TransactionInfoCreationError};
 use crate::transaction::objects::{
     CommonAccountFields,
     CurrentTransactionInfo,
@@ -296,7 +296,7 @@ impl TransactionInfoCreator for DeclareTransaction {
             starknet_api::transaction::DeclareTransaction::V3(tx) => {
                 Ok(TransactionInfo::Current(CurrentTransactionInfo {
                     common_fields,
-                    resource_bounds: tx.resource_bounds.0.clone().try_into()?,
+                    resource_bounds: tx.resource_bounds.clone(),
                     tip: tx.tip,
                     nonce_data_availability_mode: tx.nonce_data_availability_mode,
                     fee_data_availability_mode: tx.fee_data_availability_mode,
@@ -401,7 +401,7 @@ impl TransactionInfoCreator for DeployAccountTransaction {
             starknet_api::transaction::DeployAccountTransaction::V3(tx) => {
                 Ok(TransactionInfo::Current(CurrentTransactionInfo {
                     common_fields,
-                    resource_bounds: tx.resource_bounds.0.clone().try_into()?,
+                    resource_bounds: tx.resource_bounds.clone(),
                     tip: tx.tip,
                     nonce_data_availability_mode: tx.nonce_data_availability_mode,
                     fee_data_availability_mode: tx.fee_data_availability_mode,
@@ -519,7 +519,7 @@ impl TransactionInfoCreator for InvokeTransaction {
             starknet_api::transaction::InvokeTransaction::V3(tx) => {
                 Ok(TransactionInfo::Current(CurrentTransactionInfo {
                     common_fields,
-                    resource_bounds: tx.resource_bounds.0.clone().try_into()?,
+                    resource_bounds: tx.resource_bounds.clone(),
                     tip: tx.tip,
                     nonce_data_availability_mode: tx.nonce_data_availability_mode,
                     fee_data_availability_mode: tx.fee_data_availability_mode,
diff --git a/crates/native_blockifier/src/py_declare.rs b/crates/native_blockifier/src/py_declare.rs
index bfbd2894a6..b8d74535f0 100644
--- a/crates/native_blockifier/src/py_declare.rs
+++ b/crates/native_blockifier/src/py_declare.rs
@@ -12,7 +12,6 @@ use starknet_api::transaction::{
     DeclareTransactionV3,
     Fee,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionSignature,
@@ -88,7 +87,7 @@ impl TryFrom<PyDeclareTransactionV3> for DeclareTransactionV3 {
     type Error = NativeBlockifierInputError;
     fn try_from(tx: PyDeclareTransactionV3) -> Result<Self, Self::Error> {
         Ok(Self {
-            resource_bounds: DeprecatedResourceBoundsMapping::try_from(tx.resource_bounds)?,
+            resource_bounds: tx.resource_bounds.try_into()?,
             tip: Tip(tx.tip),
             signature: TransactionSignature(from_py_felts(tx.signature)),
             nonce: Nonce(tx.nonce.0),
diff --git a/crates/native_blockifier/src/py_deploy_account.rs b/crates/native_blockifier/src/py_deploy_account.rs
index 749f19586a..b25b464103 100644
--- a/crates/native_blockifier/src/py_deploy_account.rs
+++ b/crates/native_blockifier/src/py_deploy_account.rs
@@ -12,7 +12,6 @@ use starknet_api::transaction::{
     DeployAccountTransactionV3,
     Fee,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionSignature,
@@ -64,7 +63,7 @@ impl TryFrom<PyDeployAccountTransactionV3> for DeployAccountTransactionV3 {
     type Error = NativeBlockifierInputError;
     fn try_from(tx: PyDeployAccountTransactionV3) -> Result<Self, Self::Error> {
         Ok(Self {
-            resource_bounds: DeprecatedResourceBoundsMapping::try_from(tx.resource_bounds)?,
+            resource_bounds: tx.resource_bounds.try_into()?,
             tip: Tip(tx.tip),
             signature: TransactionSignature(from_py_felts(tx.signature)),
             nonce: Nonce(tx.nonce.0),
diff --git a/crates/native_blockifier/src/py_invoke_function.rs b/crates/native_blockifier/src/py_invoke_function.rs
index 111d53b0f1..974d0b9b1d 100644
--- a/crates/native_blockifier/src/py_invoke_function.rs
+++ b/crates/native_blockifier/src/py_invoke_function.rs
@@ -14,7 +14,6 @@ use starknet_api::transaction::{
     InvokeTransactionV1,
     InvokeTransactionV3,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionSignature,
@@ -87,7 +86,7 @@ impl TryFrom<PyInvokeTransactionV3> for InvokeTransactionV3 {
     type Error = NativeBlockifierInputError;
     fn try_from(tx: PyInvokeTransactionV3) -> Result<Self, Self::Error> {
         Ok(Self {
-            resource_bounds: DeprecatedResourceBoundsMapping::try_from(tx.resource_bounds)?,
+            resource_bounds: tx.resource_bounds.try_into()?,
             tip: Tip(tx.tip),
             signature: TransactionSignature(from_py_felts(tx.signature)),
             nonce: Nonce(tx.nonce.0),
diff --git a/crates/native_blockifier/src/py_transaction.rs b/crates/native_blockifier/src/py_transaction.rs
index 15254e1181..769a593305 100644
--- a/crates/native_blockifier/src/py_transaction.rs
+++ b/crates/native_blockifier/src/py_transaction.rs
@@ -11,7 +11,12 @@ use blockifier::transaction::transaction_execution::Transaction;
 use blockifier::transaction::transaction_types::TransactionType;
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
-use starknet_api::transaction::{Resource, ResourceBounds};
+use starknet_api::transaction::{
+    DeprecatedResourceBoundsMapping,
+    Resource,
+    ResourceBounds,
+    ValidResourceBounds,
+};
 use starknet_api::StarknetApiError;
 
 use crate::errors::{NativeBlockifierInputError, NativeBlockifierResult};
@@ -68,7 +73,7 @@ impl From<PyResourceBounds> for starknet_api::transaction::ResourceBounds {
 #[derive(Clone, FromPyObject)]
 pub struct PyResourceBoundsMapping(pub BTreeMap<PyResource, PyResourceBounds>);
 
-impl TryFrom<PyResourceBoundsMapping> for starknet_api::transaction::DeprecatedResourceBoundsMapping {
+impl TryFrom<PyResourceBoundsMapping> for DeprecatedResourceBoundsMapping {
     type Error = StarknetApiError;
     fn try_from(py_resource_bounds_mapping: PyResourceBoundsMapping) -> Result<Self, Self::Error> {
         let resource_bounds_vec: Vec<(Resource, ResourceBounds)> = py_resource_bounds_mapping
@@ -82,6 +87,13 @@ impl TryFrom<PyResourceBoundsMapping> for starknet_api::transaction::DeprecatedR
     }
 }
 
+impl TryFrom<PyResourceBoundsMapping> for ValidResourceBounds {
+    type Error = StarknetApiError;
+    fn try_from(py_resource_bounds_mapping: PyResourceBoundsMapping) -> Result<Self, Self::Error> {
+        DeprecatedResourceBoundsMapping::try_from(py_resource_bounds_mapping)?.0.try_into()
+    }
+}
+
 #[derive(Clone)]
 pub enum PyDataAvailabilityMode {
     L1 = 0,
diff --git a/crates/papyrus_common/src/transaction_hash.rs b/crates/papyrus_common/src/transaction_hash.rs
index c788b00b1a..9df057dfda 100644
--- a/crates/papyrus_common/src/transaction_hash.rs
+++ b/crates/papyrus_common/src/transaction_hash.rs
@@ -8,6 +8,7 @@ use starknet_api::core::{calculate_contract_address, ChainId, ContractAddress};
 use starknet_api::data_availability::DataAvailabilityMode;
 use starknet_api::hash::StarkHash;
 use starknet_api::transaction::{
+    AllResourceBounds,
     DeclareTransaction,
     DeclareTransactionV0V1,
     DeclareTransactionV2,
@@ -21,13 +22,12 @@ use starknet_api::transaction::{
     InvokeTransactionV1,
     InvokeTransactionV3,
     L1HandlerTransaction,
-    Resource,
     ResourceBounds,
-    DeprecatedResourceBoundsMapping,
     Tip,
     Transaction,
     TransactionHash,
     TransactionVersion,
+    ValidResourceBounds,
 };
 use starknet_api::StarknetApiError;
 use starknet_types_core::felt::Felt;
@@ -220,15 +220,17 @@ pub(crate) fn ascii_as_felt(ascii_str: &str) -> Result<Felt, StarknetApiError> {
 
 // An implementation of the SNIP: https://github.com/EvyatarO/SNIPs/blob/snip-8/SNIPS/snip-8.md
 fn get_tip_resource_bounds_hash(
-    resource_bounds_mapping: &DeprecatedResourceBoundsMapping,
+    resource_bounds: &ValidResourceBounds,
     tip: &Tip,
 ) -> Result<Felt, StarknetApiError> {
-    let l1_resource_bounds =
-        resource_bounds_mapping.0.get(&Resource::L1Gas).expect("Missing l1 resource");
-    let l1_resource = get_concat_resource(l1_resource_bounds, L1_GAS)?;
+    let (l1_resource_bounds, l2_resource_bounds) = match resource_bounds {
+        ValidResourceBounds::L1Gas(l1_gas_bounds) => (l1_gas_bounds, &ResourceBounds::default()),
+        ValidResourceBounds::AllResources(AllResourceBounds { l1_gas, l2_gas, .. }) => {
+            (l1_gas, l2_gas)
+        }
+    };
 
-    let l2_resource_bounds =
-        resource_bounds_mapping.0.get(&Resource::L2Gas).expect("Missing l2 resource");
+    let l1_resource = get_concat_resource(l1_resource_bounds, L1_GAS)?;
     let l2_resource = get_concat_resource(l2_resource_bounds, L2_GAS)?;
 
     Ok(HashChain::new()
diff --git a/crates/papyrus_rpc/src/v0_6/transaction.rs b/crates/papyrus_rpc/src/v0_6/transaction.rs
index 9bed607338..7601abab7d 100644
--- a/crates/papyrus_rpc/src/v0_6/transaction.rs
+++ b/crates/papyrus_rpc/src/v0_6/transaction.rs
@@ -157,6 +157,23 @@ impl From<ResourceBoundsMapping> for starknet_api::transaction::DeprecatedResour
     }
 }
 
+impl From<ResourceBoundsMapping> for starknet_api::transaction::ValidResourceBounds {
+    fn from(value: ResourceBoundsMapping) -> Self {
+        Self::L1Gas(value.l1_gas)
+    }
+}
+
+impl From<starknet_api::transaction::ValidResourceBounds> for ResourceBoundsMapping {
+    fn from(value: starknet_api::transaction::ValidResourceBounds) -> Self {
+        match value {
+            starknet_api::transaction::ValidResourceBounds::L1Gas(l1_gas) => {
+                Self { l1_gas, l2_gas: ResourceBounds::default() }
+            }
+            starknet_api::transaction::ValidResourceBounds::AllResources(_) => todo!(),
+        }
+    }
+}
+
 impl From<starknet_api::transaction::DeprecatedResourceBoundsMapping> for ResourceBoundsMapping {
     fn from(value: starknet_api::transaction::DeprecatedResourceBoundsMapping) -> Self {
         Self {
diff --git a/crates/papyrus_rpc/src/v0_7/transaction.rs b/crates/papyrus_rpc/src/v0_7/transaction.rs
index 8f4596b664..7e3e4eb8a4 100644
--- a/crates/papyrus_rpc/src/v0_7/transaction.rs
+++ b/crates/papyrus_rpc/src/v0_7/transaction.rs
@@ -169,6 +169,23 @@ impl From<starknet_api::transaction::DeprecatedResourceBoundsMapping> for Resour
     }
 }
 
+impl From<ResourceBoundsMapping> for starknet_api::transaction::ValidResourceBounds {
+    fn from(value: ResourceBoundsMapping) -> Self {
+        Self::L1Gas(value.l1_gas)
+    }
+}
+
+impl From<starknet_api::transaction::ValidResourceBounds> for ResourceBoundsMapping {
+    fn from(value: starknet_api::transaction::ValidResourceBounds) -> Self {
+        match value {
+            starknet_api::transaction::ValidResourceBounds::L1Gas(l1_gas) => {
+                Self { l1_gas, l2_gas: ResourceBounds::default() }
+            }
+            starknet_api::transaction::ValidResourceBounds::AllResources(_) => todo!(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
 pub struct DeclareTransactionV3 {
     pub resource_bounds: ResourceBoundsMapping,
diff --git a/crates/papyrus_storage/src/serialization/serializers.rs b/crates/papyrus_storage/src/serialization/serializers.rs
index 508976c97e..e58e5366be 100644
--- a/crates/papyrus_storage/src/serialization/serializers.rs
+++ b/crates/papyrus_storage/src/serialization/serializers.rs
@@ -76,6 +76,7 @@ use starknet_api::state::{
 };
 use starknet_api::transaction::{
     AccountDeploymentData,
+    AllResourceBounds,
     Calldata,
     ContractAddressSalt,
     DeclareTransaction,
@@ -89,6 +90,7 @@ use starknet_api::transaction::{
     DeployAccountTransactionV3,
     DeployTransaction,
     DeployTransactionOutput,
+    DeprecatedResourceBoundsMapping,
     Event,
     EventContent,
     EventData,
@@ -109,7 +111,6 @@ use starknet_api::transaction::{
     PaymasterData,
     Resource,
     ResourceBounds,
-    DeprecatedResourceBoundsMapping,
     RevertedTransactionExecutionStatus,
     Tip,
     Transaction,
@@ -119,6 +120,7 @@ use starknet_api::transaction::{
     TransactionOutput,
     TransactionSignature,
     TransactionVersion,
+    ValidResourceBounds,
 };
 use starknet_types_core::felt::Felt;
 use tracing::warn;
@@ -147,6 +149,11 @@ const COMPRESSION_THRESHOLD_BYTES: usize = 384;
 
 auto_storage_serde! {
     pub struct AccountDeploymentData(pub Vec<Felt>);
+    pub struct AllResourceBounds {
+        pub l1_gas: ResourceBounds,
+        pub l2_gas: ResourceBounds,
+        pub l1_data_gas: ResourceBounds,
+    }
     pub struct BlockHash(pub StarkHash);
     pub struct StorageBlockHeader {
         pub block_hash: BlockHash,
@@ -211,7 +218,7 @@ auto_storage_serde! {
         pub sender_address: ContractAddress,
     }
     pub struct DeclareTransactionV3 {
-        pub resource_bounds: DeprecatedResourceBoundsMapping,
+        pub resource_bounds: ValidResourceBounds,
         pub tip: Tip,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -419,6 +426,10 @@ auto_storage_serde! {
     }
     pub struct TransactionSignature(pub Vec<Felt>);
     pub struct TransactionVersion(pub Felt);
+    pub enum ValidResourceBounds {
+        L1Gas(ResourceBounds) = 0,
+        AllResources(AllResourceBounds) = 1,
+    }
     pub struct Version{
         pub major: u32,
         pub minor: u32,
@@ -1162,7 +1173,7 @@ auto_storage_serde_conditionally_compressed! {
     }
 
     pub struct DeployAccountTransactionV3 {
-        pub resource_bounds: DeprecatedResourceBoundsMapping,
+        pub resource_bounds: ValidResourceBounds,
         pub tip: Tip,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -1198,7 +1209,7 @@ auto_storage_serde_conditionally_compressed! {
     }
 
     pub struct InvokeTransactionV3 {
-        pub resource_bounds: DeprecatedResourceBoundsMapping,
+        pub resource_bounds: ValidResourceBounds,
         pub tip: Tip,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
diff --git a/crates/papyrus_test_utils/src/lib.rs b/crates/papyrus_test_utils/src/lib.rs
index c0864aa6a7..d62893e045 100644
--- a/crates/papyrus_test_utils/src/lib.rs
+++ b/crates/papyrus_test_utils/src/lib.rs
@@ -99,6 +99,7 @@ use starknet_api::state::{
 };
 use starknet_api::transaction::{
     AccountDeploymentData,
+    AllResourceBounds,
     Calldata,
     ContractAddressSalt,
     DeclareTransaction,
@@ -112,6 +113,7 @@ use starknet_api::transaction::{
     DeployAccountTransactionV3,
     DeployTransaction,
     DeployTransactionOutput,
+    DeprecatedResourceBoundsMapping,
     Event,
     EventContent,
     EventData,
@@ -132,7 +134,6 @@ use starknet_api::transaction::{
     PaymasterData,
     Resource,
     ResourceBounds,
-    DeprecatedResourceBoundsMapping,
     RevertedTransactionExecutionStatus,
     Tip,
     Transaction,
@@ -142,6 +143,7 @@ use starknet_api::transaction::{
     TransactionOutput,
     TransactionSignature,
     TransactionVersion,
+    ValidResourceBounds,
 };
 use starknet_types_core::felt::Felt;
 
@@ -420,6 +422,11 @@ pub trait GetTestInstance: Sized {
 
 auto_impl_get_test_instance! {
     pub struct AccountDeploymentData(pub Vec<Felt>);
+    pub struct AllResourceBounds {
+        pub l1_gas: ResourceBounds,
+        pub l2_gas: ResourceBounds,
+        pub l1_data_gas: ResourceBounds,
+    }
     pub struct BlockHash(pub StarkHash);
     pub struct BlockHeader {
         pub block_hash: BlockHash,
@@ -517,7 +524,7 @@ auto_impl_get_test_instance! {
         pub sender_address: ContractAddress,
     }
     pub struct DeclareTransactionV3 {
-        pub resource_bounds: DeprecatedResourceBoundsMapping,
+        pub resource_bounds: ValidResourceBounds,
         pub tip: Tip,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -550,7 +557,7 @@ auto_impl_get_test_instance! {
         pub constructor_calldata: Calldata,
     }
     pub struct DeployAccountTransactionV3 {
-        pub resource_bounds: DeprecatedResourceBoundsMapping,
+        pub resource_bounds: ValidResourceBounds,
         pub tip: Tip,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -657,7 +664,7 @@ auto_impl_get_test_instance! {
         pub calldata: Calldata,
     }
     pub struct InvokeTransactionV3 {
-        pub resource_bounds: DeprecatedResourceBoundsMapping,
+        pub resource_bounds: ValidResourceBounds,
         pub tip: Tip,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -784,6 +791,11 @@ auto_impl_get_test_instance! {
         pub r#type: String,
     }
 
+    pub enum ValidResourceBounds {
+        L1Gas(ResourceBounds) = 0,
+        AllResources(AllResourceBounds) = 1,
+    }
+
     pub struct CasmContractClass {
         pub prime: BigUint,
         pub compiler_version: String,
diff --git a/crates/starknet_api/src/rpc_transaction.rs b/crates/starknet_api/src/rpc_transaction.rs
index 2c402c2d9b..d1453a0a33 100644
--- a/crates/starknet_api/src/rpc_transaction.rs
+++ b/crates/starknet_api/src/rpc_transaction.rs
@@ -206,3 +206,20 @@ impl From<ResourceBoundsMapping> for crate::transaction::DeprecatedResourceBound
         crate::transaction::DeprecatedResourceBoundsMapping(map)
     }
 }
+
+impl From<ResourceBoundsMapping> for crate::transaction::ValidResourceBounds {
+    fn from(value: ResourceBoundsMapping) -> Self {
+        Self::L1Gas(value.l1_gas)
+    }
+}
+
+impl From<crate::transaction::ValidResourceBounds> for ResourceBoundsMapping {
+    fn from(value: crate::transaction::ValidResourceBounds) -> Self {
+        match value {
+            crate::transaction::ValidResourceBounds::L1Gas(l1_gas) => {
+                Self { l1_gas, l2_gas: ResourceBounds::default() }
+            }
+            crate::transaction::ValidResourceBounds::AllResources(_) => todo!(),
+        }
+    }
+}
diff --git a/crates/starknet_api/src/transaction.rs b/crates/starknet_api/src/transaction.rs
index d8e6d2437b..c4798c98c2 100644
--- a/crates/starknet_api/src/transaction.rs
+++ b/crates/starknet_api/src/transaction.rs
@@ -209,7 +209,7 @@ impl TransactionHasher for DeclareTransactionV2 {
 /// A declare V3 transaction.
 #[derive(Clone, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
 pub struct DeclareTransactionV3 {
-    pub resource_bounds: DeprecatedResourceBoundsMapping,
+    pub resource_bounds: ValidResourceBounds,
     pub tip: Tip,
     pub signature: TransactionSignature,
     pub nonce: Nonce,
@@ -318,7 +318,7 @@ impl TransactionHasher for DeployAccountTransactionV1 {
 /// A deploy account V3 transaction.
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
 pub struct DeployAccountTransactionV3 {
-    pub resource_bounds: DeprecatedResourceBoundsMapping,
+    pub resource_bounds: ValidResourceBounds,
     pub tip: Tip,
     pub signature: TransactionSignature,
     pub nonce: Nonce,
@@ -455,7 +455,7 @@ impl TransactionHasher for InvokeTransactionV1 {
 /// An invoke V3 transaction.
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
 pub struct InvokeTransactionV3 {
-    pub resource_bounds: DeprecatedResourceBoundsMapping,
+    pub resource_bounds: ValidResourceBounds,
     pub tip: Tip,
     pub signature: TransactionSignature,
     pub nonce: Nonce,
@@ -949,19 +949,56 @@ impl TryFrom<Vec<(Resource, ResourceBounds)>> for DeprecatedResourceBoundsMappin
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
 pub enum ValidResourceBounds {
     L1Gas(ResourceBounds), // Pre 0.13.3. L2 bounds are signed but never used.
     AllResources(AllResourceBounds),
 }
 
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
 pub struct AllResourceBounds {
     pub l1_gas: ResourceBounds,
     pub l2_gas: ResourceBounds,
     pub l1_data_gas: ResourceBounds,
 }
 
+/// Deserializes raw resource bounds, given as map, into valid resource bounds.
+impl<'de> Deserialize<'de> for ValidResourceBounds {
+    fn deserialize<D>(de: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let raw_resource_bounds: BTreeMap<Resource, ResourceBounds> = Deserialize::deserialize(de)?;
+        ValidResourceBounds::try_from(raw_resource_bounds).map_err(serde::de::Error::custom)
+    }
+}
+
+/// Serializes ValidResourceBounds as map for BC.
+// TODO(Nimrod): Can this be removed?
+impl Serialize for ValidResourceBounds {
+    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let map = match self {
+            ValidResourceBounds::L1Gas(l1_gas) => BTreeMap::from([
+                (Resource::L1Gas, *l1_gas),
+                (Resource::L2Gas, ResourceBounds::default()),
+            ]),
+            ValidResourceBounds::AllResources(AllResourceBounds {
+                l1_gas,
+                l2_gas,
+                l1_data_gas,
+            }) => BTreeMap::from([
+                (Resource::L1Gas, *l1_gas),
+                (Resource::L2Gas, *l2_gas),
+                (Resource::L1DataGas, *l1_data_gas),
+            ]),
+        };
+        DeprecatedResourceBoundsMapping(map).serialize(s)
+    }
+}
+
 impl TryFrom<BTreeMap<Resource, ResourceBounds>> for ValidResourceBounds {
     type Error = StarknetApiError;
     fn try_from(
diff --git a/crates/starknet_api/src/transaction_hash.rs b/crates/starknet_api/src/transaction_hash.rs
index 55cdc33caa..7531ce9c51 100644
--- a/crates/starknet_api/src/transaction_hash.rs
+++ b/crates/starknet_api/src/transaction_hash.rs
@@ -6,6 +6,7 @@ use crate::core::{calculate_contract_address, ChainId, ContractAddress};
 use crate::crypto::utils::HashChain;
 use crate::data_availability::DataAvailabilityMode;
 use crate::transaction::{
+    AllResourceBounds,
     DeclareTransaction,
     DeclareTransactionV0V1,
     DeclareTransactionV2,
@@ -14,18 +15,17 @@ use crate::transaction::{
     DeployAccountTransactionV1,
     DeployAccountTransactionV3,
     DeployTransaction,
-    DeprecatedResourceBoundsMapping,
     InvokeTransaction,
     InvokeTransactionV0,
     InvokeTransactionV1,
     InvokeTransactionV3,
     L1HandlerTransaction,
-    Resource,
     ResourceBounds,
     Tip,
     Transaction,
     TransactionHash,
     TransactionVersion,
+    ValidResourceBounds,
 };
 use crate::StarknetApiError;
 
@@ -175,15 +175,17 @@ pub(crate) fn ascii_as_felt(ascii_str: &str) -> Result<Felt, StarknetApiError> {
 
 // An implementation of the SNIP: https://github.com/EvyatarO/SNIPs/blob/snip-8/SNIPS/snip-8.md
 fn get_tip_resource_bounds_hash(
-    resource_bounds_mapping: &DeprecatedResourceBoundsMapping,
+    resource_bounds: &ValidResourceBounds,
     tip: &Tip,
 ) -> Result<Felt, StarknetApiError> {
-    let l1_resource_bounds =
-        resource_bounds_mapping.0.get(&Resource::L1Gas).expect("Missing l1 resource");
-    let l1_resource = get_concat_resource(l1_resource_bounds, L1_GAS)?;
+    let (l1_resource_bounds, l2_resource_bounds) = match resource_bounds {
+        ValidResourceBounds::L1Gas(l1_gas_bounds) => (l1_gas_bounds, &ResourceBounds::default()),
+        ValidResourceBounds::AllResources(AllResourceBounds { l1_gas, l2_gas, .. }) => {
+            (l1_gas, l2_gas)
+        }
+    };
 
-    let l2_resource_bounds =
-        resource_bounds_mapping.0.get(&Resource::L2Gas).expect("Missing l2 resource");
+    let l1_resource = get_concat_resource(l1_resource_bounds, L1_GAS)?;
     let l2_resource = get_concat_resource(l2_resource_bounds, L2_GAS)?;
 
     Ok(HashChain::new()
diff --git a/crates/starknet_client/src/reader/objects/test_utils.rs b/crates/starknet_client/src/reader/objects/test_utils.rs
index 100695878c..f4d0f8491e 100644
--- a/crates/starknet_client/src/reader/objects/test_utils.rs
+++ b/crates/starknet_client/src/reader/objects/test_utils.rs
@@ -21,12 +21,12 @@ use starknet_api::transaction::{
     L1ToL2Payload,
     L2ToL1Payload,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     Tip,
     TransactionHash,
     TransactionOffsetInBlock,
     TransactionSignature,
     TransactionVersion,
+    ValidResourceBounds,
 };
 use starknet_types_core::felt::Felt;
 
@@ -60,7 +60,7 @@ auto_impl_get_test_instance! {
         Reserved = 0,
     }
     pub struct IntermediateDeclareTransaction {
-        pub resource_bounds: Option<DeprecatedResourceBoundsMapping>,
+        pub resource_bounds: Option<ValidResourceBounds>,
         pub tip: Option<Tip>,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -76,7 +76,7 @@ auto_impl_get_test_instance! {
         pub transaction_hash: TransactionHash,
     }
     pub struct IntermediateDeployAccountTransaction {
-        pub resource_bounds: Option<DeprecatedResourceBoundsMapping>,
+        pub resource_bounds: Option<ValidResourceBounds>,
         pub tip: Option<Tip>,
         pub signature: TransactionSignature,
         pub nonce: Nonce,
@@ -100,7 +100,7 @@ auto_impl_get_test_instance! {
         pub version: TransactionVersion,
     }
     pub struct IntermediateInvokeTransaction {
-        pub resource_bounds: Option<DeprecatedResourceBoundsMapping>,
+        pub resource_bounds: Option<ValidResourceBounds>,
         pub tip: Option<Tip>,
         pub calldata: Calldata,
         pub sender_address: ContractAddress,
diff --git a/crates/starknet_client/src/reader/objects/transaction.rs b/crates/starknet_client/src/reader/objects/transaction.rs
index 16c62b5f62..4121cb26d8 100644
--- a/crates/starknet_client/src/reader/objects/transaction.rs
+++ b/crates/starknet_client/src/reader/objects/transaction.rs
@@ -31,7 +31,6 @@ use starknet_api::transaction::{
     L2ToL1Payload,
     MessageToL1,
     PaymasterData,
-    DeprecatedResourceBoundsMapping,
     RevertedTransactionExecutionStatus as SnApiRevertedTransactionExecutionStatus,
     Tip,
     TransactionExecutionStatus as SnApiTransactionExecutionStatus,
@@ -40,6 +39,7 @@ use starknet_api::transaction::{
     TransactionOutput,
     TransactionSignature,
     TransactionVersion,
+    ValidResourceBounds,
 };
 use strum_macros::EnumIter;
 use tracing::error;
@@ -178,7 +178,7 @@ impl From<ReservedDataAvailabilityMode> for starknet_api::data_availability::Dat
 #[serde(deny_unknown_fields)]
 pub struct IntermediateDeclareTransaction {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_bounds: Option<DeprecatedResourceBoundsMapping>,
+    pub resource_bounds: Option<ValidResourceBounds>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tip: Option<Tip>,
     pub signature: TransactionSignature,
@@ -347,7 +347,7 @@ impl From<DeployTransaction> for starknet_api::transaction::DeployTransaction {
 #[serde(deny_unknown_fields)]
 pub struct IntermediateDeployAccountTransaction {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_bounds: Option<DeprecatedResourceBoundsMapping>,
+    pub resource_bounds: Option<ValidResourceBounds>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tip: Option<Tip>,
     pub signature: TransactionSignature,
@@ -470,7 +470,7 @@ impl TryFrom<IntermediateDeployAccountTransaction>
 #[serde(deny_unknown_fields)]
 pub struct IntermediateInvokeTransaction {
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub resource_bounds: Option<DeprecatedResourceBoundsMapping>,
+    pub resource_bounds: Option<ValidResourceBounds>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tip: Option<Tip>,
     pub calldata: Calldata,