Skip to content

Commit 746abfb

Browse files
theStackstratospher
theStack
authored and
stratospher
committed
ci: enable silentpayments module
1 parent a794d23 commit 746abfb

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

‎.cirrus.yml

Lines changed: 3 additions & 0 deletions
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
@@ -72,6 +73,7 @@ task:
7273
SCHNORRSIG: yes
7374
MUSIG: yes
7475
ELLSWIFT: yes
76+
SILENTPAYMENTS: yes
7577
matrix:
7678
# Currently only gcc-snapshot, the other compilers are tested on GHA with QEMU
7779
- env: { CC: 'gcc-snapshot' }
@@ -90,6 +92,7 @@ task:
9092
SCHNORRSIG: yes
9193
MUSIG: yes
9294
ELLSWIFT: yes
95+
SILENTPAYMENTS: yes
9396
WRAPPER_CMD: 'valgrind --error-exitcode=42'
9497
SECP256K1_TEST_ITERS: 2
9598
matrix:

‎.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'
@@ -73,18 +74,18 @@ jobs:
7374
matrix:
7475
configuration:
7576
- env_vars: { WIDEMUL: 'int64', RECOVERY: 'yes' }
76-
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
77+
- env_vars: { WIDEMUL: 'int64', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
7778
- env_vars: { WIDEMUL: 'int128' }
7879
- env_vars: { WIDEMUL: 'int128_struct', ELLSWIFT: 'yes' }
7980
- env_vars: { WIDEMUL: 'int128', RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
80-
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
81+
- env_vars: { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes' }
8182
- env_vars: { WIDEMUL: 'int128', ASM: 'x86_64', ELLSWIFT: 'yes' }
8283
- env_vars: { RECOVERY: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes' }
83-
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', CPPFLAGS: '-DVERIFY' }
84+
- env_vars: { CTIMETESTS: 'no', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', SILENTPAYMENTS: 'yes', CPPFLAGS: '-DVERIFY' }
8485
- env_vars: { BUILD: 'distcheck', WITH_VALGRIND: 'no', CTIMETESTS: 'no', BENCH: 'no' }
8586
- env_vars: { CPPFLAGS: '-DDETERMINISTIC' }
8687
- env_vars: { CFLAGS: '-O0', CTIMETESTS: 'no' }
87-
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
88+
- env_vars: { CFLAGS: '-O1', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
8889
- env_vars: { ECMULTGENKB: 2, ECMULTWINDOW: 2 }
8990
- env_vars: { ECMULTGENKB: 86, ECMULTWINDOW: 4 }
9091
cc:
@@ -145,6 +146,7 @@ jobs:
145146
SCHNORRSIG: 'yes'
146147
MUSIG: 'yes'
147148
ELLSWIFT: 'yes'
149+
SILENTPAYMENTS: 'yes'
148150
CC: ${{ matrix.cc }}
149151

150152
steps:
@@ -191,6 +193,7 @@ jobs:
191193
SCHNORRSIG: 'yes'
192194
MUSIG: 'yes'
193195
ELLSWIFT: 'yes'
196+
SILENTPAYMENTS: 'yes'
194197
CTIMETESTS: 'no'
195198

196199
steps:
@@ -244,6 +247,7 @@ jobs:
244247
SCHNORRSIG: 'yes'
245248
MUSIG: 'yes'
246249
ELLSWIFT: 'yes'
250+
SILENTPAYMENTS: 'yes'
247251
CTIMETESTS: 'no'
248252

249253
steps:
@@ -291,6 +295,7 @@ jobs:
291295
SCHNORRSIG: 'yes'
292296
MUSIG: 'yes'
293297
ELLSWIFT: 'yes'
298+
SILENTPAYMENTS: 'yes'
294299
CTIMETESTS: 'no'
295300

296301
strategy:
@@ -348,6 +353,7 @@ jobs:
348353
SCHNORRSIG: 'yes'
349354
MUSIG: 'yes'
350355
ELLSWIFT: 'yes'
356+
SILENTPAYMENTS: 'yes'
351357
CTIMETESTS: 'no'
352358

353359
steps:
@@ -402,6 +408,7 @@ jobs:
402408
SCHNORRSIG: 'yes'
403409
MUSIG: 'yes'
404410
ELLSWIFT: 'yes'
411+
SILENTPAYMENTS: 'yes'
405412
CTIMETESTS: 'no'
406413
SECP256K1_TEST_ITERS: 2
407414

@@ -455,6 +462,7 @@ jobs:
455462
SCHNORRSIG: 'yes'
456463
MUSIG: 'yes'
457464
ELLSWIFT: 'yes'
465+
SILENTPAYMENTS: 'yes'
458466
CTIMETESTS: 'no'
459467
CFLAGS: '-fsanitize=undefined,address -g'
460468
UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
@@ -521,6 +529,7 @@ jobs:
521529
SCHNORRSIG: 'yes'
522530
MUSIG: 'yes'
523531
ELLSWIFT: 'yes'
532+
SILENTPAYMENTS: 'yes'
524533
CC: 'clang'
525534
SECP256K1_TEST_ITERS: 32
526535
ASM: 'no'
@@ -569,6 +578,7 @@ jobs:
569578
SCHNORRSIG: 'yes'
570579
MUSIG: 'yes'
571580
ELLSWIFT: 'yes'
581+
SILENTPAYMENTS: 'yes'
572582
CTIMETESTS: 'no'
573583

574584
strategy:
@@ -625,14 +635,14 @@ jobs:
625635
fail-fast: false
626636
matrix:
627637
env_vars:
628-
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
638+
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
629639
- { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
630-
- { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
640+
- { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
631641
- { WIDEMUL: 'int128', RECOVERY: 'yes' }
632-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
633-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
634-
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 }
635-
- { 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 }
642+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes' }
643+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', SILENTPAYMENTS: 'yes', CC: 'gcc' }
644+
- { 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 }
645+
- { 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 }
636646
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' }
637647
- BUILD: 'distcheck'
638648

@@ -802,6 +812,7 @@ jobs:
802812
SCHNORRSIG: 'yes'
803813
MUSIG: 'yes'
804814
ELLSWIFT: 'yes'
815+
SILENTPAYMENTS: 'yes'
805816

806817
steps:
807818
- 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\
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)