Skip to content

Fix tx blob deserialization after PeerDAS #8729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukaszRozmej merged 5 commits into from
Jun 4, 2025
Merged

Fix tx blob deserialization after PeerDAS #8729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97db5a9
Added test for failed deserialization
alexb5dh Jun 3, 2025
be08ec2
Try fix failing deserialization
alexb5dh Jun 4, 2025
e91d3d9
Simplify code
alexb5dh Jun 4, 2025
657b259
Try another fix
alexb5dh Jun 4, 2025
e018948
Simplify fix
alexb5dh Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...hermind.Network.Test/P2P/Subprotocols/Eth/V66/PooledTransactionsMessageSerializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

using System;
using Nethermind.Core;
using Nethermind.Core.Collections;
using Nethermind.Core.Crypto;
Expand Down Expand Up @@ -52,5 +53,16 @@ public void Roundtrip()

SerializerTester.TestZero(serializer, message, "f8d7820457f8d2f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb");
}

// Generated during Hive devp2p
[TestCase(
"f8f78808a6f328496c6b92f8ecb87403f871f86c870c72dd9d5e883e800107830186a09400000000000000000000000000000000000000008080c001c001a00e0f68ba5a5f7820c9b47f4388b542f55849114944b6ac20d9f14cc2e3aa0368a00ad549ecdcc4756e5f05f6364ded164a1b7d69424d232ea8f29c35420efb39c4c0c0c0b87403f871f86c870c72dd9d5e883e010107830186a09400000000000000000000000000000000000000008080c001c080a0cd2109f56cec3c639c72e2d407e85eb2e54a2a6c4cd94cafe251b62ad1dbb723a068e1fee4a81ffccb9720b8a342f2cb6278570917132e9f639339b778f2da7169c0c0c0"
)]
public void Deserialize(string hex)
{
PooledTransactionsMessageSerializer serializer = new();

serializer.Deserialize(Convert.FromHexString(hex));
}
}
}
4 changes: 1 addition & 3 deletions src/Nethermind/Nethermind.Serialization.Rlp/Rlp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,9 +1179,7 @@ public void DecodeBloomStructRef(out BloomStructRef bloom)
public ReadOnlySpan<byte> PeekNextItem()
{
int length = PeekNextRlpLength();
ReadOnlySpan<byte> item = Read(length);
Position -= item.Length;
return item;
return Peek(length);
}

public readonly bool IsNextItemNull()
Expand Down
6 changes: 2 additions & 4 deletions src/Nethermind/Nethermind.Serialization.Rlp/TxDecoders/BlobTxDecoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ protected override void EncodePayload(Transaction transaction, RlpStream stream,
private static void DecodeShardBlobNetworkWrapper(Transaction transaction, RlpStream rlpStream)
{
ProofVersion version = ProofVersion.V0;
var startingRlp = rlpStream.PeekNextItem();
if (startingRlp.Length is 1)
if (!rlpStream.IsSequenceNext())
{
version = (ProofVersion)rlpStream.ReadByte();
if (version > ProofVersion.V1)
Expand All @@ -164,8 +163,7 @@ private static void DecodeShardBlobNetworkWrapper(Transaction transaction, RlpSt
private static void DecodeShardBlobNetworkWrapper(Transaction transaction, ref Rlp.ValueDecoderContext decoderContext)
{
ProofVersion version = ProofVersion.V0;
var startingRlp = decoderContext.PeekNextItem();
if (startingRlp.Length is 1)
if (!decoderContext.IsSequenceNext())
{
version = (ProofVersion)decoderContext.ReadByte();
if (version != ProofVersion.V1)
Expand Down