From 7695e8e46ed0c4543349a8e9242875803a269261 Mon Sep 17 00:00:00 2001
From: Oleksandr Pravdyvyi <awxrvtb@gmail.com>
Date: Fri, 25 Jul 2025 10:09:34 +0300
Subject: [PATCH] fix: merge fix

---
 Cargo.lock                   |  2 +-
 sequencer_rpc/src/process.rs | 57 ++++++++++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0f810fd..b1d2f8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4377,8 +4377,8 @@ dependencies = [
  "serde",
  "serde_json",
  "storage",
- "tiny-keccak",
  "tempfile",
+ "tiny-keccak",
 ]
 
 [[package]]
diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs
index 40283b6..41d2261 100644
--- a/sequencer_rpc/src/process.rs
+++ b/sequencer_rpc/src/process.rs
@@ -2,12 +2,17 @@ use accounts::account_core::AccountForSerialization;
 use actix_web::Error as HttpError;
 use serde_json::Value;
 
-use common::rpc_primitives::{
-    errors::RpcError,
-    message::{Message, Request},
-    parser::RpcRequest,
-    requests::GetInitialTestnetAccountsRequest,
-    requests::{GetAccountBalanceRequest, GetAccountBalanceResponse},
+use common::{
+    merkle_tree_public::TreeHashType,
+    rpc_primitives::{
+        errors::RpcError,
+        message::{Message, Request},
+        parser::RpcRequest,
+        requests::{
+            GetAccountBalanceRequest, GetAccountBalanceResponse, GetInitialTestnetAccountsRequest,
+            GetTransactionByHashRequest, GetTransactionByHashResponse,
+        },
+    },
 };
 
 use common::rpc_primitives::requests::{
@@ -213,7 +218,10 @@ mod tests {
 
     use crate::{rpc_handler, JsonHandler};
     use accounts::account_core::Account;
-    use common::rpc_primitives::RpcPollingConfig;
+    use common::{
+        rpc_primitives::RpcPollingConfig,
+        transaction::{SignaturePrivateKey, Transaction, TransactionBody},
+    };
     use sequencer_core::{config::SequencerConfig, SequencerCore};
     use serde_json::Value;
     use tempfile::tempdir;
@@ -475,7 +483,7 @@ mod tests {
     fn json_handler_for_tests() -> (JsonHandler, Vec<Account>) {
         let config = sequencer_config_for_tests();
 
-        let sequencer_core = SequencerCore::start_from_config(config);
+        let mut sequencer_core = SequencerCore::start_from_config(config);
         let initial_accounts = sequencer_core
             .sequencer_config
             .initial_accounts
@@ -483,6 +491,31 @@ mod tests {
             .map(|acc_ser| acc_ser.clone().into())
             .collect();
 
+        let tx_body = TransactionBody {
+            tx_kind: common::transaction::TxKind::Public,
+            execution_input: Default::default(),
+            execution_output: Default::default(),
+            utxo_commitments_spent_hashes: Default::default(),
+            utxo_commitments_created_hashes: Default::default(),
+            nullifier_created_hashes: Default::default(),
+            execution_proof_private: Default::default(),
+            encoded_data: Default::default(),
+            ephemeral_pub_key: Default::default(),
+            commitment: Default::default(),
+            tweak: Default::default(),
+            secret_r: Default::default(),
+            sc_addr: Default::default(),
+            state_changes: Default::default(),
+        };
+        let tx = Transaction::new(tx_body, SignaturePrivateKey::from_slice(&[1; 32]).unwrap());
+
+        sequencer_core
+            .push_tx_into_mempool_pre_check(tx, [[0; 32]; 2])
+            .unwrap();
+        sequencer_core
+            .produce_new_block_with_mempool_transactions()
+            .unwrap();
+
         let sequencer_core = Arc::new(Mutex::new(sequencer_core));
 
         (
@@ -610,7 +643,7 @@ mod tests {
 
     #[actix_web::test]
     async fn test_get_transaction_by_hash_for_non_existent_hash() {
-        let json_handler = json_handler_for_tests();
+        let (json_handler, _) = json_handler_for_tests();
         let request = serde_json::json!({
             "jsonrpc": "2.0",
             "method": "get_transaction_by_hash",
@@ -632,7 +665,7 @@ mod tests {
 
     #[actix_web::test]
     async fn test_get_transaction_by_hash_for_invalid_hex() {
-        let json_handler = json_handler_for_tests();
+        let (json_handler, _) = json_handler_for_tests();
         let request = serde_json::json!({
             "jsonrpc": "2.0",
             "method": "get_transaction_by_hash",
@@ -656,7 +689,7 @@ mod tests {
 
     #[actix_web::test]
     async fn test_get_transaction_by_hash_for_invalid_length() {
-        let json_handler = json_handler_for_tests();
+        let (json_handler, _) = json_handler_for_tests();
         let request = serde_json::json!({
             "jsonrpc": "2.0",
             "method": "get_transaction_by_hash",
@@ -680,7 +713,7 @@ mod tests {
 
     #[actix_web::test]
     async fn test_get_transaction_by_hash_for_existing_transaction() {
-        let json_handler = json_handler_for_tests();
+        let (json_handler, _) = json_handler_for_tests();
         let request = serde_json::json!({
             "jsonrpc": "2.0",
             "method": "get_transaction_by_hash",