From 4af6f272c9f51a4d37d83cf526b49353a377f4c3 Mon Sep 17 00:00:00 2001
From: Andrew Richardson <andrew.richardson@kaleido.io>
Date: Wed, 2 Feb 2022 15:23:45 -0500
Subject: [PATCH] Allow passing a tokenIndex to "mint"

Some connectors may support (or require) this.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
---
 internal/apiserver/route_post_token_mint.go |  2 +-
 internal/tokens/fftokens/fftokens.go        | 26 +++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/internal/apiserver/route_post_token_mint.go b/internal/apiserver/route_post_token_mint.go
index 942f032939..b9f22500ac 100644
--- a/internal/apiserver/route_post_token_mint.go
+++ b/internal/apiserver/route_post_token_mint.go
@@ -39,7 +39,7 @@ var postTokenMint = &oapispec.Route{
 	FilterFactory:   nil,
 	Description:     i18n.MsgTBD,
 	JSONInputValue:  func() interface{} { return &fftypes.TokenTransferInput{} },
-	JSONInputMask:   []string{"Type", "LocalID", "TokenIndex", "URI", "From", "ProtocolID", "MessageHash", "TX", "Created"},
+	JSONInputMask:   []string{"Type", "LocalID", "URI", "From", "ProtocolID", "MessageHash", "TX", "Created"},
 	JSONOutputValue: func() interface{} { return &fftypes.TokenTransfer{} },
 	JSONOutputCodes: []int{http.StatusAccepted, http.StatusOK},
 	JSONHandler: func(r *oapispec.APIRequest) (output interface{}, err error) {
diff --git a/internal/tokens/fftokens/fftokens.go b/internal/tokens/fftokens/fftokens.go
index 3b4b45d806..7db99b9f5e 100644
--- a/internal/tokens/fftokens/fftokens.go
+++ b/internal/tokens/fftokens/fftokens.go
@@ -80,12 +80,13 @@ type activatePool struct {
 }
 
 type mintTokens struct {
-	PoolID    string `json:"poolId"`
-	To        string `json:"to"`
-	Amount    string `json:"amount"`
-	RequestID string `json:"requestId,omitempty"`
-	Operator  string `json:"operator"`
-	Data      string `json:"data,omitempty"`
+	PoolID     string `json:"poolId"`
+	TokenIndex string `json:"tokenIndex,omitempty"`
+	To         string `json:"to"`
+	Amount     string `json:"amount"`
+	RequestID  string `json:"requestId,omitempty"`
+	Operator   string `json:"operator"`
+	Data       string `json:"data,omitempty"`
 }
 
 type burnTokens struct {
@@ -428,12 +429,13 @@ func (ft *FFTokens) MintTokens(ctx context.Context, opID *fftypes.UUID, poolProt
 	})
 	res, err := ft.client.R().SetContext(ctx).
 		SetBody(&mintTokens{
-			PoolID:    poolProtocolID,
-			To:        mint.To,
-			Amount:    mint.Amount.Int().String(),
-			RequestID: opID.String(),
-			Operator:  mint.Key,
-			Data:      string(data),
+			PoolID:     poolProtocolID,
+			TokenIndex: mint.TokenIndex,
+			To:         mint.To,
+			Amount:     mint.Amount.Int().String(),
+			RequestID:  opID.String(),
+			Operator:   mint.Key,
+			Data:       string(data),
 		}).
 		Post("/api/v1/mint")
 	if err != nil || !res.IsSuccess() {