Rename buletproof_pp* to bppp*

.cirrus.yml

@@ -23,7 +23,7 @@ env:
   WHITELIST: no
   MUSIG: no
   ECDSAADAPTOR: no
-  BULLETPROOFS: no
+  BPPP: no
   ### test options
   SECP256K1_TEST_ITERS:
   BENCH: yes
@@ -73,12 +73,12 @@ task:
   << : *LINUX_CONTAINER
   matrix: &ENV_MATRIX
     - env: {WIDEMUL:  int64,  RECOVERY: yes}
-    - env: {WIDEMUL:  int64,                 ECDH: yes, SCHNORRSIG: yes, EXPERIMENTAL: yes, ECDSA_S2C: yes,  RANGEPROOF: yes, WHITELIST: yes, GENERATOR: yes, MUSIG: yes, ECDSAADAPTOR: yes, BULLETPROOFS: yes}
+    - env: {WIDEMUL:  int64,                 ECDH: yes, SCHNORRSIG: yes, EXPERIMENTAL: yes, ECDSA_S2C: yes,  RANGEPROOF: yes, WHITELIST: yes, GENERATOR: yes, MUSIG: yes, ECDSAADAPTOR: yes, BPPP: yes}
     - env: {WIDEMUL: int128}
     - env: {WIDEMUL: int128,  RECOVERY: yes,            SCHNORRSIG: yes}
-    - env: {WIDEMUL: int128,                 ECDH: yes, SCHNORRSIG: yes, EXPERIMENTAL: yes, ECDSA_S2C: yes, RANGEPROOF: yes, WHITELIST: yes, GENERATOR: yes, MUSIG: yes, ECDSAADAPTOR: yes, BULLETPROOFS: yes}
+    - env: {WIDEMUL: int128,                 ECDH: yes, SCHNORRSIG: yes, EXPERIMENTAL: yes, ECDSA_S2C: yes, RANGEPROOF: yes, WHITELIST: yes, GENERATOR: yes, MUSIG: yes, ECDSAADAPTOR: yes, BPPP: yes}
     - env: {WIDEMUL: int128,  ASM: x86_64}
-    - env: {                  RECOVERY: yes,            SCHNORRSIG: yes, EXPERIMENTAL: yes, ECDSA_S2C: yes, RANGEPROOF: yes, WHITELIST: yes, GENERATOR: yes, MUSIG: yes, ECDSAADAPTOR: yes, BULLETPROOFS: yes}
+    - env: {                  RECOVERY: yes,            SCHNORRSIG: yes, EXPERIMENTAL: yes, ECDSA_S2C: yes, RANGEPROOF: yes, WHITELIST: yes, GENERATOR: yes, MUSIG: yes, ECDSAADAPTOR: yes, BPPP: yes}
     - env: {BUILD: distcheck, WITH_VALGRIND: no, CTIMETEST: no, BENCH: no}
     - env: {CPPFLAGS: -DDETERMINISTIC}
     - env: {CFLAGS: -O0, CTIMETEST: no}
@@ -109,7 +109,7 @@ task:
     GENERATOR: yes
     MUSIG: yes
     ECDSAADAPTOR: yes
-    BULLETPROOFS: yes
+    BPPP: yes
   matrix:
     - env:
         CC: i686-linux-gnu-gcc
@@ -167,7 +167,7 @@ task:
     GENERATOR: yes
     MUSIG: yes
     ECDSAADAPTOR: yes
-    BULLETPROOFS: yes
+    BPPP: yes
     CTIMETEST: no
   << : *MERGE_BASE
   test_script:
@@ -262,7 +262,7 @@ task:
     GENERATOR: yes
     MUSIG: yes
     ECDSAADAPTOR: yes
-    BULLETPROOFS: yes
+    BPPP: yes
     CTIMETEST: no
   matrix:
     - name: "Valgrind (memcheck)"

.gitignore

@@ -1,5 +1,5 @@
 bench
-bench_bulletproofs
+bench_bppp
 bench_ecmult
 bench_generator
 bench_rangeproof

Makefile.am

@@ -226,8 +226,8 @@ clean-precomp:
 
 EXTRA_DIST = autogen.sh SECURITY.md
 
-if ENABLE_MODULE_BULLETPROOFS
-include src/modules/bulletproofs/Makefile.am.include
+if ENABLE_MODULE_BPPP
+include src/modules/bppp/Makefile.am.include
 endif
 
 if ENABLE_MODULE_ECDH

ci/cirrus.sh

@@ -19,7 +19,7 @@ valgrind --version || true
     --with-ecmult-gen-precision="$ECMULTGENPRECISION" \
     --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
     --enable-module-ecdsa-s2c="$ECDSA_S2C" \
-    --enable-module-bulletproofs="$BULLETPROOFS" \
+    --enable-module-bppp="$BPPP" \
     --enable-module-rangeproof="$RANGEPROOF" --enable-module-whitelist="$WHITELIST" --enable-module-generator="$GENERATOR" \
     --enable-module-schnorrsig="$SCHNORRSIG"  --enable-module-musig="$MUSIG" --enable-module-ecdsa-adaptor="$ECDSAADAPTOR" \
     --enable-module-schnorrsig="$SCHNORRSIG" \
@@ -52,9 +52,9 @@ then
         $EXEC ./bench_ecmult
         $EXEC ./bench_internal
         $EXEC ./bench
-        if [ "$BULLETPROOFS" = "yes" ]
+        if [ "$BPPP" = "yes" ]
         then
-            $EXEC ./bench_bulletproofs
+            $EXEC ./bench_bppp
         fi
     } >> bench.log 2>&1
 fi

configure.ac

@@ -140,10 +140,10 @@ AC_ARG_ENABLE(examples,
     AS_HELP_STRING([--enable-examples],[compile the examples [default=no]]), [],
     [SECP_SET_DEFAULT([enable_examples], [no], [yes])])
 
-AC_ARG_ENABLE(module_bulletproofs,
-    AS_HELP_STRING([--enable-module-bulletproofs],[enable Bulletproofs module (experimental)]),
+AC_ARG_ENABLE(module_bppp,
+    AS_HELP_STRING([--enable-module-bppp],[enable Bulletproofs++ module (experimental)]),
     [],
-    [SECP_SET_DEFAULT([enable_module_bulletproofs], [no], [yes])])
+    [SECP_SET_DEFAULT([enable_module_bppp], [no], [yes])])
 
 AC_ARG_ENABLE(module_ecdh,
     AS_HELP_STRING([--enable-module-ecdh],[enable ECDH module [default=no]]), [],
@@ -422,9 +422,9 @@ if test x"$enable_module_rangeproof" = x"yes"; then
   AC_DEFINE(ENABLE_MODULE_RANGEPROOF, 1, [Define this symbol to enable the Pedersen / zero knowledge range proof module])
 fi
 
-if test x"$enable_module_bulletproofs" = x"yes"; then
+if test x"$enable_module_bppp" = x"yes"; then
   enable_module_generator=yes
-  AC_DEFINE(ENABLE_MODULE_BULLETPROOFS, 1, [Define this symbol to enable the Bulletproofs module])
+  AC_DEFINE(ENABLE_MODULE_BPPP, 1, [Define this symbol to enable the Bulletproofs++ module])
 fi
 
 if test x"$enable_module_generator" = x"yes"; then
@@ -470,8 +470,8 @@ else
   # module (which automatically enables the module dependencies) we want to
   # print an error for the dependent module, not the module dependency. Hence,
   # we first test dependent modules.
-  if test x"$enable_module_bulletproofs" = x"yes"; then
-    AC_MSG_ERROR([Bulletproofs module is experimental. Use --enable-experimental to allow.])
+  if test x"$enable_module_bppp" = x"yes"; then
+    AC_MSG_ERROR([Bulletproofs++ module is experimental. Use --enable-experimental to allow.])
   fi
   if test x"$enable_module_whitelist" = x"yes"; then
     AC_MSG_ERROR([Key whitelisting module is experimental. Use --enable-experimental to allow.])
@@ -515,7 +515,7 @@ AM_CONDITIONAL([USE_TESTS], [test x"$enable_tests" != x"no"])
 AM_CONDITIONAL([USE_EXHAUSTIVE_TESTS], [test x"$enable_exhaustive_tests" != x"no"])
 AM_CONDITIONAL([USE_EXAMPLES], [test x"$enable_examples" != x"no"])
 AM_CONDITIONAL([USE_BENCHMARK], [test x"$enable_benchmark" = x"yes"])
-AM_CONDITIONAL([ENABLE_MODULE_BULLETPROOFS], [test x"$enable_module_bulletproofs" = x"yes"])
+AM_CONDITIONAL([ENABLE_MODULE_BPPP], [test x"$enable_module_bppp" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_ECDH], [test x"$enable_module_ecdh" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_MUSIG], [test x"$enable_module_musig" = x"yes"])
 AM_CONDITIONAL([ENABLE_MODULE_RECOVERY], [test x"$enable_module_recovery" = x"yes"])
@@ -555,7 +555,7 @@ echo "  module whitelist        = $enable_module_whitelist"
 echo "  module musig            = $enable_module_musig"
 echo "  module ecdsa-s2c        = $enable_module_ecdsa_s2c"
 echo "  module ecdsa-adaptor    = $enable_module_ecdsa_adaptor"
-echo "  module bulletproofs     = $enable_module_bulletproofs"
+echo "  module bppp             = $enable_module_bppp"
 echo
 echo "  asm                     = $set_asm"
 echo "  ecmult window size      = $set_ecmult_window"

include/secp256k1_bulletproofs.h → include/secp256k1_bppp.h

@@ -1,5 +1,5 @@
-#ifndef _SECP256K1_BULLETPROOFS_
-# define _SECP256K1_BULLETPROOFS_
+#ifndef _SECP256K1_BPPP_
+# define _SECP256K1_BPPP_
 
 # include "secp256k1.h"
 
@@ -10,7 +10,7 @@ extern "C" {
 #include <stdint.h>
 
 /** Opaque structure representing a large number of NUMS generators */
-typedef struct secp256k1_bulletproofs_generators secp256k1_bulletproofs_generators;
+typedef struct secp256k1_bppp_generators secp256k1_bppp_generators;
 
 /** Allocates and initializes a list of NUMS generators.
  *  Returns a list of generators, or calls the error callback if the allocation fails.
@@ -21,18 +21,18 @@ typedef struct secp256k1_bulletproofs_generators secp256k1_bulletproofs_generato
  * points. We will later use G = H0(required for compatibility with pedersen_commitment DS)
  * in a separate commit to make review easier.
  */
-SECP256K1_API secp256k1_bulletproofs_generators *secp256k1_bulletproofs_generators_create(
+SECP256K1_API secp256k1_bppp_generators *secp256k1_bppp_generators_create(
     const secp256k1_context* ctx,
     size_t n
 ) SECP256K1_ARG_NONNULL(1);
 
 /** Allocates a list of generators from a static array
  *  Returns a list of generators or NULL in case of failure.
  *  Args:      ctx: pointer to a context object
- *  In:       data: data that came from `secp256k1_bulletproofs_generators_serialize`
+ *  In:       data: data that came from `secp256k1_bppp_generators_serialize`
  *        data_len: the length of the `data` buffer
  */
-SECP256K1_API secp256k1_bulletproofs_generators* secp256k1_bulletproofs_generators_parse(
+SECP256K1_API secp256k1_bppp_generators* secp256k1_bppp_generators_parse(
     const secp256k1_context* ctx,
     const unsigned char* data,
     size_t data_len
@@ -49,9 +49,9 @@ SECP256K1_API secp256k1_bulletproofs_generators* secp256k1_bulletproofs_generato
  * TODO: For ease of review, this setting G = H0 is not included in this commit. We will
  * add it in the follow-up rangeproof PR.
  */
-SECP256K1_API int secp256k1_bulletproofs_generators_serialize(
+SECP256K1_API int secp256k1_bppp_generators_serialize(
     const secp256k1_context* ctx,
-    const secp256k1_bulletproofs_generators* gen,
+    const secp256k1_bppp_generators* gen,
     unsigned char* data,
     size_t *data_len
 ) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4);
@@ -61,9 +61,9 @@ SECP256K1_API int secp256k1_bulletproofs_generators_serialize(
  *          gen: pointer to the generator set to be destroyed
  *               (can be NULL, in which case this function is a no-op)
  */
-SECP256K1_API void secp256k1_bulletproofs_generators_destroy(
+SECP256K1_API void secp256k1_bppp_generators_destroy(
     const secp256k1_context* ctx,
-    secp256k1_bulletproofs_generators* gen
+    secp256k1_bppp_generators* gen
 ) SECP256K1_ARG_NONNULL(1);
 
 # ifdef __cplusplus

src/bench_bulletproofs.c → src/bench_bppp.c

@@ -6,32 +6,32 @@
 
 #include <stdint.h>
 
-#include "include/secp256k1_bulletproofs.h"
+#include "include/secp256k1_bppp.h"
 #include "util.h"
 #include "bench.h"
 
 typedef struct {
     secp256k1_context* ctx;
-} bench_bulletproofs_data;
+} bench_bppp_data;
 
-static void bench_bulletproofs_setup(void* arg) {
+static void bench_bppp_setup(void* arg) {
     (void) arg;
 }
 
-static void bench_bulletproofs(void* arg, int iters) {
-    bench_bulletproofs_data *data = (bench_bulletproofs_data*)arg;
+static void bench_bppp(void* arg, int iters) {
+    bench_bppp_data *data = (bench_bppp_data*)arg;
 
     (void) data;
     (void) iters;
 }
 
 int main(void) {
-    bench_bulletproofs_data data;
+    bench_bppp_data data;
     int iters = get_iters(32);
 
     data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
 
-    run_benchmark("bulletproofs_verify_bit", bench_bulletproofs, bench_bulletproofs_setup, NULL, &data, 10, iters);
+    run_benchmark("bppp_verify_bit", bench_bppp, bench_bppp_setup, NULL, &data, 10, iters);
 
     secp256k1_context_destroy(data.ctx);
     return 0;

src/modules/bppp/Makefile.am.include

@@ -0,0 +1,13 @@
+include_HEADERS += include/secp256k1_bppp.h
+noinst_HEADERS += src/modules/bppp/bppp_util.h
+noinst_HEADERS += src/modules/bppp/main_impl.h
+noinst_HEADERS += src/modules/bppp/bppp_transcript_impl.h
+noinst_HEADERS += src/modules/bppp/bppp_norm_product_impl.h
+noinst_HEADERS += src/modules/bppp/tests_impl.h
+
+if USE_BENCHMARK
+noinst_PROGRAMS += bench_bppp
+bench_bppp_SOURCES = src/bench_bppp.c
+bench_bppp_LDADD = libsecp256k1.la $(SECP_LIBS)
+bench_bppp_LDFLAGS = -static
+endif