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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@bitpay-labs/bitcore-wallet-service",
   "description": "A service for Mutisig HD Bitcoin Wallets",
   "author": "BitPay Inc",
-  "version": "11.11.0",
+  "version": "11.11.1",
   "license": "MIT",
   "main": "ts_build/src/index.js",
   "types": "./ts_build/src/index.d.ts",
@@ -42,8 +42,8 @@
   },
   "dependencies": {
     "@bitpay-labs/bitcore-logging": "^11.10.9",
-    "@bitpay-labs/bitcore-tss": "^11.11.0",
-    "@bitpay-labs/crypto-wallet-core": "^11.11.0",
+    "@bitpay-labs/bitcore-tss": "^11.11.1",
+    "@bitpay-labs/crypto-wallet-core": "^11.11.1",
     "@sendgrid/mail": "6.5.4",
     "abi-decoder": "2.4.0",
     "async": "0.9.2",
@@ -107,5 +107,5 @@
       "email": "kjoseph@bitpay.com"
     }
   ],
-  "gitHead": "df3d9a76fd7418767d2951fbbfce5a0c7c1db215"
+  "gitHead": "2d26cb6cfc59aab5415c9ce32863a9b9d832e5bb"
 }

package/src/config.ts

@@ -229,10 +229,6 @@ const Config = (): any => {
         transak: {
           disabled: false,
           removed: false
-        },
-        wyre: {
-          disabled: false,
-          removed: false
         }
       },
       sellCrypto: {
@@ -441,22 +437,6 @@ const Config = (): any => {
     //   },
     //   whitelist: []
     // },
-    // wyre: {
-    //   sandbox: {
-    //     apiKey: 'wyre_sandbox_api_key_here',
-    //     secretApiKey: 'wyre_sandbox_secret_api_key_here',
-    //     api: 'https://api.testwyre.com',
-    //     widgetUrl: 'https://pay.testwyre.com',
-    //     appProviderAccountId: 'wyre_provider_sandbox_account_id_here'
-    //   },
-    //   production: {
-    //     apiKey: 'wyre_production_api_key_here',
-    //     secretApiKey: 'wyre_production_secret_api_key_here',
-    //     api: 'https://api.sendwyre.com',
-    //     widgetUrl: 'https://pay.sendwyre.com/',
-    //     appProviderAccountId: 'wyre_provider_production_account_id_here'
-    //   }
-    // },
     // changelly: {
     //   v1: {
     //     apiKey: 'changelly_api_key',

package/src/externalservices/banxa.ts

@@ -3,6 +3,7 @@ import * as _ from 'lodash';
 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 BanxaService {
@@ -86,9 +87,17 @@ export class BanxaService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Banxa request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to fetch Banxa coins'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Banxa request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Banxa did not return coins'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -123,9 +132,17 @@ export class BanxaService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Banxa request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to fetch Banxa payment methods'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Banxa request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Banxa did not return payment methods'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -170,9 +187,17 @@ export class BanxaService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Banxa request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to fetch Banxa quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Banxa request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Banxa did not return quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -214,9 +239,17 @@ export class BanxaService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Banxa request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to create Banxa order'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Banxa request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Banxa did not return order'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -254,9 +287,17 @@ export class BanxaService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Banxa request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Banxa order'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Banxa request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Banxa did not return order'));
+            }
+            return resolve(data.body);
           }
         }
       );

package/src/externalservices/changelly.ts

@@ -96,8 +96,16 @@ export class ChangellyService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Changelly request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to fetch Changelly currencies'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Changelly request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Changelly did not return currencies'));
+            }
             return resolve(data.body);
           }
         }
@@ -147,8 +155,16 @@ export class ChangellyService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Changelly request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to fetch Changelly pairs params'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Changelly request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Changelly did not return pairs params'));
+            }
             return resolve(data.body);
           }
         }
@@ -199,8 +215,16 @@ export class ChangellyService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Changelly request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to fetch Changelly fix rate for amount'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Changelly request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Changelly did not return fix rate for amount'));
+            }
             return resolve(data.body);
           }
         }
@@ -262,8 +286,16 @@ export class ChangellyService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Changelly request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to create Changelly fix transaction'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Changelly request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Changelly did not return fix transaction'));
+            }
             return resolve(data.body);
           }
         }
@@ -312,8 +344,16 @@ export class ChangellyService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Changelly request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Changelly transactions'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Changelly request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Changelly did not return transactions'));
+            }
             return resolve(data.body);
           }
         }
@@ -360,8 +400,16 @@ export class ChangellyService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Changelly request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Changelly status'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Changelly request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Changelly did not return status'));
+            }
             return resolve(data.body);
           }
         }

package/src/externalservices/moonpay.ts

@@ -3,6 +3,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 MoonpayService {
@@ -58,9 +59,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay currencies'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return currencies'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -100,9 +109,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay buy quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return buy quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -141,9 +158,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay sell quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return sell quote'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -180,9 +205,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay currency limits'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return currency limits'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -366,9 +399,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay transaction details'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return transaction details'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -406,9 +447,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay sell transaction details'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return sell transaction details'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -445,10 +494,14 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to cancel Moonpay sell transaction'));
           } else {
             const success = data.statusCode >= 200 && data.statusCode < 300;
-            return resolve(data.body ? data.body : { success });
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            return resolve(data.body || { success });
           }
         }
       );
@@ -478,9 +531,17 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Moonpay account details'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Moonpay did not return account details'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -525,7 +586,8 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to create Moonpay session'));
           } else {
             if (!data.body) {
               return reject(new ClientError('Moonpay did not return a session'));
@@ -562,10 +624,14 @@ export class MoonpayService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Moonpay request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to revoke Moonpay session'));
           } else {
             const success = data.statusCode >= 200 && data.statusCode < 300;
-            return resolve(data.body ? data.body : { success });
+            if (!success) {
+              logger.warn(`Moonpay request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            return resolve(data.body || { success });
           }
         }
       );

package/src/externalservices/oneInch.ts

@@ -74,7 +74,7 @@ export class OneInchService {
 
       const chainNetwork: string = req.params?.['chain']
         ? `${req.params['chain'].toUpperCase()}_mainnet`
-        : 'eth_mainnet';
+        : 'ETH_mainnet';
       const chainId: number = ConstantsCWC.EVM_CHAIN_NETWORK_TO_CHAIN_ID[chainNetwork];
 
       const URL: string = `${credentials.API}/swap/v5.2/${chainId}/swap/?${qs.join('&')}`;
@@ -87,8 +87,16 @@ export class OneInchService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ?? err);
+            logger.error(`1Inch request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get 1Inch swap data'));
           } else {
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`1Inch request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('1Inch did not return swap data'));
+            }
             return resolve(data.body);
           }
         }
@@ -137,12 +145,12 @@ export class OneInchService {
           (err, data) => {
             const tokens = data?.body?.tokens;
             if (err) {
-              logger.warn('An error occured while retrieving the token list', err);
+              logger.error('An error occured while retrieving 1Inch token list: %o', err);
               if (oldvalues) {
                 logger.warn('Using old cached values');
                 return resolve(oldvalues);
               }
-              return reject(err.body ?? err);
+              return reject(new ClientError('Failed to get 1Inch token list'));
             } else if (data?.statusCode === 429 && oldvalues) {
               // oneinch rate limit
               return resolve(oldvalues);
@@ -152,7 +160,7 @@ export class OneInchService {
                   logger.warn('No token list available... using old cached values');
                   return resolve(oldvalues);
                 }
-                return reject(new Error('Could not get tokens list'));
+                return reject(new Error('Could not get 1Inch tokens list'));
               }
               this.storage.storeGlobalCache(cacheKey, tokens, err => {
                 if (err) {

package/src/externalservices/ramp.ts

@@ -3,6 +3,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 RampService {
@@ -59,9 +60,17 @@ export class RampService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Ramp request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Ramp quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Ramp request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Ramp did not return quote data'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -99,9 +108,17 @@ export class RampService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Ramp request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Ramp sell quote'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Ramp request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Ramp did not return sell quote data'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -232,9 +249,17 @@ export class RampService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Ramp request failed with error (${URL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Ramp assets'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Ramp request failed with status code ${data.statusCode}: ${URL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Ramp did not return assets data'));
+            }
+            return resolve(data.body);
           }
         }
       );
@@ -258,6 +283,7 @@ export class RampService {
       qs.push('secret=' + req.body.saleViewToken);
 
       const URL = API + `/host-api/v3/offramp/sale/${req.body.id}?${qs.join('&')}`;
+      const safeURL = URL.replace('secret=' + req.body.saleViewToken, 'secret=***');
 
       this.request.get(
         URL,
@@ -267,9 +293,17 @@ export class RampService {
         },
         (err, data) => {
           if (err) {
-            return reject(err.body ? err.body : err);
+            logger.error(`Ramp request failed with error (${safeURL}): ${err.stack || err}`);
+            return reject(new ClientError('Failed to get Ramp sell transaction details'));
           } else {
-            return resolve(data.body ? data.body : data);
+            const success = data.statusCode >= 200 && data.statusCode < 300;
+            if (!success) {
+              logger.warn(`Ramp request failed with status code ${data.statusCode}: ${safeURL}`);
+            }
+            if (!data.body) {
+              return reject(new ClientError('Ramp did not return sell transaction details'));
+            }
+            return resolve(data.body);
           }
         }
       );