add NewDABatchFromParams

scroll-tech · Jan 22, 2025 · 9117170 · 9117170
1 parent 8c2a5cc
commit 9117170
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/encoding/codecv0.go b/encoding/codecv0.go
@@ -223,6 +223,10 @@ func (d *DACodecV0) NewDABatchFromBytes(data []byte) (DABatch, error) {
 	), nil
 }
 
+func (d *DACodecV0) NewDABatchFromParams(_ uint64, _, _ common.Hash) (DABatch, error) {
+	return nil, nil
+}
+
 // EstimateBlockL1CommitCalldataSize calculates the calldata size in l1 commit for this block approximately.
 func (d *DACodecV0) EstimateBlockL1CommitCalldataSize(b *Block) (uint64, error) {
 	var size uint64

diff --git a/encoding/codecv7.go b/encoding/codecv7.go
@@ -80,7 +80,7 @@ func (d *DACodecV7) NewDABatch(batch *Batch) (DABatch, error) {
 		return nil, fmt.Errorf("failed to construct blob: %w", err)
 	}
 
-	daBatch, err := newDABatchV7(CodecV7, batch.Index, batch.ParentBatchHash, blobVersionedHash, blob, blobBytes)
+	daBatch, err := newDABatchV7(CodecV7, batch.Index, blobVersionedHash, batch.ParentBatchHash, blob, blobBytes)
 	if err != nil {
 		return nil, fmt.Errorf("failed to construct DABatch: %w", err)
 	}
@@ -170,6 +170,10 @@ func (d *DACodecV7) NewDABatchFromBytes(data []byte) (DABatch, error) {
 	return daBatch, nil
 }
 
+func (d *DACodecV7) NewDABatchFromParams(batchIndex uint64, blobVersionedHash, parentBatchHash common.Hash) (DABatch, error) {
+	return newDABatchV7(CodecV7, batchIndex, blobVersionedHash, parentBatchHash, nil, nil)
+}
+
 func (d *DACodecV7) DecodeDAChunksRawTx(_ [][]byte) ([]*DAChunkRawTx, error) {
 	return nil, nil
 }

diff --git a/encoding/codecv7_types.go b/encoding/codecv7_types.go
@@ -50,20 +50,20 @@ const (
 type daBatchV7 struct {
 	version           CodecVersion
 	batchIndex        uint64
-	parentBatchHash   common.Hash
 	blobVersionedHash common.Hash
+	parentBatchHash   common.Hash
 
 	blob      *kzg4844.Blob
 	blobBytes []byte
 }
 
 // newDABatchV7 is a constructor for daBatchV7 that calls blobDataProofForPICircuit internally.
-func newDABatchV7(version CodecVersion, batchIndex uint64, parentBatchHash, blobVersionedHash common.Hash, blob *kzg4844.Blob, blobBytes []byte) (*daBatchV7, error) {
+func newDABatchV7(version CodecVersion, batchIndex uint64, blobVersionedHash, parentBatchHash common.Hash, blob *kzg4844.Blob, blobBytes []byte) (*daBatchV7, error) {
 	daBatch := &daBatchV7{
 		version:           version,
 		batchIndex:        batchIndex,
-		parentBatchHash:   parentBatchHash,
 		blobVersionedHash: blobVersionedHash,
+		parentBatchHash:   parentBatchHash,
 		blob:              blob,
 		blobBytes:         blobBytes,
 	}
@@ -81,7 +81,7 @@ func decodeDABatchV7(data []byte) (*daBatchV7, error) {
 	blobVersionedHash := common.BytesToHash(data[daBatchV7OffsetBlobVersionedHash:daBatchV7OffsetParentBatchHash])
 	parentBatchHash := common.BytesToHash(data[daBatchV7OffsetParentBatchHash:daBatchV7EncodedLength])
 
-	return newDABatchV7(version, batchIndex, parentBatchHash, blobVersionedHash, nil, nil)
+	return newDABatchV7(version, batchIndex, blobVersionedHash, parentBatchHash, nil, nil)
 }
 
 // Encode serializes the DABatchV3 into bytes.

diff --git a/encoding/interfaces.go b/encoding/interfaces.go
@@ -49,6 +49,7 @@ type Codec interface {
 	NewDAChunk(*Chunk, uint64) (DAChunk, error)
 	NewDABatch(*Batch) (DABatch, error)
 	NewDABatchFromBytes([]byte) (DABatch, error)
+	NewDABatchFromParams(batchIndex uint64, blobVersionedHash, parentBatchHash common.Hash) (DABatch, error)
 
 	DecodeDAChunksRawTx(chunkBytes [][]byte) ([]*DAChunkRawTx, error)
 	DecodeTxsFromBlob(blob *kzg4844.Blob, chunks []*DAChunkRawTx) error