@bitpay-labs/bitcore-wallet-service 11.11.0 → 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/routes/services.ts

@@ -459,18 +459,6 @@ export function registerServiceRoutes(router: express.Router, context: RouteCont
     });
   });
 
-  router.post('/v1/service/wyre/walletOrderQuotation', (req, res) => {
-    respondWithAuthServer(req, res, context, server => {
-      return server.externalServices.wyre.wyreWalletOrderQuotation(req);
-    });
-  });
-
-  router.post('/v1/service/wyre/walletOrderReservation', (req, res) => {
-    respondWithAuthServer(req, res, context, server => {
-      return server.externalServices.wyre.wyreWalletOrderReservation(req);
-    });
-  });
-
   router.post('/v1/service/changelly/getCurrencies', (req, res) => {
     respondWithPublicServer(req, res, context, server => {
       return server.externalServices.changelly.changellyGetCurrencies(req);

package/src/lib/server.ts

@@ -27,7 +27,6 @@ import { SardineService } from '../externalservices/sardine';
 import { SimplexService } from '../externalservices/simplex';
 import { ThorswapService } from '../externalservices/thorswap';
 import { TransakService } from '../externalservices/transak';
-import { WyreService } from '../externalservices/wyre';
 import { serverMessages } from '../serverMessages';
 import { BCHAddressTranslator } from './bchaddresstranslator';
 import { BlockChainExplorer } from './blockchainexplorer';
@@ -160,7 +159,6 @@ export class WalletService implements IWalletService {
     simplex: SimplexService;
     thorswap: ThorswapService;
     transak: TransakService;
-    wyre: WyreService;
     coinGecko: CoinGeckoService;
   };
 
@@ -190,7 +188,6 @@ export class WalletService implements IWalletService {
       simplex: new SimplexService(),
       thorswap: new ThorswapService(),
       transak: new TransakService(),
-      wyre: new WyreService(),
       coinGecko: new CoinGeckoService(this.storage),
     };
   }

package/src/types/externalservices.d.ts

@@ -20,7 +20,6 @@ export interface BuyCryptoConfig {
   sardine?: ExchangeConfig;
   simplex?: ExchangeConfig;
   transak?: ExchangeConfig;
-  wyre?: ExchangeConfig;
 }
 
 export interface SellCryptoConfig {