Rename index and my_index to idx

Author: jesseposner

include/secp256k1_frost.h

@@ -80,15 +80,15 @@ SECP256K1_API int secp256k1_frost_share_agg(
     const secp256k1_pubkey * const* pubcoeffs,
     uint16_t n_shares,
     uint16_t threshold,
-    uint16_t index
+    uint16_t idx
 ) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4) SECP256K1_ARG_NONNULL(5) SECP256K1_ARG_NONNULL(6);
 
 SECP256K1_API int secp256k1_frost_nonce_gen(
     const secp256k1_context* ctx,
     secp256k1_frost_secnonce *secnonce,
     secp256k1_frost_pubnonce *pubnonce,
     const unsigned char *session_id32,
-    uint16_t index,
+    uint16_t idx,
     const secp256k1_frost_share *agg_share,
     const unsigned char *msg32,
     const secp256k1_xonly_pubkey *agg_pk,

src/modules/frost/keygen_impl.h

@@ -176,19 +176,19 @@ static int secp256k1_frost_pubkey_combine_callback(secp256k1_scalar *sc, secp256
     return secp256k1_pubkey_load(ctx->ctx, pt, &ctx->pks[idx][0]);
 }
 
-static int vss_verify(const secp256k1_context* ctx, uint16_t threshold, uint16_t index, const secp256k1_scalar *share, const secp256k1_pubkey * const* vss_commitment) {
+static int vss_verify(const secp256k1_context* ctx, uint16_t threshold, uint16_t idx, const secp256k1_scalar *share, const secp256k1_pubkey * const* vss_commitment) {
     secp256k1_scalar share_neg;
     secp256k1_gej tmpj;
     secp256k1_frost_verify_share_ecmult_data verify_share_ecmult_data;
 
     /* Use an EC multi-multiplication to verify the following equation:
-     *   0 = - share_i*G + index^0*vss_commitment[0]
+     *   0 = - share_i*G + idx^0*vss_commitment[0]
      *                   + ...
-     *                   + index^(threshold - 1)*vss_commitment[threshold - 1]*/
+     *                   + idx^(threshold - 1)*vss_commitment[threshold - 1]*/
     verify_share_ecmult_data.ctx = ctx;
     verify_share_ecmult_data.pubcoeff = vss_commitment;
-    /* Evaluate the public polynomial at the index */
-    secp256k1_scalar_set_int(&verify_share_ecmult_data.idx, index);
+    /* Evaluate the public polynomial at the idx */
+    secp256k1_scalar_set_int(&verify_share_ecmult_data.idx, idx);
     secp256k1_scalar_set_int(&verify_share_ecmult_data.idxn, 1);
     secp256k1_scalar_negate(&share_neg, share);
     /* TODO: add scratch */
@@ -198,7 +198,7 @@ static int vss_verify(const secp256k1_context* ctx, uint16_t threshold, uint16_t
     return secp256k1_gej_is_infinity(&tmpj);
 }
 
-int secp256k1_frost_share_agg(const secp256k1_context* ctx, secp256k1_frost_share *agg_share, secp256k1_xonly_pubkey *agg_pk, unsigned char *vss_hash, const secp256k1_frost_share * const* shares, const secp256k1_pubkey * const* pubcoeffs, uint16_t n_shares, uint16_t threshold, uint16_t index) {
+int secp256k1_frost_share_agg(const secp256k1_context* ctx, secp256k1_frost_share *agg_share, secp256k1_xonly_pubkey *agg_pk, unsigned char *vss_hash, const secp256k1_frost_share * const* shares, const secp256k1_pubkey * const* pubcoeffs, uint16_t n_shares, uint16_t threshold, uint16_t idx) {
     secp256k1_frost_pubkey_combine_ecmult_data pubkey_combine_ecmult_data;
     secp256k1_gej pkj;
     secp256k1_ge pkp;
@@ -214,7 +214,7 @@ int secp256k1_frost_share_agg(const secp256k1_context* ctx, secp256k1_frost_shar
     ARG_CHECK(shares != NULL);
     ARG_CHECK(pubcoeffs != NULL);
     ARG_CHECK(n_shares > 0);
-    ARG_CHECK(index > 0);
+    ARG_CHECK(idx > 0);
 
     if (threshold == 0 || threshold > n_shares) {
         return 0;
@@ -228,7 +228,7 @@ int secp256k1_frost_share_agg(const secp256k1_context* ctx, secp256k1_frost_shar
         if (overflow) {
             return 0;
         }
-        if (!vss_verify(ctx, threshold, index, &share_i, &pubcoeffs[i])) {
+        if (!vss_verify(ctx, threshold, idx, &share_i, &pubcoeffs[i])) {
             return 0;
         }
         secp256k1_scalar_add(&acc, &acc, &share_i);

src/modules/frost/session_impl.h

@@ -241,7 +241,7 @@ static void secp256k1_nonce_function_frost(secp256k1_scalar *k, const unsigned c
     }
 }
 
-int secp256k1_frost_nonce_gen(const secp256k1_context* ctx, secp256k1_frost_secnonce *secnonce, secp256k1_frost_pubnonce *pubnonce, const unsigned char *session_id32, uint16_t my_index, const secp256k1_frost_share *agg_share, const unsigned char *msg32, const secp256k1_xonly_pubkey *agg_pk, const unsigned char *extra_input32) {
+int secp256k1_frost_nonce_gen(const secp256k1_context* ctx, secp256k1_frost_secnonce *secnonce, secp256k1_frost_pubnonce *pubnonce, const unsigned char *session_id32, uint16_t idx, const secp256k1_frost_share *agg_share, const unsigned char *msg32, const secp256k1_xonly_pubkey *agg_pk, const unsigned char *extra_input32) {
     secp256k1_scalar k[2];
     secp256k1_ge nonce_pt[2];
     int i;
@@ -297,7 +297,7 @@ int secp256k1_frost_nonce_gen(const secp256k1_context* ctx, secp256k1_frost_secn
         secp256k1_scalar_clear(&k[i]);
     }
     /* nonce_pt won't be infinity because k != 0 with overwhelming probability */
-    secp256k1_frost_pubnonce_save(pubnonce, nonce_pt, my_index);
+    secp256k1_frost_pubnonce_save(pubnonce, nonce_pt, idx);
     return ret;
 }