Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: public key aggregate #576

Merged
merged 3 commits into from
Jul 5, 2023
Merged

refactor: public key aggregate #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
088bf8a
refactor:public key aggregate
RiXelanya Jul 5, 2023
ef52258
format fix
RiXelanya Jul 5, 2023
3efcabd
format fix
RiXelanya Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion consensus/consensus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (td *testData) commitBlockForAllStates(t *testing.T) (*block.Block, *block.
sig2 := td.signers[1].SignData(sb).(*bls.Signature)
sig4 := td.signers[3].SignData(sb).(*bls.Signature)

sig := bls.Aggregate([]*bls.Signature{sig1, sig2, sig4})
sig := bls.SignatureAggregate([]*bls.Signature{sig1, sig2, sig4})
cert := block.NewCertificate(0, []int32{0, 1, 2, 3}, []int32{2}, sig)
block := p.Block()

Expand Down
2 changes: 1 addition & 1 deletion consensus/voteset/voteset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (vs *VoteSet) ToCertificate() *block.Certificate {
committers[i] = val.Number()
}

sig := bls.Aggregate(sigs)
sig := bls.SignatureAggregate(sigs)

return block.NewCertificate(vs.Round(), committers, absentees, sig)
}
Expand Down
15 changes: 10 additions & 5 deletions crypto/bls/bls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bls-signature-04#section-4.2.1
var dst = []byte("BLS_SIG_BLS12381G1_XMD:SHA-256_SSWU_RO_NUL_")

func Aggregate(sigs []*Signature) *Signature {
func SignatureAggregate(sigs []*Signature) *Signature {
if len(sigs) == 0 {
return nil
}
Expand All @@ -26,22 +26,27 @@ func Aggregate(sigs []*Signature) *Signature {
}
}

func VerifyAggregated(sig *Signature, pubs []*PublicKey, msg []byte) bool {
func PublicKeyAggregate(pubs []*PublicKey) *PublicKey {
if len(pubs) == 0 {
return false
return nil
}
g2 := bls12381.NewG2()
aggPointG2 := pubs[0].pointG2
for i := 1; i < len(pubs); i++ {
if g2.IsZero(&pubs[i].pointG2) {
return false
return nil
}
g2.Add(
&aggPointG2,
&aggPointG2,
&pubs[i].pointG2)
}
return &PublicKey{
pointG2: aggPointG2,
}
}

aggPub := PublicKey{pointG2: aggPointG2}
func VerifyAggregated(sig *Signature, pubs []*PublicKey, msg []byte) bool {
aggPub := PublicKeyAggregate(pubs)
return aggPub.Verify(msg, sig) == nil
}
56 changes: 45 additions & 11 deletions crypto/bls/bls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestSignatureAggregate(t *testing.T) {
sig1 := prv1.Sign(msg).(*bls.Signature)
sig2 := prv2.Sign(msg).(*bls.Signature)

assert.True(t, bls.Aggregate([]*bls.Signature{sig1, sig2}).EqualsTo(agg))
assert.True(t, bls.SignatureAggregate([]*bls.Signature{sig1, sig2}).EqualsTo(agg))
assert.False(t, prv1.EqualsTo(prv2))
}

Expand All @@ -59,17 +59,22 @@ func TestAggregateFailed(t *testing.T) {
sig3 := prv3.Sign(msg1).(*bls.Signature)
sig4 := prv4.Sign(msg1).(*bls.Signature)

agg1 := bls.Aggregate([]*bls.Signature{sig1, sig2, sig3})
agg2 := bls.Aggregate([]*bls.Signature{sig1, sig2, sig4})
agg3 := bls.Aggregate([]*bls.Signature{sig11, sig2, sig3})
agg4 := bls.Aggregate([]*bls.Signature{sig1, sig2})
agg5 := bls.Aggregate([]*bls.Signature{sig3, sig2, sig1})
agg1 := bls.SignatureAggregate([]*bls.Signature{sig1, sig2, sig3})
agg2 := bls.SignatureAggregate([]*bls.Signature{sig1, sig2, sig4})
agg3 := bls.SignatureAggregate([]*bls.Signature{sig11, sig2, sig3})
agg4 := bls.SignatureAggregate([]*bls.Signature{sig1, sig2})
agg5 := bls.SignatureAggregate([]*bls.Signature{sig3, sig2, sig1})

pubs1 := []*bls.PublicKey{pub1, pub2, pub3}
pubs2 := []*bls.PublicKey{pub1, pub2, pub4}
pubs3 := []*bls.PublicKey{pub1, pub2}
pubs4 := []*bls.PublicKey{pub3, pub2, pub1}

pubAgg1 := bls.PublicKeyAggregate(pubs1)
pubAgg2 := bls.PublicKeyAggregate(pubs2)
pubAgg3 := bls.PublicKeyAggregate(pubs3)
pubAgg4 := bls.PublicKeyAggregate(pubs4)

assert.NoError(t, pub1.Verify(msg1, sig1))
assert.NoError(t, pub2.Verify(msg1, sig2))
assert.NoError(t, pub3.Verify(msg1, sig3))
Expand All @@ -91,10 +96,24 @@ func TestAggregateFailed(t *testing.T) {
assert.False(t, bls.VerifyAggregated(agg1, pubs3, msg1))
assert.True(t, bls.VerifyAggregated(agg5, pubs1, msg1))
assert.True(t, bls.VerifyAggregated(agg1, pubs4, msg1))

assert.Nil(t, pubAgg1.Verify(msg1, agg1))
assert.NotNil(t, pubAgg1.Verify(msg2, agg1))
assert.NotNil(t, pubAgg1.Verify(msg1, agg2))
assert.NotNil(t, pubAgg2.Verify(msg1, agg1))
assert.Nil(t, pubAgg2.Verify(msg1, agg2))
assert.NotNil(t, pubAgg2.Verify(msg2, agg2))
assert.NotNil(t, pubAgg1.Verify(msg1, agg3))
assert.NotNil(t, pubAgg1.Verify(msg2, agg3))
assert.NotNil(t, pubAgg1.Verify(msg1, agg4))
assert.NotNil(t, pubAgg3.Verify(msg1, agg1))
assert.Nil(t, pubAgg1.Verify(msg1, agg5))
assert.Nil(t, pubAgg4.Verify(msg1, agg1))
}

func TestAggregateNil(t *testing.T) {
assert.Nil(t, bls.Aggregate(nil))
assert.Nil(t, bls.SignatureAggregate(nil))
assert.Nil(t, bls.PublicKeyAggregate(nil))
}

func TestAggregateOnlyOneSignature(t *testing.T) {
Expand All @@ -103,11 +122,20 @@ func TestAggregateOnlyOneSignature(t *testing.T) {
_, prv1 := ts.RandomBLSKeyPair()
msg1 := []byte("zarb")
sig1 := prv1.Sign(msg1).(*bls.Signature)
agg1 := bls.Aggregate([]*bls.Signature{sig1})
agg1 := bls.SignatureAggregate([]*bls.Signature{sig1})

assert.True(t, agg1.EqualsTo(sig1))
}

func TestAggregateOnlyOnePublicKey(t *testing.T) {
ts := testsuite.NewTestSuite(t)

pub1, _ := ts.RandomBLSKeyPair()
agg1 := bls.PublicKeyAggregate([]*bls.PublicKey{pub1})

assert.True(t, agg1.EqualsTo(pub1))
}

// TODO: should we check for duplication here?
func TestDuplicatedAggregate(t *testing.T) {
ts := testsuite.NewTestSuite(t)
Expand All @@ -120,15 +148,21 @@ func TestDuplicatedAggregate(t *testing.T) {
sig1 := prv1.Sign(msg1).(*bls.Signature)
sig2 := prv2.Sign(msg1).(*bls.Signature)

agg1 := bls.Aggregate([]*bls.Signature{sig1, sig2, sig1})
agg2 := bls.Aggregate([]*bls.Signature{sig1, sig2})
agg1 := bls.SignatureAggregate([]*bls.Signature{sig1, sig2, sig1})
agg2 := bls.SignatureAggregate([]*bls.Signature{sig1, sig2})
assert.False(t, agg1.EqualsTo(agg2))

pubs1 := []*bls.PublicKey{pub1, pub2}
pubs2 := []*bls.PublicKey{pub1, pub2, pub1}
pubAgg1 := bls.PublicKeyAggregate(pubs1)
pubAgg2 := bls.PublicKeyAggregate(pubs2)
assert.False(t, pubAgg1.EqualsTo(pubAgg2))

assert.False(t, bls.VerifyAggregated(agg1, pubs1, msg1))
assert.NotNil(t, pubAgg1.Verify(msg1, agg1))

pubs2 := []*bls.PublicKey{pub1, pub2, pub1}
assert.True(t, bls.VerifyAggregated(agg1, pubs2, msg1))
assert.Nil(t, pubAgg2.Verify(msg1, agg1))
}

// TestHashToCurve ensures that the hash-to-curve function in kilic/bls12-381
Expand Down
4 changes: 2 additions & 2 deletions state/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (td *testData) makeCertificateAndSign(t *testing.T, blockHash hash.Hash, ro
}

absentees := util.Subtracts(committers, signedBy)
return block.NewCertificate(round, committers, absentees, bls.Aggregate(sigs))
return block.NewCertificate(round, committers, absentees, bls.SignatureAggregate(sigs))
}

func (td *testData) commitBlockForAllStates(t *testing.T, b *block.Block, c *block.Certificate) {
Expand Down Expand Up @@ -449,7 +449,7 @@ func TestSortition(t *testing.T) {
sigs[1] = td.valSigner3.SignData(sb).(*bls.Signature)
sigs[2] = td.valSigner4.SignData(sb).(*bls.Signature)
sigs[3] = signer.SignData(sb).(*bls.Signature)
c14 := block.NewCertificate(3, []int32{4, 0, 1, 2, 3}, []int32{0}, bls.Aggregate(sigs))
c14 := block.NewCertificate(3, []int32{4, 0, 1, 2, 3}, []int32{0}, bls.SignatureAggregate(sigs))

height++
assert.NoError(t, st1.CommitBlock(height, b14, c14))
Expand Down
2 changes: 1 addition & 1 deletion state/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func aggregate(sigs []crypto.Signature) *bls.Signature {
for i, s := range sigs {
blsSigs[i] = s.(*bls.Signature)
}
return bls.Aggregate(blsSigs)
return bls.SignatureAggregate(blsSigs)
}

func TestCertificateValidation(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion util/testsuite/testsuite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func (ts *TestSuite) GenerateTestCertificate(blockHash hash.Hash) *block.Certifi
priv3.Sign(blockHash.Bytes()).(*bls.Signature),
priv4.Sign(blockHash.Bytes()).(*bls.Signature),
}
sig := bls.Aggregate(sigs)
sig := bls.SignatureAggregate(sigs)

c1 := ts.RandInt32(10)
c2 := ts.RandInt32(10) + 10
Expand Down