fix

Author: colinlyguo

common/libzkp/impl/src/lib.rs

@@ -26,12 +26,6 @@ pub unsafe extern "C" fn verify_chunk_proof(
 
 fn verify_proof(proof: *const c_char, fork_name: *const c_char, task_type: TaskType) -> c_char {
     let fork_name_str = c_char_to_str(fork_name);
-    // Skip verification for darwinV2 as we can't host darwinV2 and euclid verifiers on the same
-    // binary.
-    if fork_name_str == "darwinV2" {
-        return true as c_char;
-    }
-
     let proof = c_char_to_vec(proof);
     let verifier = verifier::get_verifier(fork_name_str);
 

coordinator/cmd/api/app/mock_app.go

@@ -93,7 +93,7 @@ func (c *CoordinatorApp) MockConfig(store bool) error {
 			HighVersionCircuit: &coordinatorConfig.CircuitConfig{
 				ParamsPath:       "",
 				AssetsPath:       "",
-				ForkName:         "darwinV2",
+				ForkName:         "euclidV2",
 				MinProverVersion: "v4.4.89",
 			},
 		},

coordinator/conf/config.json

@@ -8,9 +8,8 @@
     "chunk_collection_time_sec": 180,
     "verifier": {
       "high_version_circuit": {
-        "params_path": "params",
         "assets_path": "assets",
-        "fork_name": "darwinV2",
+        "fork_name": "euclidV2",
         "min_prover_version": "v4.4.45"
       }
     }

coordinator/internal/logic/verifier/verifier_test.go

@@ -32,7 +32,7 @@ func TestFFI(t *testing.T) {
 		HighVersionCircuit: &config.CircuitConfig{
 			ParamsPath:       *paramsPath,
 			AssetsPath:       *assetsPathHi,
-			ForkName:         "darwinV2",
+			ForkName:         "euclidV2",
 			MinProverVersion: "",
 		},
 	}
@@ -41,19 +41,19 @@ func TestFFI(t *testing.T) {
 	as.NoError(err)
 
 	chunkProof1 := readChunkProof(*chunkProofPath1, as)
-	chunkOk1, err := v.VerifyChunkProof(chunkProof1, "darwinV2")
+	chunkOk1, err := v.VerifyChunkProof(chunkProof1, "euclidV2")
 	as.NoError(err)
 	as.True(chunkOk1)
 	t.Log("Verified chunk proof 1")
 
 	chunkProof2 := readChunkProof(*chunkProofPath2, as)
-	chunkOk2, err := v.VerifyChunkProof(chunkProof2, "darwinV2")
+	chunkOk2, err := v.VerifyChunkProof(chunkProof2, "euclidV2")
 	as.NoError(err)
 	as.True(chunkOk2)
 	t.Log("Verified chunk proof 2")
 
 	batchProof := readBatchProof(*batchProofPath, as)
-	batchOk, err := v.VerifyBatchProof(batchProof, "darwinV2")
+	batchOk, err := v.VerifyBatchProof(batchProof, "euclidV2")
 	as.NoError(err)
 	as.True(batchOk)
 	t.Log("Verified batch proof")

coordinator/test/api_test.go

@@ -374,7 +374,7 @@ func testValidProof(t *testing.T) {
 func testInvalidProof(t *testing.T) {
 	// Setup coordinator and ws server.
 	coordinatorURL := randomURL()
-	collector, httpHandler := setupCoordinator(t, 3, coordinatorURL, []string{"darwinV2"})
+	collector, httpHandler := setupCoordinator(t, 3, coordinatorURL, []string{"euclidV2"})
 	defer func() {
 		collector.Stop()
 		assert.NoError(t, httpHandler.Shutdown(context.Background()))
@@ -462,7 +462,7 @@ func testInvalidProof(t *testing.T) {
 func testProofGeneratedFailed(t *testing.T) {
 	// Setup coordinator and ws server.
 	coordinatorURL := randomURL()
-	collector, httpHandler := setupCoordinator(t, 3, coordinatorURL, []string{"darwinV2"})
+	collector, httpHandler := setupCoordinator(t, 3, coordinatorURL, []string{"euclidV2"})
 	defer func() {
 		collector.Stop()
 		assert.NoError(t, httpHandler.Shutdown(context.Background()))
@@ -563,7 +563,7 @@ func testProofGeneratedFailed(t *testing.T) {
 func testTimeoutProof(t *testing.T) {
 	// Setup coordinator and ws server.
 	coordinatorURL := randomURL()
-	collector, httpHandler := setupCoordinator(t, 1, coordinatorURL, []string{"darwinV2"})
+	collector, httpHandler := setupCoordinator(t, 1, coordinatorURL, []string{"euclidV2"})
 	defer func() {
 		collector.Stop()
 		assert.NoError(t, httpHandler.Shutdown(context.Background()))

rollup/internal/orm/orm_test.go

@@ -292,7 +292,7 @@ func TestBatchOrm(t *testing.T) {
 		err = batchOrm.UpdateProvingStatus(context.Background(), batchHash2, types.ProvingTaskVerified)
 		assert.NoError(t, err)
 
-		dbProof, err := batchOrm.GetVerifiedProofByHash(context.Background(), batchHash1, "darwinV2")
+		dbProof, err := batchOrm.GetVerifiedProofByHash(context.Background(), batchHash1, "euclidV2")
 		assert.Error(t, err)
 		assert.Nil(t, dbProof)
 
@@ -458,7 +458,7 @@ func TestBundleOrm(t *testing.T) {
 		err = db.Model(&Bundle{}).Where("hash = ?", bundle1.Hash).Update("proof", proofBytes).Error
 		assert.NoError(t, err)
 
-		retrievedProof, err := bundleOrm.GetVerifiedProofByHash(context.Background(), bundle1.Hash, "darwinV2")
+		retrievedProof, err := bundleOrm.GetVerifiedProofByHash(context.Background(), bundle1.Hash, "euclidV2")
 		assert.NoError(t, err)
 		assert.Equal(t, proof.Proof(), retrievedProof.Proof())
 	})