Merge pull request #84 from kaleido-io/mint-tokenidxfield

token index support for minting
hyperledger · May 5, 2022 · 7f2caf0 · 7f2caf0
2 parents 10e7382 + 0f8e03a
commit 7f2caf0
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 52 deletions.
diff --git a/server/src/controllers/tokens.ts b/server/src/controllers/tokens.ts
@@ -107,6 +107,7 @@ export class TokensController {
     const mintBody = {
       pool: body.pool,
       amount: body.amount,
+      tokenIndex: body.tokenIndex
     } as any;
     if (body.messagingMethod) {
       mintBody.message =
@@ -268,7 +269,8 @@ export class TokensTemplateController {
     return formatTemplate(`
       const transfer = await firefly.mintTokens({
         pool: <%= ${q('pool')} %>,
-        amount: <%= ${q('amount')} %>,<% if(messagingMethod && (value||jsonValue)) { %>
+        amount: <%= ${q('amount')} %>,<% if(tokenIndex) { %>
+        tokenIndex: <%= ${q('tokenIndex')} %>,<% } %><% if(messagingMethod && (value||jsonValue)) { %>
         message: {
           header: {
             tag: <%= tag ? ${q('tag')} : 'undefined' %>,
@@ -311,32 +313,32 @@ export class TokensTemplateController {
       file.buffer,
       <%= ${q('filename')} %>,
     );
-      const transfer = await firefly.mintTokens({
-        pool: <%= ${q('pool')} %>,
-        amount: <%= ${q('amount')} %>,<% if (tokenIndex) { %>
-          <% print('tokenIndex: ' + ${q(
-            'tokenIndex',
-          )} + ',') } %>,<% if(messagingMethod === 'broadcast') { %>
-        message: {
-          header: {
-            tag: <%= tag ? ${q('tag')} : 'undefined' %>,
-            topics: <%= topic ? ('[' + ${q('topic')} + ']') : 'undefined' %>,
-          },
-          data: [{ id: data.id }],
-        }<% } else { %>
-          message: {
-            header: {
-              tag: <%= tag ? ${q('tag')} : 'undefined' %>,
-              topics: <%= topic ? ('[' + ${q('topic')} + ']') : 'undefined' %>,
-            },
-            group: {
-              members: [<%= recipients.map((r) => '{ identity: ' + ${q('r')} + ' }').join(', ') %>],
-            },
-            data: [{ id: data.id }],
-          }
-      <%} %>
-      });
-      return { type: 'token_transfer', id: transfer.localId };
+    const transfer = await firefly.mintTokens({
+      pool: <%= ${q('pool')} %>,
+      amount: <%= ${q('amount')} %>,<% if (tokenIndex) { %>
+      <% print('tokenIndex: ' + ${q(
+          'tokenIndex',
+        )} + ',') } %><% if(messagingMethod === 'broadcast') { %>
+      message: {
+        header: {
+          tag: <%= tag ? ${q('tag')} : 'undefined' %>,
+          topics: <%= topic ? ('[' + ${q('topic')} + ']') : 'undefined' %>,
+        },
+        data: [{ id: data.id }],
+      }<% } else { %>
+      message: {
+        header: {
+          tag: <%= tag ? ${q('tag')} : 'undefined' %>,
+          topics: <%= topic ? ('[' + ${q('topic')} + ']') : 'undefined' %>,
+        },
+        group: {
+          members: [<%= recipients.map((r) => '{ identity: ' + ${q('r')} + ' }').join(', ') %>],
+        },
+        data: [{ id: data.id }],
+      }
+    <%} %>
+    });
+    return { type: 'token_transfer', id: transfer.localId };
     `);
   }
 

diff --git a/server/test/tokens.template.test.ts b/server/test/tokens.template.test.ts
@@ -79,18 +79,18 @@ describe('Templates: Tokens', () => {
             file.buffer,
             'document.pdf',
           );
-            const transfer = await firefly.mintTokens({
-              pool: 'pool1',
-              amount: '10',,
-              message: {
-                header: {
-                  tag: 'test-tag',
-                  topics: ['test-topic'],
-                },
-                data: [{ id: data.id }],
-              }
-            });
-            return { type: 'token_transfer', id: transfer.localId };
+          const transfer = await firefly.mintTokens({
+            pool: 'pool1',
+            amount: '10',
+            message: {
+              header: {
+                tag: 'test-tag',
+                topics: ['test-topic'],
+              },
+              data: [{ id: data.id }],
+            }
+          });
+          return { type: 'token_transfer', id: transfer.localId };
         `),
         );
       });

diff --git a/server/test/tokens.test.ts b/server/test/tokens.test.ts
@@ -281,7 +281,7 @@ describe('Tokens', () => {
       .expect({ type: 'token_transfer', id: 'transfer1' });
 
     expect(mockFireFly.uploadDataBlob).toHaveBeenCalledWith(expect.any(Buffer), 'simple-file.txt');
-    expect(mockFireFly.mintTokens).toHaveBeenCalledWith({"amount": "10000", "message": {"data": [{"id": "data1"}], "header": {"tag": undefined, "topics": undefined}}, "pool": "test-pool"});
+    expect(mockFireFly.mintTokens).toHaveBeenCalledWith({"amount": "10000", "message": {"data": [{"id": "data1"}], "header": {"tag": undefined, "topics": undefined}}, "pool": "test-pool", "tokenIndex": ""});
   });
 
   test('Mint tokens with private blob', async () => {
@@ -310,7 +310,7 @@ describe('Tokens', () => {
       .expect({ type: 'token_transfer', id: 'transfer1' });
 
     expect(mockFireFly.uploadDataBlob).toHaveBeenCalledWith(expect.any(Buffer), 'simple-file.txt');
-    expect(mockFireFly.mintTokens).toHaveBeenCalledWith({"amount": "10000", "message": {"data": [{"id": "data1"}], "group": {"members": [{"identity": "alpha"}, {"identity": "beta"}]}, "header": {"tag": undefined, "topics": undefined, "type": "transfer_private"}}, "pool": "test-pool"});
+    expect(mockFireFly.mintTokens).toHaveBeenCalledWith({"amount": "10000", "message": {"data": [{"id": "data1"}], "group": {"members": [{"identity": "alpha"}, {"identity": "beta"}]}, "header": {"tag": undefined, "topics": undefined, "type": "transfer_private"}}, "pool": "test-pool", "tokenIndex": ""});
   });
 
   test('Burn tokens', async () => {

diff --git a/ui/src/components/Forms/Tokens/MintForm.tsx b/ui/src/components/Forms/Tokens/MintForm.tsx
@@ -33,6 +33,7 @@ export const MintForm: React.FC = () => {
 
   const [pool, setPool] = useState<ITokenPool>();
   const [amount, setAmount] = useState<string>('1');
+  const [tokenIndex, setTokenIndex] = useState<string>('1');
   const [decimalAmount, setDecimalAmount] = useState<string | undefined>(
     undefined
   );
@@ -59,11 +60,11 @@ export const MintForm: React.FC = () => {
     const body = {
       pool: pool?.name,
       amount: pool?.type === PoolType.F ? decimalAmount : amount,
-      tokenIndex: '',
+      tokenIndex: pool?.type === PoolType.NF ? tokenIndex : '',
       messagingMethod: messagingMethod ? messagingMethod : null,
     };
     setJsonPayload(messagingMethod ? { ...jsonPayload, ...body } : body);
-  }, [pool, decimalAmount, formID]);
+  }, [pool, decimalAmount, tokenIndex, formID]);
 
   useEffect(() => {
     if (formID !== TUTORIAL_FORMS.MINT) return;
@@ -89,6 +90,11 @@ export const MintForm: React.FC = () => {
     setJsonPayload({ ...jsonPayload, recipients: null, messagingMethod: null });
   };
 
+  const isFungible = () => {
+    const selectedPool = tokenPools.find((p) => p.name === pool?.name);
+    return selectedPool?.type === 'fungible';
+  };
+
   const handleAmountChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     if (pool && pool.type === PoolType.NF) {
       setAmount(event.target.value);
@@ -104,6 +110,18 @@ export const MintForm: React.FC = () => {
     setAmount(event.target.value);
   };
 
+  const handleTokenIndexChange = (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    if (
+      !pool ||
+      pool.type !== PoolType.NF ||
+      isAmountInvalid(event.target.value)
+    )
+      return;
+    setTokenIndex(event.target.value);
+  };
+
   return (
     <Grid container>
       <Grid container spacing={DEFAULT_SPACING}>
@@ -152,16 +170,31 @@ export const MintForm: React.FC = () => {
                 label={t('amount')}
                 placeholder={t('exampleAmount')}
                 value={amount}
+                disabled={pool?.type === PoolType.NF}
                 onChange={handleAmountChange}
               />
             </FormControl>
           </Grid>
+          {!isFungible() && (
+            <Grid item xs={10} mt={2}>
+              <FormControl fullWidth required>
+                <TextField
+                  fullWidth
+                  label={t('tokenIndex')}
+                  placeholder={t('exampleTokenIndex')}
+                  value={tokenIndex}
+                  onChange={handleTokenIndexChange}
+                />
+              </FormControl>
+            </Grid>
+          )}
         </Grid>
         <MessageForm
           tokenMissingFields={!amount || !pool}
           tokenOperationPayload={{
             pool: pool?.name,
             amount: amount.toString(),
+            tokenIndex: pool?.type === PoolType.NF ? tokenIndex : '',
           }}
           label={t('attachAMessage')}
         />

diff --git a/ui/src/ff_models/eventTypes.tsx b/ui/src/ff_models/eventTypes.tsx
@@ -638,15 +638,6 @@ export const FF_EVENTS_CATEGORY_MAP: {
             />
           ),
         },
-        {
-          label: t('tokenIndex') + ':',
-          value: (
-            <FFListText
-              color="secondary"
-              text={event.tokenTransfer?.tokenIndex ?? t('---')}
-            />
-          ),
-        },
       ];
 
       if (event.tokenTransfer?.tokenIndex) {

diff --git a/ui/src/translations/en.json b/ui/src/translations/en.json
@@ -79,6 +79,7 @@
   "exampleAmount": "ex. 10",
   "exampleFromAddress": "ex. 0x987....321",
   "exampleTag": "ex. new_widget",
+  "exampleTokenIndex": "ex. 7",
   "exampleTopic": "ex. widget_123",
   "ffi": "FFI - FireFly Interface",
   "ffiShort": "FFI",