move htlc and pledge validator to common

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

token/core/common/validator_htlc.go

@@ -0,0 +1,87 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package common
+
+import (
+	"encoding/json"
+	"time"
+
+	"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/interop/htlc"
+	"github.com/pkg/errors"
+)
+
+// TransferHTLCValidate checks the validity of the HTLC scripts, if any
+func TransferHTLCValidate[P driver.PublicParameters, T driver.Output, TA driver.TransferAction, IA driver.IssueAction](ctx *Context[P, T, TA, IA]) error {
+	now := time.Now()
+
+	for i, in := range ctx.InputTokens {
+		owner, err := identity.UnmarshalTypedIdentity(in.GetOwner())
+		if err != nil {
+			return errors.Wrap(err, "failed to unmarshal owner of input token")
+		}
+		// is it owned by an htlc script?
+		if owner.Type == htlc.ScriptType {
+			// Then, the first output must be compatible with this input.
+			if len(ctx.TransferAction.GetOutputs()) != 1 {
+				return errors.New("invalid transfer action: an htlc script only transfers the ownership of a token")
+			}
+
+			// check it is not a redeem
+			output := ctx.TransferAction.GetOutputs()[0]
+			if output.IsRedeem() {
+				return errors.New("invalid transfer action: the output corresponding to an htlc spending should not be a redeem")
+			}
+
+			// check that owner field in output is correct
+			script, op, err := htlc.VerifyOwner(ctx.InputTokens[0].GetOwner(), output.GetOwner(), now)
+			if err != nil {
+				return errors.Wrap(err, "failed to verify transfer from htlc script")
+			}
+
+			// check metadata
+			sigma := ctx.Signatures[i]
+			metadataKey, err := htlc.MetadataClaimKeyCheck(ctx.TransferAction, script, op, sigma)
+			if err != nil {
+				return errors.WithMessagef(err, "failed to check htlc metadata")
+			}
+			if op != htlc.Reclaim {
+				ctx.CountMetadataKey(metadataKey)
+			}
+		}
+	}
+
+	for _, out := range ctx.TransferAction.GetOutputs() {
+		if out.IsRedeem() {
+			continue
+		}
+
+		// if it is an htlc script then the deadline must still be valid
+		owner, err := identity.UnmarshalTypedIdentity(out.GetOwner())
+		if err != nil {
+			return err
+		}
+		if owner.Type == htlc.ScriptType {
+			script := &htlc.Script{}
+			err = json.Unmarshal(owner.Identity, script)
+			if err != nil {
+				return err
+			}
+			if err := script.Validate(now); err != nil {
+				return errors.WithMessagef(err, "htlc script invalid")
+			}
+			metadataKey, err := htlc.MetadataLockKeyCheck(ctx.TransferAction, script)
+			if err != nil {
+				return errors.WithMessagef(err, "failed to check htlc metadata")
+			}
+			ctx.CountMetadataKey(metadataKey)
+			continue
+		}
+	}
+	return nil
+}

token/core/zkatdlog/crypto/validator/validator_pledge.go → token/core/common/validator_pledge.go

@@ -4,40 +4,39 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package validator
+package common
 
 import (
 	"bytes"
 	"encoding/json"
 	"fmt"
 	"time"
 
-	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/crypto/token"
-	"github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/crypto/transfer"
+	"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/interop/pledge"
 	"github.com/pkg/errors"
 )
 
-func IssuePledgeValidate(ctx *Context) error {
-	for k := range ctx.IssueAction.Metadata {
+func IssuePledgeValidate[P driver.PublicParameters, T driver.Output, TA driver.TransferAction, IA driver.IssueAction](ctx *Context[P, T, TA, IA]) error {
+	for k := range ctx.IssueAction.GetMetadata() {
 		ctx.CountMetadataKey(k)
 	}
 	return nil
 }
 
-func TransferPledgeValidate(ctx *Context) error {
+func TransferPledgeValidate[P driver.PublicParameters, T driver.Output, TA driver.TransferAction, IA driver.IssueAction](ctx *Context[P, T, TA, IA]) error {
 	for _, in := range ctx.InputTokens {
-		id, err := identity.UnmarshalTypedIdentity(in.Owner)
+		id, err := identity.UnmarshalTypedIdentity(in.GetOwner())
 		if err != nil {
 			return errors.Wrap(err, "failed to unmarshal owner of input token")
 		}
 		if id.Type == pledge.ScriptType {
 			if len(ctx.InputTokens) != 1 || len(ctx.TransferAction.GetOutputs()) != 1 {
 				return errors.Errorf("invalid transfer action: a pledge script only transfers the ownership of a token")
 			}
-			out := ctx.TransferAction.GetOutputs()[0].(*token.Token)
-			sender, err := identity.UnmarshalTypedIdentity(ctx.InputTokens[0].Owner)
+			out := ctx.TransferAction.GetOutputs()[0]
+			sender, err := identity.UnmarshalTypedIdentity(ctx.InputTokens[0].GetOwner())
 			if err != nil {
 				return err
 			}
@@ -67,7 +66,7 @@ func TransferPledgeValidate(ctx *Context) error {
 				ctx.CountMetadataKey(redeemKey)
 				continue
 			}
-			if !script.Sender.Equal(out.Owner) {
+			if !script.Sender.Equal(out.GetOwner()) {
 				return errors.New("recipient of token does not correspond to sender of reclaim request")
 			}
 
@@ -83,15 +82,11 @@ func TransferPledgeValidate(ctx *Context) error {
 		}
 	}
 
-	for _, o := range ctx.TransferAction.GetOutputs() {
-		out, ok := o.(*token.Token)
-		if !ok {
-			return errors.Errorf("invalid output")
-		}
+	for _, out := range ctx.TransferAction.GetOutputs() {
 		if out.IsRedeem() {
 			continue
 		}
-		owner, err := identity.UnmarshalTypedIdentity(out.Owner)
+		owner, err := identity.UnmarshalTypedIdentity(out.GetOwner())
 		if err != nil {
 			return err
 		}
@@ -117,7 +112,7 @@ func TransferPledgeValidate(ctx *Context) error {
 	return nil
 }
 
-func constructMetadataKey(action *transfer.Action) (string, error) {
+func constructMetadataKey(action driver.TransferAction) (string, error) {
 	inputs, err := action.GetInputs()
 	if err != nil {
 		return "", errors.Wrap(err, "failed to retrieve input IDs from action")

token/core/fabtoken/actions.go

@@ -46,6 +46,10 @@ func (t *Output) IsRedeem() bool {
 	return len(t.Output.Owner.Raw) == 0
 }
 
+func (t *Output) GetOwner() []byte {
+	return t.Output.Owner.Raw
+}
+
 // IssueAction encodes a fabtoken Issue
 type IssueAction struct {
 	// issuer's public key

token/core/fabtoken/validator.go

@@ -49,14 +49,14 @@ func NewValidator(logger logging.Logger, pp *PublicParams, deserializer driver.D
 	transferValidators := []ValidateTransferFunc{
 		TransferSignatureValidate,
 		TransferBalanceValidate,
-		TransferHTLCValidate,
-		TransferPledgeValidate,
+		common.TransferHTLCValidate[*PublicParams, *token.Token, *TransferAction, *IssueAction],
+		common.TransferPledgeValidate[*PublicParams, *token.Token, *TransferAction, *IssueAction],
 	}
 	transferValidators = append(transferValidators, extraValidators...)
 
 	issueValidators := []ValidateIssueFunc{
 		IssueValidate,
-		IssuePledgeValidate,
+		common.IssuePledgeValidate[*PublicParams, *token.Token, *TransferAction, *IssueAction],
 	}
 
 	return common.NewValidator[*PublicParams, *token.Token, *TransferAction, *IssueAction](