pp extensions as requested + extensive unit-tests for the public parameters

Signed-off-by: Angelo De Caro <[email protected]>

Author: adecaro

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

@@ -96,7 +96,7 @@ func Gen(args *GeneratorArgs) ([]byte, error) {
 	if Version != 0 {
 		ver = driver.TokenDriverVersion(Version)
 	}
-	pp, err := v1.SetupWithVersion(v1.DefaultPrecision, ver)
+	pp, err := v1.WithVersion(v1.DefaultPrecision, ver)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed setting up public parameters")
 	}

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

@@ -138,7 +138,7 @@ func Gen(args *GeneratorArgs) ([]byte, error) {
 	if args.Version != 0 {
 		ver = driver.TokenDriverVersion(args.Version)
 	}
-	pp, err := v1.SetupWithVersion(64, ipkBytes, curveID, ver)
+	pp, err := v1.WithVersion(64, ipkBytes, curveID, ver)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed setting up public parameters")
 	}

token/core/fabtoken/protos-go/pp/ftpp.pb.go

@@ -18,8 +18,9 @@ message Identity {
 message PublicParameters {
   string token_driver_name = 1; // the name of the token driver
   uint64 token_driver_version = 2; // the version of token driver
-  Identity auditor = 7; // is the public key of the auditor.
-  repeated Identity issuers = 8; // is a list of public keys of the entities that can issue tokens.
-  uint64 max_token = 9; // is the maximum quantity a token can hold
-  uint64 quantity_precision = 10; // is the precision used to represent quantities
+  Identity auditor = 3; // is the public key of the auditor.
+  repeated Identity issuers = 4; // is a list of public keys of the entities that can issue tokens.
+  uint64 max_token = 5; // is the maximum quantity a token can hold
+  uint64 quantity_precision = 6; // is the precision used to represent quantities
+  map<string, bytes> extra_data = 7; // extra_data allows to store arbitrary data in the public parameters
 }

token/core/fabtoken/protos/ftpp.proto

@@ -40,15 +40,17 @@ type PublicParams struct {
 	Auditor []byte
 	// This encodes the list of authorized issuers
 	IssuerIDs []driver.Identity
+	// ExtraData contains any extra custom data
+	ExtraData map[string][]byte
 }
 
 // Setup initializes PublicParams
 func Setup(precision uint64) (*PublicParams, error) {
 	return NewWith(FabTokenDriverName, ProtocolV1, precision)
 }
 
-// SetupWithVersion is like Setup with the additional possibility to specify the version number
-func SetupWithVersion(precision uint64, version driver.TokenDriverVersion) (*PublicParams, error) {
+// WithVersion is like Setup with the additional possibility to specify the version number
+func WithVersion(precision uint64, version driver.TokenDriverVersion) (*PublicParams, error) {
 	return NewWith(FabTokenDriverName, version, precision)
 }
 
@@ -132,6 +134,7 @@ func (p *PublicParams) Bytes() ([]byte, error) {
 		Issuers:           issuers,
 		MaxToken:          p.MaxToken,
 		QuantityPrecision: p.QuantityPrecision,
+		ExtraData:         p.ExtraData,
 	}
 	return proto.Marshal(params)
 }
@@ -157,6 +160,7 @@ func (p *PublicParams) FromBytes(data []byte) error {
 	if publicParams.Auditor != nil {
 		p.Auditor = publicParams.Auditor.Raw
 	}
+	p.ExtraData = publicParams.ExtraData
 	return nil
 }