allow to configure the number of public digits/bits

Author: glslang

include/wally_elements.h

@@ -74,6 +74,8 @@ WALLY_CORE_API int wally_asset_rangeproof(
     const unsigned char *generator,
     size_t generator_len,
     uint64_t min_value,
+    int exp,
+    int min_bits,
     unsigned char *bytes_out,
     size_t len,
     size_t *written);

src/elements.c

@@ -129,7 +129,8 @@ int wally_asset_rangeproof(uint64_t value,
                            const unsigned char *commitment, size_t commitment_len,
                            const unsigned char *extra, size_t extra_len,
                            const unsigned char *generator, size_t generator_len,
-                           uint64_t min_value, unsigned char *bytes_out, size_t len,
+                           uint64_t min_value, int exp, int min_bits,
+                           unsigned char *bytes_out, size_t len,
                            size_t *written)
 {
     const secp256k1_context *ctx = secp_ctx();
@@ -157,6 +158,8 @@ int wally_asset_rangeproof(uint64_t value,
         /* FIXME: Is there an upper size limit on the extra commitment? */
         (extra_len && !extra) ||
         min_value > 0x7ffffffffffffffful ||
+        exp < -1 || exp > 18 ||
+        min_bits < 0 || min_bits > 64 ||
         get_generator(ctx, generator, generator_len, &gen) != WALLY_OK)
         goto cleanup;
 
@@ -175,10 +178,8 @@ int wally_asset_rangeproof(uint64_t value,
     memcpy(message + ASSET_TAG_LEN, abf, ASSET_TAG_LEN);
 
     *written = ASSET_RANGEPROOF_MAX_LEN;
-    /* FIXME: This only allows 32 bit values. The caller should be able to
-     * pass in the maximum value allowed */
     if (secp256k1_rangeproof_sign(ctx, bytes_out, written, min_value, &commit,
-                                  vbf, nonce_sha.u.u8, 0, 32, value,
+                                  vbf, nonce_sha.u.u8, exp, min_bits, value,
                                   message, sizeof(message),
                                   extra, extra_len,
                                   &gen))

src/swig_java/jni_elements_extra.java_in

@@ -15,10 +15,10 @@
 
   public final static byte[] asset_rangeproof(long jarg1, byte[] jarg2, byte[] jarg3, byte[] jarg4,
                                               byte[] jarg5, byte[] jarg6, byte[] jarg7, byte[] jarg8,
-                                              byte[] jarg9, int jarg10) {
+                                              byte[] jarg9, int jarg10, int jarg11, int jarg12) {
       final byte[] buf = new byte[ASSET_RANGEPROOF_MAX_LEN];
       final int len = asset_rangeproof(jarg1, jarg2, jarg3, jarg4, jarg5, jarg6, jarg7, jarg8,
-                                       jarg9, jarg10, buf);
+                                       jarg9, jarg10, jarg11, jarg12, buf);
       return trimBuffer(buf, len);
   }
 

src/wrap_js/makewrappers/templates/nan.py

@@ -115,6 +115,23 @@
     return value;
 }
 
+static int32_t GetInt32(Nan::NAN_METHOD_ARGS_TYPE info, int n, int& ret)
+{
+    int value = 0;
+    if (ret == WALLY_OK) {
+        if (!IsValid(info[n]) || !info[n]->IsInt32())
+            ret = WALLY_EINVAL;
+        else {
+            Nan::Maybe<int32_t> m = Nan::To<int32_t>(info[n]);
+            if (IsValid(m))
+                value = m.FromJust();
+            else
+                ret = WALLY_EINVAL;
+        }
+    }
+    return value;
+}
+
 // uint64_t values are expected as an 8 byte buffer of big endian bytes
 struct LocalUInt64 : public LocalBuffer {
     LocalUInt64(Nan::NAN_METHOD_ARGS_TYPE info, int n, int& ret)
@@ -239,6 +256,9 @@ def _generate_nan(funcname, f):
         elif arg.startswith('uint32_t'):
             input_args.append('uint32_t arg%s = GetUInt32(info, %s, ret);' % (i, i))
             args.append('arg%s' % i)
+        elif arg.startswith('int'):
+            input_args.append('int32_t arg%s = GetInt32(info, %s, ret);' % (i, i))
+            args.append('arg%s' % i)
         elif arg.startswith('string'):
             args.append('*Nan::Utf8String(info[%s])' % i)
         elif arg.startswith('const_uint64s'):

src/wrap_js/makewrappers/wrap.py

@@ -196,6 +196,8 @@ def __init__(self, arguments, out_size=None, wally_name=None, nodejs_append_allo
         'const_bytes[extra_in]',
         'const_bytes[generator]',
         'uint64_t[min_value]',
+        'int[exp]',
+        'int[min_bits]',
         'out_bytes_sized',
     ], out_size='5134')),
     ('wally_asset_surjectionproof', F([