From 9f41899ddf807bf1db2e97c98234fce0589017c7 Mon Sep 17 00:00:00 2001
From: sealer3 <125761775+sealer3@users.noreply.github.com>
Date: Sat, 20 Apr 2024 20:35:13 +0100
Subject: [PATCH] Return transaction hash in ots_getTransactionBySenderAndNonce

---
 crates/anvil/src/eth/otterscan/api.rs | 8 +++-----
 crates/anvil/tests/it/otterscan.rs    | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/crates/anvil/src/eth/otterscan/api.rs b/crates/anvil/src/eth/otterscan/api.rs
index 636140f13ffe..400f99193aec 100644
--- a/crates/anvil/src/eth/otterscan/api.rs
+++ b/crates/anvil/src/eth/otterscan/api.rs
@@ -8,9 +8,7 @@ use crate::eth::{
     EthApi,
 };
 use alloy_primitives::{Address, Bytes, B256, U256};
-use alloy_rpc_types::{
-    Block, BlockId, BlockNumberOrTag as BlockNumber, Transaction, WithOtherFields,
-};
+use alloy_rpc_types::{Block, BlockId, BlockNumberOrTag as BlockNumber};
 use alloy_rpc_types_trace::parity::{
     Action, CallAction, CreateAction, CreateOutput, RewardAction, TraceOutput,
 };
@@ -240,7 +238,7 @@ impl EthApi {
         &self,
         address: Address,
         nonce: U256,
-    ) -> Result<Option<WithOtherFields<Transaction>>> {
+    ) -> Result<Option<B256>> {
         node_info!("ots_getTransactionBySenderAndNonce");
 
         let from = self.get_fork().map(|f| f.block_number() + 1).unwrap_or_default();
@@ -250,7 +248,7 @@ impl EthApi {
             if let Some(txs) = self.backend.mined_transactions_by_block_number(n.into()).await {
                 for tx in txs {
                     if U256::from(tx.nonce) == nonce && tx.from == address {
-                        return Ok(Some(tx))
+                        return Ok(Some(tx.hash))
                     }
                 }
             }
diff --git a/crates/anvil/tests/it/otterscan.rs b/crates/anvil/tests/it/otterscan.rs
index 4c344264034c..3b27a0f6c687 100644
--- a/crates/anvil/tests/it/otterscan.rs
+++ b/crates/anvil/tests/it/otterscan.rs
@@ -594,8 +594,8 @@ async fn can_call_ots_get_transaction_by_sender_and_nonce() {
         .await
         .unwrap();
 
-    assert_eq!(result1.unwrap().hash, receipt1.transaction_hash.to_alloy());
-    assert_eq!(result2.unwrap().hash, receipt2.transaction_hash.to_alloy());
+    assert_eq!(result1.unwrap(), receipt1.transaction_hash.to_alloy());
+    assert_eq!(result2.unwrap(), receipt2.transaction_hash.to_alloy());
 }
 
 #[tokio::test(flavor = "multi_thread")]