integrate agg changes on crypto

Author: ssd04

crypto/signing/bls/bls.go

@@ -1,7 +1,7 @@
 package bls
 
 import (
-	"github.com/multiversx/mx-chain-crypto-go"
+	crypto "github.com/multiversx/mx-chain-crypto-go"
 	"github.com/multiversx/mx-chain-crypto-go/signing"
 	"github.com/multiversx/mx-chain-crypto-go/signing/mcl"
 	mclMultiSig "github.com/multiversx/mx-chain-crypto-go/signing/mcl/multisig"
@@ -46,5 +46,25 @@ func (b *bls) VerifySignatureShare(publicKey []byte, message []byte, sig []byte)
 
 // VerifyAggregatedSig verifies aggregated signature of BLS MultiSig
 func (b *bls) VerifyAggregatedSig(pubKeysSigners [][]byte, message []byte, aggSig []byte) error {
-	return b.multiSigner.VerifyAggregatedSig(pubKeysSigners, message, aggSig)
+	pubKeys, err := b.convertBytesToPubKeys(pubKeysSigners)
+	if err != nil {
+		return err
+	}
+
+	return b.multiSigner.VerifyAggregatedSig(pubKeys, message, aggSig)
+}
+
+func (b *bls) convertBytesToPubKeys(pubKeysBytes [][]byte) ([]crypto.PublicKey, error) {
+	pubKeys := make([]crypto.PublicKey, 0, len(pubKeysBytes))
+
+	for _, pubKeyBytes := range pubKeysBytes {
+		pk, err := b.keyGenerator.PublicKeyFromByteArray(pubKeyBytes)
+		if err != nil {
+			return nil, err
+		}
+
+		pubKeys = append(pubKeys, pk)
+	}
+
+	return pubKeys, nil
 }

crypto/signing/bls/bls_test.go

@@ -17,7 +17,8 @@ import (
 
 type multiSignerSetup struct {
 	privKeys          [][]byte
-	pubKeys           [][]byte
+	pubKeysBytes      [][]byte
+	pubKeys           []crypto.PublicKey
 	partialSignatures [][][]byte
 	messages          []string
 	aggSignatures     [][]byte
@@ -51,19 +52,19 @@ func TestBls_VerifyBLSMultiSig(t *testing.T) {
 	setupKOSK, multiSignerKOSK := createMultiSigSetupKOSK(uint16(numMessages), numMessages)
 	setupKOSK.aggSignatures = aggregateSignatures(setupKOSK, multiSignerKOSK)
 
-	for i := 0; i < len(setupKOSK.pubKeys); i++ {
-		fmt.Println(hex.EncodeToString(setupKOSK.pubKeys[i]))
+	for i := 0; i < len(setupKOSK.pubKeysBytes); i++ {
+		fmt.Println(hex.EncodeToString(setupKOSK.pubKeysBytes[i]))
 	}
 
 	for i := 0; i < numMessages; i++ {
 		fmt.Println(setupKOSK.messages[i])
 		fmt.Println(hex.EncodeToString(setupKOSK.aggSignatures[i]))
 
-		assert.Nil(t, b.VerifyAggregatedSig(setupKOSK.pubKeys, []byte(setupKOSK.messages[i]), setupKOSK.aggSignatures[i]))
+		assert.Nil(t, b.VerifyAggregatedSig(setupKOSK.pubKeysBytes, []byte(setupKOSK.messages[i]), setupKOSK.aggSignatures[i]))
 		changedSig := make([]byte, len(setupKOSK.aggSignatures[i]))
 		copy(changedSig, setupKOSK.aggSignatures[i])
 		changedSig[0] += 1
-		assert.NotNil(t, b.VerifyAggregatedSig(setupKOSK.pubKeys, []byte(setupKOSK.messages[i]), changedSig))
+		assert.NotNil(t, b.VerifyAggregatedSig(setupKOSK.pubKeysBytes, []byte(setupKOSK.messages[i]), changedSig))
 	}
 }
 
@@ -84,26 +85,28 @@ func splitString(t testing.TB, str string) ([]byte, []byte, []byte) {
 func createKeysAndMultiSignerBlsKOSK(
 	grSize uint16,
 	suite crypto.Suite,
-) ([][]byte, [][]byte, crypto.MultiSigner) {
+) ([][]byte, []crypto.PublicKey, [][]byte, crypto.MultiSigner) {
 
-	kg, privKeys, pubKeys := createMultiSignerSetup(grSize, suite)
+	kg, pubKeys, privKeys, pubKeysBytes := createMultiSignerSetup(grSize, suite)
 	llSigner := &llsig.BlsMultiSignerKOSK{}
 	multiSigner, _ := multisig.NewBLSMultisig(llSigner, kg)
 
-	return privKeys, pubKeys, multiSigner
+	return privKeys, pubKeys, pubKeysBytes, multiSigner
 }
 
-func createMultiSignerSetup(grSize uint16, suite crypto.Suite) (crypto.KeyGenerator, [][]byte, [][]byte) {
+func createMultiSignerSetup(grSize uint16, suite crypto.Suite) (crypto.KeyGenerator, []crypto.PublicKey, [][]byte, [][]byte) {
 	kg := signing.NewKeyGenerator(suite)
 	privKeys := make([][]byte, grSize)
-	pubKeys := make([][]byte, grSize)
+	pubKeysBytes := make([][]byte, grSize)
+	pubKeys := make([]crypto.PublicKey, grSize)
 
 	for i := uint16(0); i < grSize; i++ {
 		sk, pk := kg.GeneratePair()
 		privKeys[i], _ = sk.ToByteArray()
-		pubKeys[i], _ = pk.ToByteArray()
+		pubKeysBytes[i], _ = pk.ToByteArray()
+		pubKeys[i] = pk
 	}
-	return kg, privKeys, pubKeys
+	return kg, pubKeys, privKeys, pubKeysBytes
 }
 
 func createSignaturesShares(privKeys [][]byte, multiSigner crypto.MultiSigner, message []byte) [][]byte {
@@ -119,7 +122,7 @@ func createMultiSigSetupKOSK(numSigners uint16, numMessages int) (*multiSignerSe
 	var multiSigner crypto.MultiSigner
 	setup := &multiSignerSetup{}
 	suite := mcl.NewSuiteBLS12()
-	setup.privKeys, setup.pubKeys, multiSigner = createKeysAndMultiSignerBlsKOSK(numSigners, suite)
+	setup.privKeys, setup.pubKeys, setup.pubKeysBytes, multiSigner = createKeysAndMultiSignerBlsKOSK(numSigners, suite)
 	setup.messages, setup.partialSignatures = createMessagesAndPartialSignatures(numMessages, setup.privKeys, multiSigner)
 
 	return setup, multiSigner

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/multiversx/mx-chain-core-go v1.4.0
-	github.com/multiversx/mx-chain-crypto-go v1.3.0
+	github.com/multiversx/mx-chain-crypto-go v1.3.1-0.20260127130843-3c6c4667127e
 	github.com/multiversx/mx-chain-logger-go v1.1.0
 	github.com/multiversx/mx-chain-scenario-go v1.6.0
 	github.com/multiversx/mx-chain-storage-go v1.1.0

go.sum

@@ -85,8 +85,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiversx/mx-chain-core-go v1.4.0 h1:p6FbfCzvMXF54kpS0B5mrjNWYpq4SEQqo0UvrMF7YVY=
 github.com/multiversx/mx-chain-core-go v1.4.0/go.mod h1:IO+vspNan+gT0WOHnJ95uvWygiziHZvfXpff6KnxV7g=
-github.com/multiversx/mx-chain-crypto-go v1.3.0 h1:0eK2bkDOMi8VbSPrB1/vGJSYT81IBtfL4zw+C4sWe/k=
-github.com/multiversx/mx-chain-crypto-go v1.3.0/go.mod h1:nPIkxxzyTP8IquWKds+22Q2OJ9W7LtusC7cAosz7ojM=
+github.com/multiversx/mx-chain-crypto-go v1.3.1-0.20260127130843-3c6c4667127e h1:F3v0GphOgNrGxwYZdMuSr4BznolQApzIfSOv9ys0nYM=
+github.com/multiversx/mx-chain-crypto-go v1.3.1-0.20260127130843-3c6c4667127e/go.mod h1:nPIkxxzyTP8IquWKds+22Q2OJ9W7LtusC7cAosz7ojM=
 github.com/multiversx/mx-chain-logger-go v1.1.0 h1:97x84A6L4RfCa6YOx1HpAFxZp1cf/WI0Qh112whgZNM=
 github.com/multiversx/mx-chain-logger-go v1.1.0/go.mod h1:K9XgiohLwOsNACETMNL0LItJMREuEvTH6NsoXWXWg7g=
 github.com/multiversx/mx-chain-scenario-go v1.6.0 h1:cwDFuS1pSc4YXnfiKKDTEb+QDY4fulPQaiRgIebnKxI=