Skip to content

Throw RLPException that is handled correctly instead of IllegalArgumentException #10025

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
pinges merged 7 commits into from
Mar 12, 2026
+21 −3
Merged

Throw RLPException that is handled correctly instead of IllegalArgumentException #10025

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1fff5b
throw RLPException that is handled correctly instead of IllegalArgume…
pinges Mar 11, 2026
f70f83c
Update ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/e…
pinges Mar 11, 2026
593f4a8
Merge branch 'main' of github.com:hyperledger/besu into transactionAn…
pinges Mar 11, 2026
2bb2860
fix spotless
pinges Mar 12, 2026
84b14c0
Merge branch 'main' of github.com:hyperledger/besu into transactionAn…
pinges Mar 12, 2026
0ccc9f3
Merge branch 'main' into transactionAnnouncementDecoder
pinges Mar 12, 2026
453897b
Merge branch 'main' into transactionAnnouncementDecoder
macfarla Mar 12, 2026
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: 1 addition & 2 deletions .../main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ private static List<TransactionAnnouncement> decodeForEth68(final RLPInput input
for (final byte b : bytes) {
final var transactionType =
TransactionType.fromEthSerializedType(b)
.orElseThrow(
() -> new IllegalArgumentException("Invalid transaction type %x".formatted(b)));
.orElseThrow(() -> new RLPException("Invalid transaction type 0x%02x".formatted(b)));
types.add(transactionType);
}

Expand Down
20 changes: 18 additions & 2 deletions ...ledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
import org.hyperledger.besu.ethereum.eth.transactions.NewPooledTransactionHashesMessageProcessor.FetcherCreatorTask;
import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
import org.hyperledger.besu.ethereum.rlp.RLP;
import org.hyperledger.besu.ethereum.rlp.RLPException;
import org.hyperledger.besu.metrics.StubMetricsSystem;
Expand Down Expand Up @@ -407,8 +408,8 @@ void shouldThrowRLPExceptionWhenTypeIsInvalid() {
() ->
TransactionAnnouncementDecoder.getDecoder(EthProtocol.ETH68)
.decode(RLP.input(invalidMessageBytes)))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("Invalid transaction type 7");
.isInstanceOf(RLPException.class)
.hasMessageContaining("Invalid transaction type 0x07");
}

@Test
Expand Down Expand Up @@ -449,4 +450,19 @@ void shouldThrowNullPointerIfArgumentsAreNull() {
.isInstanceOf(NullPointerException.class)
.hasMessage("Transaction cannot be null");
}

@Test
void shouldDisconnectPeerWhenInvalidTransactionType() {
final Bytes invalidMessageBytes =
Bytes.fromHexString(
// ["0x07",["0x00000002"],["0x881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351"]]
"0xe907c58400000002e1a0881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351");

final NewPooledTransactionHashesMessage message =
new NewPooledTransactionHashesMessage(invalidMessageBytes, EthProtocol.ETH68);

messageHandler.processNewPooledTransactionHashesMessage(peer1, message, now(), ofMinutes(1));

verify(peer1).disconnect(DisconnectReason.BREACH_OF_PROTOCOL_MALFORMED_MESSAGE_RECEIVED);
}
}