refactor: use deploy account transaction extension trait

crates/blockifier/src/test_utils/deploy_account.rs

@@ -15,7 +15,7 @@ use starknet_api::transaction::{
 };
 
 use crate::test_utils::{default_testing_resource_bounds, NonceManager};
-use crate::transaction::transactions::DeployAccountTransaction;
+use crate::transaction::transactions::{DeployAccountTransaction, DeployAccountTransactionExt};
 
 #[derive(Clone)]
 pub struct DeployAccountTxArgs {

crates/blockifier/src/transaction/account_transaction.rs

@@ -43,6 +43,7 @@ use crate::transaction::transaction_utils::update_remaining_gas;
 use crate::transaction::transactions::{
     DeclareTransaction,
     DeployAccountTransaction,
+    DeployAccountTransactionExt,
     Executable,
     ExecutableTransaction,
     ExecutionFlags,

crates/blockifier/src/transaction/transaction_execution.rs

@@ -22,6 +22,7 @@ use crate::transaction::objects::{
 use crate::transaction::transactions::{
     DeclareTransaction,
     DeployAccountTransaction,
+    DeployAccountTransactionExt,
     Executable,
     ExecutableTransaction,
     ExecutionFlags,

crates/blockifier/src/transaction/transactions.rs

@@ -4,6 +4,7 @@ use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use starknet_api::calldata;
 use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_api::deprecated_contract_class::EntryPointType;
+use starknet_api::internal_transaction::InternalDeployAccountTransaction;
 use starknet_api::transaction::{
     AccountDeploymentData,
     Calldata,
@@ -57,6 +58,20 @@ macro_rules! implement_inner_tx_getter_calls {
     };
 }
 
+macro_rules! trait_inner_tx_getter_calls {
+    ($(($field:ident, $field_type:ty)),*) => {
+        $(fn $field(&self) -> $field_type;)*
+    };
+}
+
+macro_rules! implement_trait_inner_tx_getter_calls {
+    ($(($field:ident, $field_type:ty)),*) => {
+        $(fn $field(&self) -> $field_type {
+            self.tx.$field().clone()
+        })*
+    };
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct ExecutionFlags {
     pub charge_fee: bool,
@@ -282,41 +297,60 @@ impl TransactionInfoCreator for DeclareTransaction {
         }
     }
 }
-#[derive(Debug, Clone)]
-pub struct DeployAccountTransaction {
-    pub tx: starknet_api::transaction::DeployAccountTransaction,
-    pub tx_hash: TransactionHash,
-    pub contract_address: ContractAddress,
-    // Indicates the presence of the only_query bit in the version.
-    pub only_query: bool,
+
+pub type DeployAccountTransaction = InternalDeployAccountTransaction;
+
+/// A trait for extending the `DeployAccountTransaction` with additional functionality.
+pub trait DeployAccountTransactionExt {
+    fn new(
+        deploy_account_tx: starknet_api::transaction::DeployAccountTransaction,
+        tx_hash: TransactionHash,
+        contract_address: ContractAddress,
+    ) -> Self;
+
+    fn new_for_query(
+        deploy_account_tx: starknet_api::transaction::DeployAccountTransaction,
+        tx_hash: TransactionHash,
+        contract_address: ContractAddress,
+    ) -> Self;
+
+    trait_inner_tx_getter_calls!(
+        (class_hash, ClassHash),
+        (constructor_calldata, Calldata),
+        (contract_address_salt, ContractAddressSalt),
+        (nonce, Nonce),
+        (signature, TransactionSignature)
+    );
+
+    fn tx(&self) -> &starknet_api::transaction::DeployAccountTransaction;
 }
 
-impl DeployAccountTransaction {
-    pub fn new(
+impl DeployAccountTransactionExt for DeployAccountTransaction {
+    fn new(
         deploy_account_tx: starknet_api::transaction::DeployAccountTransaction,
         tx_hash: TransactionHash,
         contract_address: ContractAddress,
     ) -> Self {
         Self { tx: deploy_account_tx, tx_hash, contract_address, only_query: false }
     }
 
-    pub fn new_for_query(
+    fn new_for_query(
         deploy_account_tx: starknet_api::transaction::DeployAccountTransaction,
         tx_hash: TransactionHash,
         contract_address: ContractAddress,
     ) -> Self {
         Self { tx: deploy_account_tx, tx_hash, contract_address, only_query: true }
     }
 
-    implement_inner_tx_getter_calls!(
+    implement_trait_inner_tx_getter_calls!(
         (class_hash, ClassHash),
         (constructor_calldata, Calldata),
         (contract_address_salt, ContractAddressSalt),
         (nonce, Nonce),
         (signature, TransactionSignature)
     );
 
-    pub fn tx(&self) -> &starknet_api::transaction::DeployAccountTransaction {
+    fn tx(&self) -> &starknet_api::transaction::DeployAccountTransaction {
         &self.tx
     }
 }

crates/blockifier/src/transaction/transactions_test.rs

@@ -119,7 +119,11 @@ use crate::transaction::test_utils::{
     VALID,
 };
 use crate::transaction::transaction_types::TransactionType;
-use crate::transaction::transactions::{ExecutableTransaction, L1HandlerTransaction};
+use crate::transaction::transactions::{
+    DeployAccountTransactionExt,
+    ExecutableTransaction,
+    L1HandlerTransaction,
+};
 use crate::versioned_constants::VersionedConstants;
 use crate::{
     check_transaction_execution_error_for_custom_hint,

crates/gateway/src/utils.rs

@@ -3,6 +3,7 @@ use blockifier::transaction::account_transaction::AccountTransaction;
 use blockifier::transaction::transactions::{
     DeclareTransaction as BlockifierDeclareTransaction,
     DeployAccountTransaction as BlockifierDeployAccountTransaction,
+    DeployAccountTransactionExt,
     InvokeTransaction as BlockifierInvokeTransaction,
 };
 use starknet_api::core::{calculate_contract_address, ChainId, ClassHash, ContractAddress, Nonce};

crates/native_blockifier/src/py_deploy_account.rs

@@ -1,7 +1,10 @@
 use std::sync::Arc;
 
 use blockifier::transaction::transaction_types::TransactionType;
-use blockifier::transaction::transactions::DeployAccountTransaction;
+use blockifier::transaction::transactions::{
+    DeployAccountTransaction,
+    DeployAccountTransactionExt,
+};
 use pyo3::prelude::*;
 use starknet_api::core::{ClassHash, ContractAddress, Nonce};
 use starknet_api::data_availability::DataAvailabilityMode;