update batch/chunk details for phase2

Author: omerfirmak

common/types/message/message.go

@@ -46,10 +46,13 @@ type ChunkTaskDetail struct {
 
 // BatchTaskDetail is a type containing BatchTask detail.
 type BatchTaskDetail struct {
-	ChunkInfos  []*ChunkInfo `json:"chunk_infos"`
-	ChunkProofs []ChunkProof `json:"chunk_proofs"`
-	BatchHeader interface{}  `json:"batch_header"`
-	BlobBytes   []byte       `json:"blob_bytes"`
+	ChunkInfos    []*ChunkInfo `json:"chunk_infos"`
+	ChunkProofs   []ChunkProof `json:"chunk_proofs"`
+	BatchHeader   interface{}  `json:"batch_header"`
+	BlobBytes     []byte       `json:"blob_bytes"`
+	KzgProof      []byte       `json:"kzg_proof"`
+	KzgCommitment []byte       `json:"kzg_commitment"`
+	Challenge     common.Hash  `json:"challenge"`
 }
 
 // BundleTaskDetail consists of all the information required to describe the task to generate a proof for a bundle of batches.
@@ -59,14 +62,15 @@ type BundleTaskDetail struct {
 
 // ChunkInfo is for calculating pi_hash for chunk
 type ChunkInfo struct {
-	ChainID       uint64      `json:"chain_id"`
-	PrevStateRoot common.Hash `json:"prev_state_root"`
-	PostStateRoot common.Hash `json:"post_state_root"`
-	WithdrawRoot  common.Hash `json:"withdraw_root"`
-	DataHash      common.Hash `json:"data_hash"`
-	IsPadding     bool        `json:"is_padding"`
-	TxBytes       []byte      `json:"tx_bytes"`
-	TxBytesHash   common.Hash `json:"tx_data_digest"`
+	ChainID          uint64      `json:"chain_id"`
+	PrevStateRoot    common.Hash `json:"prev_state_root"`
+	PostStateRoot    common.Hash `json:"post_state_root"`
+	WithdrawRoot     common.Hash `json:"withdraw_root"`
+	DataHash         common.Hash `json:"data_hash"`
+	IsPadding        bool        `json:"is_padding"`
+	TxBytes          []byte      `json:"tx_bytes"`
+	TxBytesHash      common.Hash `json:"tx_data_digest"`
+	PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"`
 }
 
 // SubCircuitRowUsage tracing info added in v0.11.0rc8

coordinator/internal/logic/provertask/batch_prover_task.go

@@ -225,12 +225,13 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove
 		chunkProofs = append(chunkProofs, proof)
 
 		chunkInfo := message.ChunkInfo{
-			ChainID:       bp.cfg.L2.ChainID,
-			PrevStateRoot: common.HexToHash(chunk.ParentChunkStateRoot),
-			PostStateRoot: common.HexToHash(chunk.StateRoot),
-			WithdrawRoot:  common.HexToHash(chunk.WithdrawRoot),
-			DataHash:      common.HexToHash(chunk.Hash),
-			IsPadding:     false,
+			ChainID:          bp.cfg.L2.ChainID,
+			PrevStateRoot:    common.HexToHash(chunk.ParentChunkStateRoot),
+			PostStateRoot:    common.HexToHash(chunk.StateRoot),
+			WithdrawRoot:     common.HexToHash(chunk.WithdrawRoot),
+			DataHash:         common.HexToHash(chunk.Hash),
+			PrevMsgQueueHash: common.HexToHash(chunk.PrevL1MessageQueueHash),
+			IsPadding:        false,
 		}
 		if haloProot, ok := proof.(*message.Halo2ChunkProof); ok {
 			if haloProot.ChunkInfo != nil {
@@ -290,6 +291,8 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []*
 	}
 	taskDetail.BatchHeader = batchHeader
 	taskDetail.BlobBytes = dbBatch.BlobBytes
-
+	taskDetail.KzgProof = dbBatch.BlobDataProof[112:160]
+	taskDetail.KzgCommitment = dbBatch.BlobDataProof[64:112]
+	taskDetail.Challenge = common.Hash(dbBatch.BlobDataProof[0:32])
 	return taskDetail, nil
 }

coordinator/internal/orm/chunk.go

@@ -28,6 +28,8 @@ type Chunk struct {
 	StartBlockTime               uint64 `json:"start_block_time" gorm:"column:start_block_time"`
 	TotalL1MessagesPoppedBefore  uint64 `json:"total_l1_messages_popped_before" gorm:"column:total_l1_messages_popped_before"`
 	TotalL1MessagesPoppedInChunk uint64 `json:"total_l1_messages_popped_in_chunk" gorm:"column:total_l1_messages_popped_in_chunk"`
+	PrevL1MessageQueueHash       string `json:"prev_l1_message_queue_hash" gorm:"column:prev_l1_message_queue_hash"`
+	PostL1MessageQueueHash       string `json:"post_l1_message_queue_hash" gorm:"column:post_l1_message_queue_hash"`
 	ParentChunkHash              string `json:"parent_chunk_hash" gorm:"column:parent_chunk_hash"`
 	StateRoot                    string `json:"state_root" gorm:"column:state_root"`
 	ParentChunkStateRoot         string `json:"parent_chunk_state_root" gorm:"column:parent_chunk_state_root"`