Skip to content

Skip signature only for TxType.DepositTx #6349

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
deffrian merged 2 commits into from
Dec 12, 2023
+4 −11
Merged

Skip signature only for TxType.DepositTx #6349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7853fde
Skip signature only for TxType.DepositTx
LukaszRozmej Dec 11, 2023
ddcffc6
Merge branch 'master' into fix/op-deposit-tx-type-decoding
deffrian Dec 12, 2023
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
15 changes: 4 additions & 11 deletions src/Nethermind/Nethermind.Serialization.Rlp/TxDecoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,7 @@ static Span<byte> DecodeTxType(RlpStream rlpStream, int length, out TxType txTyp
transactionSequence = DecodeTxType(rlpStream, rlpStream.ReadPrefixAndContentLength().ContentLength, out txType);
}


return transactionSequence;


}

private static Hash256 CalculateHashForNetworkPayloadForm(TxType type, Span<byte> transactionSequence)
Expand Down Expand Up @@ -521,10 +518,7 @@ private static void DecodeSignature(
ulong v = rlpStream.DecodeULong();
ReadOnlySpan<byte> rBytes = rlpStream.DecodeByteArraySpan();
ReadOnlySpan<byte> sBytes = rlpStream.DecodeByteArraySpan();
if (!(v == 0 && rBytes.IsEmpty && sBytes.IsEmpty))
{
ApplySignature(transaction, v, rBytes, sBytes, rlpBehaviors);
}
ApplySignature(transaction, v, rBytes, sBytes, rlpBehaviors);
}

private static void DecodeSignature(
Expand All @@ -535,10 +529,7 @@ private static void DecodeSignature(
ulong v = decoderContext.DecodeULong();
ReadOnlySpan<byte> rBytes = decoderContext.DecodeByteArraySpan();
ReadOnlySpan<byte> sBytes = decoderContext.DecodeByteArraySpan();
if (!(v == 0 && rBytes.IsEmpty && sBytes.IsEmpty))
{
ApplySignature(transaction, v, rBytes, sBytes, rlpBehaviors);
}
ApplySignature(transaction, v, rBytes, sBytes, rlpBehaviors);
}

private static void ApplySignature(
Expand All @@ -548,6 +539,8 @@ private static void ApplySignature(
ReadOnlySpan<byte> sBytes,
RlpBehaviors rlpBehaviors)
{
if (transaction.Type == TxType.DepositTx && v == 0 && rBytes.IsEmpty && sBytes.IsEmpty) return;

bool allowUnsigned = (rlpBehaviors & RlpBehaviors.AllowUnsigned) == RlpBehaviors.AllowUnsigned;
bool isSignatureOk = true;
string signatureError = null;
Expand Down