update transaction type

ArkProjectNFTs · May 22, 2024 · f6705a4 · f6705a4
1 parent 0fb79ec
commit f6705a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/crates/katana/core/src/hooker.rs b/crates/katana/core/src/hooker.rs
@@ -5,7 +5,7 @@ use crate::sequencer::KatanaSequencer;
 use async_trait::async_trait;
 use katana_executor::ExecutorFactory;
 use starknet::accounts::Call;
-use starknet::core::types::{BroadcastedInvokeTransactionV3, FieldElement};
+use starknet::core::types::{BroadcastedInvokeTransaction, FieldElement};
 use std::sync::Arc;
 use tracing::{error, info};
 
@@ -44,7 +44,7 @@ pub trait KatanaHooker<EF: ExecutorFactory> {
     /// # Arguments
     ///
     /// * `transaction` - The invoke transaction to be verified.
-    async fn verify_invoke_tx_before_pool(&self, transaction: BroadcastedInvokeTransactionV3)
+    async fn verify_invoke_tx_before_pool(&self, transaction: BroadcastedInvokeTransaction)
         -> bool;
 
     /// Runs code right before a message to starknet
@@ -108,7 +108,7 @@ impl<EF: ExecutorFactory + 'static + Send + Sync> KatanaHooker<EF> for DefaultKa
 
     async fn verify_invoke_tx_before_pool(
         &self,
-        transaction: BroadcastedInvokeTransactionV3,
+        transaction: BroadcastedInvokeTransaction,
     ) -> bool {
         info!("HOOKER: verify_invoke_tx_before_pool called with transaction: {:?}", transaction);
         true

diff --git a/crates/katana/rpc/rpc/src/starknet.rs b/crates/katana/rpc/rpc/src/starknet.rs
@@ -677,16 +677,9 @@ impl<EF: ExecutorFactory> StarknetApiServer for StarknetApi<EF> {
     ) -> RpcResult<InvokeTxResult> {
 
         if let Some(hooker) = &self.inner.sequencer.hooker {
-            let tx_clone = invoke_transaction.0.clone();
-            match tx_clone {
-                BroadcastedInvokeTransaction::V3(tx) => {
-                    if !hooker.read().await.verify_invoke_tx_before_pool(tx).await {
-                       return Err(StarknetApiError::SolisAssetFault.into());
-                    }
-                },
-                BroadcastedInvokeTransaction::V1(_tx) => {
-                    return Err(StarknetApiError::UnsupportedTransactionVersion.into());
-                }
+            let tx = invoke_transaction.0.clone();
+            if !hooker.read().await.verify_invoke_tx_before_pool(tx).await {
+               return Err(StarknetApiError::SolisAssetFault.into());
             }
         }
         self.on_io_blocking_task(move |this| {