Skip to content
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

Jump to bottom

Fix encoding for branch and extension for inlined data. #391

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix encoding for branch and extension for inlined data. #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2206fa9
Fix encoding for branch and extension for inlined data.
damian-orzechowski Sep 13, 2024
f4da5bc
Added constant for single byte prefix content length in RLP
damian-orzechowski Sep 18, 2024
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
3 changes: 3 additions & 0 deletions src/Paprika.Tests/Merkle/Commit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ public class Commit(bool skipMemoizedRlpCheck = false) : ICommit
public void Set(in Key key, ReadOnlySpan<byte> value)
{
_before[GetKey(key)] = value.ToArray();
//to enable storage root calculation for tests
if (!key.IsState)
_stats.RegisterSetStorageAccount(key.Path.UnsafeAsKeccak);
}

public void DeleteKey(in Key key) => Set(key, ReadOnlySpan<byte>.Empty);
Expand Down
22 changes: 22 additions & 0 deletions src/Paprika.Tests/Merkle/RootHashTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,28 @@ public void Extension()
AssertRoot("a624947d9693a5cba0701897b3a48cb9954c2f4fd54de36151800eb2c7f6bf50", commit);
}

[Test]
public void Extension_branch_two_short_leaves()
{
var commit = new Commit();

//create E->B->L
// ->L
//leaves without any key and very small value cause to be inlined in branch
//encoded branch rlp is also < 32 bytes which causes it to be encoded as RLP in extension node
Keccak storageKey1 =
new Keccak(Convert.FromHexString("ccccccccccccccccccccddddddddddddddddeeeeeeeeeeeeeeeeeeeeeeeeeeb1"));
Keccak storageKey2 =
new Keccak(Convert.FromHexString("ccccccccccccccccccccddddddddddddddddeeeeeeeeeeeeeeeeeeeeeeeeeeb2"));

commit.Set(Key.Account(Values.Key0),
new Account(0, 1).WriteTo(stackalloc byte[Paprika.Account.MaxByteCount]));
commit.Set(Key.StorageCell(NibblePath.FromKey(Values.Key0), storageKey1), new byte[] { 1, 2, 3 });
commit.Set(Key.StorageCell(NibblePath.FromKey(Values.Key0), storageKey2), new byte[] { 10, 20, 30 });

AssertRoot("c8f9c9c3a0e95e13d6f6b7e0df65052a0cc484ab0db3e57c287df74f2714d5b3", commit);
}

[TestCase(0, "7f7fd47a28dc4dbfd1b1b33d254da8be74deab55bef81a02c232ca9957e05689", TestName = "From the Root")]
[TestCase(Keccak.Size - 2, "d8fc42b5f9491f526d0935445e9b83d8ddde46978cc450a6d1f83351da1bfae2",
TestName = "At the bottom")]
Expand Down
9 changes: 7 additions & 2 deletions src/Paprika/Merkle/ComputeMerkleBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,9 @@ private void EncodeBranch(scoped in Key key, scoped in ComputeContext ctx, scope
// Write length of length in front of the payload, resetting the stream properly
var end = stream.Position;
var actualLength = end - initialShift;
var lengthOfLength = Rlp.LengthOfLength(actualLength) + 1;
var lengthOfLength = Rlp.LengthOfLength(actualLength);
if (actualLength >= Rlp.SmallPrefixBarrier) //to match StartSequence
lengthOfLength++;
var from = initialShift - lengthOfLength;
stream.Position = from;
stream.StartSequence(actualLength);
Expand Down Expand Up @@ -692,7 +694,10 @@ private void EncodeExtension(scoped in Key key, scoped in ComputeContext ctx, sc
RlpStream stream = new(pooled.Span.Slice(slice, totalLength));
stream.StartSequence(contentLength);
stream.Encode(span);
stream.Encode(keccakOrRlp.Keccak);
if (keccakOrRlp.DataType == KeccakOrRlp.Type.Rlp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clearly, after following the test, this check was missing.

stream.Write(keccakOrRlp.Span);
else
stream.Encode(keccakOrRlp.Keccak);
stream.ToKeccakOrRlp(out keccakOrRlp);
}

Expand Down
5 changes: 3 additions & 2 deletions src/Paprika/RLP/Rlp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public static class Rlp
{
public const int LengthOfKeccakRlp = 33;
public const int MaxLengthOfLength = 4;
public const int SmallPrefixBarrier = 56;

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int LengthOf(in UInt256 item)
Expand Down Expand Up @@ -47,7 +48,7 @@ public static int LengthOf(ReadOnlySpan<byte> span)
return 1;
}

if (span.Length < 56)
if (span.Length < SmallPrefixBarrier)
{
return span.Length + 1;
}
Expand All @@ -57,7 +58,7 @@ public static int LengthOf(ReadOnlySpan<byte> span)

public static int LengthOfSequence(int contentLength)
{
if (contentLength < 56)
if (contentLength < SmallPrefixBarrier)
{
return 1 + contentLength;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Paprika/RLP/RlpStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public RlpStream(Span<byte> data)

public void StartSequence(int contentLength)
{
if (contentLength < 56)
if (contentLength < Rlp.SmallPrefixBarrier)
{
byte prefix = (byte)(192 + contentLength);
WriteByte(prefix);
Expand Down Expand Up @@ -72,7 +72,7 @@ public void Encode(scoped ReadOnlySpan<byte> input)
{
WriteByte(input[0]);
}
else if (input.Length < 56)
else if (input.Length < Rlp.SmallPrefixBarrier)
{
byte smallPrefix = (byte)(input.Length + 128);
WriteByte(smallPrefix);
Expand Down
Loading