update according to reviews

Author: noel2004

common/types/message/message.go

@@ -94,8 +94,7 @@ func (e *Byte48) UnmarshalJSON(input []byte) error {
 type BatchTaskDetail struct {
 	Version uint8 `json:"version"`
 	// use one of the string of "euclidv1" / "euclidv2"
-	ForkName string `json:"fork_name"`
-	//	ChunkInfos    []*ChunkInfo        `json:"chunk_infos"`
+	ForkName      string              `json:"fork_name"`
 	ChunkProofs   []*OpenVMChunkProof `json:"chunk_proofs"`
 	BatchHeader   interface{}         `json:"batch_header"`
 	BlobBytes     []byte              `json:"blob_bytes"`

coordinator/internal/logic/provertask/batch_prover_task.go

@@ -264,22 +264,6 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove
 			return nil, fmt.Errorf("Chunk.GetProofsByBatchHash unmarshal proof error: %w, batch hash: %v, chunk hash: %v", encodeErr, task.TaskID, chunk.Hash)
 		}
 		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),
-		// 	PrevMsgQueueHash:   common.HexToHash(chunk.PrevL1MessageQueueHash),
-		// 	PostMsgQueueHash:   common.HexToHash(chunk.PostL1MessageQueueHash),
-		// 	IsPadding:          false,
-		// 	InitialBlockNumber: proof.MetaData.ChunkInfo.InitialBlockNumber,
-		// 	BlockCtxs:          proof.MetaData.ChunkInfo.BlockCtxs,
-		// 	TxDataLength:       proof.MetaData.ChunkInfo.TxDataLength,
-		// 	EncryptionKey:      proof.MetaData.ChunkInfo.EncryptionKey,
-		// }
-		// chunkInfos = append(chunkInfos, &chunkInfo)
 	}
 
 	taskDetail, err := bp.getBatchTaskDetail(batch, chunkProofs, hardForkName)

crates/libzkp/src/lib.rs

@@ -18,8 +18,6 @@ pub(crate) fn witness_use_legacy_mode() -> bool {
     unsafe { LEGACY_WITNESS_ENCODING }
 }
 
-pub const VALIDIUM_VERSION: u8 = 0b01000001;
-
 pub fn set_dynamic_feature(feats: &str) {
     for feat_s in feats.split(':') {
         match feat_s.trim().to_lowercase().as_str() {

crates/libzkp/src/tasks/batch.rs

@@ -38,6 +38,16 @@ pub enum BatchHeaderV {
     V7_8(BatchHeaderV7),
 }
 
+impl core::fmt::Display for BatchHeaderV {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match self {
+            BatchHeaderV::V6(_) => write!(f, "V6"),
+            BatchHeaderV::V7_8(_) => write!(f, "V7_8"),
+            BatchHeaderV::Validium(_) => write!(f, "Validium"),
+        }
+    }
+}
+
 impl BatchHeaderV {
     pub fn batch_hash(&self) -> B256 {
         match self {
@@ -50,28 +60,28 @@ impl BatchHeaderV {
     pub fn must_v6_header(&self) -> &BatchHeaderV6 {
         match self {
             BatchHeaderV::V6(h) => h,
-            _ => panic!("try to pick other header type"),
+            _ => unreachable!("A header of {} is considered to be v6", self),
         }
     }
 
     pub fn must_v7_header(&self) -> &BatchHeaderV7 {
         match self {
             BatchHeaderV::V7_8(h) => h,
-            _ => panic!("try to pick other header type"),
+            _ => unreachable!("A header of {} is considered to be v7", self),
         }
     }
 
     pub fn must_v8_header(&self) -> &BatchHeaderV8 {
         match self {
             BatchHeaderV::V7_8(h) => h,
-            _ => panic!("try to pick other header type"),
+            _ => unreachable!("A header of {} is considered to be v8", self),
         }
     }
 
     pub fn must_validium_header(&self) -> &BatchHeaderValidium {
         match self {
             BatchHeaderV::Validium(h) => &h.header,
-            _ => panic!("try to pick other header type"),
+            _ => unreachable!("A header of {} is considered to be validium", self),
         }
     }
 }