fix issues in e2e

Author: noel2004

coordinator/internal/logic/provertask/prover_task.go

@@ -206,9 +206,13 @@ func (b *BaseProverTask) applyUniversal(schema *coordinatorType.GetTaskSchema) (
 		return nil, nil, fmt.Errorf("no expectedVk found from hardfork %s", schema.HardForkName)
 	}
 
-	decryptionKey, err := hex.DecodeString(b.cfg.Sequencer.DecryptionKey)
-	if err != nil {
-		return nil, nil, fmt.Errorf("sequencer decryption key hex-decoding failed")
+	var decryptionKey []byte
+	if b.cfg.L2.ValidiumMode {
+		var err error
+		decryptionKey, err = hex.DecodeString(b.cfg.Sequencer.DecryptionKey)
+		if err != nil {
+			return nil, nil, fmt.Errorf("sequencer decryption key hex-decoding failed")
+		}
 	}
 
 	ok, uTaskData, metadata, _ := libzkp.GenerateUniversalTask(schema.TaskType, schema.TaskData, schema.HardForkName, expectedVk, decryptionKey)

crates/libzkp/src/tasks.rs

@@ -10,7 +10,7 @@ pub use chunk_interpreter::ChunkInterpreter;
 pub use scroll_zkvm_types::task::ProvingTask;
 
 use crate::{
-    proofs::{self, BatchProofMetadata, BundleProofMetadata, ChunkProofMetadata},
+    proofs::{BatchProofMetadata, BundleProofMetadata, ChunkProofMetadata},
     utils::panic_catch,
 };
 use sbv_primitives::B256;
@@ -21,21 +21,17 @@ fn encode_task_to_witness<T: serde::Serialize>(task: &T) -> eyre::Result<Vec<u8>
     Ok(bincode::serde::encode_to_vec(task, config)?)
 }
 
-fn check_aggregation_proofs<Metadata>(
-    proofs: &[proofs::WrappedProof<Metadata>],
+fn check_aggregation_proofs<Metadata: MultiVersionPublicInputs>(
+    metadata: &[Metadata],
     version: Version,
 ) -> eyre::Result<()>
-where
-    Metadata: proofs::ProofMetadata,
 {
     panic_catch(|| {
-        for w in proofs.windows(2) {
-            w[1].metadata
-                .pi_hash_info()
-                .validate(w[0].metadata.pi_hash_info(), version);
+        for w in metadata.windows(2) {
+            w[1].validate(&w[0], version);
         }
     })
-    .map_err(|e| eyre::eyre!("Chunk data validation failed: {}", e))?;
+    .map_err(|e| eyre::eyre!("Metadata validation failed: {}", e))?;
 
     Ok(())
 }

crates/libzkp/src/tasks/batch.rs

@@ -255,7 +255,7 @@ impl BatchProvingTask {
         // 2. validate every adjacent proof pair
         let witness = self.build_guest_input();
         let metadata = BatchInfo::from(&witness);
-        super::check_aggregation_proofs(self.chunk_proofs.as_slice(), Version::from(self.version))?;
+        super::check_aggregation_proofs(witness.chunk_infos.as_slice(), Version::from(self.version))?;
 
         Ok(metadata)
     }

crates/libzkp/src/tasks/bundle.rs

@@ -63,7 +63,7 @@ impl BundleProvingTask {
         // 2. validate every adjacent proof pair
         let witness = self.build_guest_input();
         let metadata = BundleInfo::from(&witness);
-        super::check_aggregation_proofs(self.batch_proofs.as_slice(), Version::from(self.version))?;
+        super::check_aggregation_proofs(witness.batch_infos.as_slice(), Version::from(self.version))?;
 
         Ok(metadata)
     }