Improve serialization

xevisalle · Nov 8, 2023 · 32f959c · 32f959c
1 parent 6761464
commit 32f959c
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 204 deletions.
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ else ifeq ($(ARCH), arm)
 	$(CARM) $(COMMON) $(LIBCROSS) -D $(CURVE) $(MULTI_SET)
 
 else ifeq ($(shell uname), Darwin)
-	$(CC) $(COMMON) $(LIBMAC)-D $(CURVE) $(MULTI_SET)
+	$(CC) $(COMMON) $(LIBMAC) -D $(CURVE) $(MULTI_SET) -D IS_MAC_OS
 
 else
 	$(CC) $(COMMON) $(LIB) -D $(CURVE) $(MULTI_SET)

diff --git a/src/bench.c b/src/bench.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
     bench = 1; 
     if (argc < 3)
     {
-        printf("******************* ZPiE v0.4 *******************\n");
+        printf("******************* ZPiE v0.5 *******************\n");
         printf("USAGE: ./zpie [ACTIONS] [OPTIONS]\n\n");
         printf("[ACTIONS]:\n");
         printf("-s <c>: Perform setup of 'c' constraints.\n");
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 
     if ((argc == 4) && (strcmp(argv[3], "-l") == 0)) logs = 1;
 
-    printf("******************* ZPiE v0.4 *******************\n");
+    printf("******************* ZPiE v0.5 *******************\n");
 
     if ((strcmp(argv[1], "-s") == 0) || (strcmp(argv[1], "-p") == 0) || (strcmp(argv[1], "-v") == 0))
     {
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 
         printf("--- Starting ZPiE - Groth'16...\n");
         printf("  |--- # of constraints: %d\n", N);
-        printf("  |--- # of variables: %d\n", M);
-        printf("  |--- # of public outputs: %d\n", nPublic);
+        printf("  |--- # of elements: %d\n", M);
+        printf("  |--- # of public elements: %d\n", nPublic);
     }
     else
     {
@@ -72,13 +72,13 @@ int main(int argc, char *argv[])
     if (strcmp(argv[1], "-s") == 0)
     {
         setup_keys keys = perform_setup(&bench_circuit);
-        store_setup(keys);
+        store_setup(&keys);
     }
     else if (strcmp(argv[1], "-p") == 0)
     {
         setup_keys keys = read_setup(&bench_circuit);
         proof p = generate_proof(&bench_circuit, keys.pk);
-        store_proof(p);
+        store_proof(&p);
     }
     else if (strcmp(argv[1], "-v") == 0)
     {

diff --git a/src/common/utils.c b/src/common/utils.c
@@ -68,11 +68,9 @@ void init_prover(void *circuit, proving_key pk)
     BsFr = (mclBnFr*) malloc((n) * sizeof(mclBnFr));
     CsFr = (mclBnFr*) malloc((n) * sizeof(mclBnFr));
 
-    if (bench) printf("  |--- Mode: Prove\n");
-
     mpz_init(pPrime);
     mpz_set_str(pPrime, PRIMESTR, 10);
-    if (bench) printf("  |--- FFT constraints size : %d\n", n);
+    if (bench) printf("  |--- FFT domain size : %d\n", n);
 
     rsigma = (mpz_t*) malloc((n) * sizeof(mpz_t)); 
     rsigmaInv = (mpz_t*) malloc((n) * sizeof(mpz_t)); 

diff --git a/src/gro16/prover.c b/src/gro16/prover.c
@@ -111,7 +111,11 @@ void mul_exp(struct mulExpResult *result, mpz_t *uwProof, proving_key pk)
         if(i >= (nPublic + nConst)) mpz_to_fr(&uwFactorPublic[i-(nPublic + nConst)], &uw[i]);
     }
 
-    int num_threads = get_nprocs();
+    #ifdef IS_MAC_OS
+        int num_threads = 8;
+    #else
+        int num_threads = get_nprocs();
+    #endif
 
     mclBnG1_mulVecMT(&result->uwA1, pk.A1, uwFactor, M, num_threads);
     mclBnG1_mulVecMT(&result->uwB1, pk.B1, uwFactor, M, num_threads);

diff --git a/src/tests.c b/src/tests.c
@@ -52,32 +52,6 @@ void test_mimc_hash()
     mimc7(&h, &x_in, &k);
 }
 
-void test_setup(void)
-{
-    test_no_rand = 1;
-    setup_keys keys = perform_setup(&test_single_constraint); 
-
-    char* pk_bytes = serialize_pk(&keys.pk);
-    char* vk_bytes = serialize_vk(&keys.vk);
-
-    BYTE hash_bytes[SHA256_BLOCK_SIZE];
-    SHA256_CTX ctx;
-
-    sha256_init(&ctx);
-    sha256_update(&ctx, pk_bytes, strlen(pk_bytes));
-    sha256_final(&ctx, hash_bytes);
-
-    CU_ASSERT(!strcmp(to_hex(hash_bytes, sizeof hash_bytes), "26047d607444ba18b641499f11483896560195b1f16b0a12c734ccf0f6552cf4"));
-
-    sha256_init(&ctx);
-    sha256_update(&ctx, vk_bytes, strlen(vk_bytes));
-    sha256_final(&ctx, hash_bytes);
-
-    CU_ASSERT(!strcmp(to_hex(hash_bytes, sizeof hash_bytes), "1c91757242555e6705802233a5b7ca934fd33278c2461f21df343321c8ffb5d0"));
-
-    test_no_rand = 0;
-}
-
 void test_prover(void)
 {
     test_no_rand = 1;
@@ -156,12 +130,6 @@ int main()
         return CU_get_error();
     }
 
-    if ((NULL == suite) || (NULL == CU_add_test(suite, "\n\nSetup Testing\n\n", test_setup)))
-    {
-        CU_cleanup_registry();
-        return CU_get_error();
-    }
-
     CU_basic_run_tests();
     if(CU_get_number_of_failures()) abort();