diff --git a/blssig/aggregation.go b/blssig/aggregation.go index a2e60a09..390478de 100644 --- a/blssig/aggregation.go +++ b/blssig/aggregation.go @@ -22,7 +22,7 @@ func (v Verifier) Aggregate(pubkeys []gpbft.PubKey, signatures [][]byte) ([]byte return nil, xerrors.Errorf("converting public keys to mask: %w", err) } - aggSigPoint, err := bdn.AggregateSignatures(v.suite, signatures, mask) + aggSigPoint, err := bdn.NewSchemeOnG2(v.suite).AggregateSignatures(signatures, mask) if err != nil { return nil, xerrors.Errorf("computing aggregate signature: %w", err) } @@ -40,7 +40,7 @@ func (v Verifier) VerifyAggregate(msg []byte, signature []byte, pubkeys []gpbft. return xerrors.Errorf("converting public keys to mask: %w", err) } - aggPubKey, err := bdn.AggregatePublicKeys(v.suite, mask) + aggPubKey, err := bdn.NewSchemeOnG2(v.suite).AggregatePublicKeys(mask) if err != nil { return xerrors.Errorf("aggregating public keys: %w", err) } diff --git a/blssig/signer.go b/blssig/signer.go index ac6b0a6d..0d5fedce 100644 --- a/blssig/signer.go +++ b/blssig/signer.go @@ -21,12 +21,12 @@ type Signer struct { keys map[string]kyber.Scalar } -func SignerWithKeyOnG2() *Signer { +func SignerWithKeyOnG1() *Signer { suite := bls12381.NewBLS12381Suite() return &Signer{ suite: suite, - scheme: bls.NewSchemeOnG1(suite), - keyGroup: suite.G2(), + scheme: bls.NewSchemeOnG2(suite), + keyGroup: suite.G1(), keys: make(map[string]kyber.Scalar), } } diff --git a/blssig/suite_test.go b/blssig/suite_test.go index 049c8928..cf3bbb2d 100644 --- a/blssig/suite_test.go +++ b/blssig/suite_test.go @@ -9,6 +9,6 @@ import ( func TestBLSSigning(t *testing.T) { test.NewSigningSuite( - blssig.SignerWithKeyOnG2(), - blssig.VerifierWithKeyOnG2()).Run(t) + blssig.SignerWithKeyOnG1(), + blssig.VerifierWithKeyOnG1()).Run(t) } diff --git a/blssig/verifier.go b/blssig/verifier.go index 46b58fc5..ebe2065a 100644 --- a/blssig/verifier.go +++ b/blssig/verifier.go @@ -14,11 +14,11 @@ type Verifier struct { keyGroup kyber.Group } -func VerifierWithKeyOnG2() Verifier { +func VerifierWithKeyOnG1() Verifier { suite := bls12381.NewBLS12381Suite() return Verifier{ suite: suite, - keyGroup: suite.G2(), + keyGroup: suite.G1(), } } diff --git a/sim/sim.go b/sim/sim.go index 5ad4a813..4422e2d0 100644 --- a/sim/sim.go +++ b/sim/sim.go @@ -48,8 +48,8 @@ func FakeSigningBacked() *SigningBacked { func BLSSigningBacked() *SigningBacked { return &SigningBacked{ - Signer: blssig.SignerWithKeyOnG2(), - Verifier: blssig.VerifierWithKeyOnG2(), + Signer: blssig.SignerWithKeyOnG1(), + Verifier: blssig.VerifierWithKeyOnG1(), } }