forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: fix tx size calculation (#35406)
Some checks are pending
/ Linux Build (push) Waiting to run
Details
/ Linux Build (arm) (push) Waiting to run
Details
/ Keeper Build (push) Waiting to run
Details
/ Windows Build (push) Waiting to run
Details
/ Docker Image (push) Waiting to run
Details

Browse source 
This PR fixes the incorrect size calculation for blob sidecar. The
original formula is for legacy sidecar without the version tag. As the
legacy version has been deprecated and no longer supported by the Geth's
blobPool, the size calculation should also be flipped to sidecar v1.
This commit is contained in:
rjl493456442 2026-07-24 16:50:20 +08:00 committed by GitHub
parent cd65ccad96
commit ca1f2e4d38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,8 +171,11 @@ func (ptx *BlobTxForPool) sidecar() (*types.BlobTxSidecar, error) {
return types.NewBlobTxSidecar(sidecar.Version, blobs, sidecar.Commitments, sidecar.Proofs), nil return types.NewBlobTxSidecar(sidecar.Version, blobs, sidecar.Commitments, sidecar.Proofs), nil
} }
// TxSize returns the transaction size on the network without // txSize returns the network size of the transaction without reconstructing it.
// reconstructing the transaction. //
// The blobpool only holds v1 (cell-proof) sidecars: legacy v0 sidecars are no longer
// accepted into the pool, nor served over the wire protocol. The size therefore assumes
// the v1 wire form [tx, version, blobs, commitments, proofs].
func (ptx *BlobTxForPool) txSize() uint64 { func (ptx *BlobTxForPool) txSize() uint64 {
sidecar := ptx.CellSidecar sidecar := ptx.CellSidecar
@ -185,9 +188,17 @@ func (ptx *BlobTxForPool) txSize() uint64 {
} }
var blob kzg4844.Blob var blob kzg4844.Blob
blobs := uint64(len(sidecar.Commitments)) * rlp.BytesSize(blob[:]) blobs := uint64(len(sidecar.Commitments)) * rlp.BytesSize(blob[:])
return ptx.Tx.Size() + rlp.ListSize(rlp.ListSize(blobs)+rlp.ListSize(commitments)+rlp.ListSize(proofs))
version := uint64(rlp.IntSize(uint64(sidecar.Version)))
return ptx.Tx.Size() + rlp.ListSize(version+rlp.ListSize(blobs)+rlp.ListSize(commitments)+rlp.ListSize(proofs))
} }
// txSizeWithoutBlob returns the eth/72 network size, where the blob payload is dropped
// to an empty list and fetched separately via GetCells.
//
// Like txSize, this assumes the v1 wire form: only v1 sidecars live in the pool (v0 is
// no longer accepted or served), so the version byte is always present, only the blob
// payload becomes an empty list [tx, version, [], commitments, proofs].
func (ptx *BlobTxForPool) txSizeWithoutBlob() uint64 { func (ptx *BlobTxForPool) txSizeWithoutBlob() uint64 {
sidecar := ptx.CellSidecar sidecar := ptx.CellSidecar
@ -198,7 +209,8 @@ func (ptx *BlobTxForPool) txSizeWithoutBlob() uint64 {
for i := range sidecar.Proofs { for i := range sidecar.Proofs {
proofs += rlp.BytesSize(sidecar.Proofs[i][:]) proofs += rlp.BytesSize(sidecar.Proofs[i][:])
} }
return ptx.Tx.Size() + rlp.ListSize(rlp.ListSize(0)+rlp.ListSize(commitments)+rlp.ListSize(proofs)) version := uint64(rlp.IntSize(uint64(sidecar.Version)))
return ptx.Tx.Size() + rlp.ListSize(version+rlp.ListSize(0)+rlp.ListSize(commitments)+rlp.ListSize(proofs))
} }
// ToTx reconstructs a full Transaction with the sidecar attached. // ToTx reconstructs a full Transaction with the sidecar attached.

6
core/types/tx_blob.go
View file

@ -144,7 +144,11 @@ func (sc *BlobTxSidecar) encodedSize() uint64 {
for i := range sc.Proofs { for i := range sc.Proofs {
proofs += rlp.BytesSize(sc.Proofs[i][:]) proofs += rlp.BytesSize(sc.Proofs[i][:])
} }
return rlp.ListSize(blobs) + rlp.ListSize(commitments) + rlp.ListSize(proofs) size := rlp.ListSize(blobs) + rlp.ListSize(commitments) + rlp.ListSize(proofs)
if sc.Version != BlobSidecarVersion0 {
size += uint64(rlp.IntSize(uint64(sc.Version)))
}
return size
} }
// ValidateBlobCommitmentHashes checks whether the given hashes correspond to the // ValidateBlobCommitmentHashes checks whether the given hashes correspond to the