added BlobGasUsed in NewFrag and Seal

Author: BrycePy

op-node/rollup/engine/preconf.go

@@ -49,7 +49,7 @@ func NewPreconfChannels() PreconfChannels {
 		EnvCh:     make(chan *eth.SignedEnv),
 		NewFragCh: make(chan *eth.SignedNewFrag),
 		SealCh:    make(chan *eth.SignedSeal),
-		l2BlockCh: make(chan *eth.L2BlockRef),
+		l2BlockCh: make(chan *eth.L2BlockRef, 10),
 	}
 }
 

op-service/eth/ssz.go

@@ -522,8 +522,8 @@ func (envelope *ExecutionPayloadEnvelope) MarshalSSZ(w io.Writer) (n int, err er
 	return hashSize + payloadSize, nil
 }
 
-// block number, squence number, is_last, txs offset, version.
-const NewFragFixedSize = 8 + 8 + 1 + 4 + 8
+// block number, squence number, is_last, txs offset, version + blob gas used.
+const NewFragFixedSize = 8 + 8 + 1 + 4 + 8 + 8
 
 // UnmarshalSSZ decodes the NewFrag as SSZ type
 func (newFrag *NewFrag) UnmarshalSSZ(scope uint32, r io.Reader) error {
@@ -574,7 +574,7 @@ func (signedNewFrag *SignedNewFrag) MarshalSSZ(w io.Writer) error {
 	return nil
 }
 
-func (s *Seal) SizeSSZ(siz *ssz.Sizer) uint32 { return 32*4 + 8*4 }
+func (s *Seal) SizeSSZ(siz *ssz.Sizer) uint32 { return 32*4 + 8*4 + 8 }
 
 func (s *Seal) DefineSSZ(codec *ssz.Codec) {
 	ssz.DefineUint64(codec, &s.TotalFrags)
@@ -586,11 +586,12 @@ func (s *Seal) DefineSSZ(codec *ssz.Codec) {
 	ssz.DefineStaticBytes(codec, &s.ReceiptsRoot)
 	ssz.DefineStaticBytes(codec, &s.StateRoot)
 	ssz.DefineStaticBytes(codec, &s.BlockHash)
+	ssz.DefineUint64(codec, &s.BlobGasUsed)
 }
 
 func (f *NewFrag) SizeSSZ(siz *ssz.Sizer, fixed bool) uint32 {
-	// fixed size, 2 uint64 + 1 bool + 1 offset
-	size := uint32(8*2 + 1 + 4)
+	// Fixed size: BlockNumber(8) + Seq(8) + IsLast(1) + TxsOffset(4) + BlobGasUsed(8)
+	size := uint32(8*2 + 1 + 4 + 8)
 	if fixed {
 		return size
 	}
@@ -608,9 +609,10 @@ func (f *NewFrag) DefineSSZ(codec *ssz.Codec) {
 	ssz.DefineUint64(codec, &f.BlockNumber)
 	ssz.DefineUint64(codec, &f.Seq)
 	ssz.DefineBool(codec, &f.IsLast)
-	ssz.DefineSliceOfDynamicBytesOffset(codec, &f.Txs, MaxTxAmount, MaxTxsSize)
+	ssz.DefineUint64(codec, &f.BlobGasUsed)
 
 	// Variable size section
+	ssz.DefineSliceOfDynamicBytesOffset(codec, &f.Txs, MaxTxAmount, MaxTxsSize)
 	ssz.DefineSliceOfDynamicBytesContent(codec, &f.Txs, MaxTxAmount, MaxTxsSize)
 }
 

op-service/eth/types.go

@@ -246,6 +246,7 @@ type NewFrag struct {
 	BlockNumber uint64   `ssz-size:"8"`
 	Seq         uint64   `ssz-size:"8"`
 	IsLast      bool     `ssz-size:"1"`
+	BlobGasUsed uint64   `ssz-size:"8"`
 	Txs         [][]byte `ssz-max:"1048576,1073741824"`
 }
 
@@ -254,6 +255,7 @@ func (f *NewFrag) UnmarshalJSON(data []byte) error {
 		BlockNumber uint64          `json:"blockNumber"`
 		Seq         uint64          `json:"seq"`
 		IsLast      bool            `json:"isLast"`
+		BlobGasUsed uint64          `json:"blobGasUsed"`
 		Txs         []hexutil.Bytes `json:"txs"`
 	}
 
@@ -265,6 +267,7 @@ func (f *NewFrag) UnmarshalJSON(data []byte) error {
 	f.BlockNumber = frag.BlockNumber
 	f.Seq = frag.Seq
 	f.IsLast = frag.IsLast
+	f.BlobGasUsed = frag.BlobGasUsed
 	f.Txs = make([][]byte, len(frag.Txs))
 	for i, tx := range frag.Txs {
 		f.Txs[i] = tx
@@ -283,11 +286,13 @@ func (f *NewFrag) MarshalJSON() ([]byte, error) {
 		BlockNumber uint64          `json:"blockNumber"`
 		Seq         uint64          `json:"seq"`
 		IsLast      bool            `json:"isLast"`
+		BlobGasUsed uint64          `json:"blobGasUsed"`
 		Txs         []hexutil.Bytes `json:"txs"`
 	}{
 		BlockNumber: f.BlockNumber,
 		Seq:         f.Seq,
 		IsLast:      f.IsLast,
+		BlobGasUsed: f.BlobGasUsed,
 		Txs:         txs,
 	})
 }
@@ -308,6 +313,7 @@ type Seal struct {
 	ReceiptsRoot     Bytes32 `json:"receiptsRoot" ssz-size:"32"`
 	StateRoot        Bytes32 `json:"stateRoot" ssz-size:"32"`
 	BlockHash        Bytes32 `json:"blockHash" ssz-size:"32"`
+	BlobGasUsed      uint64  `json:"blobGasUsed" ssz-size:"8"`
 }
 
 type SignedEnv struct {