refacto request and metadata internals

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

Author: adecaro

token/core/common/validator_test.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	dmock "github.com/hyperledger-labs/fabric-token-sdk/token/driver/mock"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver/protos-go/v1/request"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -218,7 +219,9 @@ func TestValidatorWithCounterfeiter(t *testing.T) {
 
 	t.Run("VerifyTokenRequestFromRaw", func(t *testing.T) {
 		tr := &driver.TokenRequest{
-			Issues: [][]byte{[]byte("issue1")},
+			Actions: []*driver.TypedAction{
+				{Type: request.ActionType_ACTION_TYPE_ISSUE, Raw: []byte("issue1")},
+			},
 			Signatures: []*driver.RequestSignature{
 				{
 					Auditor: &driver.AuditorSignature{

token/core/fabtoken/protos-go/v1/actions/ftactions.pb.go

@@ -13,6 +13,7 @@ import (
 	v1 "github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/v1"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/core/fabtoken/v1/actions"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver/protos-go/v1/request"
 	benchmark2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/benchmark"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 	"github.com/stretchr/testify/require"
@@ -114,23 +115,28 @@ func newAuditEnv(benchmarkCase *benchmark2.Case) (*auditEnv, error) {
 	}
 
 	request := &driver.TokenRequest{
-		Issues: [][]byte{rawAction},
+		Actions: []*driver.TypedAction{
+			{Type: request.ActionType_ACTION_TYPE_ISSUE, Raw: rawAction},
+		},
 	}
 
 	metadata := &driver.TokenRequestMetadata{
-		Issues: []*driver.IssueMetadata{
+		Actions: []*driver.ActionMetadataEntry{
 			{
-				Issuer: driver.AuditableIdentity{
-					Identity:  []byte("issuer"),
-					AuditInfo: []byte("audit-info"),
-				},
-				Outputs: []*driver.IssueOutputMetadata{
-					{
-						OutputMetadata: []byte("token-metadata"),
-						Receivers: []*driver.AuditableIdentity{
-							{
-								Identity:  []byte("owner"),
-								AuditInfo: []byte("audit-info"),
+				ActionID: 0,
+				IssueMetadata: &driver.IssueMetadata{
+					Issuer: driver.AuditableIdentity{
+						Identity:  []byte("issuer"),
+						AuditInfo: []byte("audit-info"),
+					},
+					Outputs: []*driver.IssueOutputMetadata{
+						{
+							OutputMetadata: []byte("token-metadata"),
+							Receivers: []*driver.AuditableIdentity{
+								{
+									Identity:  []byte("owner"),
+									AuditInfo: []byte("audit-info"),
+								},
 							},
 						},
 					},

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

@@ -23,19 +23,21 @@ type ValidateAuditingFunc = common.ValidateAuditingFunc[*setup.PublicParams, *ac
 type ActionDeserializer struct{}
 
 func (a *ActionDeserializer) DeserializeActions(tr *driver.TokenRequest) ([]*actions.IssueAction, []*actions.TransferAction, error) {
-	issueActions := make([]*actions.IssueAction, len(tr.Issues))
-	for i := range len(tr.Issues) {
+	issues := tr.GetIssues()
+	issueActions := make([]*actions.IssueAction, len(issues))
+	for i := range issues {
 		ia := &actions.IssueAction{}
-		if err := ia.Deserialize(tr.Issues[i]); err != nil {
+		if err := ia.Deserialize(issues[i]); err != nil {
 			return nil, nil, err
 		}
 		issueActions[i] = ia
 	}
 
-	transferActions := make([]*actions.TransferAction, len(tr.Transfers))
-	for i := range len(tr.Transfers) {
+	transfers := tr.GetTransfers()
+	transferActions := make([]*actions.TransferAction, len(transfers))
+	for i := range transfers {
 		ta := &actions.TransferAction{}
-		if err := ta.Deserialize(tr.Transfers[i]); err != nil {
+		if err := ta.Deserialize(transfers[i]); err != nil {
 			return nil, nil, err
 		}
 		transferActions[i] = ta

token/core/fabtoken/v1/auditor_test.go

@@ -19,6 +19,7 @@ import (
 	validator2 "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/validator"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/driver/mock"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver/protos-go/v1/request"
 	benchmark2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/benchmark"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity"
 	"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/x509"
@@ -47,7 +48,9 @@ func TestActionDeserializer_DeserializeActions(t *testing.T) {
 		require.NoError(t, err)
 
 		tr := &driver.TokenRequest{
-			Issues: [][]byte{ia1Bytes},
+			Actions: []*driver.TypedAction{
+				{Type: request.ActionType_ACTION_TYPE_ISSUE, Raw: ia1Bytes},
+			},
 		}
 		ia, ta, err := ad.DeserializeActions(tr)
 		require.NoError(t, err)
@@ -62,7 +65,9 @@ func TestActionDeserializer_DeserializeActions(t *testing.T) {
 		require.NoError(t, err)
 
 		tr := &driver.TokenRequest{
-			Transfers: [][]byte{ta1Bytes},
+			Actions: []*driver.TypedAction{
+				{Type: request.ActionType_ACTION_TYPE_TRANSFER, Raw: ta1Bytes},
+			},
 		}
 		ia, ta, err := ad.DeserializeActions(tr)
 		require.NoError(t, err)
@@ -73,15 +78,19 @@ func TestActionDeserializer_DeserializeActions(t *testing.T) {
 
 	t.Run("IssueDeserializeError", func(t *testing.T) {
 		tr := &driver.TokenRequest{
-			Issues: [][]byte{[]byte("invalid")},
+			Actions: []*driver.TypedAction{
+				{Type: request.ActionType_ACTION_TYPE_ISSUE, Raw: []byte("invalid")},
+			},
 		}
 		_, _, err := ad.DeserializeActions(tr)
 		require.Error(t, err)
 	})
 
 	t.Run("TransferDeserializeError", func(t *testing.T) {
 		tr := &driver.TokenRequest{
-			Transfers: [][]byte{[]byte("invalid")},
+			Actions: []*driver.TypedAction{
+				{Type: request.ActionType_ACTION_TYPE_TRANSFER, Raw: []byte("invalid")},
+			},
 		}
 		_, _, err := ad.DeserializeActions(tr)
 		require.Error(t, err)
@@ -1127,7 +1136,9 @@ func newValidatorEnv(benchmarkCase *benchmark2.Case, isIssue bool) (*validatorEn
 		if err != nil {
 			return nil, err
 		}
-		tr.Issues = [][]byte{rawIA}
+		tr.Actions = []*driver.TypedAction{
+			{Type: request.ActionType_ACTION_TYPE_ISSUE, Raw: rawIA},
+		}
 		tr.Signatures = []*driver.RequestSignature{
 			{Action: &driver.ActionSignature{Signature: []byte("signature")}},
 		}
@@ -1156,7 +1167,9 @@ func newValidatorEnv(benchmarkCase *benchmark2.Case, isIssue bool) (*validatorEn
 		if err != nil {
 			return nil, err
 		}
-		tr.Transfers = [][]byte{rawTA}
+		tr.Actions = []*driver.TypedAction{
+			{Type: request.ActionType_ACTION_TYPE_TRANSFER, Raw: rawTA},
+		}
 		for range benchmarkCase.NumInputs {
 			tr.Signatures = append(tr.Signatures, &driver.RequestSignature{
 				Action: &driver.ActionSignature{Signature: []byte("signature")},

token/core/fabtoken/v1/validator/validator.go

@@ -124,8 +124,18 @@ func (a *Auditor) Check(
 ) error {
 	// TODO: inputTokens should be checked against the actions
 	// De-obfuscate issue requests
-	a.Logger.DebugfContext(ctx, "Get audit info for %d issues", len(tokenRequest.Issues))
-	outputsFromIssue, identitiesFromIssue, err := a.GetAuditInfoForIssues(tokenRequest.Issues, tokenRequestMetadata.Issues)
+	issues := tokenRequest.GetIssues()
+	a.Logger.DebugfContext(ctx, "Get audit info for %d issues", len(issues))
+
+	// Extract issue metadata
+	issueMetadata := make([]*driver.IssueMetadata, 0)
+	for _, action := range tokenRequestMetadata.Actions {
+		if action.IssueMetadata != nil {
+			issueMetadata = append(issueMetadata, action.IssueMetadata)
+		}
+	}
+
+	outputsFromIssue, identitiesFromIssue, err := a.GetAuditInfoForIssues(issues, issueMetadata)
 	if err != nil {
 		return errors.Wrapf(err, "failed getting audit info for issues for [%s]", txID)
 	}
@@ -143,8 +153,18 @@ func (a *Auditor) Check(
 		}
 	}
 	// De-obfuscate transfer requests
-	a.Logger.DebugfContext(ctx, "Get audit info for %d transfers", len(tokenRequest.Transfers))
-	auditableInputs, outputsFromTransfer, err := a.GetAuditInfoForTransfers(tokenRequest.Transfers, tokenRequestMetadata.Transfers, inputTokens)
+	transfers := tokenRequest.GetTransfers()
+	a.Logger.DebugfContext(ctx, "Get audit info for %d transfers", len(transfers))
+
+	// Extract transfer metadata
+	transferMetadata := make([]*driver.TransferMetadata, 0)
+	for _, action := range tokenRequestMetadata.Actions {
+		if action.TransferMetadata != nil {
+			transferMetadata = append(transferMetadata, action.TransferMetadata)
+		}
+	}
+
+	auditableInputs, outputsFromTransfer, err := a.GetAuditInfoForTransfers(transfers, transferMetadata, inputTokens)
 	if err != nil {
 		return errors.Wrapf(err, "failed getting audit info for transfers for [%s]", txID)
 	}