Expand transaction deprecation warning (#704)

Author: FabijanC

crates/starknet-devnet-server/src/api/json_rpc/mod.rs

@@ -107,24 +107,20 @@ fn log_if_deprecated_tx(request: &JsonRpcRequest) {
     let is_deprecated_tx = match request {
         JsonRpcRequest::AddDeclareTransaction(BroadcastedDeclareTransactionInput {
             declare_transaction: BroadcastedDeclareTransactionEnumWrapper::Declare(tx),
-        }) => match tx {
-            starknet_types::rpc::transactions::BroadcastedDeclareTransaction::V1(_) => true,
-            starknet_types::rpc::transactions::BroadcastedDeclareTransaction::V2(_) => true,
-            starknet_types::rpc::transactions::BroadcastedDeclareTransaction::V3(_) => false,
-        },
+        }) => tx.is_deprecated(),
         JsonRpcRequest::AddDeployAccountTransaction(BroadcastedDeployAccountTransactionInput {
             deploy_account_transaction:
                 BroadcastedDeployAccountTransactionEnumWrapper::DeployAccount(tx),
-        }) => match tx {
-            starknet_types::rpc::transactions::BroadcastedDeployAccountTransaction::V1(_) => true,
-            starknet_types::rpc::transactions::BroadcastedDeployAccountTransaction::V3(_) => false,
-        },
+        }) => tx.is_deprecated(),
         JsonRpcRequest::AddInvokeTransaction(BroadcastedInvokeTransactionInput {
             invoke_transaction: BroadcastedInvokeTransactionEnumWrapper::Invoke(tx),
-        }) => match tx {
-            starknet_types::rpc::transactions::BroadcastedInvokeTransaction::V1(_) => true,
-            starknet_types::rpc::transactions::BroadcastedInvokeTransaction::V3(_) => false,
-        },
+        }) => tx.is_deprecated(),
+        JsonRpcRequest::EstimateFee(EstimateFeeInput { request: txs, .. }) => {
+            txs.iter().any(|tx| tx.is_deprecated())
+        }
+        JsonRpcRequest::SimulateTransactions(SimulateTransactionsInput {
+            transactions, ..
+        }) => transactions.iter().any(|tx| tx.is_deprecated()),
         _ => false,
     };
 

crates/starknet-devnet-types/src/rpc/transactions.rs

@@ -504,6 +504,14 @@ impl BroadcastedTransaction {
             }
         }
     }
+
+    pub fn is_deprecated(&self) -> bool {
+        match self {
+            BroadcastedTransaction::Invoke(tx) => tx.is_deprecated(),
+            BroadcastedTransaction::Declare(tx) => tx.is_deprecated(),
+            BroadcastedTransaction::DeployAccount(tx) => tx.is_deprecated(),
+        }
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -522,6 +530,13 @@ impl BroadcastedDeclareTransaction {
         }
     }
 
+    pub fn is_deprecated(&self) -> bool {
+        match self {
+            BroadcastedDeclareTransaction::V1(_) | BroadcastedDeclareTransaction::V2(_) => true,
+            BroadcastedDeclareTransaction::V3(_) => false,
+        }
+    }
+
     pub fn is_only_query(&self) -> bool {
         match self {
             BroadcastedDeclareTransaction::V1(tx) => tx.common.is_only_query(),
@@ -665,6 +680,13 @@ impl BroadcastedDeployAccountTransaction {
         }
     }
 
+    pub fn is_deprecated(&self) -> bool {
+        match self {
+            BroadcastedDeployAccountTransaction::V1(_) => true,
+            BroadcastedDeployAccountTransaction::V3(_) => false,
+        }
+    }
+
     pub fn is_only_query(&self) -> bool {
         match self {
             BroadcastedDeployAccountTransaction::V1(tx) => tx.common.is_only_query(),
@@ -788,6 +810,13 @@ impl BroadcastedInvokeTransaction {
         }
     }
 
+    pub fn is_deprecated(&self) -> bool {
+        match self {
+            BroadcastedInvokeTransaction::V1(_) => true,
+            BroadcastedInvokeTransaction::V3(_) => false,
+        }
+    }
+
     pub fn is_only_query(&self) -> bool {
         match self {
             BroadcastedInvokeTransaction::V1(tx) => tx.common.is_only_query(),