Skip to content

Enforce that blob_versioned_hashes field len matches number of blobs #10278

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
fab-10 merged 2 commits into from
Apr 21, 2026
Merged

Enforce that blob_versioned_hashes field len matches number of blobs #10278

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
f749f16
Enforce that blob_versioned_hashes match blobs
fab-10 Apr 20, 2026
8e5a79a
Merge branch 'main' into enforce-blob-versioned-hashes-match-blobs
macfarla Apr 21, 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
18 changes: 18 additions & 0 deletions ...yperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_emptyVersionedHashes.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 0 additions & 8 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 @@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static org.hyperledger.besu.crypto.Hash.keccak256;
import static org.hyperledger.besu.datatypes.VersionedHash.SHA256_VERSION_ID;

import org.hyperledger.besu.crypto.KeyPair;
import org.hyperledger.besu.crypto.SECPPublicKey;
Expand All @@ -30,7 +29,6 @@
import org.hyperledger.besu.datatypes.BytesHolder;
import org.hyperledger.besu.datatypes.CodeDelegation;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.datatypes.Sha256Hash;
import org.hyperledger.besu.datatypes.TransactionType;
import org.hyperledger.besu.datatypes.VersionedHash;
import org.hyperledger.besu.datatypes.Wei;
Expand Down Expand Up @@ -1540,12 +1538,6 @@ public Builder kzgBlobs(
final List<KZGCommitment> kzgCommitments,
final List<Blob> blobs,
final List<KZGProof> kzgProofs) {
if (this.versionedHashes == null || this.versionedHashes.isEmpty()) {
this.versionedHashes =
kzgCommitments.stream()
.map(c -> new VersionedHash(SHA256_VERSION_ID, Sha256Hash.sha256(c.getData())))
.toList();
}
this.blobsWithCommitments =
new BlobsWithCommitments(blobType, kzgCommitments, blobs, kzgProofs, versionedHashes);
return this;
Expand Down
2 changes: 2 additions & 0 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/kzg/BlobsWithCommitments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package org.hyperledger.besu.ethereum.core.kzg;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.hyperledger.besu.datatypes.BlobType.KZG_PROOF;
import static org.hyperledger.besu.ethereum.core.kzg.CKZG4844Helper.CELL_PROOFS_PER_BLOB;

Expand Down Expand Up @@ -108,6 +109,7 @@ private static void validateInputParameters(
final List<Blob> blobs,
final List<KZGProof> kzgProofs,
final List<VersionedHash> versionedHashes) {
checkNotNull(versionedHashes, "versionedHashes must be set before calling kzgBlobs()");
int blobCount = blobs.size();
int expectedProofs = blobType == KZG_PROOF ? blobCount : CELL_PROOFS_PER_BLOB * blobCount;
checkArgument(
Expand Down
13 changes: 12 additions & 1 deletion ...core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.hyperledger.besu.datatypes.AccessListEntry;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.datatypes.Sha256Hash;
import org.hyperledger.besu.datatypes.TransactionType;
import org.hyperledger.besu.datatypes.VersionedHash;
import org.hyperledger.besu.datatypes.Wei;
Expand Down Expand Up @@ -99,13 +100,23 @@ public Transaction createTransaction(final KeyPair keys) {
builder.maxFeePerGas(maxFeePerGas.orElse(Wei.of(5000)));
builder.accessList(accessListEntries.orElse(List.of()));
builder.maxFeePerBlobGas(maxFeePerBlobGas.orElse(Wei.ONE));
versionedHashes.ifPresent(builder::versionedHashes);
if (blobs.isPresent()) {
if (versionedHashes.isEmpty()) {
builder.versionedHashes(
blobs.get().getKzgCommitments().stream()
.map(
c ->
new VersionedHash(
VersionedHash.SHA256_VERSION_ID, Sha256Hash.sha256(c.getData())))
.toList());
}
Comment thread
fab-10 marked this conversation as resolved.
builder.kzgBlobs(
blobs.get().getBlobType(),
blobs.get().getKzgCommitments(),
blobs.get().getBlobs(),
blobs.get().getKzgProofs());
} else versionedHashes.ifPresent(builder::versionedHashes);
}
break;
case DELEGATE_CODE:
builder.maxPriorityFeePerGas(maxPriorityFeePerGas.orElse(Wei.of(500)));
Expand Down
Loading