tweak logs

Author: colinlyguo

common/types/message/message.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/common/hexutil"
-	"github.com/scroll-tech/go-ethereum/log"
 )
 
 const (
@@ -108,7 +107,6 @@ type ChunkProof interface {
 
 // NewChunkProof creates a new ChunkProof instance.
 func NewChunkProof(hardForkName string) ChunkProof {
-	log.Info("NewChunkProof", "hardForkName", hardForkName, "euclidForkName", EuclidFork, "euclidV2ForkName", EuclidV2Fork)
 	switch hardForkName {
 	case EuclidFork, EuclidV2Fork:
 		return &OpenVMChunkProof{}
@@ -143,7 +141,6 @@ type BatchProof interface {
 
 // NewBatchProof creates a new BatchProof instance.
 func NewBatchProof(hardForkName string) BatchProof {
-	log.Info("NewBatchProof", "hardForkName", hardForkName, "euclidForkName", EuclidFork, "euclidV2ForkName", EuclidV2Fork)
 	switch hardForkName {
 	case EuclidFork, EuclidV2Fork:
 		return &OpenVMBatchProof{}
@@ -201,7 +198,6 @@ type BundleProof interface {
 
 // NewBundleProof creates a new BundleProof instance.
 func NewBundleProof(hardForkName string) BundleProof {
-	log.Info("NewBundleProof", "hardForkName", hardForkName, "euclidForkName", EuclidFork, "euclidV2ForkName", EuclidV2Fork)
 	switch hardForkName {
 	case EuclidFork, EuclidV2Fork:
 		return &OpenVMBundleProof{}

coordinator/internal/logic/auth/login.go

@@ -9,6 +9,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/types/message"
 	"scroll-tech/common/version"
 
 	"scroll-tech/coordinator/internal/config"
@@ -42,7 +43,7 @@ func NewLoginLogic(db *gorm.DB, cfg *config.Config, vf *verifier.Verifier) *Logi
 
 	var highHardForks []string
 	highHardForks = append(highHardForks, cfg.ProverManager.Verifier.HighVersionCircuit.ForkName)
-	if cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != "euclid" && cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != "euclidV2" {
+	if cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != message.EuclidFork && cfg.ProverManager.Verifier.HighVersionCircuit.ForkName != message.EuclidV2Fork {
 		highHardForks = append(highHardForks, cfg.ProverManager.Verifier.LowVersionCircuit.ForkName)
 	}
 	proverVersionHardForkMap[cfg.ProverManager.Verifier.HighVersionCircuit.MinProverVersion] = highHardForks

coordinator/internal/logic/provertask/batch_prover_task.go

@@ -239,16 +239,16 @@ func (bp *BatchProverTask) formatProverTask(ctx context.Context, task *orm.Prove
 		return nil, fmt.Errorf("failed to marshal chunk proofs, taskID:%s err:%w", task.TaskID, err)
 	}
 
-	log.Info("get batch task", "task_id", task.TaskID, "public_key", task.ProverPublicKey, "prover_name", task.ProverName, "prover_version", task.ProverVersion)
-	log.Info("chunkProofsBytes", "chunkProofsBytes", string(chunkProofsBytes))
-
 	taskMsg := &coordinatorType.GetTaskSchema{
 		UUID:         task.UUID.String(),
 		TaskID:       task.TaskID,
 		TaskType:     int(message.ProofTypeBatch),
 		TaskData:     string(chunkProofsBytes),
 		HardForkName: hardForkName,
 	}
+
+	log.Debug("TaskData", "task_id", task.TaskID, "task_type", message.ProofTypeChunk.String(), "hard_fork_name", hardForkName, "task_data", taskMsg.TaskData)
+
 	return taskMsg, nil
 }
 

coordinator/internal/logic/provertask/bundle_prover_task.go

@@ -219,6 +219,9 @@ func (bp *BundleProverTask) formatProverTask(ctx context.Context, task *orm.Prov
 		TaskData:     string(batchProofsBytes),
 		HardForkName: hardForkName,
 	}
+
+	log.Debug("TaskData", "task_id", task.TaskID, "task_type", message.ProofTypeChunk.String(), "hard_fork_name", hardForkName, "task_data", taskMsg.TaskData)
+
 	return taskMsg, nil
 }
 

coordinator/internal/logic/provertask/chunk_prover_task.go

@@ -217,8 +217,7 @@ func (cp *ChunkProverTask) formatProverTask(ctx context.Context, task *orm.Prove
 		HardForkName: hardForkName,
 	}
 
-	log.Info("format prover task", "task_id", task.TaskID, "task_type", message.ProofTypeChunk.String(), "hard_fork_name", hardForkName)
-	log.Info("TaskData", "task_id", task.TaskID, "task_data", proverTaskSchema.TaskData, "taskDetail", string(taskDetailBytes))
+	log.Debug("TaskData", "task_id", task.TaskID, "task_type", message.ProofTypeChunk.String(), "hard_fork_name", hardForkName, "task_data", proverTaskSchema.TaskData)
 
 	return proverTaskSchema, nil
 }

zkvm-prover/src/prover.rs

@@ -64,23 +64,16 @@ impl ProvingService for LocalProver {
     async fn get_vks(&self, req: GetVkRequest) -> GetVkResponse {
         let mut vks = vec![];
         for hard_fork_name in self.config.circuits.keys() {
-            println!("\n\n\nhard fork = {:?}", hard_fork_name);
             let handler = self.new_handler(hard_fork_name);
-            println!("request proof-types = {:?}", req.proof_types);
             for proof_type in &req.proof_types {
                 let vk = handler.get_vk(*proof_type).await;
-                println!("proof type = {:?}, vk = {:?}", proof_type, vk);
 
                 if let Some(vk) = vk {
-                    let vk_base64 = base64::encode(vk);
-                    println!("vk (base64) = {:?}", vk_base64);
-                    vks.push(vk_base64);
+                    vks.push(base64::encode(vk));
                 }
             }
         }
 
-        println!("\n\n\nall vks = {:#?}", vks);
-
         GetVkResponse { vks, error: None }
     }
     async fn prove(&mut self, req: ProveRequest) -> ProveResponse {
@@ -186,7 +179,6 @@ impl LocalProver {
     }
 
     fn new_handler(&self, hard_fork_name: &str) -> Arc<dyn CircuitsHandler> {
-        println!("in new_handler");
         // if we got assigned a task for an unknown hard fork, there is something wrong in the
         // coordinator
         let config = self.config.circuits.get(hard_fork_name).unwrap();

zkvm-prover/src/zk_circuits_handler/euclidV2.rs

@@ -20,7 +20,6 @@ unsafe impl Send for EuclidV2Handler {}
 impl EuclidV2Handler {
     pub fn new(workspace_path: &str) -> Self {
         let workspace_path = Path::new(workspace_path);
-        println!("ok 1");
 
         let cache_dir = workspace_path.join("cache");
         let chunk_exe = workspace_path.join("chunk/app.vmexe");
@@ -34,7 +33,6 @@ impl EuclidV2Handler {
             },
         )
         .expect("Failed to setup chunk prover");
-        println!("ok 2");
 
         let batch_exe = workspace_path.join("batch/app.vmexe");
         let batch_app_config = workspace_path.join("batch/openvm.toml");
@@ -47,7 +45,6 @@ impl EuclidV2Handler {
             },
         )
         .expect("Failed to setup batch prover");
-        println!("ok 3");
 
         let bundle_exe = workspace_path.join("bundle/app.vmexe");
         let bundle_app_config = workspace_path.join("bundle/openvm.toml");
@@ -60,7 +57,6 @@ impl EuclidV2Handler {
             },
         )
         .expect("Failed to setup bundle prover");
-        println!("ok 4");
 
         Self {
             chunk_prover,