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

[MINOR] test RLP used for encode/decode blob tx should contain to field #5883

Merged
merged 3 commits into from
Sep 15, 2023
Merged

[MINOR] test RLP used for encode/decode blob tx should contain to field #5883

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4a5836
validate to field on encode/decode for blob tx
macfarla Sep 15, 2023
60afe02
revert decode/encode checks - tis done later in tx validation
macfarla Sep 15, 2023
b2f2c8c
Merge branch 'main' of github.com:hyperledger/besu into fix/blob-requ…
macfarla Sep 15, 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
3 changes: 3 additions & 0 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,9 @@ private static Bytes blobPreimage(
final Optional<List<AccessListEntry>> accessList,
final List<VersionedHash> versionedHashes) {

if (to.isEmpty()) {
throw new RuntimeException("to field cannot be empty for blob transaction");
}
final Bytes encoded =
RLP.encode(
rlpOutput -> {
Expand Down
11 changes: 10 additions & 1 deletion ...ore/src/main/java/org/hyperledger/besu/ethereum/core/encoding/BlobTransactionDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.hyperledger.besu.datatypes.VersionedHash;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.ethereum.rlp.RLPException;
import org.hyperledger.besu.ethereum.rlp.RLPInput;

import java.util.function.Supplier;
Expand Down Expand Up @@ -68,7 +69,15 @@ static void readTransactionPayloadInner(final Transaction.Builder builder, final
.maxPriorityFeePerGas(Wei.of(input.readUInt256Scalar()))
.maxFeePerGas(Wei.of(input.readUInt256Scalar()))
.gasLimit(input.readLongScalar())
.to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
.to(
input.readBytes(
v -> {
if (v.isEmpty()) {
throw new RLPException("to field cannot be empty for blob transaction");
} else {
return Address.wrap(v);
}
}))
.value(Wei.of(input.readUInt256Scalar()))
.payload(input.readBytes())
.accessList(
Expand Down
3 changes: 2 additions & 1 deletion ...ore/src/main/java/org/hyperledger/besu/ethereum/core/encoding/BlobTransactionEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public static void encode(final Transaction transaction, final RLPOutput out) {
out.writeUInt256Scalar(transaction.getMaxPriorityFeePerGas().orElseThrow());
out.writeUInt256Scalar(transaction.getMaxFeePerGas().orElseThrow());
out.writeLongScalar(transaction.getGasLimit());
out.writeBytes(transaction.getTo().map(Bytes::copy).orElse(Bytes.EMPTY));
out.writeBytes(
transaction.getTo().map(Bytes::copy).orElseThrow()); // blob tx can't have empty to field
out.writeUInt256Scalar(transaction.getValue());
out.writeBytes(transaction.getPayload());
AccessListTransactionEncoder.writeAccessList(out, transaction.getAccessList());
Expand Down
26 changes: 24 additions & 2 deletions ...rc/test/java/org/hyperledger/besu/ethereum/core/encoding/BlobTransactionEncodingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
package org.hyperledger.besu.ethereum.core.encoding;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
import org.hyperledger.besu.ethereum.rlp.RLPException;

import java.io.BufferedReader;
import java.io.IOException;
Expand All @@ -37,13 +39,21 @@ private static Stream<Arguments> provideOpaqueBytesNoBlobsWithCommitments() {
createArgument(
"0x03f89d850120b996ed3685012a1a646085012a1a64608303345094ffb38a7a99e3e2335be83fc74b7faa19d55312418308a80280c085012a1a6460e1a00153a6a1e053cf4c5a09e84088ed8ad7cb53d76c8168f1b82f7cfebfcd06da1a01a007785223eec68459d72265f10bdb30ec3415252a63100605a03142fa211ebbe9a07dbbf9e081fa7b9a01202e4d9ee0e0e513f80efbbab6c784635429905389ce86"),
createArgument(
"0x03f889850120b996ed81f0847735940084b2d05e158307a1208001855f495f4955c084b2d05e15e1a001d343d3cd62abd9c5754cbe5128c25ea90786a8ae75fb79c8cf95f4dcdd08ec80a014103732b5a9789bbf5ea859ed904155398abbef343f8fd63007efb70795d382a07272e847382789a092eadf08e2b9002e727376f8466fff0e4d4639fd60a528f2"),
"0x03f89d850120b996ed81f0847735940084b2d05e158307a12094000000000000000000000000000000000010101001855f495f4955c084b2d05e15e1a001d343d3cd62abd9c5754cbe5128c25ea90786a8ae75fb79c8cf95f4dcdd08ec80a014103732b5a9789bbf5ea859ed904155398abbef343f8fd63007efb70795d382a07272e847382789a092eadf08e2b9002e727376f8466fff0e4d4639fd60a528f2"),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this change just populates the to field - previously was 0x, now 0x0000000000000000000000000000000000101010

createArgument(
"0x03f889850120b996ed81f1843b9aca00847735940e8307a1208001855f495f4955c0847735940ee1a001d552e24560ec2f168be1d4a6385df61c70afe4288f00a3ad172da1a6f2b4f280a0b6690786e5fe79df67dcb60e8a9e8555142c3c96ffd5097c838717f0a7f64129a0112f01ed0cd3b86495f01736fbbc1b793f71565223aa26f093471a4d8605d198"),
"0x03f89d850120b996ed81f1843b9aca00847735940e8307a12094000000000000000000000000000000000010101001855f495f4955c0847735940ee1a001d552e24560ec2f168be1d4a6385df61c70afe4288f00a3ad172da1a6f2b4f280a0b6690786e5fe79df67dcb60e8a9e8555142c3c96ffd5097c838717f0a7f64129a0112f01ed0cd3b86495f01736fbbc1b793f71565223aa26f093471a4d8605d198"),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this change just populates the to field - previously was 0x, now 0x0000000000000000000000000000000000101010

createArgument(
"0x03f897850120b996ed80840bebc200843b9aca078303345094c8d369b164361a8961286cfbab3bc10f962185a88080c08411e1a300e1a0011df88a2971c8a7ac494a7ba37ec1acaa1fc1edeeb38c839b5d1693d47b69b080a032f122f06e5802224db4c8a58fd22c75173a713f63f89936f811c144b9e40129a043a2a872cbfa5727007adf6a48febe5f190d2e4cd5ed6122823fb6ff47ecda32"));
}

private static Stream<Arguments> provideOpaqueBytesWithEmptyToField() {
return Stream.of(
createArgument(
"0x03f889850120b996ed81f0847735940084b2d05e158307a1208001855f495f4955c084b2d05e15e1a001d343d3cd62abd9c5754cbe5128c25ea90786a8ae75fb79c8cf95f4dcdd08ec80a014103732b5a9789bbf5ea859ed904155398abbef343f8fd63007efb70795d382a07272e847382789a092eadf08e2b9002e727376f8466fff0e4d4639fd60a528f2"),
createArgument(
"0x03f889850120b996ed81f1843b9aca00847735940e8307a1208001855f495f4955c0847735940ee1a001d552e24560ec2f168be1d4a6385df61c70afe4288f00a3ad172da1a6f2b4f280a0b6690786e5fe79df67dcb60e8a9e8555142c3c96ffd5097c838717f0a7f64129a0112f01ed0cd3b86495f01736fbbc1b793f71565223aa26f093471a4d8605d198"));
}

private static Stream<Arguments> provideOpaqueBytesForNetwork() throws IOException {
return Stream.of(createArgumentFromFile("blob2.txt"));
}
Expand Down Expand Up @@ -84,6 +94,18 @@ public void blobTransactionEncodingDecodingTest(final TypedTransactionBytesArgum
assertThat(transaction.getSize()).isEqualTo(bytes.size());
}

@ParameterizedTest(name = "{index} {0}")
@MethodSource("provideOpaqueBytesWithEmptyToField")
public void givenEmptyToField_whenDecoding_shouldThrowException(
final TypedTransactionBytesArgument argument) {
Bytes bytes = argument.bytes;
// Decode the transaction from the wire using the TransactionDecoder.
// expect an exception to be thrown since the to field is empty
assertThatThrownBy(
() -> TransactionDecoder.decodeOpaqueBytes(bytes, EncodingContext.BLOCK_BODY))
.isInstanceOf(RLPException.class);
}

private static Arguments createArgumentFromFile(final String path) throws IOException {
StringBuilder contentBuilder = new StringBuilder();

Expand Down
Loading