Skip to content

Commit 31ecaff

Browse files
RoasbeefRoasbeef
authored
Merge pull request #1913 from sputn1ck/musig2_update
Musig2: Update to 1.0.0.rc2
2 parents 108fcf7 + d99a169 commit 31ecaff

File tree

9 files changed

+206
-64
lines changed

9 files changed

+206
-64
lines changed

‎btcec/schnorr/musig2/bench_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func genSigner(t *testing.B) signer {
5252
t.Fatalf("unable to gen key: %v", err)
5353
}
5454

55-
nonces, err := GenNonces()
55+
nonces, err := GenNonces(WithPublicKey(pubKey))
5656
if err != nil {
5757
t.Fatalf("unable to gen nonces: %v", err)
5858
}
@@ -185,7 +185,7 @@ func BenchmarkPartialVerify(b *testing.B) {
185185
for i := 0; i < b.N; i++ {
186186
ok = sig.Verify(
187187
signers[0].nonces.PubNonce, combinedNonce,
188-
keys, pubKey, msg,
188+
keys, pubKey, msg, signOpts...,
189189
)
190190
if !ok {
191191
b.Fatalf("generated invalid sig!")

‎btcec/schnorr/musig2/context.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ func NewContext(signingKey *btcec.PrivateKey, shouldSort bool,
240240
if opts.earlyNonce {
241241
var err error
242242
ctx.sessionNonce, err = GenNonces(
243+
WithPublicKey(ctx.pubKey),
243244
WithNonceSecretKeyAux(signingKey),
244245
)
245246
if err != nil {
@@ -483,6 +484,7 @@ func (c *Context) NewSession(options ...SessionOption) (*Session, error) {
483484
// in some auxiliary information to strengthen the nonce
484485
// generated.
485486
localNonces, err = GenNonces(
487+
WithPublicKey(c.pubKey),
486488
WithNonceSecretKeyAux(c.signingKey),
487489
WithNonceCombinedKeyAux(c.combinedKey.FinalKey),
488490
)

‎btcec/schnorr/musig2/data/nonce_gen_vectors.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,38 @@
33
{
44
"rand_": "0000000000000000000000000000000000000000000000000000000000000000",
55
"sk": "0202020202020202020202020202020202020202020202020202020202020202",
6+
"pk": "024D4B6CD1361032CA9BD2AEB9D900AA4D45D9EAD80AC9423374C451A7254D0766",
67
"aggpk": "0707070707070707070707070707070707070707070707070707070707070707",
78
"msg": "0101010101010101010101010101010101010101010101010101010101010101",
89
"extra_in": "0808080808080808080808080808080808080808080808080808080808080808",
9-
"expected": "BC6C683EBBCC39DCB3C29B3D010D2AAA7C86CFB562FC41ED9A460EE061013E75FB4AD2F0B816713269800D018803906D5481E00A940EAB4F4AC49B4A372EB0F4"
10+
"expected": "227243DCB40EF2A13A981DB188FA433717B506BDFA14B1AE47D5DC027C9C3B9EF2370B2AD206E724243215137C86365699361126991E6FEC816845F837BDDAC3024D4B6CD1361032CA9BD2AEB9D900AA4D45D9EAD80AC9423374C451A7254D0766"
1011
},
1112
{
1213
"rand_": "0000000000000000000000000000000000000000000000000000000000000000",
1314
"sk": "0202020202020202020202020202020202020202020202020202020202020202",
15+
"pk": "024D4B6CD1361032CA9BD2AEB9D900AA4D45D9EAD80AC9423374C451A7254D0766",
1416
"aggpk": "0707070707070707070707070707070707070707070707070707070707070707",
1517
"msg": "",
1618
"extra_in": "0808080808080808080808080808080808080808080808080808080808080808",
17-
"expected": "AAC4BFD707F4953B4063851D7E4AAD5C59D5D0BFB0E71012788A85698B5ACF8F11834D5051928424BA501C8CD064F3F942F8D4A07D8A2ED79F153E4ABD9EBBE9"
19+
"expected": "CD0F47FE471D6788FF3243F47345EA0A179AEF69476BE8348322EF39C2723318870C2065AFB52DEDF02BF4FDBF6D2F442E608692F50C2374C08FFFE57042A61C024D4B6CD1361032CA9BD2AEB9D900AA4D45D9EAD80AC9423374C451A7254D0766"
1820
},
1921
{
2022
"rand_": "0000000000000000000000000000000000000000000000000000000000000000",
2123
"sk": "0202020202020202020202020202020202020202020202020202020202020202",
24+
"pk": "024D4B6CD1361032CA9BD2AEB9D900AA4D45D9EAD80AC9423374C451A7254D0766",
2225
"aggpk": "0707070707070707070707070707070707070707070707070707070707070707",
2326
"msg": "2626262626262626262626262626262626262626262626262626262626262626262626262626",
2427
"extra_in": "0808080808080808080808080808080808080808080808080808080808080808",
25-
"expected": "DF54500DD2B503DBA3753C48A9D6B67E6C11EC4325EDD1DC256C7F75D6A85DBECA6D9857A6F3F292FB3B50DBCBF69FADB67B1CDDB0EA6EB693F6455C4C9088E1"
28+
"expected": "011F8BC60EF061DEEF4D72A0A87200D9994B3F0CD9867910085C38D5366E3E6B9FF03BC0124E56B24069E91EC3F162378983F194E8BD0ED89BE3059649EAE262024D4B6CD1361032CA9BD2AEB9D900AA4D45D9EAD80AC9423374C451A7254D0766"
2629
},
2730
{
2831
"rand_": "0000000000000000000000000000000000000000000000000000000000000000",
2932
"sk": null,
33+
"pk": "02F9308A019258C31049344F85F89D5229B531C845836F99B08601F113BCE036F9",
3034
"aggpk": null,
3135
"msg": null,
3236
"extra_in": null,
33-
"expected": "7B3B5A002356471AF0E961DE2549C121BD0D48ABCEEDC6E034BDDF86AD3E0A187ECEE674CEF7364B0BC4BEEFB8B66CAD89F98DE2F8C5A5EAD5D1D1E4BD7D04CD"
37+
"expected": "890E83616A3BC4640AB9B6374F21C81FF89CDDDBAFAA7475AE2A102A92E3EDB29FD7E874E23342813A60D9646948242646B7951CA046B4B36D7D6078506D3C9402F9308A019258C31049344F85F89D5229B531C845836F99B08601F113BCE036F9"
3438
}
3539
]
36-
}
40+
}

‎btcec/schnorr/musig2/data/sig_agg_vectors.json‎

Lines changed: 110 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,81 +6,146 @@
66
"02352433B21E7E05D3B452B81CAE566E06D2E003ECE16D1074AABA4289E0E3D581"
77
],
88
"pnonces": [
9-
"0300A32F8548F59C533F55DB9754E3C0BA3C2544F085649FDCE42B8BD3F244C2CA0384449BED61004E8863452A38534E91875516C3CC543122CE2BE1F31845025588",
10-
"03F66B072A869BC2A57D776D487151D707E82B4F1B885066A589858C1BF3871DB603ED391C9658AB6031A96ACBD5E2D9FEC465EFDC8C0D0B765C9B9F3579D520FB6F",
11-
"03A5791CA078E278126EF457C25B5C835F7282C0A47BDBF464BA35C3769427D5CD034D40350F8A5590985E38AAEFC3C695DF671C2E5498E2B60C082C546E06ECAF78",
12-
"020DE6382B8C0550E8174D5263B981224EBCFEF7706588B6936177FEB68E639B8C02BA5F18DDB3487AD087F63CEF7D7818AC8ECA3D6B736113FF36FB25D113F514F6",
13-
"031883080513BB69B31367F9A7B5F4E81246C627060A7414B7F137FA8459F261990345445505F158EDCFDF0D4BF26E04E018C143BF76B5D457AE57DF06CA41371DF0",
14-
"0300028E83123E7FAB1E1F230547CE8B96CC23F13197312972DE72AACBA98EF9870274C2D8566E9E021AA7E2DDDA01B52AE670E0742418F147610528B65ACDB4D0B3"
9+
"036E5EE6E28824029FEA3E8A9DDD2C8483F5AF98F7177C3AF3CB6F47CAF8D94AE902DBA67E4A1F3680826172DA15AFB1A8CA85C7C5CC88900905C8DC8C328511B53E",
10+
"03E4F798DA48A76EEC1C9CC5AB7A880FFBA201A5F064E627EC9CB0031D1D58FC5103E06180315C5A522B7EC7C08B69DCD721C313C940819296D0A7AB8E8795AC1F00",
11+
"02C0068FD25523A31578B8077F24F78F5BD5F2422AFF47C1FADA0F36B3CEB6C7D202098A55D1736AA5FCC21CF0729CCE852575C06C081125144763C2C4C4A05C09B6",
12+
"031F5C87DCFBFCF330DEE4311D85E8F1DEA01D87A6F1C14CDFC7E4F1D8C441CFA40277BF176E9F747C34F81B0D9F072B1B404A86F402C2D86CF9EA9E9C69876EA3B9",
13+
"023F7042046E0397822C4144A17F8B63D78748696A46C3B9F0A901D296EC3406C302022B0B464292CF9751D699F10980AC764E6F671EFCA15069BBE62B0D1C62522A",
14+
"02D97DDA5988461DF58C5897444F116A7C74E5711BF77A9446E27806563F3B6C47020CBAD9C363A7737F99FA06B6BE093CEAFF5397316C5AC46915C43767AE867C00"
1515
],
1616
"tweaks": [
1717
"B511DA492182A91B0FFB9A98020D55F260AE86D7ECBD0399C7383D59A5F2AF7C",
1818
"A815FE049EE3C5AAB66310477FBC8BCCCAC2F3395F59F921C364ACD78A2F48DC",
1919
"75448A87274B056468B977BE06EB1E9F657577B7320B0A3376EA51FD420D18A8"
2020
],
2121
"psigs": [
22-
"7918521F42E5727FE2E82D802876E0C8844336FDA1B58C82696A55B0188C8B3D",
23-
"599044037AE15C4A99FB94F022B48E7AB215BF703954EC0B83D0E06230476001",
24-
"F05BE3CA783AD1FAF68C5059B43F859BFD4EBB0242459DF2C6BF013F4217F7E7",
25-
"BF85B2A751066466C24A5E7FA6C90DBAADAC2DF1F0BB48546AE239E340437CEB",
26-
"142076B034A7401123EFB07E2317DF819B86B3FFA17180DDD093997D018270D0",
27-
"B7A0C7F5B325B7993925E56B60F53EF8198169F31E1AF7E62BBEF1C5DCD1BA22",
28-
"C717ECA32C148CE8EB8882CD9656DF9C64929DCAE9AF798E381B1E888DDF0F8F",
29-
"5988823E78488D8005311E16E5EA67AF70514CB44F5A5CD51FFA262BEEAA21CE",
22+
"B15D2CD3C3D22B04DAE438CE653F6B4ECF042F42CFDED7C41B64AAF9B4AF53FB",
23+
"6193D6AC61B354E9105BBDC8937A3454A6D705B6D57322A5A472A02CE99FCB64",
24+
"9A87D3B79EC67228CB97878B76049B15DBD05B8158D17B5B9114D3C226887505",
25+
"66F82EA90923689B855D36C6B7E032FB9970301481B99E01CDB4D6AC7C347A15",
26+
"4F5AEE41510848A6447DCD1BBC78457EF69024944C87F40250D3EF2C25D33EFE",
27+
"DDEF427BBB847CC027BEFF4EDB01038148917832253EBC355FC33F4A8E2FCCE4",
28+
"97B890A26C981DA8102D3BC294159D171D72810FDF7C6A691DEF02F0F7AF3FDC",
29+
"53FA9E08BA5243CBCB0D797C5EE83BC6728E539EB76C2D0BF0F971EE4E909971",
3030
"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141"
3131
],
3232
"msg": "599C67EA410D005B9DA90817CF03ED3B1C868E4DA4EDF00A5880B0082C237869",
3333
"valid_test_cases": [
3434
{
35-
"aggnonce": "02BC34CDF6FA1298D7B6A126812FAD0739005BC44E45C21276EEFE41AAF841C86F03F3562AED52243BB99F43D1677DB59F0FEFB961633997F7AC924B78FBD0B0334F",
36-
"nonce_indices": [0, 1],
37-
"key_indices": [0, 1],
35+
"aggnonce": "0341432722C5CD0268D829C702CF0D1CBCE57033EED201FD335191385227C3210C03D377F2D258B64AADC0E16F26462323D701D286046A2EA93365656AFD9875982B",
36+
"nonce_indices": [
37+
0,
38+
1
39+
],
40+
"key_indices": [
41+
0,
42+
1
43+
],
3844
"tweak_indices": [],
3945
"is_xonly": [],
40-
"psig_indices": [0, 1],
41-
"expected": "CA3C28729659E50F829F55DC5DB1DE88A05D1702B4165B85F95B627FC57733F8D2A89622BDC6CECA7CE3C2704B2B6F433658F66DDB0A788DED3B361248D3EB3E"
46+
"psig_indices": [
47+
0,
48+
1
49+
],
50+
"expected": "041DA22223CE65C92C9A0D6C2CAC828AAF1EEE56304FEC371DDF91EBB2B9EF0912F1038025857FEDEB3FF696F8B99FA4BB2C5812F6095A2E0004EC99CE18DE1E"
4251
},
4352
{
44-
"aggnonce": "035538518B8043CF4EACD0E701A80657B741C0E6445EC1D6C6177964D22C642971030CFE657EC882F4E08E751B883A78AC1491B30FC86CB57AF2DFF012C2BE6DF1F2",
45-
"nonce_indices": [0, 2],
46-
"key_indices": [0, 2],
53+
"aggnonce": "0224AFD36C902084058B51B5D36676BBA4DC97C775873768E58822F87FE437D792028CB15929099EEE2F5DAE404CD39357591BA32E9AF4E162B8D3E7CB5EFE31CB20",
54+
"nonce_indices": [
55+
0,
56+
2
57+
],
58+
"key_indices": [
59+
0,
60+
2
61+
],
4762
"tweak_indices": [],
4863
"is_xonly": [],
49-
"psig_indices": [2, 3],
50-
"expected": "3997A11DFF76349532CF25E761365EA1D4F24B62EB23A12A9DAABD5976C3DB9FAFE19671C9413661B8D6AED95B089357F04C0C0D83B8460B71CEDC95B2253391"
64+
"psig_indices": [
65+
2,
66+
3
67+
],
68+
"expected": "1069B67EC3D2F3C7C08291ACCB17A9C9B8F2819A52EB5DF8726E17E7D6B52E9F01800260A7E9DAC450F4BE522DE4CE12BA91AEAF2B4279219EF74BE1D286ADD9"
5169
},
5270
{
53-
"aggnonce": "024366775E6FFBEBBB954225936BAED71A3884C7933B18225088D19E7AF12D8D5D028D79A520B347B793FFE897A7EB79A4366A3FDCDC652C243FAC3976B3D6DF8AB2",
54-
"nonce_indices": [0, 3],
55-
"key_indices": [0, 2],
56-
"tweak_indices": [0],
57-
"is_xonly": [false],
58-
"psig_indices": [4, 5],
59-
"expected": "5AF759C2839B7FEE59D31DAB800F82FC21258457773A3B1F69F5228C80CAD4317EA39AD756601030E4D4051B7C9A25AB4DE7CB39BED26E0A03A1B2ED5B747F7F"
71+
"aggnonce": "0208C5C438C710F4F96A61E9FF3C37758814B8C3AE12BFEA0ED2C87FF6954FF186020B1816EA104B4FCA2D304D733E0E19CEAD51303FF6420BFD222335CAA402916D",
72+
"nonce_indices": [
73+
0,
74+
3
75+
],
76+
"key_indices": [
77+
0,
78+
2
79+
],
80+
"tweak_indices": [
81+
0
82+
],
83+
"is_xonly": [
84+
false
85+
],
86+
"psig_indices": [
87+
4,
88+
5
89+
],
90+
"expected": "5C558E1DCADE86DA0B2F02626A512E30A22CF5255CAEA7EE32C38E9A71A0E9148BA6C0E6EC7683B64220F0298696F1B878CD47B107B81F7188812D593971E0CC"
6091
},
6192
{
62-
"aggnonce": "03B25098C6D0B72DC5717314AF26C126609B4776AA468553DD4354EE20B216B227027D242E9203499173A74E286C1F796F2711E171EE937706BBEA2F4DB10C4E6809",
63-
"nonce_indices": [0, 4],
64-
"key_indices": [0, 3],
65-
"tweak_indices": [0, 1, 2],
66-
"is_xonly": [true, false, true],
67-
"psig_indices": [6, 7],
68-
"expected": "B495A478F91D6E10BF08A156E46D9E62B4C5399C1AEDDA1A9D306F06AFB8A52F2C078FD6B50DDBC33BFFE583C3C1E3D0D5E52891E190101C70D2278BCA943457"
93+
"aggnonce": "02B5AD07AFCD99B6D92CB433FBD2A28FDEB98EAE2EB09B6014EF0F8197CD58403302E8616910F9293CF692C49F351DB86B25E352901F0E237BAFDA11F1C1CEF29FFD",
94+
"nonce_indices": [
95+
0,
96+
4
97+
],
98+
"key_indices": [
99+
0,
100+
3
101+
],
102+
"tweak_indices": [
103+
0,
104+
1,
105+
2
106+
],
107+
"is_xonly": [
108+
true,
109+
false,
110+
true
111+
],
112+
"psig_indices": [
113+
6,
114+
7
115+
],
116+
"expected": "839B08820B681DBA8DAF4CC7B104E8F2638F9388F8D7A555DC17B6E6971D7426CE07BF6AB01F1DB50E4E33719295F4094572B79868E440FB3DEFD3FAC1DB589E"
69117
}
70118
],
71119
"error_test_cases": [
72120
{
73-
"aggnonce": "03B25098C6D0B72DC5717314AF26C126609B4776AA468553DD4354EE20B216B227027D242E9203499173A74E286C1F796F2711E171EE937706BBEA2F4DB10C4E6809",
74-
"nonce_indices": [0, 4],
75-
"key_indices": [0, 3],
76-
"tweak_indices": [0, 1, 2],
77-
"is_xonly": [true, false, true],
78-
"psig_indices": [7, 8],
121+
"aggnonce": "02B5AD07AFCD99B6D92CB433FBD2A28FDEB98EAE2EB09B6014EF0F8197CD58403302E8616910F9293CF692C49F351DB86B25E352901F0E237BAFDA11F1C1CEF29FFD",
122+
"nonce_indices": [
123+
0,
124+
4
125+
],
126+
"key_indices": [
127+
0,
128+
3
129+
],
130+
"tweak_indices": [
131+
0,
132+
1,
133+
2
134+
],
135+
"is_xonly": [
136+
true,
137+
false,
138+
true
139+
],
140+
"psig_indices": [
141+
7,
142+
8
143+
],
79144
"error": {
80145
"type": "invalid_contribution",
81146
"signer": 1
82147
},
83148
"comment": "Partial signature is invalid because it exceeds group size"
84149
}
85150
]
86-
}
151+
}

‎btcec/schnorr/musig2/data/sign_verify_vectors.json‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"020000000000000000000000000000000000000000000000000000000000000007"
88
],
99
"secnonces": [
10-
"508B81A611F100A6B2B6B29656590898AF488BCF2E1F55CF22E5CFB84421FE61FA27FD49B1D50085B481285E1CA205D55C82CC1B31FF5CD54A489829355901F7",
11-
"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
10+
"508B81A611F100A6B2B6B29656590898AF488BCF2E1F55CF22E5CFB84421FE61FA27FD49B1D50085B481285E1CA205D55C82CC1B31FF5CD54A489829355901F703935F972DA013F80AE011890FA89B67A27B7BE6CCB24D3274D18B2D4067F261A9",
11+
"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003935F972DA013F80AE011890FA89B67A27B7BE6CCB24D3274D18B2D4067F261A9"
1212
],
1313
"pnonces": [
1414
"0337C87821AFD50A8644D820A8F3E02E499C931865C2360FB43D0A0D20DAFE07EA0287BF891D2A6DEAEBADC909352AA9405D1428C15F4B75F04DAE642A95C2548480",
@@ -65,6 +65,17 @@
6565
}
6666
],
6767
"sign_error_test_cases": [
68+
{
69+
"key_indices": [1, 2],
70+
"aggnonce_index": 0,
71+
"msg_index": 0,
72+
"secnonce_index": 0,
73+
"error": {
74+
"type": "value",
75+
"message": "The signer's pubkey must be included in the list of pubkeys."
76+
},
77+
"comment": "The signers pubkey is not in the list of pubkeys"
78+
},
6879
{
6980
"key_indices": [1, 0, 3],
7081
"aggnonce_index": 0,

‎btcec/schnorr/musig2/data/tweak_vectors.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"02F9308A019258C31049344F85F89D5229B531C845836F99B08601F113BCE036F9",
66
"02DFF1D77F2A671C5F36183726DB2341BE58FEAE1DA2DECED843240F7B502BA659"
77
],
8-
"secnonce": "508B81A611F100A6B2B6B29656590898AF488BCF2E1F55CF22E5CFB84421FE61FA27FD49B1D50085B481285E1CA205D55C82CC1B31FF5CD54A489829355901F7",
8+
"secnonce": "508B81A611F100A6B2B6B29656590898AF488BCF2E1F55CF22E5CFB84421FE61FA27FD49B1D50085B481285E1CA205D55C82CC1B31FF5CD54A489829355901F703935F972DA013F80AE011890FA89B67A27B7BE6CCB24D3274D18B2D4067F261A9",
99
"pnonces": [
1010
"0337C87821AFD50A8644D820A8F3E02E499C931865C2360FB43D0A0D20DAFE07EA0287BF891D2A6DEAEBADC909352AA9405D1428C15F4B75F04DAE642A95C2548480",
1111
"0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F817980279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",

0 commit comments

Comments
 (0)