Preserve RLP cleanup behavior

Author: flcl42

src/Nethermind/Nethermind.Blockchain.Test/Proofs/ReceiptTrieTests.cs

@@ -84,7 +84,7 @@ private void VerifyProof(byte[][] proof, Hash256 receiptRoot)
     {
         TrieNode node = new(NodeType.Unknown, proof.Last());
         node.ResolveNode(Substitute.For<ITrieNodeResolver>(), TreePath.Empty);
-        RlpReader ctx = new(node.Value.ToArray());
+        RlpReader ctx = new(node.Value.AsSpan());
         TxReceipt receipt = _decoder.Decode(ref ctx);
         Assert.That(receipt.Bloom, Is.Not.Null);
 

src/Nethermind/Nethermind.EraE.Test/Archive/EraWriterTests.cs

@@ -2,12 +2,10 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using Nethermind.Core;
-using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Core.Test.Builders;
 using Nethermind.Core.Test.IO;
 using Nethermind.Era1.Exceptions;
-using Nethermind.EraE.Proofs;
 using Nethermind.Int256;
 using NSubstitute;
 using NUnit.Framework;
@@ -72,21 +70,6 @@ public Task Add_PostMergeBlockWithoutTotalDifficulty_Succeeds()
         return Task.CompletedTask;
     }
 
-    [Test]
-    public async Task Add_WhenBeaconRootsProviderThrows_DoesNotAdvanceBufferedBlock()
-    {
-        ThrowOnceBeaconRootsProvider beaconRootsProvider = new();
-        ISpecProvider specProvider = Substitute.For<ISpecProvider>();
-        specProvider.BeaconChainGenesisTimestamp.Returns((ulong?)0UL);
-        using EraWriter sut = new(new MemoryStream(), specProvider, beaconRootsProvider);
-
-        Block block = Build.A.Block.WithNumber(0).WithPostMergeRules().TestObject;
-
-        Assert.That(async () => await sut.Add(block, []), Throws.TypeOf<InvalidOperationException>());
-        Assert.That(async () => await sut.Add(block, []), Throws.Nothing);
-        Assert.That(async () => await sut.Finalize(), Throws.Nothing);
-    }
-
     [Test]
     public async Task Add_AfterFinalized_ThrowsEraException()
     {
@@ -199,26 +182,4 @@ public void Dispose_WhenCalled_DisposesInnerStream()
     }
 
     private static EraWriter CreateSut() => new(new MemoryStream(), Substitute.For<ISpecProvider>());
-
-    private sealed class ThrowOnceBeaconRootsProvider : IBeaconRootsProvider
-    {
-        private bool _shouldThrow = true;
-
-        public Task<(ValueHash256 BeaconBlockRoot, ValueHash256 StateRoot)?> GetBeaconRoots(
-            long slot,
-            CancellationToken cancellationToken = default)
-        {
-            if (_shouldThrow)
-            {
-                _shouldThrow = false;
-                throw new InvalidOperationException("Beacon roots lookup failed.");
-            }
-
-            return Task.FromResult<(ValueHash256 BeaconBlockRoot, ValueHash256 StateRoot)?>(null);
-        }
-
-        public void Dispose()
-        {
-        }
-    }
 }

src/Nethermind/Nethermind.EraE/Archive/EraWriter.cs

@@ -131,18 +131,13 @@ public async Task Add(Block block, TxReceipt[] receipts, CancellationToken cance
 
         RlpBehaviors rlpBehaviors = spec.IsEip658Enabled ? RlpBehaviors.Eip658Receipts : RlpBehaviors.None;
 
-        (ValueHash256 BeaconBlockRoot, ValueHash256 StateRoot)? roots = null;
+        AddEncodedPayloads(block, receipts, rlpBehaviors, spec.IsEip658Enabled);
 
         if (isPostMerge && _beaconRootsProvider is not null && _slotTime is not null)
         {
             long slot = (long)_slotTime.GetSlot(block.Header.Timestamp * MillisecondsPerSecond);
-            roots = await _beaconRootsProvider.GetBeaconRoots(slot, cancellation);
-        }
-
-        AddEncodedPayloads(block, receipts, rlpBehaviors, spec.IsEip658Enabled);
-
-        if (isPostMerge)
-        {
+            (ValueHash256 BeaconBlockRoot, ValueHash256 StateRoot)? roots =
+                await _beaconRootsProvider.GetBeaconRoots(slot, cancellation);
             _blocksRootContext!.ProcessBlock(block, roots?.BeaconBlockRoot, roots?.StateRoot);
         }
         else
@@ -399,56 +394,38 @@ private static void DisposePayloads(ArrayPoolList<ArrayPoolSpan<byte>> payloads)
         payloads.Clear();
     }
 
-    private static void DisposeAddedOrOwned(
-        ArrayPoolList<ArrayPoolSpan<byte>> payloads,
-        int originalCount,
-        ArrayPoolSpan<byte> payload,
-        bool ownsPayload)
+    private void AddEncodedPayloads(Block block, TxReceipt[] receipts, RlpBehaviors rlpBehaviors, bool isEip658)
     {
-        if (payloads.Count > originalCount)
+        ArrayPoolSpan<byte> headerRlp = _headerDecoder.EncodeToArrayPoolSpan(block.Header, rlpBehaviors);
+        try
         {
-            payloads[^1].Dispose();
-            payloads.RemoveAt(payloads.Count - 1);
+            _headers.Add(headerRlp);
         }
-        else if (ownsPayload)
+        catch
         {
-            payload.Dispose();
+            headerRlp.Dispose();
+            throw;
         }
-    }
-
-    private void AddEncodedPayloads(Block block, TxReceipt[] receipts, RlpBehaviors rlpBehaviors, bool isEip658)
-    {
-        ArrayPoolSpan<byte> headerRlp = _headerDecoder.EncodeToArrayPoolSpan(block.Header, rlpBehaviors);
-        ArrayPoolSpan<byte> bodyRlp = default;
-        ArrayPoolSpan<byte> receiptRlp = default;
-
-        bool ownsHeader = true;
-        bool ownsBody = false;
-        bool ownsReceipt = false;
-
-        int headersCount = _headers.Count;
-        int bodiesCount = _bodies.Count;
-        int receiptsCount = _receipts.Count;
 
+        ArrayPoolSpan<byte> bodyRlp = _blockBodyDecoder.EncodeToArrayPoolSpan(block.Body, rlpBehaviors);
         try
         {
-            bodyRlp = _blockBodyDecoder.EncodeToArrayPoolSpan(block.Body, rlpBehaviors);
-            ownsBody = true;
-            receiptRlp = EncodeSlimReceipts(receipts, isEip658);
-            ownsReceipt = true;
-
-            _headers.Add(headerRlp);
-            ownsHeader = false;
             _bodies.Add(bodyRlp);
-            ownsBody = false;
+        }
+        catch
+        {
+            bodyRlp.Dispose();
+            throw;
+        }
+
+        ArrayPoolSpan<byte> receiptRlp = EncodeSlimReceipts(receipts, isEip658);
+        try
+        {
             _receipts.Add(receiptRlp);
-            ownsReceipt = false;
         }
         catch
         {
-            DisposeAddedOrOwned(_headers, headersCount, headerRlp, ownsHeader);
-            DisposeAddedOrOwned(_bodies, bodiesCount, bodyRlp, ownsBody);
-            DisposeAddedOrOwned(_receipts, receiptsCount, receiptRlp, ownsReceipt);
+            receiptRlp.Dispose();
             throw;
         }
     }

src/Nethermind/Nethermind.Serialization.Rlp/RlpReader.cs

@@ -285,9 +285,10 @@ public bool TryDecodeValueKeccak(out ValueHash256 keccak)
         }
 
         ReadOnlySpan<byte> theSpan = DecodeByteArraySpan(RlpLimit.L32);
-        byte[] keccakByte = new byte[32];
-        theSpan.CopyTo(keccakByte.AsSpan(32 - theSpan.Length));
-        return new Hash256(keccakByte);
+        Span<byte> keccakBytes = stackalloc byte[32];
+        keccakBytes.Clear();
+        theSpan.CopyTo(keccakBytes[(32 - theSpan.Length)..]);
+        return new Hash256(keccakBytes);
     }
 
     public void DecodeKeccakStructRef(out Hash256StructRef keccak)
@@ -376,8 +377,7 @@ public void DecodeZeroPrefixedKeccakStructRef(out Hash256StructRef keccak, Span<
             RlpHelpers.ThrowUnexpectedPrefix(prefix);
         }
 
-        byte[] buffer = Read(20).ToArray();
-        return new Address(buffer);
+        return new Address(Read(20));
     }
 
     public void DecodeAddressStructRef(out AddressStructRef address)

src/Nethermind/Nethermind.Serialization.Rlp/RlpWriterExtensions.cs

@@ -357,7 +357,9 @@ public void Encode(string? value)
             }
             else
             {
-                writer.Encode(Encoding.ASCII.GetBytes(value));
+                using ArrayPoolSpan<byte> bytes = new(value.Length);
+                Encoding.ASCII.GetBytes(value.AsSpan(), bytes);
+                writer.Encode(bytes);
             }
         }