Clean-up, improve error handling

client/src/PublicRequest.ts

@@ -1,8 +1,6 @@
 import * as Nimiq from '@nimiq/core-web';
 import { KeyguardCommand } from './KeyguardCommand';
 
-export { KeyguardCommand };
-
 export type ObjectType = {
     [key: string]: any;
 };
@@ -425,6 +423,7 @@ export type RedirectRequest
     | ConnectRequest
     | SignTransactionRequest
     | SignBtcTransactionRequest
+    | SignMultisigTransactionRequest
     | SimpleRequest
     | DeriveBtcXPubRequest
     | SignSwapRequest;

client/src/main.ts

@@ -1,5 +1,5 @@
 export * from './KeyguardClient';
 export * from './RequestBehavior';
-// export * from './KeyguardCommand';
+export * from './KeyguardCommand';
 export * from './KeyguardErrors';
 export * from './PublicRequest';

demos/ConnectAccount.html

@@ -83,7 +83,7 @@
             keyId,
             keyLabel: 'Some Account',
 
-            appLogoUrl: 'http://localhost:3000/src/request/connect/logo.svg',
+            appLogoUrl: `${window.location.origin}/demos/multisig-logo.svg`,
 			permissions,
             requestedKeyPaths: [`m/44'/242'/0'/0'`],
 			challenge,

src/lib/multisig/MultisigUtils.js

@@ -40,6 +40,8 @@ class MultisigUtils { // eslint-disable-line no-unused-vars
             const loadPromise = new Promise(resolve => script.addEventListener('load', () => resolve()));
             document.head.appendChild(script);
             await loadPromise;
+
+            // `wasm_bindgen` is a global variable from the script above
             await wasm_bindgen('../../lib/multisig/wasm/pkg/multisig_bg.wasm'); // Relative path from a request URL
         }
 

src/lib/multisig/wasm/src/lib.rs

@@ -9,6 +9,10 @@ pub fn aggregate_secrets(concatenated_secrets: &[u8], b: &[u8]) -> Vec<u8> {
 
     let secrets = concatenated_secrets.chunks_exact(32);
 
+    if secrets.len() != number_commitments {
+        panic!("Invalid number of secrects: is {}, must be {}", secrets.len(), number_commitments);
+    }
+
     if secrets.remainder().len() != 0 {
         panic!("Invalid length of concatenated secrets");
     }

src/request/sign-multisig-transaction/SignMultisigTransaction.js

@@ -247,13 +247,26 @@ class SignMultisigTransaction {
         } else {
             // If we only have encrypted secrets, decrypt them and aggregate them with the bScalar
             const rsaKey = await key.getRsaPrivateKey();
-            const secrets = await Promise.all(request.multisigConfig.secret.encryptedSecrets.map(
-                async encrypted => new Uint8Array(
-                    await window.crypto.subtle.decrypt({ name: 'RSA-OAEP' }, rsaKey, encrypted),
-                ),
-            ));
 
-            aggregatedSecret = await MultisigUtils.aggregateSecrets(secrets, request.multisigConfig.secret.bScalar);
+            /** @type {Uint8Array[]} */
+            let secrets;
+            try {
+                secrets = await Promise.all(request.multisigConfig.secret.encryptedSecrets.map(
+                    async encrypted => new Uint8Array(
+                        await window.crypto.subtle.decrypt({ name: 'RSA-OAEP' }, rsaKey, encrypted),
+                    ),
+                ));
+            } catch (e) {
+                reject(new Errors.InvalidRequestError(`Cannot decrypt secrets: ${e.message}`));
+                return;
+            }
+
+            try {
+                aggregatedSecret = await MultisigUtils.aggregateSecrets(secrets, request.multisigConfig.secret.bScalar);
+            } catch (e) {
+                reject(new Errors.InvalidRequestError(`Cannot aggregate secrets: ${e.message}`));
+                return;
+            }
         }
 
         const signature = key.signPartially(