mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2025-02-24 06:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2003 from sputn1ck/musig2_fix_early_nonce_gen

Browse source 
musig2: fix early nonce gen option
This commit is contained in:
Olaoluwa Osuntokun 2023-07-11 15:28:09 -07:00 • committed by GitHub
commit 7faa9b2662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
btcec/schnorr/musig2/context.go
View file

@ -234,9 +234,12 @@ func NewContext(signingKey *btcec.PrivateKey, shouldSort bool,
opts.keySet = make([]*btcec.PublicKey, 0, opts.numSigners)
opts.keySet = append(opts.keySet, pubKey)
// If early nonce generation is specified, then we'll generate
// the nonce now to pass in to the session once all the callers
// are known.
default:
return nil, ErrSignersNotSpecified
}
// If early nonce generation is specified, then we'll generate the
// nonce now to pass in to the session once all the callers are known.
if opts.earlyNonce {
var err error
ctx.sessionNonce, err = GenNonces(
@ -248,10 +251,6 @@ func NewContext(signingKey *btcec.PrivateKey, shouldSort bool,
}
}
default:
return nil, ErrSignersNotSpecified
}
return ctx, nil
}

27
btcec/schnorr/musig2/musig2_test.go
View file

@ -278,7 +278,8 @@ func TestMuSigEarlyNonce(t *testing.T) {
t.Fatalf("unexpected ctx error: %v", err)
}
numSigners := 2
signers := []*btcec.PublicKey{privKey1.PubKey(), privKey2.PubKey()}
numSigners := len(signers)
ctx1, err := NewContext(
privKey1, true, WithNumSigners(numSigners), WithEarlyNonceGen(),
@ -289,20 +290,21 @@ func TestMuSigEarlyNonce(t *testing.T) {
pubKey1 := ctx1.PubKey()
ctx2, err := NewContext(
privKey2, true, WithNumSigners(numSigners), WithEarlyNonceGen(),
privKey2, true, WithKnownSigners(signers), WithEarlyNonceGen(),
)
if err != nil {
t.Fatalf("unable to make ctx: %v", err)
}
pubKey2 := ctx2.PubKey()
// At this point, the combined key shouldn't be available for both
// signers, since we only know of the sole signers.
// At this point, the combined key shouldn't be available for signer 1,
// but should be for signer 2, as they know about all signers.
if _, err := ctx1.CombinedKey(); !errors.Is(err, ErrNotEnoughSigners) {
t.Fatalf("unepxected error: %v", err)
}
if _, err := ctx2.CombinedKey(); !errors.Is(err, ErrNotEnoughSigners) {
t.Fatalf("unepxected error: %v", err)
_, err = ctx2.CombinedKey()
if err != nil {
t.Fatalf("unable to get combined key: %v", err)
}
// The early nonces _should_ be available at this point.
@ -320,8 +322,8 @@ func TestMuSigEarlyNonce(t *testing.T) {
t.Fatalf("expected 1 signer, instead have: %v",
ctx1.NumRegisteredSigners())
}
if ctx2.NumRegisteredSigners() != 1 {
t.Fatalf("expected 1 signer, instead have: %v",
if ctx2.NumRegisteredSigners() != 2 {
t.Fatalf("expected 2 signers, instead have: %v",
ctx2.NumRegisteredSigners())
}
@ -336,7 +338,7 @@ func TestMuSigEarlyNonce(t *testing.T) {
t.Fatalf("unexpected combined key error: %v", err)
}
// We'll now register the other signer for both parties.
// We'll now register the other signer for party 1.
done, err := ctx1.RegisterSigner(&pubKey2)
if err != nil {
t.Fatalf("unable to register signer: %v", err)
@ -344,13 +346,6 @@ func TestMuSigEarlyNonce(t *testing.T) {
if !done {
t.Fatalf("signer 1 doesn't have all keys")
}
done, err = ctx2.RegisterSigner(&pubKey1)
if err != nil {
t.Fatalf("unable to register signer: %v", err)
}
if !done {
t.Fatalf("signer 2 doesn't have all keys")
}
// If we try to register the signer again, we should get an error.
_, err = ctx2.RegisterSigner(&pubKey1)