commnets

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

Author: adecaro

token/core/common/auditor.go

@@ -293,12 +293,11 @@ func RetrieveAuditTokens(
 		return nil, errors.WithMessagef(err, "failed to retrieve audit tokens for tx [%s]", anchor)
 	}
 
-	// Build the token map using token ID string as key
+	// Build the token map using token ID string as key.
+	// Tokens is in order of the ids.
 	auditTokens := make(map[string]*token.Token, len(tokens))
-	for i, tok := range tokens {
-		if tok != nil && i < len(tokenIDs) {
-			auditTokens[tokenIDs[i].String()] = tok
-		}
+	for i, id := range tokenIDs {
+		auditTokens[id.String()] = tokens[i]
 	}
 	logger.DebugfContext(ctx, "[%s] retrieved [%d] audit tokens", anchor, len(auditTokens))
 

token/core/zkatdlog/nogh/v1/testutils/env.go

@@ -12,7 +12,6 @@ import (
 	"encoding/json"
 	"maps"
 	"os"
-	"strconv"
 
 	math "github.com/IBM/mathlib"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
@@ -717,10 +716,7 @@ func prepareTransfer(
 		if err != nil {
 			return nil, nil, nil, nil, errors.Wrap(err, "failed to serialize metadata for loader")
 		}
-		key := ids[i].TxId
-		if ids[i].Index != 0 {
-			key = ids[i].TxId + ":" + strconv.FormatUint(ids[i].Index, 10)
-		}
+		key := ids[i].String()
 		tokenLoaderMap[key] = v1.LoadedToken{
 			Token:       tokenRaw,
 			Metadata:    metadataRaw,

token/core/zkatdlog/nogh/v1/testutils/support.go

@@ -9,7 +9,6 @@ package testutils
 import (
 	"context"
 	"math/big"
-	"strconv"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	v1 "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1"
@@ -163,10 +162,7 @@ type testTokenLoader struct {
 func (t *testTokenLoader) LoadTokens(ctx context.Context, ids []*token2.ID) ([]v1.LoadedToken, error) {
 	result := make([]v1.LoadedToken, len(ids))
 	for i, id := range ids {
-		key := id.TxId
-		if id.Index != 0 {
-			key = id.TxId + ":" + strconv.FormatUint(id.Index, 10)
-		}
+		key := id.String()
 		tok, ok := t.tokens[key]
 		if !ok {
 			return nil, errors.Errorf("token not found: %s", key)

token/driver/request.go

@@ -340,6 +340,60 @@ func (r *TokenRequest) FromProtos(tr *request.TokenRequest) error {
 		r.Signatures = append(r.Signatures, requestSignature)
 	}
 
+	// Validate the structural integrity of the token request
+	if err := r.Validate(); err != nil {
+		return errors.Wrap(err, "token request validation failed")
+	}
+
+	return nil
+}
+
+// Validate checks the structural validity of the TokenRequest.
+// It ensures that all required fields are present and non-empty.
+// This method should be called after unmarshalling to verify the request is well-formed.
+//
+// Special case: Empty requests (nil Actions or empty Actions slice) are allowed
+// to support test scenarios where requests are created but not yet populated.
+// This is necessary because ToProtos() sets Version=ProtocolV1 even for empty requests.
+//
+// Returns an error if:
+//   - Any action in Actions is nil
+//   - Any action has empty Raw bytes
+//   - Any signature in Signatures is nil
+//   - Any signature has empty signature bytes
+func (r *TokenRequest) Validate() error {
+	// If we have actions, validate them
+
+	for i, action := range r.Actions {
+		if action == nil {
+			return errors.Errorf("action at index %d is nil", i)
+		}
+		if len(action.Raw) == 0 {
+			return errors.Errorf("action at index %d has empty Raw bytes", i)
+		}
+	}
+
+	// Validate signatures (if present)
+	for i, sig := range r.Signatures {
+		if sig == nil {
+			return errors.Errorf("signature at index %d is nil", i)
+		}
+
+		// Check that signature has either Action or Auditor signature with non-empty bytes
+		switch {
+		case sig.Action != nil:
+			if len(sig.Action.Signature) == 0 {
+				return errors.Errorf("action signature at index %d has empty signature bytes", i)
+			}
+		case sig.Auditor != nil:
+			if len(sig.Auditor.Signature) == 0 {
+				return errors.Errorf("auditor signature at index %d has empty signature bytes", i)
+			}
+		default:
+			return errors.Errorf("signature at index %d has neither action nor auditor signature", i)
+		}
+	}
+
 	return nil
 }