status-im
/
c-kzg-4844
mirror of https://github.com/status-im/c-kzg-4844.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add new NUM_G1_POINTS var for consistency (#257)

This commit is contained in:
Justin Traglia 2023-03-29 02:01:24 -05:00 committed by GitHub
parent 2913b5ab31
commit 9059ba5ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/c_kzg_4844.c
View File

@ -72,6 +72,9 @@ static const char *RANDOM_CHALLENGE_KZG_BATCH_DOMAIN = "RCKZGBATCH___V1_";
/** The number of bytes in a g2 point. */ /** The number of bytes in a g2 point. */
#define BYTES_PER_G2 96 #define BYTES_PER_G2 96
/** The number of g1 points in a trusted setup. */
#define TRUSTED_SETUP_NUM_G1_POINTS FIELD_ELEMENTS_PER_BLOB
/** The number of g2 points in a trusted setup. */ /** The number of g2 points in a trusted setup. */
#define TRUSTED_SETUP_NUM_G2_POINTS 65 #define TRUSTED_SETUP_NUM_G2_POINTS 65
@ -1772,10 +1775,10 @@ static void free_kzg_settings(KZGSettings *s) {
* @remark Free after use with free_trusted_setup(). * @remark Free after use with free_trusted_setup().
* *
* @param[out] out Pointer to the stored trusted setup data * @param[out] out Pointer to the stored trusted setup data
* @param[in] g1_bytes Array of G1 elements * @param[in] g1_bytes Array of G1 points
* @param[in] n1 Length of `g1` * @param[in] n1 Number of `g1` points in g1_bytes
* @param[in] g2_bytes Array of G2 elements * @param[in] g2_bytes Array of G2 points
* @param[in] n2 Length of `g2` * @param[in] n2 Number of `g2` points in g2_bytes
*/ */
C_KZG_RET load_trusted_setup( C_KZG_RET load_trusted_setup(
KZGSettings *out, KZGSettings *out,
@ -1793,6 +1796,9 @@ C_KZG_RET load_trusted_setup(
out->g1_values = NULL; out->g1_values = NULL;
out->g2_values = NULL; out->g2_values = NULL;
CHECK(n1 == TRUSTED_SETUP_NUM_G1_POINTS);
CHECK(n2 == TRUSTED_SETUP_NUM_G2_POINTS);
ret = new_g1_array(&out->g1_values, n1); ret = new_g1_array(&out->g1_values, n1);
if (ret != C_KZG_OK) goto out_error; if (ret != C_KZG_OK) goto out_error;
ret = new_g2_array(&out->g2_values, n2); ret = new_g2_array(&out->g2_values, n2);
@ -1852,13 +1858,13 @@ out_success:
C_KZG_RET load_trusted_setup_file(KZGSettings *out, FILE *in) { C_KZG_RET load_trusted_setup_file(KZGSettings *out, FILE *in) {
int num_matches; int num_matches;
uint64_t i; uint64_t i;
uint8_t g1_bytes[FIELD_ELEMENTS_PER_BLOB * BYTES_PER_G1]; uint8_t g1_bytes[TRUSTED_SETUP_NUM_G1_POINTS * BYTES_PER_G1];
uint8_t g2_bytes[TRUSTED_SETUP_NUM_G2_POINTS * BYTES_PER_G2]; uint8_t g2_bytes[TRUSTED_SETUP_NUM_G2_POINTS * BYTES_PER_G2];
/* Read the number of g1 points */ /* Read the number of g1 points */
num_matches = fscanf(in, "%" SCNu64, &i); num_matches = fscanf(in, "%" SCNu64, &i);
CHECK(num_matches == 1); CHECK(num_matches == 1);
CHECK(i == FIELD_ELEMENTS_PER_BLOB); CHECK(i == TRUSTED_SETUP_NUM_G1_POINTS);
/* Read the number of g2 points */ /* Read the number of g2 points */
num_matches = fscanf(in, "%" SCNu64, &i); num_matches = fscanf(in, "%" SCNu64, &i);
@ -1866,7 +1872,7 @@ C_KZG_RET load_trusted_setup_file(KZGSettings *out, FILE *in) {
CHECK(i == TRUSTED_SETUP_NUM_G2_POINTS); CHECK(i == TRUSTED_SETUP_NUM_G2_POINTS);
/* Read all of the g1 points, byte by byte */ /* Read all of the g1 points, byte by byte */
for (i = 0; i < FIELD_ELEMENTS_PER_BLOB * BYTES_PER_G1; i++) { for (i = 0; i < TRUSTED_SETUP_NUM_G1_POINTS * BYTES_PER_G1; i++) {
num_matches = fscanf(in, "%2hhx", &g1_bytes[i]); num_matches = fscanf(in, "%2hhx", &g1_bytes[i]);
CHECK(num_matches == 1); CHECK(num_matches == 1);
} }
@ -1880,7 +1886,7 @@ C_KZG_RET load_trusted_setup_file(KZGSettings *out, FILE *in) {
return load_trusted_setup( return load_trusted_setup(
out, out,
g1_bytes, g1_bytes,
FIELD_ELEMENTS_PER_BLOB, TRUSTED_SETUP_NUM_G1_POINTS,
g2_bytes, g2_bytes,
TRUSTED_SETUP_NUM_G2_POINTS TRUSTED_SETUP_NUM_G2_POINTS
); );