Skip to content

core/types: enhance BlobTx decode to validate blob sidecar version #33030

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

Closed
wants to merge 1 commit into from
Closed

core/types: enhance BlobTx decode to validate blob sidecar version #33030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions core/types/tx_blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,14 @@ func (tx *BlobTx) decode(input []byte) error {
return err
}
var payload blobTxWithBlobs
var notV0 bool
if secondElemKind == rlp.List {
// No version byte: blob sidecar v0.
payload = new(blobTxWithBlobsV0)
} else {
// It has a version byte. Decode as v1, version is checked by assign()
payload = new(blobTxWithBlobsV1)
notV0 = true
}
if err := rlp.DecodeBytes(input, payload); err != nil {
return err
Expand All @@ -416,6 +418,9 @@ func (tx *BlobTx) decode(input []byte) error {
if err := payload.assign(sc); err != nil {
return err
}
if notV0 && sc.Version == BlobSidecarVersion0 {
Copy link
Member

@rjl493456442 rjl493456442 Oct 29, 2025

Choose a reason for hiding this comment

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

nitpick

diff --git a/core/types/tx_blob.go b/core/types/tx_blob.go
index bbfd3c98db..464e294218 100644
--- a/core/types/tx_blob.go
+++ b/core/types/tx_blob.go
@@ -401,13 +401,18 @@ func (tx *BlobTx) decode(input []byte) error {
 	if err != nil {
 		return err
 	}
-	var payload blobTxWithBlobs
+	var (
+		payload blobTxWithBlobs
+		version byte
+	)
 	if secondElemKind == rlp.List {
 		// No version byte: blob sidecar v0.
 		payload = new(blobTxWithBlobsV0)
+		version = BlobSidecarVersion0
 	} else {
 		// It has a version byte. Decode as v1, version is checked by assign()
 		payload = new(blobTxWithBlobsV1)
+		version = BlobSidecarVersion1
 	}
 	if err := rlp.DecodeBytes(input, payload); err != nil {
 		return err
@@ -416,6 +421,9 @@ func (tx *BlobTx) decode(input []byte) error {
 	if err := payload.assign(sc); err != nil {
 		return err
 	}
+	if sc.Version != version {
+		return fmt.Errorf("unexpected sidecar version, want: %d, got: %d", version, sc.Version)
+	}
 	*tx = *payload.tx()
 	tx.Sidecar = sc
 	return nil

return errors.New("invalid blob encoding structure for version 0")
}
*tx = *payload.tx()
tx.Sidecar = sc
return nil
Expand Down