Skip to content

Commit 3475a07

Browse files
EunovoEunovo
committed
Merge commit '73a8058a51ef84359c98350556375416d1b7c0b3' into batch-verification
2 parents a38615e + 73a8058 commit 3475a07

24 files changed

+1126
-11
lines changed

‎src/secp256k1/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ecdsa_example
1212
schnorr_example
1313
ellswift_example
1414
musig_example
15+
batch_example
1516
*.exe
1617
*.so
1718
*.a

‎src/secp256k1/CMakeLists.txt

+15-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(libsecp256k1
77
# The package (a.k.a. release) version is based on semantic versioning 2.0.0 of
88
# the API. All changes in experimental modules are treated as
99
# backwards-compatible and therefore at most increase the minor version.
10-
VERSION 0.6.0
10+
VERSION 0.6.1
1111
DESCRIPTION "Optimized C library for ECDSA signatures and secret/public key operations on curve secp256k1."
1212
HOMEPAGE_URL "https://github.com/bitcoin-core/secp256k1"
1313
LANGUAGES C
@@ -32,7 +32,7 @@ endif()
3232
# All changes in experimental modules are treated as if they don't affect the
3333
# interface and therefore only increase the revision.
3434
set(${PROJECT_NAME}_LIB_VERSION_CURRENT 5)
35-
set(${PROJECT_NAME}_LIB_VERSION_REVISION 0)
35+
set(${PROJECT_NAME}_LIB_VERSION_REVISION 1)
3636
set(${PROJECT_NAME}_LIB_VERSION_AGE 0)
3737

3838
#=============================
@@ -55,13 +55,13 @@ option(SECP256K1_INSTALL "Enable installation." ${PROJECT_IS_TOP_LEVEL})
5555
## Modules
5656

5757
# We declare all options before processing them, to make sure we can express
58-
# dependendencies while processing.
58+
# dependencies while processing.
5959
option(SECP256K1_ENABLE_MODULE_ECDH "Enable ECDH module." ON)
6060
option(SECP256K1_ENABLE_MODULE_RECOVERY "Enable ECDSA pubkey recovery module." OFF)
6161
option(SECP256K1_ENABLE_MODULE_EXTRAKEYS "Enable extrakeys module." ON)
6262
option(SECP256K1_ENABLE_MODULE_SCHNORRSIG "Enable schnorrsig module." ON)
6363
option(SECP256K1_ENABLE_MODULE_MUSIG "Enable musig module." ON)
64-
option(SECP256K1_ENABLE_MODULE_ELLSWIFT "Enable ElligatorSwift module." ON)
64+
option(SECP256K1_ENABLE_MODULE_ELLSWIFT "Enable ElligatorSwift module." OFF)
6565

6666
# Processing must be done in a topological sorting of the dependency graph
6767
# (dependent module first).
@@ -156,13 +156,22 @@ elseif(SECP256K1_ASM)
156156
endif()
157157
endif()
158158

159-
option(SECP256K1_EXPERIMENTAL "Allow experimental configuration options." OFF)
159+
option(SECP256K1_EXPERIMENTAL "Allow experimental configuration options." ON)
160160
if(NOT SECP256K1_EXPERIMENTAL)
161161
if(SECP256K1_ASM STREQUAL "arm32")
162162
message(FATAL_ERROR "ARM32 assembly is experimental. Use -DSECP256K1_EXPERIMENTAL=ON to allow.")
163163
endif()
164164
endif()
165165

166+
option(SECP256K1_ENABLE_MODULE_BATCH "Enable batch verification module." ON)
167+
if(SECP256K1_ENABLE_MODULE_BATCH)
168+
if(DEFINED SECP256K1_EXPERIMENTAL AND NOT SECP256K1_EXPERIMENTAL)
169+
message(FATAL_ERROR "Batch verification module is experimental")
170+
endif()
171+
set(SECP256K1_ENABLE_MODULE_BATCH ON)
172+
add_compile_definitions(ENABLE_MODULE_BATCH=1)
173+
endif()
174+
166175
set(SECP256K1_VALGRIND "AUTO" CACHE STRING "Build with extra checks for running inside Valgrind. [default=AUTO]")
167176
set_property(CACHE SECP256K1_VALGRIND PROPERTY STRINGS "AUTO" "OFF" "ON")
168177
check_string_option_value(SECP256K1_VALGRIND)
@@ -327,6 +336,7 @@ message(" extrakeys ........................... ${SECP256K1_ENABLE_MODULE_EXTRA
327336
message(" schnorrsig .......................... ${SECP256K1_ENABLE_MODULE_SCHNORRSIG}")
328337
message(" musig ............................... ${SECP256K1_ENABLE_MODULE_MUSIG}")
329338
message(" ElligatorSwift ...................... ${SECP256K1_ENABLE_MODULE_ELLSWIFT}")
339+
message(" Batch ............................... ${SECP256K1_ENABLE_MODULE_BATCH}")
330340
message("Parameters:")
331341
message(" ecmult window size .................. ${SECP256K1_ECMULT_WINDOW_SIZE}")
332342
message(" ecmult gen table size ............... ${SECP256K1_ECMULT_GEN_KB} KiB")

‎src/secp256k1/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Features:
2222
* Optional module for Schnorr signatures according to [BIP-340](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki).
2323
* Optional module for ElligatorSwift key exchange according to [BIP-324](https://github.com/bitcoin/bips/blob/master/bip-0324.mediawiki).
2424
* Optional module for MuSig2 Schnorr multi-signatures according to [BIP-327](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki).
25+
* Optional module for Batch Verification (experimental).
2526

2627
Implementation details
2728
----------------------

‎src/secp256k1/batch_example

1.43 MB
Binary file not shown.

‎src/secp256k1/ci/cirrus.sh

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
#!/bin/sh
2+
3+
set -e
4+
set -x
5+
6+
export LC_ALL=C
7+
8+
# Start persistent wineserver if necessary.
9+
# This speeds up jobs with many invocations of wine (e.g., ./configure with MSVC) tremendously.
10+
case "$WRAPPER_CMD" in
11+
*wine*)
12+
# This is apparently only reliable when we run a dummy command such as "hh.exe" afterwards.
13+
wineserver -p && wine hh.exe
14+
;;
15+
esac
16+
17+
env >> test_env.log
18+
19+
$CC -v || true
20+
valgrind --version || true
21+
$WRAPPER_CMD --version || true
22+
23+
./autogen.sh
24+
25+
./configure \
26+
--enable-experimental="$EXPERIMENTAL" \
27+
--with-test-override-wide-multiply="$WIDEMUL" --with-asm="$ASM" \
28+
--with-ecmult-window="$ECMULTWINDOW" \
29+
--with-ecmult-gen-precision="$ECMULTGENPRECISION" \
30+
--enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
31+
--enable-module-schnorrsig="$SCHNORRSIG" \
32+
--enable-module-batch="$BATCH" \
33+
--enable-examples="$EXAMPLES" \
34+
--with-valgrind="$WITH_VALGRIND" \
35+
--host="$HOST" $EXTRAFLAGS
36+
37+
# We have set "-j<n>" in MAKEFLAGS.
38+
make
39+
40+
# Print information about binaries so that we can see that the architecture is correct
41+
file *tests* || true
42+
file bench* || true
43+
file .libs/* || true
44+
45+
# This tells `make check` to wrap test invocations.
46+
export LOG_COMPILER="$WRAPPER_CMD"
47+
48+
make "$BUILD"
49+
50+
if [ "$BENCH" = "yes" ]
51+
then
52+
# Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
53+
EXEC='./libtool --mode=execute'
54+
if [ -n "$WRAPPER_CMD" ]
55+
then
56+
EXEC="$EXEC $WRAPPER_CMD"
57+
fi
58+
{
59+
$EXEC ./bench_ecmult
60+
$EXEC ./bench_internal
61+
$EXEC ./bench
62+
} >> bench.log 2>&1
63+
fi
64+
65+
if [ "$CTIMETEST" = "yes" ]
66+
then
67+
./libtool --mode=execute valgrind --error-exitcode=42 ./valgrind_ctime_test > valgrind_ctime_test.log 2>&1
68+
fi
69+
70+
# Rebuild precomputed files (if not cross-compiling).
71+
if [ -z "$HOST" ]
72+
then
73+
make clean-precomp
74+
make precomp
75+
fi
76+
77+
# Shutdown wineserver again
78+
wineserver -k || true
79+
80+
# Check that no repo files have been modified by the build.
81+
# (This fails for example if the precomp files need to be updated in the repo.)
82+
git diff --exit-code

‎src/secp256k1/doc/speedup-batch.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Schnorrsig Batch Verification Speedup
2+
3+
![Speedup over single verification](speedup-batch/schnorrsig-speedup-batch.png)
4+
5+
# Tweak Pubkey Check Batch Verification Speedup
6+
7+
![Speedup over single verification](speedup-batch/tweakcheck-speedup-batch.png)
8+
9+
Build steps
10+
-----------
11+
To generate the above graphs on your local machine:
12+
13+
$ cd doc/speedup-batch
14+
$ make
15+
$ make speedup-batch.png

‎src/secp256k1/doc/speedup-batch/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.dat

‎src/secp256k1/doc/speedup-batch/Makefile

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
schnorrsig_data = schnorrsig_batch.dat schnorrsig_single.dat
2+
tweak_data = tweak_batch.dat tweak_single.dat
3+
4+
bench_output.txt: bench.sh
5+
SECP256K1_BENCH_ITERS=500000 ./bench.sh bench_output.txt
6+
7+
schnorrsig_batch.dat: bench_output.txt
8+
cat bench_output.txt | grep -v "schnorrsig_batch_verify_1 " | awk '{ gsub(/ /,""); print }' | awk -F, 'match($$0, /schnorrsig_batch_verify_([0-9]+)/, arr) {print arr[1] " " $$3}' > schnorrsig_batch.dat
9+
10+
schnorrsig_single.dat: bench_output.txt
11+
cat bench_output.txt | awk '{ gsub(/ /,""); print }' | awk -F, 'match($$0, /schnorrsig_verify/) {print $$3}' > schnorrsig_single.dat
12+
13+
tweak_batch.dat: bench_output.txt
14+
cat bench_output.txt | grep -v "tweak_check_batch_verify_1 " | awk '{ gsub(/ /,""); print }' | awk -F, 'match($$0, /tweak_check_batch_verify_([0-9]+)/, arr) {print arr[1] " " $$3}' > tweak_batch.dat
15+
16+
tweak_single.dat: bench_output.txt
17+
cat bench_output.txt | awk '{ gsub(/ /,""); print }' | awk -F, 'match($$0, /tweak_add_check/) {print $$3}' > tweak_single.dat
18+
19+
speedup-batch.png: $(schnorrsig_data) $(tweak_data) plot.gp
20+
gnuplot plot.gp
21+
22+
clean:
23+
rm *.log *.txt *.dat *.png

‎src/secp256k1/doc/speedup-batch/bench.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
output_file=$1
4+
cur_dir=$(pwd)
5+
6+
cd ../../
7+
echo "HEAD: $(git rev-parse --short HEAD)" > "$cur_dir/$output_file.log"
8+
make clean
9+
./autogen.sh
10+
./configure --enable-experimental --enable-module-batch --enable-module-schnorrsig >> "$cur_dir/$output_file.log"
11+
make -j
12+
./bench schnorrsig > "$cur_dir/$output_file"
13+
./bench extrakeys >> "$cur_dir/$output_file"

‎src/secp256k1/doc/speedup-batch/bench_output.txt

+137
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
Benchmark , Min(us) , Avg(us) , Max(us)
2+
3+
schnorrsig_sign , 50.4 , 50.5 , 50.7
4+
schnorrsig_verify , 89.1 , 89.2 , 89.3
5+
schnorrsig_batch_verify_1 , 104.0 , 104.0 , 104.0
6+
schnorrsig_batch_verify_2 , 89.0 , 89.1 , 89.1
7+
schnorrsig_batch_verify_3 , 84.1 , 84.1 , 84.1
8+
schnorrsig_batch_verify_4 , 81.5 , 81.5 , 81.5
9+
schnorrsig_batch_verify_5 , 79.9 , 79.9 , 79.9
10+
schnorrsig_batch_verify_7 , 78.0 , 78.1 , 78.3
11+
schnorrsig_batch_verify_9 , 77.0 , 77.0 , 77.1
12+
schnorrsig_batch_verify_11 , 76.2 , 76.3 , 76.3
13+
schnorrsig_batch_verify_14 , 75.6 , 75.6 , 75.6
14+
schnorrsig_batch_verify_17 , 75.2 , 75.2 , 75.2
15+
schnorrsig_batch_verify_21 , 74.8 , 74.8 , 74.8
16+
schnorrsig_batch_verify_26 , 74.5 , 74.6 , 74.9
17+
schnorrsig_batch_verify_32 , 74.3 , 74.5 , 74.7
18+
schnorrsig_batch_verify_39 , 74.1 , 74.1 , 74.1
19+
schnorrsig_batch_verify_47 , 73.9 , 73.9 , 73.9
20+
schnorrsig_batch_verify_57 , 74.5 , 74.5 , 74.5
21+
schnorrsig_batch_verify_69 , 74.3 , 74.3 , 74.5
22+
schnorrsig_batch_verify_83 , 74.1 , 74.1 , 74.2
23+
schnorrsig_batch_verify_100 , 73.9 , 74.0 , 74.1
24+
schnorrsig_batch_verify_121 , 74.1 , 74.1 , 74.2
25+
schnorrsig_batch_verify_146 , 73.9 , 73.9 , 74.0
26+
schnorrsig_batch_verify_176 , 74.0 , 74.2 , 74.5
27+
schnorrsig_batch_verify_212 , 73.9 , 74.1 , 74.1
28+
schnorrsig_batch_verify_255 , 74.0 , 74.0 , 74.1
29+
schnorrsig_batch_verify_307 , 73.9 , 74.0 , 74.1
30+
schnorrsig_batch_verify_369 , 73.9 , 73.9 , 73.9
31+
schnorrsig_batch_verify_443 , 73.9 , 74.1 , 74.3
32+
schnorrsig_batch_verify_532 , 74.0 , 74.0 , 74.1
33+
schnorrsig_batch_verify_639 , 73.9 , 74.0 , 74.0
34+
schnorrsig_batch_verify_767 , 73.9 , 73.9 , 73.9
35+
schnorrsig_batch_verify_921 , 74.0 , 74.0 , 74.1
36+
schnorrsig_batch_verify_1106 , 73.9 , 73.9 , 73.9
37+
schnorrsig_batch_verify_1328 , 73.9 , 74.1 , 74.2
38+
schnorrsig_batch_verify_1594 , 74.0 , 74.1 , 74.1
39+
schnorrsig_batch_verify_1913 , 74.0 , 74.0 , 74.0
40+
schnorrsig_batch_verify_2296 , 74.0 , 74.0 , 74.0
41+
schnorrsig_batch_verify_2756 , 73.9 , 74.0 , 74.1
42+
schnorrsig_batch_verify_3308 , 74.1 , 74.1 , 74.2
43+
schnorrsig_batch_verify_3970 , 74.1 , 74.2 , 74.4
44+
schnorrsig_batch_verify_4765 , 74.0 , 74.1 , 74.2
45+
schnorrsig_batch_verify_5719 , 74.0 , 74.1 , 74.1
46+
schnorrsig_batch_verify_6863 , 74.0 , 74.1 , 74.1
47+
schnorrsig_batch_verify_8236 , 74.0 , 74.1 , 74.1
48+
schnorrsig_batch_verify_9884 , 74.0 , 74.1 , 74.3
49+
schnorrsig_batch_verify_11861 , 74.0 , 74.0 , 74.1
50+
schnorrsig_batch_verify_14234 , 73.9 , 74.0 , 74.1
51+
schnorrsig_batch_verify_17081 , 73.9 , 73.9 , 73.9
52+
schnorrsig_batch_verify_20498 , 73.9 , 74.0 , 74.0
53+
schnorrsig_batch_verify_24598 , 73.9 , 74.0 , 74.1
54+
schnorrsig_batch_verify_29518 , 73.9 , 74.0 , 74.1
55+
schnorrsig_batch_verify_35422 , 73.9 , 73.9 , 73.9
56+
schnorrsig_batch_verify_42507 , 73.9 , 74.0 , 74.0
57+
schnorrsig_batch_verify_51009 , 73.9 , 74.1 , 74.3
58+
schnorrsig_batch_verify_61211 , 73.9 , 73.9 , 74.0
59+
schnorrsig_batch_verify_73454 , 73.9 , 74.0 , 74.3
60+
schnorrsig_batch_verify_88145 , 73.9 , 74.0 , 74.1
61+
schnorrsig_batch_verify_105775 , 74.0 , 74.1 , 74.1
62+
schnorrsig_batch_verify_126931 , 73.9 , 74.0 , 74.1
63+
schnorrsig_batch_verify_152318 , 73.9 , 73.9 , 74.0
64+
schnorrsig_batch_verify_182782 , 73.9 , 73.9 , 74.0
65+
schnorrsig_batch_verify_219339 , 73.9 , 73.9 , 74.0
66+
schnorrsig_batch_verify_263207 , 74.0 , 74.1 , 74.3
67+
schnorrsig_batch_verify_315849 , 73.9 , 74.0 , 74.0
68+
schnorrsig_batch_verify_379019 , 73.9 , 73.9 , 73.9
69+
schnorrsig_batch_verify_454823 , 74.0 , 74.0 , 74.0
70+
Benchmark , Min(us) , Avg(us) , Max(us)
71+
72+
tweak_add_check , 64.7 , 64.7 , 65.0
73+
tweak_check_batch_verify_1 , 69.7 , 69.8 , 69.8
74+
tweak_check_batch_verify_2 , 57.2 , 57.2 , 57.3
75+
tweak_check_batch_verify_3 , 52.0 , 52.1 , 52.2
76+
tweak_check_batch_verify_4 , 49.4 , 49.5 , 49.5
77+
tweak_check_batch_verify_5 , 47.9 , 47.9 , 47.9
78+
tweak_check_batch_verify_7 , 46.1 , 46.1 , 46.2
79+
tweak_check_batch_verify_9 , 45.2 , 45.2 , 45.4
80+
tweak_check_batch_verify_11 , 44.5 , 44.6 , 44.6
81+
tweak_check_batch_verify_14 , 43.9 , 43.9 , 43.9
82+
tweak_check_batch_verify_17 , 43.5 , 43.5 , 43.5
83+
tweak_check_batch_verify_21 , 43.1 , 43.1 , 43.1
84+
tweak_check_batch_verify_26 , 42.8 , 42.8 , 42.8
85+
tweak_check_batch_verify_32 , 42.5 , 42.6 , 42.6
86+
tweak_check_batch_verify_39 , 42.3 , 42.4 , 42.4
87+
tweak_check_batch_verify_47 , 42.2 , 42.2 , 42.2
88+
tweak_check_batch_verify_57 , 42.1 , 42.2 , 42.3
89+
tweak_check_batch_verify_69 , 42.0 , 42.1 , 42.1
90+
tweak_check_batch_verify_83 , 41.9 , 41.9 , 41.9
91+
tweak_check_batch_verify_100 , 41.8 , 41.9 , 41.9
92+
tweak_check_batch_verify_121 , 42.1 , 42.1 , 42.1
93+
tweak_check_batch_verify_146 , 42.0 , 42.0 , 42.0
94+
tweak_check_batch_verify_176 , 41.9 , 41.9 , 42.0
95+
tweak_check_batch_verify_212 , 41.8 , 41.9 , 41.9
96+
tweak_check_batch_verify_255 , 41.9 , 41.9 , 41.9
97+
tweak_check_batch_verify_307 , 41.8 , 41.9 , 41.9
98+
tweak_check_batch_verify_369 , 41.9 , 42.0 , 42.1
99+
tweak_check_batch_verify_443 , 41.9 , 41.9 , 41.9
100+
tweak_check_batch_verify_532 , 41.9 , 41.9 , 41.9
101+
tweak_check_batch_verify_639 , 41.9 , 41.9 , 42.0
102+
tweak_check_batch_verify_767 , 41.9 , 41.9 , 41.9
103+
tweak_check_batch_verify_921 , 41.9 , 41.9 , 41.9
104+
tweak_check_batch_verify_1106 , 41.9 , 41.9 , 41.9
105+
tweak_check_batch_verify_1328 , 41.9 , 41.9 , 42.0
106+
tweak_check_batch_verify_1594 , 41.9 , 41.9 , 42.0
107+
tweak_check_batch_verify_1913 , 41.9 , 41.9 , 41.9
108+
tweak_check_batch_verify_2296 , 41.9 , 41.9 , 41.9
109+
tweak_check_batch_verify_2756 , 41.8 , 41.9 , 41.9
110+
tweak_check_batch_verify_3308 , 41.9 , 41.9 , 42.0
111+
tweak_check_batch_verify_3970 , 41.9 , 41.9 , 41.9
112+
tweak_check_batch_verify_4765 , 41.8 , 41.9 , 41.9
113+
tweak_check_batch_verify_5719 , 41.9 , 42.0 , 42.1
114+
tweak_check_batch_verify_6863 , 42.0 , 42.0 , 42.0
115+
tweak_check_batch_verify_8236 , 42.0 , 42.0 , 42.0
116+
tweak_check_batch_verify_9884 , 41.9 , 41.9 , 42.0
117+
tweak_check_batch_verify_11861 , 41.9 , 42.0 , 42.1
118+
tweak_check_batch_verify_14234 , 41.9 , 42.0 , 42.0
119+
tweak_check_batch_verify_17081 , 41.8 , 41.9 , 41.9
120+
tweak_check_batch_verify_20498 , 41.8 , 41.9 , 41.9
121+
tweak_check_batch_verify_24598 , 41.8 , 41.9 , 41.9
122+
tweak_check_batch_verify_29518 , 41.9 , 41.9 , 41.9
123+
tweak_check_batch_verify_35422 , 41.9 , 41.9 , 41.9
124+
tweak_check_batch_verify_42507 , 41.8 , 41.8 , 41.9
125+
tweak_check_batch_verify_51009 , 41.9 , 41.9 , 41.9
126+
tweak_check_batch_verify_61211 , 41.8 , 41.8 , 41.8
127+
tweak_check_batch_verify_73454 , 41.8 , 42.0 , 42.2
128+
tweak_check_batch_verify_88145 , 41.9 , 41.9 , 41.9
129+
tweak_check_batch_verify_105775 , 41.8 , 41.8 , 41.8
130+
tweak_check_batch_verify_126931 , 41.8 , 41.9 , 41.9
131+
tweak_check_batch_verify_152318 , 41.8 , 41.9 , 42.0
132+
tweak_check_batch_verify_182782 , 41.9 , 41.9 , 41.9
133+
tweak_check_batch_verify_219339 , 41.9 , 42.0 , 42.0
134+
tweak_check_batch_verify_263207 , 41.9 , 42.0 , 42.1
135+
tweak_check_batch_verify_315849 , 41.9 , 41.9 , 41.9
136+
tweak_check_batch_verify_379019 , 41.9 , 41.9 , 42.0
137+
tweak_check_batch_verify_454823 , 41.9 , 41.9 , 41.9

0 commit comments

Comments
 (0)