@bitpay-labs/bitcore-wallet-service 11.8.2 → 11.10.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.2",
+  "version": "11.10.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.10.0",
+    "@bitpay-labs/crypto-wallet-core": "^11.10.0",
     "@sendgrid/mail": "6.5.4",
     "abi-decoder": "2.4.0",
     "async": "0.9.2",
@@ -126,5 +126,5 @@
       "email": "kjoseph@bitpay.com"
     }
   ],
-  "gitHead": "a46b839de0bbad1e1dde9dcc50cafce7ef414edd"
+  "gitHead": "cccc9de4342d56cfcfc14d8b563d7542e4b08b6a"
 }

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/chain/eth/index.ts

@@ -3,13 +3,14 @@ import _ from 'lodash';
 import { IWallet } from 'src/lib/model';
 import { IAddress } from 'src/lib/model/address';
 import { WalletService } from 'src/lib/server';
-import { IChain } from '../../../types/chain';
 import { Common } from '../../common';
 import { ClientError } from '../../errors/clienterror';
 import { Errors } from '../../errors/errordefinitions';
 import logger from '../../logger';
 import { ERC20Abi } from './abi-erc20';
 import { InvoiceAbi } from './abi-invoice';
+import type { IChain } from '../../../types/chain';
+import type { TxProposal } from '../../model/txproposal';
 
 const {
   Constants,
@@ -98,24 +99,24 @@ export class EthChain implements IChain {
       // getPendingTxs returns all txps when given a native currency
       server.getPendingTxs(opts, (err, txps) => {
         if (err) return cb(err);
-        let fees = 0;
-        let amounts = 0;
+        let fees = 0n;
+        let amounts = 0n;
 
         txps.filter(txp => {
           // Add gas used for tokens when getting native balance
           if (!opts.tokenAddress) {
-            fees += txp.fee || 0;
+            fees += txp.fee ? BigInt(txp.fee) : 0n;
           }
           // Filter tokens when getting native balance
           if (txp.tokenAddress && !opts.tokenAddress) {
             return false;
           }
-          amounts += txp.amount;
+          amounts += txp.amount ? BigInt(txp.amount) : 0n;
           return true;
         });
 
         // TODO support big int
-        const lockedSum = (amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
+        const lockedSum = Number(amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
         const convertedBalance = this.convertBitcoreBalance(balance, lockedSum);
         server.storage.fetchAddresses(server.walletId, (err, addresses: IAddress[]) => {
           if (err) return cb(err);
@@ -286,7 +287,7 @@ export class EthChain implements IChain {
     });
   }
 
-  getBitcoreTx(txp, opts = { signed: true }) {
+  getBitcoreTx(txp: TxProposal, opts = { signed: true }) {
     const {
       data,
       outputs,

package/src/lib/chain/index.ts

@@ -94,7 +94,7 @@ class ChainProxy {
     return this.get(wallet.chain).getFee(server, wallet, opts);
   }
 
-  getBitcoreTx(txp: TxProposal, opts = { signed: true }) {
+  getBitcoreTx(txp: TxProposal<any>, opts = { signed: true }) {
     return this.get(txp.chain).getBitcoreTx(txp, { signed: opts.signed });
   }
 

package/src/lib/chain/sol/index.ts

@@ -56,18 +56,18 @@ export class SolChain implements IChain {
           const { fees, amounts } = txps.reduce((acc, txp) => {
             // Add gas used for tokens when getting native balance
             if (!opts.tokenAddress) {
-              acc.fees += txp.fee || 0;
+              acc.fees += txp.fee ? BigInt(txp.fee) : 0n;
             }
             
             // Filter tokens when getting native balance
             if (!(txp.tokenAddress && !opts.tokenAddress)) {
-              acc.amounts += txp.amount;
+              acc.amounts += txp.amount ? BigInt(txp.amount) : 0n;
             }
             
             return acc;
-          }, { fees: 0, amounts: 0 });
+          }, { fees: 0n, amounts: 0n });
 
-          const lockedSum = (amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
+          const lockedSum = Number(amounts + fees) || 0;  // previously set to 0 if opts.multisigContractAddress
           const reserveAmount = opts.tokenAddress ? 0 : reserve;
           const convertedBalance = this.convertBitcoreBalance(balance, lockedSum, reserveAmount);
           server.storage.fetchAddresses(server.walletId, (err, addresses: IAddress[]) => {

package/src/lib/chain/xrp/index.ts

@@ -65,9 +65,9 @@ export class XrpChain implements IChain {
         server.getPendingTxs(opts, (err, txps) => {
           if (err) return cb(err);
           const lockedSum = txps.reduce((sum, txp) => {
-            return sum + txp.amount + (txp.fee || 0);
-          }, 0) || 0;
-          const convertedBalance = this.convertBitcoreBalance(balance, lockedSum, reserve);
+            return sum + BigInt(txp.amount || 0) + BigInt(txp.fee || 0);
+          }, 0n) || 0n;
+          const convertedBalance = this.convertBitcoreBalance(balance, Number(lockedSum), reserve);
           server.storage.fetchAddresses(server.walletId, (err, addresses: IAddress[]) => {
             if (err) return cb(err);
             if (addresses.length > 0) {

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) {

package/src/lib/errors/errordefinitions.ts

@@ -61,6 +61,7 @@ interface Errors<T> {
   WALLET_NOT_FOUND: T;
   WALLET_NEED_SCAN: T;
   WRONG_SIGNING_METHOD: T;
+  INVALID_NUMBER_FORMAT: T;
   TSS_SESSION_NOT_FOUND: T;
   TSS_INVALID_PASSWORD: T;
   TSS_ROUND_ALREADY_DONE: T;
@@ -132,6 +133,7 @@ const errors: Errors<string> = {
   WALLET_NOT_FOUND: 'Wallet not found',
   WALLET_NEED_SCAN: 'Wallet needs addresses scan',
   WRONG_SIGNING_METHOD: 'Wrong signed method for coin/network',
+  INVALID_NUMBER_FORMAT: 'Invalid number format. Supported formats are: number, string, hex',
   TSS_SESSION_NOT_FOUND: 'Session not found',
   TSS_INVALID_PASSWORD: 'Invalid password',
   TSS_ROUND_ALREADY_DONE: 'Your message is for a round that has already finished',

package/src/lib/expressapp.ts

@@ -49,7 +49,8 @@ export class ExpressApp {
       getServerWithAuth,
       getServerWithMultiAuth,
       logDeprecated,
-      setPublicCache
+      setPublicCache,
+      checkNumberFormat
     } = createRouteHelpers(returnError);
 
     registerWalletRoutes(router, {
@@ -58,12 +59,14 @@ export class ExpressApp {
       getServerWithAuth,
       getServerWithMultiAuth,
       logDeprecated,
-      returnError
+      returnError,
+      checkNumberFormat
     });
 
     registerTransactionRoutes(router, {
       getServerWithAuth,
-      returnError
+      returnError,
+      checkNumberFormat
     });
 
     registerAdvertisementRoutes(router, {

package/src/lib/model/txnote.ts

@@ -16,6 +16,9 @@ export class TxNote {
   editedOn: number;
   editedBy: string;
 
+  // Non-persisted fields - populated when fetching from storage
+  editedByName?: string;
+
   static create(opts) {
     opts = opts || {};