Skip to content

Commit df99e36

Browse files
theStackjosibake
theStack
authored and
josibake
committed
ci: enable silentpayments module
1 parent 7175220 commit df99e36

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 10 deletions
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'
@@ -84,18 +85,18 @@ jobs:
8485
matrix:
8586
configuration:
8687
- env_vars: { WIDEMUL: 'int64', RECOVERY: 'yes' }
87-
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
88+
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
8889
- env_vars: { WIDEMUL: 'int128' }
8990
- env_vars: { WIDEMUL: 'int128_struct', ELLSWIFT: 'yes' }
9091
- env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
91-
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
92+
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes' }
9293
- env_vars: { WIDEMUL: 'int128', ASM: 'x86_64', ELLSWIFT: 'yes' }
9394
- env_vars: { RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
94-
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', CPPFLAGS: '-DVERIFY' }
95+
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes', CPPFLAGS: '-DVERIFY' }
9596
- env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' }
9697
- env_vars: { CPPFLAGS: '-DDETERMINISTIC' }
9798
- env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' }
98-
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
99+
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
99100
- env_vars: { ECMULTGENKB: 2, ECMULTWINDOW: 2 }
100101
- env_vars: { ECMULTGENKB: 86, ECMULTWINDOW: 4 }
101102
cc:
@@ -142,6 +143,7 @@ jobs:
142143
SCHNORRSIG: 'yes'
143144
MUSIG: 'yes'
144145
ELLSWIFT: 'yes'
146+
SILENTPAYMENTS: 'yes'
145147
CC: ${{ matrix.cc }}
146148

147149
steps:
@@ -174,6 +176,7 @@ jobs:
174176
SCHNORRSIG: 'yes'
175177
MUSIG: 'yes'
176178
ELLSWIFT: 'yes'
179+
SILENTPAYMENTS: 'yes'
177180
CTIMETESTS: 'no'
178181

179182
steps:
@@ -214,6 +217,7 @@ jobs:
214217
SCHNORRSIG: 'yes'
215218
MUSIG: 'yes'
216219
ELLSWIFT: 'yes'
220+
SILENTPAYMENTS: 'yes'
217221
CTIMETESTS: 'no'
218222

219223
steps:
@@ -245,6 +249,7 @@ jobs:
245249
SCHNORRSIG: 'yes'
246250
MUSIG: 'yes'
247251
ELLSWIFT: 'yes'
252+
SILENTPAYMENTS: 'yes'
248253
CTIMETESTS: 'no'
249254
CC: ${{ matrix.cc }}
250255

@@ -287,6 +292,7 @@ jobs:
287292
SCHNORRSIG: 'yes'
288293
MUSIG: 'yes'
289294
ELLSWIFT: 'yes'
295+
SILENTPAYMENTS: 'yes'
290296
CTIMETESTS: 'no'
291297

292298
steps:
@@ -348,6 +354,7 @@ jobs:
348354
SCHNORRSIG: 'yes'
349355
MUSIG: 'yes'
350356
ELLSWIFT: 'yes'
357+
SILENTPAYMENTS: 'yes'
351358
CTIMETESTS: 'no'
352359
SECP256K1_TEST_ITERS: 2
353360

@@ -387,6 +394,7 @@ jobs:
387394
SCHNORRSIG: 'yes'
388395
MUSIG: 'yes'
389396
ELLSWIFT: 'yes'
397+
SILENTPAYMENTS: 'yes'
390398
CTIMETESTS: 'no'
391399
CFLAGS: '-fsanitize=undefined,address -g'
392400
UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
@@ -440,6 +448,7 @@ jobs:
440448
SCHNORRSIG: 'yes'
441449
MUSIG: 'yes'
442450
ELLSWIFT: 'yes'
451+
SILENTPAYMENTS: 'yes'
443452
CC: 'clang'
444453
SECP256K1_TEST_ITERS: 32
445454
ASM: 'no'
@@ -476,6 +485,7 @@ jobs:
476485
SCHNORRSIG: 'yes'
477486
MUSIG: 'yes'
478487
ELLSWIFT: 'yes'
488+
SILENTPAYMENTS: 'yes'
479489
CTIMETESTS: 'no'
480490

481491
strategy:
@@ -519,14 +529,14 @@ jobs:
519529
fail-fast: false
520530
matrix:
521531
env_vars:
522-
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
532+
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
523533
- { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
524-
- { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
534+
- { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
525535
- { WIDEMUL: 'int128', RECOVERY: 'yes' }
526-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
527-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
528-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
529-
- { 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 }
536+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
537+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc' }
538+
- { 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 }
539+
- { 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 }
530540
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
531541
- BUILD: 'distcheck'
532542

@@ -697,6 +707,7 @@ jobs:
697707
SCHNORRSIG: 'yes'
698708
MUSIG: 'yes'
699709
ELLSWIFT: 'yes'
710+
SILENTPAYMENTS: 'yes'
700711

701712
steps:
702713
- name: Checkout

‎ci/ci.sh‎

Lines changed: 2 additions & 1 deletion
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)