Merge pull request #57 from kaleido-io/numbers

Pass all token numbers as strings

server/package.json

@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/hyperledger/firefly-sandbox#readme",
   "dependencies": {
-    "@hyperledger/firefly-sdk": "^0.1.0-alpha.5",
+    "@hyperledger/firefly-sdk": "^0.1.0-alpha.8",
     "body-parser": "^1.20.0",
     "class-transformer": "^0.3.1",
     "class-validator": "^0.12.2",

server/src/controllers/contracts.ts

@@ -43,7 +43,7 @@ export class ContractsController {
         ? await firefly.generateContractInterface({
             name: body.name,
             version: body.version,
-            input: { abi: body.schema } as any,
+            input: { abi: body.schema },
           })
         : body.schema;
     const result = await firefly.createContractInterface(ffi);
@@ -64,7 +64,7 @@ export class ContractsController {
       },
       location: {
         address: body.address,
-      } as any,
+      },
     });
     return { type: 'message', id: api.message };
   }
@@ -84,7 +84,7 @@ export class ContractsController {
     const apis = await firefly.getContractAPIs();
     return apis.map((api) => ({
       name: api.name,
-      address: (api.location as any)?.address,
+      address: api.location?.address,
       urls: api.urls,
     }));
   }
@@ -100,7 +100,7 @@ export class ContractsController {
     const ffi = await firefly.getContractInterface(api.interface.id, true);
     return {
       name: api.name,
-      address: (api.location as any)?.address,
+      address: api.location?.address,
       urls: api.urls,
       events: ffi.events?.map((e) => ({ pathname: e.pathname })),
     };
@@ -119,7 +119,7 @@ export class ContractsController {
       id: l.id,
       name: l.name,
       topic: l.topic,
-      address: (l.location as any)?.address,
+      address: l.location?.address,
       eventName: l.event.name,
     }));
   }

server/src/interfaces.ts

@@ -123,7 +123,7 @@ export class TokenMint {
   @IsString()
   pool: string;
 
-  @IsString()
+  @IsNumberString()
   amount: string;
 }
 

server/test/contracts.test.ts

@@ -171,7 +171,7 @@ describe('Smart Contracts', () => {
     const listener = {
       id: 'listener1',
       topic: 'my-app',
-      location: { address: '0x123' } as any,
+      location: { address: '0x123' },
       event: { name: 'event1' },
     } as FireFlyContractListenerResponse;
 

ui/src/components/Forms/BurnForm.tsx

@@ -27,10 +27,10 @@ export const BurnForm: React.FC = () => {
 
   const [tokenPools, setTokenPools] = useState<ITokenPool[]>([]);
   const [pool, setPool] = useState<ITokenPool>();
-  const [amount, setAmount] = useState<number>(0);
+  const [amount, setAmount] = useState<string>('0');
   const [tokenIndex, setTokenIndex] = useState<string | null>('');
   const [refresh, setRefresh] = useState<number>(0);
-  const [tokenBalance, setTokenBalance] = useState<number>(0);
+  const [tokenBalance, setTokenBalance] = useState<string>('0');
 
   useEffect(() => {
     if (activeForm !== TUTORIALS.BURN) return;
@@ -80,7 +80,7 @@ export const BurnForm: React.FC = () => {
 
   useEffect(() => {
     if (!isFungible()) {
-      setAmount(1);
+      setAmount('1');
     }
   }, [pool, amount]);
 
@@ -96,9 +96,7 @@ export const BurnForm: React.FC = () => {
   };
 
   const handleAmountChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    if (parseInt(event.target.value)) {
-      setAmount(parseInt(event.target.value));
-    }
+    setAmount(event.target.value);
   };
 
   return (

ui/src/components/Forms/MintForm.tsx

@@ -27,19 +27,19 @@ export const MintForm: React.FC = () => {
   const { t } = useTranslation();
 
   const [tokenPools, setTokenPools] = useState<ITokenPool[]>([]);
-  const [tokenBalance, setTokenBalance] = useState<number>(0);
+  const [tokenBalance, setTokenBalance] = useState<string>('0');
 
   const [message] = useState<string | object | undefined>(
     DEFAULT_MESSAGE_STRING
   );
 
   const [pool, setPool] = useState<ITokenPool>();
-  const [amount, setAmount] = useState<number>(1);
+  const [amount, setAmount] = useState<string>('1');
   const [refresh, setRefresh] = useState<number>(0);
 
   useEffect(() => {
     if (activeForm !== TUTORIALS.MINT) {
-      setAmount(1);
+      setAmount('1');
       return;
     }
     setPayloadMissingFields(!amount || !pool);
@@ -101,9 +101,7 @@ export const MintForm: React.FC = () => {
   }, [pool, refresh]);
 
   const handleAmountChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    if (parseInt(event.target.value)) {
-      setAmount(parseInt(event.target.value));
-    }
+    setAmount(event.target.value);
   };
 
   return (

ui/src/components/Forms/TransferForm.tsx

@@ -28,16 +28,16 @@ export const TransferForm: React.FC = () => {
 
   const [tokenPools, setTokenPools] = useState<ITokenPool[]>([]);
   const [pool, setPool] = useState<ITokenPool>();
-  const [amount, setAmount] = useState<number>(1);
+  const [amount, setAmount] = useState<string>('1');
   const [tokenVerifiers, setTokenVerifiers] = useState<IVerifiers[]>([]);
   const [recipient, setRecipient] = useState<string>('');
   const [tokenIndex, setTokenIndex] = useState<string | null>('');
-  const [tokenBalance, setTokenBalance] = useState<number>(0);
-  const [refresh, setRefresh] = useState<number>(0);
+  const [tokenBalance, setTokenBalance] = useState<string>('0');
+  const [refresh, setRefresh] = useState<string>('0');
 
   useEffect(() => {
     if (activeForm !== TUTORIALS.TRANSFER) {
-      setAmount(1);
+      setAmount('1');
       return;
     }
     setPayloadMissingFields(
@@ -80,7 +80,7 @@ export const TransferForm: React.FC = () => {
 
   useEffect(() => {
     if (!isFungible()) {
-      setAmount(1);
+      setAmount('1');
     }
   }, [pool, amount]);
 
@@ -112,9 +112,7 @@ export const TransferForm: React.FC = () => {
   };
 
   const handleAmountChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    if (parseInt(event.target.value)) {
-      setAmount(parseInt(event.target.value));
-    }
+    setAmount(event.target.value);
   };
 
   const handleTokenIndexChange = (