fix

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

Author: adecaro

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

@@ -85,7 +85,7 @@ func (d *base) newWalletService(
 	}
 
 	// interop deserializer
-	deserializerManager.AddTypedSignerDeserializer(htlc.ScriptType, htlc.NewSenderSignerDeserializer(deserializerManager))
+	deserializerManager.AddTypedSignerDeserializer(htlc.ScriptType, htlc.NewSignerDeserializer(deserializerManager))
 
 	// Prepare roles
 	roleFactory := role.NewFactory(

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

@@ -70,7 +70,7 @@ func (d *base) newWalletService(
 	}
 
 	// interop deserializer
-	deserializerManager.AddTypedSignerDeserializer(htlc.ScriptType, htlc.NewSenderSignerDeserializer(deserializerManager))
+	deserializerManager.AddTypedSignerDeserializer(htlc.ScriptType, htlc.NewSignerDeserializer(deserializerManager))
 
 	// Prepare roles
 	keyStore := x509.NewKeyStore(baseKeyStore)

token/core/zkatdlog/nogh/v1/driver/base.go

@@ -85,7 +85,7 @@ func (d *base) newWalletService(
 	}
 
 	// interop deserializer
-	deserializerManager.AddTypedSignerDeserializer(htlc.ScriptType, htlc.NewSenderSignerDeserializer(deserializerManager))
+	deserializerManager.AddTypedSignerDeserializer(htlc.ScriptType, htlc.NewSignerDeserializer(deserializerManager))
 
 	// Prepare roles
 	roleFactory := role.NewFactory(

token/services/identity/deserializer/signer.go

@@ -47,12 +47,12 @@ func (v *TypedSignerDeserializerMultiplex) DeserializeSigner(ctx context.Context
 	logger.DebugfContext(ctx, "deserializing [%s] with type [%s]", id, si.Type)
 	var errs []error
 	for _, deserializer := range dess {
-		verifier, err := deserializer.DeserializeSigner(ctx, si.Type, si.Identity)
+		signer, err := deserializer.DeserializeSigner(ctx, si.Type, si.Identity)
 		if err != nil {
 			errs = append(errs, err)
 			continue
 		}
-		return verifier, nil
+		return signer, nil
 	}
 	return nil, errors.Wrapf(errors2.Join(errs...), "failed to deserialize verifier for [%s]", si.Type)
 }

token/services/identity/idemix/km_test.go

@@ -427,10 +427,7 @@ func testKeyManager_DeserializeSigner(t *testing.T, configPath string, curveID m
 	assert.NoError(t, err)
 
 	// this must work
-	des := deserializer.NewTypedSignerDeserializerMultiplex()
-	des.AddTypedSignerDeserializer(keyManager.IdentityType(), &TypedSignerDeserializer{KeyManager: keyManager})
-	des.AddTypedSignerDeserializer(keyManager2.IdentityType(), &TypedSignerDeserializer{KeyManager: keyManager2})
-	signer, err = des.DeserializeSigner(t.Context(), id)
+	signer, err = keyManager.DeserializeSigner(t.Context(), id)
 	assert.NoError(t, err)
 	verifier, err = keyManager.DeserializeVerifier(t.Context(), id)
 	assert.NoError(t, err)

token/services/identity/interop/htlc/deserializer.go

@@ -8,6 +8,7 @@ package htlc
 
 import (
 	"context"
+	errors2 "errors"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/encoding/json"
@@ -165,17 +166,17 @@ func GetScriptSenderAndRecipient(id []byte) (sender, recipient driver.Identity,
 	return script.Sender, script.Recipient, nil
 }
 
-type SenderSignerDeserializer struct {
+type SignerDeserializer struct {
 	manager idriver.SignerDeserializerManager
 }
 
-func NewSenderSignerDeserializer(manager idriver.SignerDeserializerManager) *SenderSignerDeserializer {
-	return &SenderSignerDeserializer{
+func NewSignerDeserializer(manager idriver.SignerDeserializerManager) *SignerDeserializer {
+	return &SignerDeserializer{
 		manager: manager,
 	}
 }
 
-func (d *SenderSignerDeserializer) DeserializeSigner(ctx context.Context, typ idriver.IdentityType, raw []byte) (driver.Signer, error) {
+func (d *SignerDeserializer) DeserializeSigner(ctx context.Context, typ idriver.IdentityType, raw []byte) (driver.Signer, error) {
 	if typ != htlc.ScriptType {
 		return nil, errors.Errorf("invalid type, got [%s], expected [%s]", typ, htlc.ScriptType)
 	}
@@ -185,5 +186,14 @@ func (d *SenderSignerDeserializer) DeserializeSigner(ctx context.Context, typ id
 	if err != nil {
 		return nil, errors.Errorf("failed to unmarshal TypedIdentity as an htlc script")
 	}
-	return d.manager.DeserializeSigner(ctx, script.Sender)
+	s, err := d.manager.DeserializeSigner(ctx, script.Sender)
+	if err != nil {
+		// try the recipient
+		var err2 error
+		s, err2 = d.manager.DeserializeSigner(ctx, script.Recipient)
+		if err2 != nil {
+			return nil, errors.Wrapf(errors2.Join(err, err2), "failed deserializing signer")
+		}
+	}
+	return s, nil
 }