Responds to feedback from PR #413

GridPlus · Jun 27, 2022 · 991ebaa · 991ebaa
1 parent 3ba8c3b
commit 991ebaa
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -15,6 +15,7 @@ import {
   sign
 } from './functions/index';
 import { retryWrapper } from './shared/functions';
+import { validateEphemeralPub } from './shared/validators';
 import { getP256KeyPair, getP256KeyPairFromPub, randomBytes } from './util';
 
 /**
@@ -109,9 +110,8 @@ export class Client {
 
   /** @internal */
   public set ephemeralPub (ephemeralPub: KeyPair) {
-    if (ephemeralPub) {
-      this._ephemeralPub = ephemeralPub;
-    }
+    validateEphemeralPub(ephemeralPub)
+    this._ephemeralPub = ephemeralPub;
   }
 
   /**

diff --git a/src/shared/errors.ts b/src/shared/errors.ts
@@ -3,8 +3,7 @@ import { responseMsgs } from '../constants';
 const buildLatticeResponseErrorMessage = ({ responseCode, errorMessage }) => {
   const msg: string[] = [];
   if (responseCode) {
-    msg.push(`Response Code: ${responseCode}`);
-    msg.push(`Message: ${responseMsgs[responseCode]}`);
+    msg.push(`${responseMsgs[responseCode]}`);
   }
   if (errorMessage) {
     msg.push('Error Message: ');

diff --git a/src/shared/functions.ts b/src/shared/functions.ts
@@ -7,7 +7,6 @@ import {
   ENC_MSG_LEN,
   EXTERNAL,
   REQUEST_TYPE_BYTE,
-  responseMsgs,
   VERSION_BYTE,
 } from '../constants';
 import ethereum from '../ethereum';
@@ -225,33 +224,36 @@ export const retryWrapper = async ({
   retries,
   client,
 }) => {
-  return fn({ ...params }).catch(async (err) => {
-    const errorMessage = err.errorMessage;
-    const responseCode = err.responseCode;
+  return fn({ ...params })
+    .catch(async (err) => {
+      /** `string` returned from the Lattice if there's an error */
+      const errorMessage = err.errorMessage;
+      /** `number` returned from the Lattice if there's an error */
+      const responseCode = err.responseCode;
 
-    if ((errorMessage || responseCode) && retries) {
+      if ((errorMessage || responseCode) && retries) {
 
-      if (isDeviceBusy(responseCode)) {
-        await sleep(3000);
-      }
+        if (isDeviceBusy(responseCode)) {
+          await sleep(3000);
+        }
 
-      if (isWrongWallet(responseCode) && !client.skipRetryOnWrongWallet) {
-        await client.fetchActiveWallet();
-      }
+        if (isWrongWallet(responseCode) && !client.skipRetryOnWrongWallet) {
+          await client.fetchActiveWallet();
+        }
 
-      if (isInvalidEphemeralId(responseCode)) {
-        await client.connect(client.deviceId);
-      }
+        if (isInvalidEphemeralId(responseCode)) {
+          await client.connect(client.deviceId);
+        }
 
-      return retryWrapper({
-        fn,
-        params,
-        retries: retries - 1,
-        client,
-      });
-    }
-    throw err;
-  });
+        return retryWrapper({
+          fn,
+          params,
+          retries: retries - 1,
+          client,
+        });
+      }
+      throw err;
+    });
 };
 
 /**

diff --git a/src/shared/validators.ts b/src/shared/validators.ts
@@ -17,7 +17,6 @@ export const validateIsUInt4 = (n?: number) => {
 };
 
 export const validateNAddresses = (n: number) => {
-  validateIsUInt4(n);
   if (n > MAX_ADDR)
     throw new Error(`You may only request ${MAX_ADDR} addresses at once.`);
 };
@@ -84,7 +83,7 @@ export const validateFwConstants = (fwConstants?: FirmwareConstants) => {
   return fwConstants;
 };
 export const validateFwVersion = (fwVersion?: Buffer) => {
-  if (!fwVersion) {
+  if (!fwVersion || fwVersion.byteLength > 4) {
     throw new Error('Firmware version does not exist. Please reconnect.');
   }
   return fwVersion;