Skip to content

Commit bc55515

Browse files
theStackjosibake
theStack
authored and
josibake
committed
ci: enable silentpayments module
1 parent 5ce5a45 commit bc55515

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

‎.cirrus.yml

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424
SCHNORRSIG: no
2525
MUSIG: no
2626
ELLSWIFT: no
27+
SILENTPAYMENTS: no
2728
### test options
2829
SECP256K1_TEST_ITERS: 64
2930
BENCH: yes
@@ -75,6 +76,7 @@ task:
7576
SCHNORRSIG: yes
7677
MUSIG: yes
7778
ELLSWIFT: yes
79+
SILENTPAYMENTS: yes
7880
matrix:
7981
# Currently only gcc-snapshot, the other compilers are tested on GHA with QEMU
8082
- env: { CC: 'gcc-snapshot' }
@@ -93,6 +95,7 @@ task:
9395
SCHNORRSIG: yes
9496
MUSIG: yes
9597
ELLSWIFT: yes
98+
SILENTPAYMENTS: yes
9699
WRAPPER_CMD: 'valgrind --error-exitcode=42'
97100
SECP256K1_TEST_ITERS: 2
98101
matrix:

‎.github/workflows/ci.yml

+21-10
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ env:
3535
SCHNORRSIG: 'no'
3636
MUSIG: 'no'
3737
ELLSWIFT: 'no'
38+
SILENTPAYMENTS: 'no'
3839
### test options
3940
SECP256K1_TEST_ITERS: 64
4041
BENCH: 'yes'
@@ -74,18 +75,18 @@ jobs:
7475
matrix:
7576
configuration:
7677
- env_vars: { WIDEMUL: 'int64', RECOVERY: 'yes' }
77-
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
78+
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
7879
- env_vars: { WIDEMUL: 'int128' }
7980
- env_vars: { WIDEMUL: 'int128_struct', ELLSWIFT: 'yes' }
8081
- env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
81-
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
82+
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes' }
8283
- env_vars: { WIDEMUL: 'int128', ASM: 'x86_64', ELLSWIFT: 'yes' }
8384
- env_vars: { RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
84-
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', CPPFLAGS: '-DVERIFY' }
85+
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes', CPPFLAGS: '-DVERIFY' }
8586
- env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' }
8687
- env_vars: { CPPFLAGS: '-DDETERMINISTIC' }
8788
- env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' }
88-
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
89+
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
8990
- env_vars: { ECMULTGENKB: 2, ECMULTWINDOW: 2 }
9091
- env_vars: { ECMULTGENKB: 86, ECMULTWINDOW: 4 }
9192
cc:
@@ -132,6 +133,7 @@ jobs:
132133
SCHNORRSIG: 'yes'
133134
MUSIG: 'yes'
134135
ELLSWIFT: 'yes'
136+
SILENTPAYMENTS: 'yes'
135137
CC: ${{ matrix.cc }}
136138

137139
steps:
@@ -164,6 +166,7 @@ jobs:
164166
SCHNORRSIG: 'yes'
165167
MUSIG: 'yes'
166168
ELLSWIFT: 'yes'
169+
SILENTPAYMENTS: 'yes'
167170
CTIMETESTS: 'no'
168171

169172
steps:
@@ -204,6 +207,7 @@ jobs:
204207
SCHNORRSIG: 'yes'
205208
MUSIG: 'yes'
206209
ELLSWIFT: 'yes'
210+
SILENTPAYMENTS: 'yes'
207211
CTIMETESTS: 'no'
208212

209213
steps:
@@ -237,6 +241,7 @@ jobs:
237241
SCHNORRSIG: 'yes'
238242
MUSIG: 'yes'
239243
ELLSWIFT: 'yes'
244+
SILENTPAYMENTS: 'yes'
240245
CTIMETESTS: 'no'
241246

242247
strategy:
@@ -280,6 +285,7 @@ jobs:
280285
SCHNORRSIG: 'yes'
281286
MUSIG: 'yes'
282287
ELLSWIFT: 'yes'
288+
SILENTPAYMENTS: 'yes'
283289
CTIMETESTS: 'no'
284290

285291
steps:
@@ -321,6 +327,7 @@ jobs:
321327
SCHNORRSIG: 'yes'
322328
MUSIG: 'yes'
323329
ELLSWIFT: 'yes'
330+
SILENTPAYMENTS: 'yes'
324331
CTIMETESTS: 'no'
325332
SECP256K1_TEST_ITERS: 2
326333

@@ -360,6 +367,7 @@ jobs:
360367
SCHNORRSIG: 'yes'
361368
MUSIG: 'yes'
362369
ELLSWIFT: 'yes'
370+
SILENTPAYMENTS: 'yes'
363371
CTIMETESTS: 'no'
364372
CFLAGS: '-fsanitize=undefined,address -g'
365373
UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
@@ -413,6 +421,7 @@ jobs:
413421
SCHNORRSIG: 'yes'
414422
MUSIG: 'yes'
415423
ELLSWIFT: 'yes'
424+
SILENTPAYMENTS: 'yes'
416425
CC: 'clang'
417426
SECP256K1_TEST_ITERS: 32
418427
ASM: 'no'
@@ -449,6 +458,7 @@ jobs:
449458
SCHNORRSIG: 'yes'
450459
MUSIG: 'yes'
451460
ELLSWIFT: 'yes'
461+
SILENTPAYMENTS: 'yes'
452462
CTIMETESTS: 'no'
453463

454464
strategy:
@@ -492,14 +502,14 @@ jobs:
492502
fail-fast: false
493503
matrix:
494504
env_vars:
495-
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
505+
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
496506
- { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
497-
- { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
507+
- { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
498508
- { WIDEMUL: 'int128', RECOVERY: 'yes' }
499-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
500-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
501-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
502-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
509+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
510+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc' }
511+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
512+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
503513
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
504514
- BUILD: 'distcheck'
505515

@@ -669,6 +679,7 @@ jobs:
669679
SCHNORRSIG: 'yes'
670680
MUSIG: 'yes'
671681
ELLSWIFT: 'yes'
682+
SILENTPAYMENTS: 'yes'
672683

673684
steps:
674685
- name: Checkout

‎ci/ci.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ print_environment() {
1313
# does not rely on bash.
1414
for var in WERROR_CFLAGS MAKEFLAGS BUILD \
1515
ECMULTWINDOW ECMULTGENKB ASM WIDEMUL WITH_VALGRIND EXTRAFLAGS \
16-
EXPERIMENTAL ECDH RECOVERY EXTRAKEYS MUSIG SCHNORRSIG ELLSWIFT \
16+
EXPERIMENTAL ECDH RECOVERY EXTRAKEYS MUSIG SCHNORRSIG ELLSWIFT SILENTPAYMENTS \
1717
SECP256K1_TEST_ITERS BENCH SECP256K1_BENCH_ITERS CTIMETESTS SYMBOL_CHECK \
1818
EXAMPLES \
1919
HOST WRAPPER_CMD \
@@ -80,6 +80,7 @@ esac
8080
--enable-module-extrakeys="$EXTRAKEYS" \
8181
--enable-module-schnorrsig="$SCHNORRSIG" \
8282
--enable-module-musig="$MUSIG" \
83+
--enable-module-silentpayments="$SILENTPAYMENTS" \
8384
--enable-examples="$EXAMPLES" \
8485
--enable-ctime-tests="$CTIMETESTS" \
8586
--with-valgrind="$WITH_VALGRIND" \

0 commit comments

Comments
 (0)