Better null-ckecks in TryGetCanonicalTransaction

src/Nethermind/Nethermind.Core/BlockExtensions.cs

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Int256;
 
@@ -46,4 +47,18 @@ bool ParentBeforeTTD()
     /// <seealso cref="https://github.com/ethereum/EIPs/blob/d896145678bd65d3eafd8749690c1b5228875c39/EIPS/eip-3675.md#specification"/>
     /// </remarks>
     public static bool IsTerminalBlock(this Block block, ISpecProvider specProvider) => block.Header.IsTerminalBlock(specProvider);
+
+    public static int GetTransactionIndex(this Block block, in ValueHash256 txHash)
+    {
+        Transaction[] blockTransactions = block.Transactions;
+        for (int index = 0; index < blockTransactions.Length; index++)
+        {
+            if (blockTransactions[index].Hash == txHash)
+            {
+                return index;
+            }
+        }
+
+        return -1;
+    }
 }

src/Nethermind/Nethermind.Facade.Test/BlockchainBridgeTests.cs

@@ -83,21 +83,28 @@ public void get_transaction_returns_null_when_block_not_found()
     public void get_transaction_returns_receipt_and_transaction_when_found()
     {
         int index = 5;
-        var receipt = Build.A.Receipt
-            .WithBlockHash(TestItem.KeccakB)
-            .WithTransactionHash(TestItem.KeccakA)
-            .WithIndex(index)
-            .TestObject;
-        IEnumerable<Transaction> transactions = Enumerable.Range(0, 10)
-            .Select(static i => Build.A.Transaction.WithNonce((UInt256)i).TestObject);
-        var block = Build.A.Block
+        Transaction[] transactions = Enumerable.Range(0, 10)
+            .Select(static i => Build.A.Transaction.WithNonce((UInt256)i).WithHash(TestItem.Keccaks[i]).TestObject)
+            .ToArray();
+        Block block = Build.A.Block
             .WithTransactions(transactions.ToArray())
             .TestObject;
+        TxReceipt[] receipts = block.Transactions.Select((t, i) => Build.A.Receipt
+            .WithBlockHash(TestItem.KeccakB)
+            .WithIndex(i)
+            .WithTransactionHash(t.Hash)
+            .TestObject
+        ).ToArray();
+        ;
         _blockTree.FindBlock(TestItem.KeccakB, Arg.Any<BlockTreeLookupOptions>()).Returns(block);
-        _receiptStorage.FindBlockHash(TestItem.KeccakA).Returns(TestItem.KeccakB);
-        _receiptStorage.Get(block).Returns(new[] { receipt });
-        _blockchainBridge.GetTransaction(TestItem.KeccakA).Should()
-            .BeEquivalentTo((receipt, Build.A.Transaction.WithNonce((UInt256)index).TestObject, UInt256.Zero));
+        foreach (TxReceipt receipt in receipts)
+        {
+            _receiptStorage.FindBlockHash(receipt.TxHash!).Returns(TestItem.KeccakB);
+        }
+        _receiptStorage.Get(block).Returns(receipts);
+        var expectation = (receipts[index], Build.A.Transaction.WithNonce((UInt256)index).WithHash(TestItem.Keccaks[index]).TestObject, UInt256.Zero);
+        var result = _blockchainBridge.GetTransaction(transactions[index].Hash!);
+        result.Should().BeEquivalentTo(expectation);
     }
 
     [Test]
@@ -193,10 +200,12 @@ public void GetReceiptAndGasInfo_returns_correct_results(bool isCanonical, bool
                 .WithType(TxType.Blob)
                 .WithMaxFeePerBlobGas(2)
                 .WithBlobVersionedHashes(2)
+                .WithHash(txHash)
                 .TestObject
             : Build.A.Transaction
                 .WithGasPrice(effectiveGasPrice)
                 .WithMaxFeePerGas(effectiveGasPrice)
+                .WithHash(txHash)
                 .TestObject;
         Block block = postEip4844
             ? Build.A.Block
@@ -218,7 +227,7 @@ public void GetReceiptAndGasInfo_returns_correct_results(bool isCanonical, bool
         _blockTree.FindBlock(blockHash, Arg.Is(BlockTreeLookupOptions.RequireCanonical)).Returns(isCanonical ? block : null);
         _blockTree.FindBlock(blockHash, Arg.Is(BlockTreeLookupOptions.TotalDifficultyNotNeeded)).Returns(block);
         _receiptStorage.FindBlockHash(txHash).Returns(blockHash);
-        _receiptStorage.Get(block).Returns(new[] { receipt });
+        _receiptStorage.Get(block).Returns([receipt]);
 
         (TxReceipt? Receipt, TxGasInfo? GasInfo, int LogIndexStart) result = postEip4844
             ? (receipt, new(effectiveGasPrice, 1, 262144), 0)

src/Nethermind/Nethermind.Facade/BlockchainBridge.cs

@@ -80,9 +80,13 @@ private bool TryGetCanonicalTransaction(
                 if (block is not null)
                 {
                     receipts = receiptStorage.Get(block);
-                    receipt = receipts.ForTransaction(txHash);
-                    transaction = block.Transactions[receipt.Index];
-                    return true;
+                    int txIndex = block.GetTransactionIndex(txHash.ValueHash256);
+                    if (txIndex != -1)
+                    {
+                        transaction = block.Transactions[txIndex];
+                        receipt = receipts.Length > txIndex && receipts[txIndex].TxHash == txHash ? receipts[txIndex] : null;
+                        return true;
+                    }
                 }
             }