@bitpay-labs/bitcore-wallet-service 11.10.14 → 11.11.1

package/src/externalservices/sardine.ts

@@ -1,6 +1,7 @@
 import * as request from 'request';
 import config from '../config';
 import { ClientError } from '../lib/errors/clienterror';
+import logger from '../lib/logger';
 import { checkRequired } from '../lib/server';
 
 export class SardineService {
@@ -68,9 +69,17 @@ export class SardineService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Sardine request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Sardine quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Sardine request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Sardine did not return a quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -102,9 +111,17 @@ export class SardineService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Sardine request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Sardine currency limits'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Sardine request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Sardine did not return currency limits'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -141,9 +158,17 @@ export class SardineService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Sardine request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Sardine token'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Sardine request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Sardine did not return a token'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -175,9 +200,17 @@ export class SardineService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Sardine request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Sardine supported tokens'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Sardine request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Sardine did not return supported tokens'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -226,9 +259,17 @@ export class SardineService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Sardine request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Sardine order details'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Sardine request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Sardine did not return order details'));
+            }
+            return resolve(data.body);
           }
         }
       );

package/src/externalservices/simplex.ts

@@ -3,6 +3,7 @@ import Uuid from 'uuid';
 import config from '../config';
 import { Utils } from '../lib/common/utils';
 import { ClientError } from '../lib/errors/clienterror';
+import logger from '../lib/logger';
 import { checkRequired } from '../lib/server';
 
 export class SimplexService {
@@ -64,9 +65,17 @@ export class SimplexService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Simplex request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Simplex supported currencies'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Simplex request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Simplex did not return supported currencies'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -94,8 +103,10 @@ export class SimplexService {
         req.body.payment_methods = req.body.payment_methods.map(item => item === 'simplex_account' ? 'sepa_open_banking' : item);
       }
 
+      const URL: string = API + '/wallet/merchant/v2/quote';
+
       this.request.post(
-        API + '/wallet/merchant/v2/quote',
+        URL,
         {
           headers,
           body: req.body,
@@ -103,9 +114,17 @@ export class SimplexService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Simplex request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Simplex quote'));
           } else {
-            return resolve(data.body ? data.body : null);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Simplex request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Simplex did not return a quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -148,9 +167,17 @@ export class SimplexService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Simplex request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Simplex sell quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Simplex request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Simplex did not return a sell quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -196,8 +223,10 @@ export class SimplexService {
         Authorization: 'ApiKey ' + API_KEY
       };
 
+      const URL: string = API + '/wallet/merchant/v2/payments/partner/data';
+
       this.request.post(
-        API + '/wallet/merchant/v2/payments/partner/data',
+        URL,
         {
           headers,
           body: req.body,
@@ -205,8 +234,16 @@ export class SimplexService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Simplex request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Simplex payment data'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Simplex request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Simplex did not return payment data'));
+            }
             data.body.payment_id = paymentId;
             data.body.order_id = orderId;
             data.body.app_provider_id = appProviderId;
@@ -242,8 +279,10 @@ export class SimplexService {
         headers['x-country-code'] = req.body.userCountry.toUpperCase();
       }
 
+      const URL: string = API + '/v3/initiate-sell/widget';
+
       this.request.post(
-        API + '/v3/initiate-sell/widget',
+        URL,
         {
           headers,
           body: req.body,
@@ -251,8 +290,16 @@ export class SimplexService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Simplex request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to initiate Simplex sell payment'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Simplex request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Simplex did not return sell data'));
+            }
             data.body.app_sell_ref_id = appSellRefId;
             return resolve(data.body);
           }

package/src/externalservices/thorswap.ts

@@ -1,6 +1,7 @@
 import * as request from 'request';
 import config from '../config';
 import { ClientError } from '../lib/errors/clienterror';
+import logger from '../lib/logger';
 import { checkRequired } from '../lib/server';
 
 export class ThorswapService {
@@ -47,7 +48,7 @@ export class ThorswapService {
         'x-api-key': API_KEY
       };
 
-      const uriPath: string = req?.body?.includeDetails ? '/tokenlist/utils/chains/details' : '/tokenlist/utils/chains';
+      const uriPath: string = '/tokenlist/utils/chains' + (req?.body?.includeDetails ? '/details' : '');
       const URL: string = API + uriPath;
 
       this.request.get(
@@ -58,9 +59,17 @@ export class ThorswapService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Thorswap request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Thorswap supported chains'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Thorswap request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Thorswap did not return supported chains'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -84,7 +93,7 @@ export class ThorswapService {
       const qs: string[] = [];
       qs.push('categories=' + (req?.body?.categories ?? 'all'));
 
-      const uriPath: string = req?.body?.includeDetails ? '/tokenlist/utils/currencies/details' : '/tokenlist/utils/currencies';
+      const uriPath: string = '/tokenlist/utils/currencies' + (req?.body?.includeDetails ? '/details' : '');
       const URL: string = API + `${uriPath}?${qs.join('&')}`;
 
       this.request.get(
@@ -95,9 +104,17 @@ export class ThorswapService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Thorswap request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Thorswap supported currencies'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Thorswap request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Thorswap did not return supported currencies'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -147,9 +164,17 @@ export class ThorswapService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Thorswap request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Thorswap swap quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Thorswap request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Thorswap did not return a swap quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -174,8 +199,10 @@ export class ThorswapService {
         return reject(new ClientError("Thorswap's request missing arguments"));
       }
 
+      const URL = API + '/tracker/v2/txn';
+
       this.request.post(
-        API + '/tracker/v2/txn',
+        URL,
         // API + '/apiusage/v2/txn',
         // 'https://api.swapkit.dev/track',
         // /apiusage/v2/txn
@@ -186,9 +213,17 @@ export class ThorswapService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Thorswap request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Thorswap swap transaction'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Thorswap request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Thorswap did not return a swap transaction'));
+            }
+            return resolve(data.body);
           }
         }
       );

package/src/externalservices/transak.ts

@@ -2,6 +2,7 @@ import * as request from 'request';
 import config from '../config';
 import { Utils } from '../lib/common/utils';
 import { ClientError } from '../lib/errors/clienterror';
+import logger from '../lib/logger';
 import { checkRequired } from '../lib/server';
 
 export class TransakService {
@@ -89,9 +90,17 @@ export class TransakService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Transak request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Transak access token'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Transak request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Transak did not return an access token'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -126,9 +135,17 @@ export class TransakService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Transak request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Transak supported currencies'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Transak request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Transak did not return supported currencies'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -163,9 +180,17 @@ export class TransakService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Transak request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Transak supported fiat currencies'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Transak request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Transak did not return supported fiat currencies'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -214,9 +239,17 @@ export class TransakService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Transak request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Transak quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Transak request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Transak did not return a quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -282,7 +315,8 @@ export class TransakService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Transak request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Transak signed payment URL'));
           } else {
             return resolve({ urlWithSignature: data?.body?.data?.widgetUrl ?? data?.data?.widgetUrl });
           }
@@ -323,9 +357,17 @@ export class TransakService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Transak request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Transak order details'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Transak request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Transak did not return order details'));
+            }
+            return resolve(data.body);
           }
         }
       );

package/src/lib/common/constants.ts

@@ -226,7 +226,7 @@ export const Constants = {
 
   // May be different from the defaults if we rollback
   // or want to beta test new versions.
-  TSS_KEYGEN_SCHEME_VERSION_MAX: 1.1,
+  TSS_KEYGEN_SCHEME_VERSION_MAX: 1.2,
   TSS_SIGGEN_SCHEME_VERSION_MAX: 1.1,
   
   TSS_KEYGEN_SCHEME_VERSION_MIN: 1,

package/src/lib/errors/errordefinitions.ts

@@ -82,6 +82,10 @@ interface Errors<T> {
   TSS_SESSION_EXPIRED: T;
   TSS_MISMATCH_VERSION: T;
   TSS_FINAL_SIGNATURE_MISMATCH: T;
+  TSS_INVALID_PARTY_DATA: T;
+  TSS_PARTY_ALREADY_REGISTERED: T;
+  TSS_ROUNDS_ALREADY_STARTED: T;
+  TSS_REGISTRATION_PENDING: T;
 };
 
 const errors: Errors<string> = {
@@ -159,6 +163,10 @@ const errors: Errors<string> = {
   TSS_SESSION_EXPIRED: 'TSS session has expired',
   TSS_MISMATCH_VERSION: 'TSS version does not match session version',
   TSS_FINAL_SIGNATURE_MISMATCH: 'Final signature does not match the one generated by the session',
+  TSS_INVALID_PARTY_DATA: 'Invalid party data',
+  TSS_PARTY_ALREADY_REGISTERED: 'Party already registered with a different party ID',
+  TSS_ROUNDS_ALREADY_STARTED: 'Rounds have already started',
+  TSS_REGISTRATION_PENDING: 'Awaiting registration by the session initiator',
 };
 
 const errorsObject = { codes: {} };

package/src/lib/model/tsskeygen.ts

@@ -44,10 +44,14 @@ export interface ITssKeyGenModel {
    */
   n: number;
   /**
-   * The list of public keys of the participants in the TSS key generation process.
-   * The pub keys are in partyId order.
+   * The list of copayer IDs of the participants in the TSS key generation process.
+   * They are in partyId order.
    */
   participants: Array<string>;
+  /**
+   * The list of authentication public keys corresponding to the participants in the TSS key generation process.
+   */
+  authPublicKeys: Array<string>;
   /**
    * An array of the rounds in round order. Each round is an array of messages
    */
@@ -89,6 +93,7 @@ export class TssKeyGenModel implements ITssKeyGenModel {
   id: string;
   n: number;
   participants: Array<string>;
+  authPublicKeys: Array<string>;
   rounds: Array<Array<{
     fromPartyId: number;
     messages: ITssKeyMessageObject;
@@ -135,9 +140,11 @@ export class TssKeyGenModel implements ITssKeyGenModel {
     x.schemeVersion = version || Defaults.TSS_KEYGEN_SCHEME_VERSION;
     x.n = n;
     x.participants = new Array(n);
-    x.participants[partyId] = copayerId;
+    x.participants[0] = copayerId; // caller's partyId is 0 (enforced above)
+    x.authPublicKeys = new Array(n);
+    x.authPublicKeys[0] = message.publicKey; // caller's partyId is 0 (enforced above)
     x.rounds = [[{
-      fromPartyId: partyId,
+      fromPartyId: 0, // caller's partyId is 0 (enforced above)
       messages: message
     }]];
     x.joinPassword = passwordHash;
@@ -154,6 +161,7 @@ export class TssKeyGenModel implements ITssKeyGenModel {
     x.schemeVersion = obj.schemeVersion;
     x.n = obj.n;
     x.participants = obj.participants;
+    x.authPublicKeys = obj.authPublicKeys;
     x.rounds = obj.rounds;
     x.sharedPublicKey = obj.sharedPublicKey;
     x.joinPassword = obj.joinPassword;

package/src/lib/routes/middleware/authRequest.ts

@@ -39,16 +39,13 @@ async function withSession(storage: Storage, opts): Promise<Copayer> {
         return reject(Errors.NOT_AUTHORIZED.withMessage('Session expired'));
       }
 
-      storage.fetchCopayerLookup(opts.copayerId, (err, copayer) => {
-        if (err) {
-          return reject(err);
-        }
+      storage.fetchCopayerLookup(opts.copayerId).then(copayer => {
         if (!copayer) {
           return reject(Errors.NOT_AUTHORIZED.withMessage('Copayer not found'));
         }
 
         return resolve(copayer);
-      });
+      }).catch(err => reject(err));
     });
   });
 
@@ -60,17 +57,10 @@ async function withSignature(storage: Storage, opts): Promise<Copayer> {
     return;
   }
 
-  const copayer = await new Promise<Copayer>((resolve, reject) => {
-    storage.fetchCopayerLookup(opts.copayerId, (err, copayer) => {
-      if (err) {
-        return reject(err);
-      }
-      if (!copayer) {
-        return reject(Errors.NOT_AUTHORIZED.withMessage('Copayer not found'));
-      }
-      return resolve(copayer);
-    });
-  });
+  const copayer = await storage.fetchCopayerLookup(opts.copayerId);
+  if (!copayer) {
+    throw Errors.NOT_AUTHORIZED.withMessage('Copayer not found');
+  }
 
   const isValid = !!copayer.requestPubKeys.find(pubKey => Utils.verifyMessage(opts.message, opts.signature, pubKey.key));
   if (!isValid) {