Merge pull request #303 from PureStake/jan/groups-of-groups

Support nested array of Grouped Transactions

packages/common/src/types.ts

@@ -5,6 +5,7 @@ export enum RequestErrors {
   InvalidTransactionParams = '[RequestErrors.InvalidTransactionParams] Invalid transaction parameters.',
   UnsupportedAlgod = '[RequestErrors.UnsupportedAlgod] The provided method is not supported.',
   UnsupportedLedger = '[RequestErrors.UnsupportedLedger] The provided ledger is not supported.',
+  InvalidFormat = '[RequestErrors.InvalidFormat] Please provide an array of either valid transaction objects or nested arrays of valid transaction objects.',
   Undefined = '[RequestErrors.Undefined] An undefined error occurred.',
 }
 

packages/dapp/src/fn/task.ts

@@ -50,29 +50,33 @@ export class Task extends Runtime implements ITask {
   }
 
   /**
-   * @param transactions array of valid wallet transaction objects
-   * @returns array of signed transactions
+   * @param transactionsOrGroups array or nested array of grouped transaction objects
+   * @returns array or nested array of signed transactions
    */
   signTxn(
-    transactions: Array<WalletTransaction>,
+    transactionsOrGroups: Array<WalletTransaction>,
     error: RequestErrors = RequestErrors.None
   ): Promise<JsonPayload> {
-    const formatError = new Error(
-      'There was a problem with the transaction(s) recieved. Please provide an array of valid transaction objects.'
-    );
-    if (!Array.isArray(transactions) || !transactions.length) throw formatError;
-    transactions.forEach((walletTx) => {
+    const formatError = new Error(RequestErrors.InvalidFormat);
+    // We check for empty arrays
+    if (!Array.isArray(transactionsOrGroups) || !transactionsOrGroups.length) throw formatError;
+    transactionsOrGroups.forEach((txOrGroup) => {
+      // We check for no null values and no empty nested arrays
       if (
-        walletTx === null ||
-        typeof walletTx !== 'object' ||
-        walletTx.txn === null ||
-        !walletTx.txn.length
+        txOrGroup === null ||
+        txOrGroup === undefined ||
+        (!Array.isArray(txOrGroup) && typeof txOrGroup === 'object' &&
+          (!txOrGroup.txn || (txOrGroup.txn && !txOrGroup.txn.length))
+        ) ||
+        (Array.isArray(txOrGroup) && 
+          (!txOrGroup.length || (txOrGroup.length && !txOrGroup.every((tx) => tx !== null)))
+        )
       )
         throw formatError;
     });
 
     const params = {
-      transactions: transactions,
+      transactionsOrGroups: transactionsOrGroups,
     };
     return MessageBuilder.promise(JsonRpcMethod.SignWalletTransaction, params, error);
   }

packages/extension/src/background/messaging/internalMethods.ts

@@ -311,6 +311,7 @@ export class InternalMethods {
     );
     return true;
   }
+
   public static [JsonRpcMethod.LedgerGetSessionTxn](request: any, sendResponse: Function) {
     if (session.txnWrap && 'body' in session.txnWrap) {
       // The transaction may contain source and JSONRPC info, the body.params will be the transaction validation object
@@ -455,6 +456,7 @@ export class InternalMethods {
     });
     return true;
   }
+
   public static [JsonRpcMethod.AccountDetails](request: any, sendResponse: Function) {
     const { ledger, address } = request.body.params;
     const algod = this.getAlgod(ledger);
@@ -935,6 +937,7 @@ export class InternalMethods {
       sendResponse({ error: e.message });
     }
   }
+
   public static [JsonRpcMethod.GetLedgers](request: any, sendResponse: Function) {
     getAvailableLedgersExt((availableLedgers) => {
       sendResponse(availableLedgers);