Merge pull request #30 from jonasnick/noncegentest2

jonasnick · Jun 27, 2022 · 3a4f168 · 3a4f168
2 parents 9fc18ce + 79438fd
commit 3a4f168
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/bip-musig2.mediawiki b/bip-musig2.mediawiki
@@ -598,6 +598,7 @@ An exception to this rule is <code>MAJOR</code> version zero (0.y.z) which is fo
 The <code>MINOR</code> version is incremented whenever the inputs or the output of an algorithm changes in a backward-compatible way or new backward-compatible functionality is added.
 The <code>PATCH</code> version is incremented for other changes that are noteworthy (bug fixes, test vectors, important clarifications, etc.).
 
+* '''0.5.2''' (2022-06-26): Fix ''aggpk'' in ''NonceGen'' test vectors.
 * '''0.5.1''' (2022-06-22): Rename "ordinary" tweaking to "plain" tweaking.
 * '''0.5.0''' (2022-06-21): Separate ApplyTweak from KeyAgg and introduce KeyGen Context.
 * '''0.4.0''' (2022-06-20): Allow the output of NonceAgg to be infinity and add test vectors

diff --git a/bip-musig2/reference.py b/bip-musig2/reference.py
@@ -439,14 +439,16 @@ def fill(i):
     rand_ = fill(0)
     msg = fill(1)
     sk = fill(2)
-    aggpk = fill(3)
-    extra_in = fill(4)
+    aggpk = fill(7)
+    # This aggpk is a valid public key
+    assert(lift_x(aggpk) != None)
+    extra_in = fill(8)
 
     expected = fromhex_all([
-        '149378B996F012F70C1016C29AE0A9B1D86AAD557CCD29178A24479756205DFD' +
-        '6285697E57E8578FCFDE6FE7FA4B6CA8E3A5AECAB4FB92F84B7F9DF8DDEF4DB8',
-        '6613EA4A36A50F34990EAF73612EAA28636ED01325793456C04D8D89DB49372B' +
-        '54E9DB34D09CBD394DB3FE3CCFFBCA6ED016F3AC877938613095893F54FA70DF',
+        'E8F2E103D86800F19A4E97338D371CB885DB2F19D08C0BD205BBA9B906C971D0' +
+        'D786A17718AAFAD6DE025DDDD99DC823E2DFC1AE1DDFE920888AD53FFF423FC4',
+        '8A633F5EECBDB690A6BE4921426F41BE78D509DC1CE894C1215844C0E4C6DE7A' +
+        'BC9A5BE0A3BF3FE312CCB7E4817D2CB17A7CEA8382B73A99A583E323387B3C32',
         '7B3B5A002356471AF0E961DE2549C121BD0D48ABCEEDC6E034BDDF86AD3E0A18' +
         '7ECEE674CEF7364B0BC4BEEFB8B66CAD89F98DE2F8C5A5EAD5D1D1E4BD7D04CD'
     ])