deprecate the use of some mathlib curves #1203 (#1204)

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

cmd/tokengen/cobra/pp/zkatdlognoghv1/gen.go

@@ -131,7 +131,7 @@ func Gen(args *GeneratorArgs) ([]byte, error) {
 	// TODO: update the curve here
 	curveID := math3.BN254
 	if args.Aries {
-		curveID = math3.BLS12_381_BBS
+		curveID = math3.BLS12_381_BBS_GURVY
 	}
 	// todo range is hardcoded, to be changed
 	ver := v1.ProtocolV1

docs/core/extension/zkatdlog/nogh/v2/driver/base.go

@@ -67,7 +67,7 @@ func (d *base) newWalletService(
 ) (*wallet.Service, error) {
 	pp := publicParams.(*v2.PublicParams)
 	roles := wallet.NewRoles()
-	deserializerManager := deserializer.NewMultiplexDeserializer()
+	deserializerManager := deserializer.NewTypedSignerDeserializerMultiplex()
 	tmsID := tmsConfig.ID()
 	identityDB, err := storageProvider.IdentityStore(tmsID)
 	if err != nil {

integration/nwo/token/generators/crypto/zkatdlognoghv1/gen.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/IBM/idemix"
-	math3 "github.com/IBM/mathlib"
+	mathlib "github.com/IBM/mathlib"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/api"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
@@ -65,12 +65,12 @@ type CryptoMaterialGenerator struct {
 	RevocationHandlerIndex int
 }
 
-func NewCryptoMaterialGenerator(tokenPlatform generators.TokenPlatform, defaultCurveID math3.CurveID, builder api.Builder) *CryptoMaterialGenerator {
+func NewCryptoMaterialGenerator(tokenPlatform generators.TokenPlatform, defaultCurveID mathlib.CurveID, builder api.Builder) *CryptoMaterialGenerator {
 	return &CryptoMaterialGenerator{
 		FabTokenGenerator: fabtokenv1.NewCryptoMaterialGenerator(tokenPlatform, builder),
 		TokenPlatform:     tokenPlatform,
 		EventuallyTimeout: 10 * time.Minute,
-		DefaultCurve:      CurveIDToString(defaultCurveID),
+		DefaultCurve:      mathlib.CurveIDToString(defaultCurveID),
 	}
 }
 
@@ -91,7 +91,7 @@ func (d *CryptoMaterialGenerator) Setup(tms *topology.TMS) (string, error) {
 
 	curveID := d.DefaultCurve
 	if IsAries(tms) {
-		curveID = CurveIDToString(math3.BLS12_381_BBS)
+		curveID = mathlib.CurveIDToString(mathlib.BLS12_381_BBS_GURVY)
 	}
 
 	// notice that if aries is enabled, curve is ignored
@@ -117,7 +117,7 @@ func (d *CryptoMaterialGenerator) GenerateOwnerIdentities(tms *topology.TMS, n *
 
 	curveID := d.DefaultCurve
 	if IsAries(tms) {
-		curveID = CurveIDToString(math3.BLS12_381_BBS)
+		curveID = mathlib.CurveIDToString(mathlib.BLS12_381_BBS_GURVY)
 	}
 
 	var res []topology.Identity
@@ -239,20 +239,3 @@ func (d *CryptoMaterialGenerator) nextColor() string {
 	d.ColorIndex++
 	return fmt.Sprintf("%dm", color)
 }
-
-func CurveIDToString(id math3.CurveID) string {
-	switch id {
-	case math3.BN254:
-		return "BN254"
-	case math3.FP256BN_AMCL:
-		return "FP256BN_AMCL"
-	case math3.FP256BN_AMCL_MIRACL:
-		return "FP256BN_AMCL_MIRACL"
-	case math3.BLS12_377_GURVY:
-		return "BLS12_377_GURVY"
-	case math3.BLS12_381_BBS:
-		return "BLS12_381_BBS"
-	default:
-		panic("invalid curve id")
-	}
-}

integration/nwo/token/generators/pp/zkatdlognoghv1/gen.go

@@ -49,7 +49,7 @@ func (d *DLogPublicParamsGenerator) Generate(tms *topology.TMS, wallets *topolog
 
 	curveID := d.DefaultCurveID
 	if zkatdlognoghv1.IsAries(tms) {
-		curveID = math3.BLS12_381_BBS
+		curveID = math3.BLS12_381_BBS_GURVY
 	}
 
 	bits := uint64(64)

integration/token/interop/dlog/dlog_test.go

@@ -55,7 +55,7 @@ func newTestSuiteSingleFabric(commType fsc.P2PCommunicationType, factor int, nam
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: zkatdlognoghv1.DriverIdentifier},
 		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
-		// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
+		// FSCLogSpec:      "debug",
 	}))
 	return ts, selector
 }
@@ -67,7 +67,7 @@ func newTestSuiteTwoFabric(commType fsc.P2PCommunicationType, factor int, names
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: zkatdlognoghv1.DriverIdentifier},
 		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
-		// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
+		// FSCLogSpec:      "debug",
 	}))
 	return ts, selector
 }
@@ -79,7 +79,7 @@ func newTestSuiteNoCrossClaimFabric(commType fsc.P2PCommunicationType, factor in
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: zkatdlognoghv1.DriverIdentifier},
 		SDKs:            []nodepkg.SDK{&fdlog.SDK{}},
-		// FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
+		// FSCLogSpec:      "debug",
 		FinalityType: config.Delivery,
 	}))
 	return ts, selector

integration/token/interop/fabtoken/fabtoken_test.go

@@ -54,7 +54,7 @@ func newTestSuiteSingleFabric(commType fsc.P2PCommunicationType, factor int, nam
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: fabtokenv1.DriverIdentifier},
 		SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
-		FSCLogSpec:      "token-sdk=debug:fabric-sdk=debug:info",
+		// FSCLogSpec:      "debug",
 	}))
 	return ts, selector
 }
@@ -66,6 +66,7 @@ func newTestSuiteTwoFabric(commType fsc.P2PCommunicationType, factor int, names
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: fabtokenv1.DriverIdentifier},
 		SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
+		// FSCLogSpec:      "debug",
 	}))
 	return ts, selector
 }
@@ -77,6 +78,7 @@ func newTestSuiteNoCrossClaimFabric(commType fsc.P2PCommunicationType, factor in
 		ReplicationOpts: opts,
 		DefaultTMSOpts:  common.TMSOpts{TokenSDKDriver: fabtokenv1.DriverIdentifier},
 		SDKs:            []nodepkg.SDK{&ffabtoken.SDK{}},
+		// FSCLogSpec:      "debug",
 	}))
 	return ts, selector
 }

token/core/common/authrorization.go

@@ -116,7 +116,7 @@ func (o *AuthorizationMultiplexer) Issued(ctx context.Context, issuer token.Iden
 }
 
 // OwnerType returns the type of owner (e.g. 'idemix' or 'htlc') and the identity bytes
-func (o *AuthorizationMultiplexer) OwnerType(raw []byte) (string, []byte, error) {
+func (o *AuthorizationMultiplexer) OwnerType(raw []byte) (driver.IdentityType, []byte, error) {
 	owner, err := identity.UnmarshalTypedIdentity(raw)
 	if err != nil {
 		return "", nil, err

token/core/fabtoken/v1/driver/base.go

@@ -53,7 +53,7 @@ func (d *base) newWalletService(
 ) (*wallet.Service, error) {
 	tmsID := tmsConfig.ID()
 
-	deserializerManager := deserializer.NewMultiplexDeserializer()
+	deserializerManager := deserializer.NewTypedSignerDeserializerMultiplex()
 	identityDB, err := storageProvider.IdentityStore(tmsID)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to open identity db for tms [%s]", tmsID)

token/core/zkatdlog/nogh/v1/audit/auditor_test.go

@@ -9,11 +9,9 @@ package audit_test
 import (
 	"context"
 	"os"
-	"time"
 
 	"github.com/IBM/idemix/bccsp/types"
 	math "github.com/IBM/mathlib"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/view"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/audit"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/audit/mock"
 	v1 "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/setup"
@@ -22,7 +20,7 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/deserializer"
-	idemix2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/idemix"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/idemix"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/idemix/crypto"
 	kvs2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/storage/kvs"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
@@ -42,14 +40,14 @@ var _ = Describe("Auditor", func() {
 	BeforeEach(func() {
 		var err error
 		fakeSigningIdentity = &mock.SigningIdentity{}
-		ipk, err := os.ReadFile("./testdata/idemix/msp/IssuerPublicKey")
+		ipk, err := os.ReadFile("./testdata/bls12_381_bbs/idemix/msp/IssuerPublicKey")
 		Expect(err).NotTo(HaveOccurred())
-		pp, err = v1.Setup(32, ipk, math.FP256BN_AMCL)
+		pp, err = v1.Setup(32, ipk, math.BLS12_381_BBS_GURVY)
 		Expect(err).NotTo(HaveOccurred())
-		idemixDes, err := idemix2.NewDeserializer(slices.GetUnique(pp.IdemixIssuerPublicKeys).PublicKey, math.FP256BN_AMCL)
+		idemixDes, err := idemix.NewDeserializer(slices.GetUnique(pp.IdemixIssuerPublicKeys).PublicKey, math.BLS12_381_BBS_GURVY)
 		Expect(err).NotTo(HaveOccurred())
 		des := deserializer.NewTypedVerifierDeserializerMultiplex()
-		des.AddTypedVerifierDeserializer(idemix2.IdentityType, deserializer.NewTypedIdentityVerifierDeserializer(idemixDes, idemixDes))
+		des.AddTypedVerifierDeserializer(idemix.IdentityType, deserializer.NewTypedIdentityVerifierDeserializer(idemixDes, idemixDes))
 		auditor = audit.NewAuditor(
 			logging.MustGetLogger(),
 			&noop.Tracer{},
@@ -92,7 +90,7 @@ var _ = Describe("Auditor", func() {
 			It("fails", func() {
 				transfer, metadata, tokens := createTransfer(pp)
 				// test idemix info
-				_, auditinfo := getIdemixInfo("./testdata/idemix")
+				_, auditinfo := getIdemixInfo("./testdata/bls12_381_bbs/idemix")
 				raw, err := auditinfo.Bytes()
 				Expect(err).NotTo(HaveOccurred())
 				metadata.Inputs[0].Senders[0].AuditInfo = raw
@@ -109,7 +107,7 @@ var _ = Describe("Auditor", func() {
 			It("fails", func() {
 				transfer, metadata, tokens := createTransfer(pp)
 				// test idemix info
-				_, auditinfo := getIdemixInfo("./testdata/idemix")
+				_, auditinfo := getIdemixInfo("./testdata/bls12_381_bbs/idemix")
 				raw, err := auditinfo.Bytes()
 				Expect(err).NotTo(HaveOccurred())
 				metadata.Outputs[0].OutputAuditInfo = raw
@@ -126,7 +124,7 @@ var _ = Describe("Auditor", func() {
 })
 
 func createTransfer(pp *v1.PublicParams) (*transfer.Action, *driver.TransferMetadata, [][]*token.Token) {
-	id, auditInfo := getIdemixInfo("./testdata/idemix")
+	id, auditInfo := getIdemixInfo("./testdata/bls12_381_bbs/idemix")
 	transfer, meta, inputs := prepareTransfer(pp, id)
 
 	auditInfoRaw, err := auditInfo.Bytes()
@@ -166,7 +164,7 @@ func createTransfer(pp *v1.PublicParams) (*transfer.Action, *driver.TransferMeta
 }
 
 func createTransferWithBogusOutput(pp *v1.PublicParams) (*transfer.Action, *driver.TransferMetadata, [][]*token.Token) {
-	id, auditInfo := getIdemixInfo("./testdata/idemix")
+	id, auditInfo := getIdemixInfo("./testdata/bls12_381_bbs/idemix")
 	transfer, inf, inputs := prepareTransfer(pp, id)
 
 	c := math.Curves[pp.Curve]
@@ -214,69 +212,18 @@ func createTransferWithBogusOutput(pp *v1.PublicParams) (*transfer.Action, *driv
 	return transfer, metadata, tokns
 }
 
-type fakeProv struct {
-	typ string
-}
-
-func (f *fakeProv) GetString(key string) string {
-	return f.typ
-}
-
-func (f *fakeProv) GetInt(key string) int {
-	return 0
-}
-
-func (f *fakeProv) GetDuration(key string) time.Duration {
-	return time.Duration(0)
-}
-
-func (f *fakeProv) GetBool(key string) bool {
-	return false
-}
-
-func (f *fakeProv) GetStringSlice(key string) []string {
-	return nil
-}
-
-func (f *fakeProv) IsSet(key string) bool {
-	return false
-}
-
-func (f *fakeProv) UnmarshalKey(key string, rawVal interface{}) error {
-	return nil
-}
-
-func (f *fakeProv) ConfigFileUsed() string {
-	return ""
-}
-
-func (f *fakeProv) GetPath(key string) string {
-	return ""
-}
-
-func (f *fakeProv) TranslatePath(path string) string {
-	return ""
-}
-
 func getIdemixInfo(dir string) (driver.Identity, *crypto.AuditInfo) {
-	sp := view.NewServiceProvider()
-	configService := &fakeProv{typ: "memory"}
-	Expect(sp.RegisterService(configService)).NotTo(HaveOccurred())
-
 	backend, err := kvs2.NewInMemory()
-	Expect(err).NotTo(HaveOccurred())
-	err = sp.RegisterService(backend)
-	Expect(err).NotTo(HaveOccurred())
-
 	Expect(err).NotTo(HaveOccurred())
 	config, err := crypto.NewConfig(dir)
 	Expect(err).NotTo(HaveOccurred())
+	curveID := math.BLS12_381_BBS_GURVY
 
-	keyStore, err := crypto.NewKeyStore(math.FP256BN_AMCL, kvs2.Keystore(backend))
+	keyStore, err := crypto.NewKeyStore(curveID, kvs2.Keystore(backend))
 	Expect(err).NotTo(HaveOccurred())
-	cryptoProvider, err := crypto.NewBCCSP(keyStore, math.FP256BN_AMCL, false)
+	cryptoProvider, err := crypto.NewBCCSP(keyStore, curveID)
 	Expect(err).NotTo(HaveOccurred())
-	p, err := idemix2.NewKeyManager(config, types.EidNymRhNym, cryptoProvider)
+	p, err := idemix.NewKeyManager(config, types.EidNymRhNym, cryptoProvider)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(p).NotTo(BeNil())
 
@@ -292,7 +239,7 @@ func getIdemixInfo(dir string) (driver.Identity, *crypto.AuditInfo) {
 	err = auditInfo.Match(context.Background(), id)
 	Expect(err).NotTo(HaveOccurred())
 
-	id, err = identity.WrapWithType(idemix2.IdentityType, id)
+	id, err = identity.WrapWithType(idemix.IdentityType, id)
 	Expect(err).NotTo(HaveOccurred())
 
 	return id, auditInfo

token/core/zkatdlog/nogh/v1/audit/testdata/bls12_381_bbs/ca/ca/IssuerPublicKey

@@ -0,0 +1,2 @@
+��7�;XoaFI�-�'�始($�F0��u�]���	�aE�Pig��m�'Y�}�vI
+����D�������H�=�N��#��a�5���b���J