forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-24 08:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/txpool/blobpool: change encodeForNetwork according to the BlobTxForPool type change

Browse source
This commit is contained in:
healthykim 2026-05-20 23:03:05 +02:00
parent db0fe7eec4
commit feff09edc5
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/txpool/blobpool/blobpool.go
View file

@ -257,7 +257,7 @@ func newBlobTxForPool(tx *types.Transaction) (*BlobTxForPool, error) {
// encodeForNetwork transforms stored BlobTxForPool RLP into the network // encodeForNetwork transforms stored BlobTxForPool RLP into the network
// transaction encoding for the given eth protocol version. Used for getRLP. // transaction encoding for the given eth protocol version. Used for getRLP.
// //
// Stored RLP: [type_byte || tx_fields, version, [comms], [proofs], [cells], custody] // Stored RLP: [type_byte || tx_fields, [version, [cells], [comms], [proofs], custody]]
// //
// eth/69, eth/70: [blobs] is recovered from stored cells via kzg. // eth/69, eth/70: [blobs] is recovered from stored cells via kzg.
// //
@ -274,8 +274,8 @@ func encodeForNetwork(storedRLP []byte, version uint) ([]byte, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid BlobTxForPool RLP: %w", err) return nil, fmt.Errorf("invalid BlobTxForPool RLP: %w", err)
} }
if len(elems) < 6 { if len(elems) < 2 {
return nil, fmt.Errorf("BlobTxForPool has %d elements, need at least 6", len(elems)) return nil, fmt.Errorf("BlobTxForPool has %d elements, need at least 2", len(elems))
} }
// 1. Extract tx byte and other tx fields // 1. Extract tx byte and other tx fields
@ -289,18 +289,27 @@ func encodeForNetwork(storedRLP []byte, version uint) ([]byte, error) {
typeByte := txBytes[0] typeByte := txBytes[0]
txRLP := txBytes[1:] txRLP := txBytes[1:]
// 2. Find the version of sidecar. // 2. Split the nested CellSidecar list.
sidecarVersion, _, err := rlp.SplitUint64(elems[1]) sidecarElems, err := rlp.SplitListValues(elems[1])
if err != nil {
return nil, fmt.Errorf("invalid CellSidecar RLP: %w", err)
}
if len(sidecarElems) < 5 {
return nil, fmt.Errorf("CellSidecar has %d elements, need at least 5", len(sidecarElems))
}
// 3. Find the version of sidecar.
sidecarVersion, _, err := rlp.SplitUint64(sidecarElems[0])
if err != nil || sidecarVersion > 255 { if err != nil || sidecarVersion > 255 {
return nil, fmt.Errorf("invalid version: %w", err) return nil, fmt.Errorf("invalid version: %w", err)
} }
sidecarVersionByte := byte(sidecarVersion) sidecarVersionByte := byte(sidecarVersion)
// 3. Extract sidecar elements. // 4. Extract sidecar elements.
commitmentsRLP := elems[2] commitmentsRLP := sidecarElems[2]
proofsRLP := elems[3] proofsRLP := sidecarElems[3]
// 4. Build the [blobs] field for the wire format. // 5. Build the [blobs] field for the wire format.
var blobsField []byte var blobsField []byte
// todo: should we use eth.ETH72 here // todo: should we use eth.ETH72 here
if version >= 72 { if version >= 72 {
@ -309,11 +318,11 @@ func encodeForNetwork(storedRLP []byte, version uint) ([]byte, error) {
} else { } else {
// eth/69, eth/70 need actual blobs: recover them from stored cells. // eth/69, eth/70 need actual blobs: recover them from stored cells.
var cells []kzg4844.Cell var cells []kzg4844.Cell
if err := rlp.DecodeBytes(elems[4], &cells); err != nil { if err := rlp.DecodeBytes(sidecarElems[1], &cells); err != nil {
return nil, fmt.Errorf("invalid cells RLP: %w", err) return nil, fmt.Errorf("invalid cells RLP: %w", err)
} }
var custody types.CustodyBitmap var custody types.CustodyBitmap
if err := rlp.DecodeBytes(elems[5], &custody); err != nil { if err := rlp.DecodeBytes(sidecarElems[4], &custody); err != nil {
return nil, fmt.Errorf("invalid custody RLP: %w", err) return nil, fmt.Errorf("invalid custody RLP: %w", err)
} }
blobs, err := kzg4844.RecoverBlobs(cells, custody.Indices()) blobs, err := kzg4844.RecoverBlobs(cells, custody.Indices())
@ -326,12 +335,12 @@ func encodeForNetwork(storedRLP []byte, version uint) ([]byte, error) {
} }
} }
// 5. Reconstruct into the network format. // 6. Reconstruct into the network format.
var outer [][]byte var outer [][]byte
if sidecarVersionByte == types.BlobSidecarVersion0 { if sidecarVersionByte == types.BlobSidecarVersion0 {
outer = [][]byte{txRLP, blobsField, commitmentsRLP, proofsRLP} outer = [][]byte{txRLP, blobsField, commitmentsRLP, proofsRLP}
} else { } else {
outer = [][]byte{txRLP, elems[1], blobsField, commitmentsRLP, proofsRLP} outer = [][]byte{txRLP, sidecarElems[0], blobsField, commitmentsRLP, proofsRLP}
} }
body, err := rlp.MergeListValues(outer) body, err := rlp.MergeListValues(outer)
if err != nil { if err != nil {