@bitpay-labs/bitcore-wallet-service 11.8.1 → 11.9.0

package/bws.example.config.js

@@ -214,10 +214,11 @@ module.exports = {
   // moonpay: {
   //   sandbox: {
   //     apiKey: 'moonpay_sandbox_api_key_here',
-  //     api: 'https://api.moonpay.com',
+  //     api: 'https://api.moonpay.dev',
   //     widgetApi: 'https://buy-sandbox.moonpay.com',
   //     sellWidgetApi: 'https://sell-sandbox.moonpay.com',
   //     secretKey: 'moonpay_sandbox_secret_key_here',
+  //     secretKeyEmbedded: 'moonpay_sandbox_secret_key_embedded_here',
   //   },
   //   production: {
   //     apiKey: 'moonpay_production_api_key_here',
@@ -225,10 +226,11 @@ module.exports = {
   //     widgetApi: 'https://buy.moonpay.com',
   //     sellWidgetApi: 'https://sell.moonpay.com',
   //     secretKey: 'moonpay_production_secret_key_here',
+  //     secretKeyEmbedded: 'moonpay_production_secret_key_embedded_here',
   //   },
   //   sandboxWeb: {
   //     apiKey: 'moonpay_sandbox_web_api_key_here',
-  //     api: 'https://api.moonpay.com',
+  //     api: 'https://api.moonpay.dev',
   //     widgetApi: 'https://buy-sandbox.moonpay.com',
   //     sellWidgetApi: 'https://sell-sandbox.moonpay.com',
   //     secretKey: 'moonpay_sandbox_web_secret_key_here',

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.8.1",
+  "version": "11.9.0",
   "license": "MIT",
   "main": "ts_build/src/index.js",
   "types": "./ts_build/src/index.d.ts",
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@bitpay-labs/bitcore-logging": "^11.8.1",
-    "@bitpay-labs/bitcore-tss": "^11.8.1",
-    "@bitpay-labs/crypto-wallet-core": "^11.8.1",
+    "@bitpay-labs/bitcore-tss": "^11.9.0",
+    "@bitpay-labs/crypto-wallet-core": "^11.9.0",
     "@sendgrid/mail": "6.5.4",
     "abi-decoder": "2.4.0",
     "async": "0.9.2",
@@ -126,5 +126,5 @@
       "email": "kjoseph@bitpay.com"
     }
   ],
-  "gitHead": "a1890ef287c9e5d0e966fb445d15bc59a9393761"
+  "gitHead": "3491bf1216d3c6b103c591564726333d55ad8c6d"
 }

package/src/bws.ts

@@ -34,6 +34,8 @@ if (config.https) {
       fs.readFileSync(config.CAinter2),
       fs.readFileSync(config.CAroot)
     ];
+  } else if (config.certificateAuthorities) {
+    serverOpts.ca = config.certificateAuthorities.map(caPath => fs.readFileSync(caPath));
   }
 }
 

package/src/config.ts

@@ -289,10 +289,11 @@ const Config = (): any => {
     // moonpay: {
     //   sandbox: {
     //     apiKey: 'moonpay_sandbox_api_key_here',
-    //     api: 'https://api.moonpay.com',
+    //     api: 'https://api.moonpay.dev',
     //     widgetApi: 'https://buy-sandbox.moonpay.com',
     //     sellWidgetApi: 'https://sell-sandbox.moonpay.com',
     //     secretKey: 'moonpay_sandbox_secret_key_here',
+    //     secretKeyEmbedded: 'moonpay_sandbox_secret_key_embedded_here',
     //   },
     //   production: {
     //     apiKey: 'moonpay_production_api_key_here',
@@ -300,10 +301,11 @@ const Config = (): any => {
     //     widgetApi: 'https://buy.moonpay.com',
     //     sellWidgetApi: 'https://sell.moonpay.com',
     //     secretKey: 'moonpay_production_secret_key_here',
+    //     secretKeyEmbedded: 'moonpay_production_secret_key_embedded_here',
     //   },
     //   sandboxWeb: {
     //     apiKey: 'moonpay_sandbox_web_api_key_here',
-    //     api: 'https://api.moonpay.com',
+    //     api: 'https://api.moonpay.dev',
     //     widgetApi: 'https://buy-sandbox.moonpay.com',
     //     sellWidgetApi: 'https://sell-sandbox.moonpay.com',
     //     secretKey: 'moonpay_sandbox_web_secret_key_here',

package/src/externalservices/moonpay.ts

@@ -1,6 +1,7 @@
 import { BitcoreLib as Bitcore } from '@bitpay-labs/crypto-wallet-core';
 import * as request from 'request';
 import config from '../config';
+import { Utils } from '../lib/common/utils';
 import { ClientError } from '../lib/errors/clienterror';
 import { checkRequired } from '../lib/server';
 
@@ -25,12 +26,14 @@ export class MoonpayService {
       SELL_WIDGET_API: string;
       API_KEY: string;
       SECRET_KEY: string;
+      SECRET_KEY_EMBEDDED: string | undefined;
     } = {
       API: config.moonpay[env].api,
       WIDGET_API: config.moonpay[env].widgetApi,
       SELL_WIDGET_API: config.moonpay[env].sellWidgetApi,
       API_KEY: config.moonpay[env].apiKey,
-      SECRET_KEY: config.moonpay[env].secretKey
+      SECRET_KEY: config.moonpay[env].secretKey,
+      SECRET_KEY_EMBEDDED: config.moonpay[env].secretKeyEmbedded
     };
 
     return keys;
@@ -435,4 +438,85 @@ export class MoonpayService {
       );
     });
   }
+
+  moonpayCreateSession(req): Promise<{ sessionToken: string }> {
+    return new Promise((resolve, reject) => {
+      const keys = this.moonpayGetKeys(req);
+      const API = keys.API;
+      const SECRET_KEY = keys.SECRET_KEY_EMBEDDED;
+
+      if (!checkRequired(req.body, ['externalCustomerId'])) {
+        return reject(new ClientError("Moonpay's request missing arguments"));
+      }
+
+      const deviceIp = Utils.getIpFromReq(req);
+      if (!deviceIp) {
+        return reject(new ClientError('Could not determine device IP address'));
+      }
+
+      const headers = {
+        'Content-Type': 'application/json',
+        Authorization: 'Api-Key ' + SECRET_KEY,
+      };
+
+      const body: any = {
+        externalCustomerId: req.body.externalCustomerId,
+        deviceIp
+      };
+      if (req.body.email) body.email = req.body.email;
+      if (req.body.phoneNumber) body.phoneNumber = req.body.phoneNumber;
+
+      const URL = API + '/platform/v1/session';
+
+      this.request.post(
+        URL,
+        {
+          headers,
+          body,
+          json: true
+        },
+        (err, data) => {
+          if (err) {
+            return reject(err.body ?? err);
+          } else {
+            return resolve(data.body ?? data);
+          }
+        }
+      );
+    });
+  }
+
+  moonpayRevokeActiveSession(req): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const keys = this.moonpayGetKeys(req);
+      const API = keys.API;
+      const SECRET_KEY = keys.SECRET_KEY_EMBEDDED;
+
+      if (!checkRequired(req.body, ['externalCustomerId'])) {
+        return reject(new ClientError("Moonpay's request missing arguments"));
+      }
+
+      const headers = {
+        Accept: 'application/json',
+        Authorization: 'Api-Key ' + SECRET_KEY
+      };
+
+      const URL = API + '/platform/v1/sessions?externalCustomerId=' + encodeURIComponent(req.body.externalCustomerId);
+
+      this.request.delete(
+        URL,
+        {
+          headers,
+          json: true
+        },
+        (err, data) => {
+          if (err) {
+            return reject(err.body ? err.body : err);
+          } else {
+            return resolve(data.body ? data.body : data);
+          }
+        }
+      );
+    });
+  }
 }

package/src/lib/blockchainexplorers/v8.ts

@@ -695,7 +695,7 @@ export class V8 {
           return cb(null, ret || Defaults.MIN_SOL_BALANCE);
         } catch (err) {
           logger.error('[v8.js] Error getting rentMinimum: %o', err);
-          return cb(null, Defaults.MIN_XRP_BALANCE);
+          return cb(null, Defaults.MIN_SOL_BALANCE);
         }
       })
       .catch(cb);

package/src/lib/common/utils.ts

@@ -282,13 +282,20 @@ export const Utils = {
   },
 
   getIpFromReq(req): string {
+    let ip = '';
     if (req.headers) {
-      if (req.headers['x-forwarded-for']) return req.headers['x-forwarded-for'].split(',')[0];
-      if (req.headers['x-real-ip']) return req.headers['x-real-ip'].split(',')[0];
+      if (req.headers['x-forwarded-for']) {
+        ip = req.headers['x-forwarded-for'].split(',')[0];
+      } else if (req.headers['x-real-ip']) {
+        ip = req.headers['x-real-ip'].split(',')[0];
+      }
     }
-    if (req.ip) return req.ip;
-    if (req.connection && req.connection.remoteAddress) return req.connection.remoteAddress;
-    return '';
+    if (!ip && req.ip) ip = req.ip;
+    if (!ip && req.connection?.remoteAddress) ip = req.connection.remoteAddress;
+
+    if (ip && typeof ip === 'string') ip = ip.trim();
+
+    return ip;
   },
 
   checkValueInCollection(value, collection) {
@@ -365,6 +372,12 @@ export const Utils = {
     return 'testnet';
   },
 
+  getAddressNetworkForDbLookup(address, network) {
+    const generic = Utils.getGenericName(network);
+    if (generic === 'livenet') return address;
+    return `${address}:${generic}`;
+  },
+
   castToBool(input: any) {
     input = input?.toString();
     if (input?.toLowerCase() === 'true' || input == '1') {