feat(sdk): parse integer input to be the correct type

AztecProtocol · Feb 13, 2020 · c73ba2f · c73ba2f
1 parent 51866e8
commit c73ba2f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
diff --git a/packages/extension/src/client/apis/ZkAsset.js b/packages/extension/src/client/apis/ZkAsset.js
@@ -3,6 +3,8 @@ import Web3Service from '~/client/services/Web3Service';
 import ConnectionService from '~/client/services/ConnectionService';
 import ContractError from '~/client/utils/ContractError';
 import ApiError from '~/client/utils/ApiError';
+import parseInputTransactions from '~/client/utils/parseInputTransactions';
+import parseInputInteger from '~/client/utils/parseInputInteger';
 import SubscriptionManager from './SubscriptionManager';
 
 const dataProperties = [
@@ -197,8 +199,8 @@ export default class ZkAsset {
             {
                 proofType: 'DEPOSIT_PROOF',
                 assetAddress: this.address,
-                transactions,
-                numberOfOutputNotes,
+                transactions: parseInputTransactions(transactions),
+                numberOfOutputNotes: parseInputInteger(numberOfOutputNotes),
                 userAccess,
             },
         );
@@ -238,9 +240,9 @@ export default class ZkAsset {
             {
                 proofType: 'WITHDRAW_PROOF',
                 assetAddress: this.address,
-                amount,
+                amount: parseInputInteger(amount),
                 to: to || address,
-                numberOfInputNotes,
+                numberOfInputNotes: parseInputInteger(numberOfInputNotes),
             },
         );
     };
@@ -274,9 +276,9 @@ export default class ZkAsset {
         {
             proofType: 'TRANSFER_PROOF',
             assetAddress: this.address,
-            transactions,
-            numberOfInputNotes,
-            numberOfOutputNotes,
+            transactions: parseInputTransactions(transactions),
+            numberOfInputNotes: parseInputInteger(numberOfInputNotes),
+            numberOfOutputNotes: parseInputInteger(numberOfOutputNotes),
             userAccess,
         },
     );
@@ -395,10 +397,10 @@ export default class ZkAsset {
             {
                 proofType: 'CREATE_NOTE_FROM_BALANCE_PROOF',
                 assetAddress: this.address,
-                amount,
+                amount: parseInputInteger(amount),
                 userAccess,
-                numberOfInputNotes,
-                numberOfOutputNotes,
+                numberOfInputNotes: parseInputInteger(numberOfInputNotes),
+                numberOfOutputNotes: parseInputInteger(numberOfOutputNotes),
             },
         ) || {};
 
@@ -429,10 +431,10 @@ export default class ZkAsset {
         'fetchNotesFromBalance',
         {
             assetAddress: this.address,
-            greaterThan,
-            lessThan,
-            equalTo,
-            numberOfNotes,
+            greaterThan: parseInputInteger(greaterThan),
+            lessThan: parseInputInteger(lessThan),
+            equalTo: parseInputInteger(equalTo),
+            numberOfNotes: parseInputInteger(numberOfNotes),
         },
     );
 }
diff --git a/packages/extension/src/client/utils/parseInputInteger.js b/packages/extension/src/client/utils/parseInputInteger.js
@@ -0,0 +1,12 @@
+export default function parseInputInteger(val) {
+    if (typeof val === 'string') {
+        if (val === '') {
+            return undefined;
+        }
+        if (val.trim().match(/^[0-9]{1,}$/)) {
+            return parseInt(val, 10);
+        }
+    }
+
+    return val;
+}
diff --git a/packages/extension/src/client/utils/parseInputTransactions.js b/packages/extension/src/client/utils/parseInputTransactions.js
@@ -0,0 +1,12 @@
+import parseInputInteger from './parseInputInteger';
+
+export default function parseInputTransactions(transactions) {
+    if (!Array.isArray(transactions)) {
+        return transactions;
+    }
+
+    return transactions.map(tx => ({
+        ...tx,
+        amount: parseInputInteger(tx.amount),
+    }));
+}