fix bug in txWrapDataMax value (ethereum#90)

imapp-pl · Jan 13, 2023 · 4a0b0e1 · 4a0b0e1
1 parent 4c3a671
commit 4a0b0e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
@@ -53,9 +53,9 @@ const (
  // to validate whether they fit into the pool or not.
  txMaxSize = 4 * txSlotSize // 128KB
 
- // txWrapDataMax is the maximum size for the additional wrapper data,
- // enough to encode a blob-transaction wrapper data (48 bytes for commitment, 4 for offset, 48 for a commitment)
- txWrapDataMax = 4 + 4 + params.MaxBlobsPerBlock*(params.FieldElementsPerBlob*32+48)
+ // txWrapDataMax is the maximum size of an ssz encoded BlobTxWrapData (2 4-byte offsets + the
+ // raw data for each blob, each kzg commitment, and the aggregated commitment)
+ txWrapDataMax = 4 + 4 + params.MaxBlobsPerBlock*(params.FieldElementsPerBlob*32+48) + 48
 )
 
 var (

diff --git a/core/types/data_blob.go b/core/types/data_blob.go
@@ -315,8 +315,9 @@ type BlobTxWrapData struct {
  KzgAggregatedProof KZGProof
 }
 
+// sizeWrapData returns the size in bytes of the ssz-encoded BlobTxWrapData
 func (b *BlobTxWrapData) sizeWrapData() common.StorageSize {
- return common.StorageSize(4 + 4 + b.BlobKzgs.ByteLength() + b.Blobs.ByteLength() + b.KzgAggregatedProof.ByteLength())
+ return common.StorageSize(codec.ContainerLength(&b.BlobKzgs, &b.Blobs, &b.KzgAggregatedProof))
 }
 
 // validateBlobTransactionWrapper implements validate_blob_transaction_wrapper from EIP-4844